diff --git a/suse-module-tools.changes b/suse-module-tools.changes index 22317aa..04c4970 100644 --- a/suse-module-tools.changes +++ b/suse-module-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 13 08:35:32 UTC 2015 - mmarek@suse.cz + +- Revert change for fate#319339, as some 3rd party KMPs are built + with a modified template (bsc#949862). + ------------------------------------------------------------------- Tue Sep 8 12:44:33 UTC 2015 - trenn@suse.de diff --git a/suse-module-tools.spec b/suse-module-tools.spec index af86dff..2b30226 100644 --- a/suse-module-tools.spec +++ b/suse-module-tools.spec @@ -1,7 +1,7 @@ # # spec file for package suse-module-tools # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/weak-modules2 b/weak-modules2 index a76514c..1e32bc5 100644 --- a/weak-modules2 +++ b/weak-modules2 @@ -247,9 +247,7 @@ find_kmps() { local basename=$1 flavor=$2 local kmp - # 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 + for kmp in $(rpm -qa --qf '%{n}-%{v}-%{r}\n' --nodigest --nosignature "$basename-kmp-$flavor"); do rpm -ql --nodigest --nosignature "$kmp" \ | grep -Ee '^/lib/modules/[^/]+/.+\.ko$' \ > $tmpdir/modules-$kmp