From 7c30164b8715c69e268df6624d17c8e2ca77a5cca1fbe30eb691cb51b42feb35 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 17 Aug 2015 20:19:27 +0000 Subject: [PATCH] Accepting request 322430 from home:michal-m:branches:Base:System - Only handle KMPs that are built using the %kernel_module_package macro (preparatory work for fate#319339). OBS-URL: https://build.opensuse.org/request/show/322430 OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=23 --- suse-module-tools.changes | 6 ++++++ weak-modules2 | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/suse-module-tools.changes b/suse-module-tools.changes index b6f5fb7..99e4cfe 100644 --- a/suse-module-tools.changes +++ b/suse-module-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Aug 13 13:30:17 UTC 2015 - mmarek@suse.cz + +- Only handle KMPs that are built using the %kernel_module_package + macro (preparatory work for fate#319339). + ------------------------------------------------------------------- Tue Jun 23 14:39:46 UTC 2015 - mmarek@suse.cz diff --git a/weak-modules2 b/weak-modules2 index 900e4d5..8e9bb35 100644 --- a/weak-modules2 +++ b/weak-modules2 @@ -247,7 +247,9 @@ find_kmps() { local basename=$1 flavor=$2 local kmp - for kmp in $(rpm -qa --qf '%{n}-%{v}-%{r}\n' --nodigest --nosignature "$basename-kmp-$flavor"); do + # Only consider KMPs that are built using the %kernel_module_package macro + # and have the _k string in their version + for kmp in $(rpm -qa --qf '%{n}-%{v}-%{r}\n' --nodigest --nosignature "$basename-kmp-$flavor" | grep '_k[1-9][^-]*-[^-]*$'); do rpm -ql --nodigest --nosignature "$kmp" \ | grep -Ee '^/lib/modules/[^/]+/.+\.ko$' \ > $tmpdir/modules-$kmp