diff --git a/modalias-no-kgraft.diff b/modalias-no-kgraft.diff new file mode 100644 index 0000000..5eb442e --- /dev/null +++ b/modalias-no-kgraft.diff @@ -0,0 +1,24 @@ +From: Michal Marek +Subject: Do not generate supplements for kgraft patches +References: bnc#904848 + +kgraft-patches are to be automatically installed if a matching kernel is +installed. Generating the KMP supplements thus makes no sense. + +Signed-off-by: Michal Marek + +--- + scripts/find-supplements.ksyms | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- scripts/find-supplements.ksyms.orig ++++ scripts/find-supplements.ksyms +@@ -7,7 +7,7 @@ PACKAGE=$1 + case "$1" in + kernel-module-*) ;; # Fedora kernel module package names start with + # kernel-module. +-kernel*) is_kernel_package=1 ;; ++kernel* | kgraft-patch*) is_kernel_package=1 ;; + esac + + if ! [ -z "$is_kernel_package" ]; then diff --git a/rpm.changes b/rpm.changes index 836f78b..1263f86 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Nov 11 10:51:37 UTC 2014 - mmarek@suse.cz + +- Do not generate supplements for kgraft patches (bnc#904848) + new patch: modalias-no-kgraft.diff + ------------------------------------------------------------------- Mon Oct 6 15:08:17 CEST 2014 - mls@suse.de diff --git a/rpm.spec b/rpm.spec index 1f55a99..da4c50e 100644 --- a/rpm.spec +++ b/rpm.spec @@ -129,6 +129,7 @@ Patch92: find-lang-python.patch Patch93: weakdepscompat.diff Patch94: checksepwarn.diff Patch95: fixsizeforbigendian.diff +Patch96: modalias-no-kgraft.diff Patch6464: auto-config-update-aarch64-ppc64le.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # @@ -216,7 +217,7 @@ rm -f rpmdb/db.h %patch -P 60 -P 61 -P 65 -P 66 -P 67 -P 68 -P 69 %patch -P 70 -P 71 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79 %patch -P 85 -%patch -P 92 -P 93 -P 94 -P 95 +%patch -P 92 -P 93 -P 94 -P 95 -P 96 %ifarch aarch64 ppc64le %patch6464