From 704c0b508ae2df659b3ac668a77f74ae803cf9ad24021d264bb99d93b8bad658 Mon Sep 17 00:00:00 2001 From: Michal Suchanek Date: Thu, 25 Jul 2019 08:06:00 +0000 Subject: [PATCH] commit afc46980b090099e95ee8b2e9b34470187e6796f OBS-URL: https://build.opensuse.org/package/show/Kernel:stable/kernel-source?expand=0&rev=1133 --- config.tar.bz2 | 4 ++-- dtb-aarch64.changes | 29 +++++++++++++++++++++++++++++ dtb-aarch64.spec | 2 +- dtb-armv6l.changes | 29 +++++++++++++++++++++++++++++ dtb-armv6l.spec | 2 +- dtb-armv7l.changes | 29 +++++++++++++++++++++++++++++ dtb-armv7l.spec | 2 +- kernel-64kb.changes | 29 +++++++++++++++++++++++++++++ kernel-64kb.spec | 12 ++++++++---- kernel-binary.spec.in | 4 ++++ kernel-debug.changes | 29 +++++++++++++++++++++++++++++ kernel-debug.spec | 12 ++++++++---- kernel-default.changes | 29 +++++++++++++++++++++++++++++ kernel-default.spec | 12 ++++++++---- kernel-docs.changes | 29 +++++++++++++++++++++++++++++ kernel-docs.spec | 4 ++-- kernel-kvmsmall.changes | 29 +++++++++++++++++++++++++++++ kernel-kvmsmall.spec | 12 ++++++++---- kernel-lpae.changes | 29 +++++++++++++++++++++++++++++ kernel-lpae.spec | 12 ++++++++---- kernel-obs-build.changes | 29 +++++++++++++++++++++++++++++ kernel-obs-build.spec | 4 ++-- kernel-obs-qa.changes | 29 +++++++++++++++++++++++++++++ kernel-obs-qa.spec | 2 +- kernel-pae.changes | 29 +++++++++++++++++++++++++++++ kernel-pae.spec | 12 ++++++++---- kernel-source.changes | 29 +++++++++++++++++++++++++++++ kernel-source.spec | 4 ++-- kernel-syms.changes | 29 +++++++++++++++++++++++++++++ kernel-syms.spec | 4 ++-- kernel-vanilla.changes | 29 +++++++++++++++++++++++++++++ kernel-vanilla.spec | 12 ++++++++---- kernel-zfcpdump.changes | 29 +++++++++++++++++++++++++++++ kernel-zfcpdump.spec | 12 ++++++++---- klp-symbols | 18 ++++++++++++++---- mkspec | 5 +++++ source-timestamp | 4 ++-- 37 files changed, 567 insertions(+), 52 deletions(-) diff --git a/config.tar.bz2 b/config.tar.bz2 index 15544f9d..e77593c8 100644 --- a/config.tar.bz2 +++ b/config.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1946c7a3fffb79f9a86dca2bf8b23d9a3a0a1928cf3c08fe0a18ad95154e2d6b -size 213697 +oid sha256:51bdeef57e7cb6ce0a0bf7cf6d38057bf099179ec8076f2ef5cb78790631804d +size 213721 diff --git a/dtb-aarch64.changes b/dtb-aarch64.changes index 8303859f..d2cd82ff 100644 --- a/dtb-aarch64.changes +++ b/dtb-aarch64.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Tue Jul 23 17:48:41 CEST 2019 - tiwai@suse.de + +- Add kernel module compression support (bsc#1135854) + For enabling the kernel module compress, add the item COMPRESS_MODULES="xz" + in config.sh, then mkspec will pass it to the spec file. +- commit cdf5806 + +------------------------------------------------------------------- +Tue Jul 23 00:11:24 CEST 2019 - jeffm@suse.com + +- config: enable PPPoE for kvmsmall (bsc#1133945). +- commit 72c928d + +------------------------------------------------------------------- +Mon Jul 22 16:43:10 CEST 2019 - mkubecek@suse.cz + +- rpm/klp-symbols: update to work with kernel >= 5.3 + Since mainline commit b7dca6dd1e59 ("kbuild: create *.mod with full + directory path and remove MODVERDIR") in v5.3-rc1, *.mod files are created + in the build tree rather than in a single directory .tmp_versions + ($MODVERDIR). They also do not provide path to the *.ko module file on + their first line as the path is the same (except for the suffix). + Update klp-symbols script to handle this new layout and format of *.mod + files to fix build of 5.3-rc1 and newer kernel. + Note: this is a quick band-aid to fix master branch build without risk of + breaking any other branch. A more proper cleanup will follow. +- commit c32f8e7 + ------------------------------------------------------------------- Sun Jul 21 19:42:03 CEST 2019 - mkubecek@suse.cz diff --git a/dtb-aarch64.spec b/dtb-aarch64.spec index e7026718..2c303829 100644 --- a/dtb-aarch64.spec +++ b/dtb-aarch64.spec @@ -31,7 +31,7 @@ Name: dtb-aarch64 Version: 5.2.2 %if 0%{?is_kotd} -Release: .gadfddac +Release: .gafc4698 %else Release: 0 %endif diff --git a/dtb-armv6l.changes b/dtb-armv6l.changes index 8303859f..d2cd82ff 100644 --- a/dtb-armv6l.changes +++ b/dtb-armv6l.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Tue Jul 23 17:48:41 CEST 2019 - tiwai@suse.de + +- Add kernel module compression support (bsc#1135854) + For enabling the kernel module compress, add the item COMPRESS_MODULES="xz" + in config.sh, then mkspec will pass it to the spec file. +- commit cdf5806 + +------------------------------------------------------------------- +Tue Jul 23 00:11:24 CEST 2019 - jeffm@suse.com + +- config: enable PPPoE for kvmsmall (bsc#1133945). +- commit 72c928d + +------------------------------------------------------------------- +Mon Jul 22 16:43:10 CEST 2019 - mkubecek@suse.cz + +- rpm/klp-symbols: update to work with kernel >= 5.3 + Since mainline commit b7dca6dd1e59 ("kbuild: create *.mod with full + directory path and remove MODVERDIR") in v5.3-rc1, *.mod files are created + in the build tree rather than in a single directory .tmp_versions + ($MODVERDIR). They also do not provide path to the *.ko module file on + their first line as the path is the same (except for the suffix). + Update klp-symbols script to handle this new layout and format of *.mod + files to fix build of 5.3-rc1 and newer kernel. + Note: this is a quick band-aid to fix master branch build without risk of + breaking any other branch. A more proper cleanup will follow. +- commit c32f8e7 + ------------------------------------------------------------------- Sun Jul 21 19:42:03 CEST 2019 - mkubecek@suse.cz diff --git a/dtb-armv6l.spec b/dtb-armv6l.spec index 21505c75..90f3f2a6 100644 --- a/dtb-armv6l.spec +++ b/dtb-armv6l.spec @@ -31,7 +31,7 @@ Name: dtb-armv6l Version: 5.2.2 %if 0%{?is_kotd} -Release: .gadfddac +Release: .gafc4698 %else Release: 0 %endif diff --git a/dtb-armv7l.changes b/dtb-armv7l.changes index 8303859f..d2cd82ff 100644 --- a/dtb-armv7l.changes +++ b/dtb-armv7l.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Tue Jul 23 17:48:41 CEST 2019 - tiwai@suse.de + +- Add kernel module compression support (bsc#1135854) + For enabling the kernel module compress, add the item COMPRESS_MODULES="xz" + in config.sh, then mkspec will pass it to the spec file. +- commit cdf5806 + +------------------------------------------------------------------- +Tue Jul 23 00:11:24 CEST 2019 - jeffm@suse.com + +- config: enable PPPoE for kvmsmall (bsc#1133945). +- commit 72c928d + +------------------------------------------------------------------- +Mon Jul 22 16:43:10 CEST 2019 - mkubecek@suse.cz + +- rpm/klp-symbols: update to work with kernel >= 5.3 + Since mainline commit b7dca6dd1e59 ("kbuild: create *.mod with full + directory path and remove MODVERDIR") in v5.3-rc1, *.mod files are created + in the build tree rather than in a single directory .tmp_versions + ($MODVERDIR). They also do not provide path to the *.ko module file on + their first line as the path is the same (except for the suffix). + Update klp-symbols script to handle this new layout and format of *.mod + files to fix build of 5.3-rc1 and newer kernel. + Note: this is a quick band-aid to fix master branch build without risk of + breaking any other branch. A more proper cleanup will follow. +- commit c32f8e7 + ------------------------------------------------------------------- Sun Jul 21 19:42:03 CEST 2019 - mkubecek@suse.cz diff --git a/dtb-armv7l.spec b/dtb-armv7l.spec index 809b3455..3cade0a0 100644 --- a/dtb-armv7l.spec +++ b/dtb-armv7l.spec @@ -31,7 +31,7 @@ Name: dtb-armv7l Version: 5.2.2 %if 0%{?is_kotd} -Release: .gadfddac +Release: .gafc4698 %else Release: 0 %endif diff --git a/kernel-64kb.changes b/kernel-64kb.changes index 8303859f..d2cd82ff 100644 --- a/kernel-64kb.changes +++ b/kernel-64kb.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Tue Jul 23 17:48:41 CEST 2019 - tiwai@suse.de + +- Add kernel module compression support (bsc#1135854) + For enabling the kernel module compress, add the item COMPRESS_MODULES="xz" + in config.sh, then mkspec will pass it to the spec file. +- commit cdf5806 + +------------------------------------------------------------------- +Tue Jul 23 00:11:24 CEST 2019 - jeffm@suse.com + +- config: enable PPPoE for kvmsmall (bsc#1133945). +- commit 72c928d + +------------------------------------------------------------------- +Mon Jul 22 16:43:10 CEST 2019 - mkubecek@suse.cz + +- rpm/klp-symbols: update to work with kernel >= 5.3 + Since mainline commit b7dca6dd1e59 ("kbuild: create *.mod with full + directory path and remove MODVERDIR") in v5.3-rc1, *.mod files are created + in the build tree rather than in a single directory .tmp_versions + ($MODVERDIR). They also do not provide path to the *.ko module file on + their first line as the path is the same (except for the suffix). + Update klp-symbols script to handle this new layout and format of *.mod + files to fix build of 5.3-rc1 and newer kernel. + Note: this is a quick band-aid to fix master branch build without risk of + breaking any other branch. A more proper cleanup will follow. +- commit c32f8e7 + ------------------------------------------------------------------- Sun Jul 21 19:42:03 CEST 2019 - mkubecek@suse.cz diff --git a/kernel-64kb.spec b/kernel-64kb.spec index 9d41269f..2da1a25c 100644 --- a/kernel-64kb.spec +++ b/kernel-64kb.spec @@ -21,6 +21,7 @@ %define patchversion 5.2.2 %define variant %{nil} %define vanilla_only 0 +%define compress_modules none %include %_sourcedir/kernel-spec-macros @@ -64,7 +65,7 @@ License: GPL-2.0 Group: System/Kernel Version: 5.2.2 %if 0%{?is_kotd} -Release: .gadfddac +Release: .gafc4698 %else Release: 0 %endif @@ -169,10 +170,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-adfddac4f7170653097d38112dfc6922cfababd8 -Provides: kernel-srchash-adfddac4f7170653097d38112dfc6922cfababd8 +Provides: kernel-%build_flavor-base-srchash-afc46980b090099e95ee8b2e9b34470187e6796f +Provides: kernel-srchash-afc46980b090099e95ee8b2e9b34470187e6796f # END COMMON DEPS -Provides: %name-srchash-adfddac4f7170653097d38112dfc6922cfababd8 +Provides: %name-srchash-afc46980b090099e95ee8b2e9b34470187e6796f %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source2: source-post.sh @@ -717,6 +718,9 @@ BRP_PESIGN_FILES="$BRP_PESIGN_FILES *.ko" BRP_PESIGN_FILES="" %endif export BRP_PESIGN_FILES +%if %{compress_modules} != "none" +export BRP_PESIGN_COMPRESS_MODULE=%{compress_modules} +%endif if test -x /usr/lib/rpm/pesign/gen-hmac; then $_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor diff --git a/kernel-binary.spec.in b/kernel-binary.spec.in index d09990d9..c1ec1589 100644 --- a/kernel-binary.spec.in +++ b/kernel-binary.spec.in @@ -21,6 +21,7 @@ %define patchversion @PATCHVERSION@ %define variant @VARIANT@%{nil} %define vanilla_only @VANILLA_ONLY@ +%define compress_modules @COMPRESS_MODULES@ %include %_sourcedir/kernel-spec-macros @@ -572,6 +573,9 @@ BRP_PESIGN_FILES="$BRP_PESIGN_FILES *.ko" BRP_PESIGN_FILES="" %endif export BRP_PESIGN_FILES +%if %{compress_modules} != "none" +export BRP_PESIGN_COMPRESS_MODULE=%{compress_modules} +%endif if test -x /usr/lib/rpm/pesign/gen-hmac; then $_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor diff --git a/kernel-debug.changes b/kernel-debug.changes index 8303859f..d2cd82ff 100644 --- a/kernel-debug.changes +++ b/kernel-debug.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Tue Jul 23 17:48:41 CEST 2019 - tiwai@suse.de + +- Add kernel module compression support (bsc#1135854) + For enabling the kernel module compress, add the item COMPRESS_MODULES="xz" + in config.sh, then mkspec will pass it to the spec file. +- commit cdf5806 + +------------------------------------------------------------------- +Tue Jul 23 00:11:24 CEST 2019 - jeffm@suse.com + +- config: enable PPPoE for kvmsmall (bsc#1133945). +- commit 72c928d + +------------------------------------------------------------------- +Mon Jul 22 16:43:10 CEST 2019 - mkubecek@suse.cz + +- rpm/klp-symbols: update to work with kernel >= 5.3 + Since mainline commit b7dca6dd1e59 ("kbuild: create *.mod with full + directory path and remove MODVERDIR") in v5.3-rc1, *.mod files are created + in the build tree rather than in a single directory .tmp_versions + ($MODVERDIR). They also do not provide path to the *.ko module file on + their first line as the path is the same (except for the suffix). + Update klp-symbols script to handle this new layout and format of *.mod + files to fix build of 5.3-rc1 and newer kernel. + Note: this is a quick band-aid to fix master branch build without risk of + breaking any other branch. A more proper cleanup will follow. +- commit c32f8e7 + ------------------------------------------------------------------- Sun Jul 21 19:42:03 CEST 2019 - mkubecek@suse.cz diff --git a/kernel-debug.spec b/kernel-debug.spec index 12bf0788..b60974d3 100644 --- a/kernel-debug.spec +++ b/kernel-debug.spec @@ -21,6 +21,7 @@ %define patchversion 5.2.2 %define variant %{nil} %define vanilla_only 0 +%define compress_modules none %include %_sourcedir/kernel-spec-macros @@ -64,7 +65,7 @@ License: GPL-2.0 Group: System/Kernel Version: 5.2.2 %if 0%{?is_kotd} -Release: .gadfddac +Release: .gafc4698 %else Release: 0 %endif @@ -169,10 +170,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-adfddac4f7170653097d38112dfc6922cfababd8 -Provides: kernel-srchash-adfddac4f7170653097d38112dfc6922cfababd8 +Provides: kernel-%build_flavor-base-srchash-afc46980b090099e95ee8b2e9b34470187e6796f +Provides: kernel-srchash-afc46980b090099e95ee8b2e9b34470187e6796f # END COMMON DEPS -Provides: %name-srchash-adfddac4f7170653097d38112dfc6922cfababd8 +Provides: %name-srchash-afc46980b090099e95ee8b2e9b34470187e6796f %ifarch ppc64 Provides: kernel-kdump = 2.6.28 Obsoletes: kernel-kdump <= 2.6.28 @@ -723,6 +724,9 @@ BRP_PESIGN_FILES="$BRP_PESIGN_FILES *.ko" BRP_PESIGN_FILES="" %endif export BRP_PESIGN_FILES +%if %{compress_modules} != "none" +export BRP_PESIGN_COMPRESS_MODULE=%{compress_modules} +%endif if test -x /usr/lib/rpm/pesign/gen-hmac; then $_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor diff --git a/kernel-default.changes b/kernel-default.changes index 8303859f..d2cd82ff 100644 --- a/kernel-default.changes +++ b/kernel-default.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Tue Jul 23 17:48:41 CEST 2019 - tiwai@suse.de + +- Add kernel module compression support (bsc#1135854) + For enabling the kernel module compress, add the item COMPRESS_MODULES="xz" + in config.sh, then mkspec will pass it to the spec file. +- commit cdf5806 + +------------------------------------------------------------------- +Tue Jul 23 00:11:24 CEST 2019 - jeffm@suse.com + +- config: enable PPPoE for kvmsmall (bsc#1133945). +- commit 72c928d + +------------------------------------------------------------------- +Mon Jul 22 16:43:10 CEST 2019 - mkubecek@suse.cz + +- rpm/klp-symbols: update to work with kernel >= 5.3 + Since mainline commit b7dca6dd1e59 ("kbuild: create *.mod with full + directory path and remove MODVERDIR") in v5.3-rc1, *.mod files are created + in the build tree rather than in a single directory .tmp_versions + ($MODVERDIR). They also do not provide path to the *.ko module file on + their first line as the path is the same (except for the suffix). + Update klp-symbols script to handle this new layout and format of *.mod + files to fix build of 5.3-rc1 and newer kernel. + Note: this is a quick band-aid to fix master branch build without risk of + breaking any other branch. A more proper cleanup will follow. +- commit c32f8e7 + ------------------------------------------------------------------- Sun Jul 21 19:42:03 CEST 2019 - mkubecek@suse.cz diff --git a/kernel-default.spec b/kernel-default.spec index f24a9cdf..9658094e 100644 --- a/kernel-default.spec +++ b/kernel-default.spec @@ -21,6 +21,7 @@ %define patchversion 5.2.2 %define variant %{nil} %define vanilla_only 0 +%define compress_modules none %include %_sourcedir/kernel-spec-macros @@ -64,7 +65,7 @@ License: GPL-2.0 Group: System/Kernel Version: 5.2.2 %if 0%{?is_kotd} -Release: .gadfddac +Release: .gafc4698 %else Release: 0 %endif @@ -169,10 +170,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-adfddac4f7170653097d38112dfc6922cfababd8 -Provides: kernel-srchash-adfddac4f7170653097d38112dfc6922cfababd8 +Provides: kernel-%build_flavor-base-srchash-afc46980b090099e95ee8b2e9b34470187e6796f +Provides: kernel-srchash-afc46980b090099e95ee8b2e9b34470187e6796f # END COMMON DEPS -Provides: %name-srchash-adfddac4f7170653097d38112dfc6922cfababd8 +Provides: %name-srchash-afc46980b090099e95ee8b2e9b34470187e6796f %ifarch %ix86 Provides: kernel-smp = 2.6.17 Obsoletes: kernel-smp <= 2.6.17 @@ -766,6 +767,9 @@ BRP_PESIGN_FILES="$BRP_PESIGN_FILES *.ko" BRP_PESIGN_FILES="" %endif export BRP_PESIGN_FILES +%if %{compress_modules} != "none" +export BRP_PESIGN_COMPRESS_MODULE=%{compress_modules} +%endif if test -x /usr/lib/rpm/pesign/gen-hmac; then $_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor diff --git a/kernel-docs.changes b/kernel-docs.changes index 8303859f..d2cd82ff 100644 --- a/kernel-docs.changes +++ b/kernel-docs.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Tue Jul 23 17:48:41 CEST 2019 - tiwai@suse.de + +- Add kernel module compression support (bsc#1135854) + For enabling the kernel module compress, add the item COMPRESS_MODULES="xz" + in config.sh, then mkspec will pass it to the spec file. +- commit cdf5806 + +------------------------------------------------------------------- +Tue Jul 23 00:11:24 CEST 2019 - jeffm@suse.com + +- config: enable PPPoE for kvmsmall (bsc#1133945). +- commit 72c928d + +------------------------------------------------------------------- +Mon Jul 22 16:43:10 CEST 2019 - mkubecek@suse.cz + +- rpm/klp-symbols: update to work with kernel >= 5.3 + Since mainline commit b7dca6dd1e59 ("kbuild: create *.mod with full + directory path and remove MODVERDIR") in v5.3-rc1, *.mod files are created + in the build tree rather than in a single directory .tmp_versions + ($MODVERDIR). They also do not provide path to the *.ko module file on + their first line as the path is the same (except for the suffix). + Update klp-symbols script to handle this new layout and format of *.mod + files to fix build of 5.3-rc1 and newer kernel. + Note: this is a quick band-aid to fix master branch build without risk of + breaking any other branch. A more proper cleanup will follow. +- commit c32f8e7 + ------------------------------------------------------------------- Sun Jul 21 19:42:03 CEST 2019 - mkubecek@suse.cz diff --git a/kernel-docs.spec b/kernel-docs.spec index 84ded18c..2b5c0794 100644 --- a/kernel-docs.spec +++ b/kernel-docs.spec @@ -33,7 +33,7 @@ License: GPL-2.0 Group: Documentation/Man Version: 5.2.2 %if 0%{?is_kotd} -Release: .gadfddac +Release: .gafc4698 %else Release: 0 %endif @@ -63,7 +63,7 @@ BuildRequires: texlive-zapfding %endif Url: http://www.kernel.org/ Provides: %name = %version-%source_rel -Provides: %name-srchash-adfddac4f7170653097d38112dfc6922cfababd8 +Provides: %name-srchash-afc46980b090099e95ee8b2e9b34470187e6796f BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz diff --git a/kernel-kvmsmall.changes b/kernel-kvmsmall.changes index 8303859f..d2cd82ff 100644 --- a/kernel-kvmsmall.changes +++ b/kernel-kvmsmall.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Tue Jul 23 17:48:41 CEST 2019 - tiwai@suse.de + +- Add kernel module compression support (bsc#1135854) + For enabling the kernel module compress, add the item COMPRESS_MODULES="xz" + in config.sh, then mkspec will pass it to the spec file. +- commit cdf5806 + +------------------------------------------------------------------- +Tue Jul 23 00:11:24 CEST 2019 - jeffm@suse.com + +- config: enable PPPoE for kvmsmall (bsc#1133945). +- commit 72c928d + +------------------------------------------------------------------- +Mon Jul 22 16:43:10 CEST 2019 - mkubecek@suse.cz + +- rpm/klp-symbols: update to work with kernel >= 5.3 + Since mainline commit b7dca6dd1e59 ("kbuild: create *.mod with full + directory path and remove MODVERDIR") in v5.3-rc1, *.mod files are created + in the build tree rather than in a single directory .tmp_versions + ($MODVERDIR). They also do not provide path to the *.ko module file on + their first line as the path is the same (except for the suffix). + Update klp-symbols script to handle this new layout and format of *.mod + files to fix build of 5.3-rc1 and newer kernel. + Note: this is a quick band-aid to fix master branch build without risk of + breaking any other branch. A more proper cleanup will follow. +- commit c32f8e7 + ------------------------------------------------------------------- Sun Jul 21 19:42:03 CEST 2019 - mkubecek@suse.cz diff --git a/kernel-kvmsmall.spec b/kernel-kvmsmall.spec index c2bf5652..2a2753f6 100644 --- a/kernel-kvmsmall.spec +++ b/kernel-kvmsmall.spec @@ -21,6 +21,7 @@ %define patchversion 5.2.2 %define variant %{nil} %define vanilla_only 0 +%define compress_modules none %include %_sourcedir/kernel-spec-macros @@ -64,7 +65,7 @@ License: GPL-2.0 Group: System/Kernel Version: 5.2.2 %if 0%{?is_kotd} -Release: .gadfddac +Release: .gafc4698 %else Release: 0 %endif @@ -169,10 +170,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-adfddac4f7170653097d38112dfc6922cfababd8 -Provides: kernel-srchash-adfddac4f7170653097d38112dfc6922cfababd8 +Provides: kernel-%build_flavor-base-srchash-afc46980b090099e95ee8b2e9b34470187e6796f +Provides: kernel-srchash-afc46980b090099e95ee8b2e9b34470187e6796f # END COMMON DEPS -Provides: %name-srchash-adfddac4f7170653097d38112dfc6922cfababd8 +Provides: %name-srchash-afc46980b090099e95ee8b2e9b34470187e6796f %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source2: source-post.sh @@ -721,6 +722,9 @@ BRP_PESIGN_FILES="$BRP_PESIGN_FILES *.ko" BRP_PESIGN_FILES="" %endif export BRP_PESIGN_FILES +%if %{compress_modules} != "none" +export BRP_PESIGN_COMPRESS_MODULE=%{compress_modules} +%endif if test -x /usr/lib/rpm/pesign/gen-hmac; then $_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor diff --git a/kernel-lpae.changes b/kernel-lpae.changes index 8303859f..d2cd82ff 100644 --- a/kernel-lpae.changes +++ b/kernel-lpae.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Tue Jul 23 17:48:41 CEST 2019 - tiwai@suse.de + +- Add kernel module compression support (bsc#1135854) + For enabling the kernel module compress, add the item COMPRESS_MODULES="xz" + in config.sh, then mkspec will pass it to the spec file. +- commit cdf5806 + +------------------------------------------------------------------- +Tue Jul 23 00:11:24 CEST 2019 - jeffm@suse.com + +- config: enable PPPoE for kvmsmall (bsc#1133945). +- commit 72c928d + +------------------------------------------------------------------- +Mon Jul 22 16:43:10 CEST 2019 - mkubecek@suse.cz + +- rpm/klp-symbols: update to work with kernel >= 5.3 + Since mainline commit b7dca6dd1e59 ("kbuild: create *.mod with full + directory path and remove MODVERDIR") in v5.3-rc1, *.mod files are created + in the build tree rather than in a single directory .tmp_versions + ($MODVERDIR). They also do not provide path to the *.ko module file on + their first line as the path is the same (except for the suffix). + Update klp-symbols script to handle this new layout and format of *.mod + files to fix build of 5.3-rc1 and newer kernel. + Note: this is a quick band-aid to fix master branch build without risk of + breaking any other branch. A more proper cleanup will follow. +- commit c32f8e7 + ------------------------------------------------------------------- Sun Jul 21 19:42:03 CEST 2019 - mkubecek@suse.cz diff --git a/kernel-lpae.spec b/kernel-lpae.spec index 483a17c7..df99fb35 100644 --- a/kernel-lpae.spec +++ b/kernel-lpae.spec @@ -21,6 +21,7 @@ %define patchversion 5.2.2 %define variant %{nil} %define vanilla_only 0 +%define compress_modules none %include %_sourcedir/kernel-spec-macros @@ -64,7 +65,7 @@ License: GPL-2.0 Group: System/Kernel Version: 5.2.2 %if 0%{?is_kotd} -Release: .gadfddac +Release: .gafc4698 %else Release: 0 %endif @@ -169,10 +170,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-adfddac4f7170653097d38112dfc6922cfababd8 -Provides: kernel-srchash-adfddac4f7170653097d38112dfc6922cfababd8 +Provides: kernel-%build_flavor-base-srchash-afc46980b090099e95ee8b2e9b34470187e6796f +Provides: kernel-srchash-afc46980b090099e95ee8b2e9b34470187e6796f # END COMMON DEPS -Provides: %name-srchash-adfddac4f7170653097d38112dfc6922cfababd8 +Provides: %name-srchash-afc46980b090099e95ee8b2e9b34470187e6796f %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source2: source-post.sh @@ -715,6 +716,9 @@ BRP_PESIGN_FILES="$BRP_PESIGN_FILES *.ko" BRP_PESIGN_FILES="" %endif export BRP_PESIGN_FILES +%if %{compress_modules} != "none" +export BRP_PESIGN_COMPRESS_MODULE=%{compress_modules} +%endif if test -x /usr/lib/rpm/pesign/gen-hmac; then $_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor diff --git a/kernel-obs-build.changes b/kernel-obs-build.changes index 8303859f..d2cd82ff 100644 --- a/kernel-obs-build.changes +++ b/kernel-obs-build.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Tue Jul 23 17:48:41 CEST 2019 - tiwai@suse.de + +- Add kernel module compression support (bsc#1135854) + For enabling the kernel module compress, add the item COMPRESS_MODULES="xz" + in config.sh, then mkspec will pass it to the spec file. +- commit cdf5806 + +------------------------------------------------------------------- +Tue Jul 23 00:11:24 CEST 2019 - jeffm@suse.com + +- config: enable PPPoE for kvmsmall (bsc#1133945). +- commit 72c928d + +------------------------------------------------------------------- +Mon Jul 22 16:43:10 CEST 2019 - mkubecek@suse.cz + +- rpm/klp-symbols: update to work with kernel >= 5.3 + Since mainline commit b7dca6dd1e59 ("kbuild: create *.mod with full + directory path and remove MODVERDIR") in v5.3-rc1, *.mod files are created + in the build tree rather than in a single directory .tmp_versions + ($MODVERDIR). They also do not provide path to the *.ko module file on + their first line as the path is the same (except for the suffix). + Update klp-symbols script to handle this new layout and format of *.mod + files to fix build of 5.3-rc1 and newer kernel. + Note: this is a quick band-aid to fix master branch build without risk of + breaking any other branch. A more proper cleanup will follow. +- commit c32f8e7 + ------------------------------------------------------------------- Sun Jul 21 19:42:03 CEST 2019 - mkubecek@suse.cz diff --git a/kernel-obs-build.spec b/kernel-obs-build.spec index e0edba62..96518f67 100644 --- a/kernel-obs-build.spec +++ b/kernel-obs-build.spec @@ -45,7 +45,7 @@ BuildRequires: util-linux %endif %endif %endif -BuildRequires: kernel%kernel_flavor-srchash-adfddac4f7170653097d38112dfc6922cfababd8 +BuildRequires: kernel%kernel_flavor-srchash-afc46980b090099e95ee8b2e9b34470187e6796f %if 0%{?rhel_version} BuildRequires: kernel @@ -66,7 +66,7 @@ License: GPL-2.0 Group: SLES Version: 5.2.2 %if 0%{?is_kotd} -Release: .gadfddac +Release: .gafc4698 %else Release: 0 %endif diff --git a/kernel-obs-qa.changes b/kernel-obs-qa.changes index 8303859f..d2cd82ff 100644 --- a/kernel-obs-qa.changes +++ b/kernel-obs-qa.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Tue Jul 23 17:48:41 CEST 2019 - tiwai@suse.de + +- Add kernel module compression support (bsc#1135854) + For enabling the kernel module compress, add the item COMPRESS_MODULES="xz" + in config.sh, then mkspec will pass it to the spec file. +- commit cdf5806 + +------------------------------------------------------------------- +Tue Jul 23 00:11:24 CEST 2019 - jeffm@suse.com + +- config: enable PPPoE for kvmsmall (bsc#1133945). +- commit 72c928d + +------------------------------------------------------------------- +Mon Jul 22 16:43:10 CEST 2019 - mkubecek@suse.cz + +- rpm/klp-symbols: update to work with kernel >= 5.3 + Since mainline commit b7dca6dd1e59 ("kbuild: create *.mod with full + directory path and remove MODVERDIR") in v5.3-rc1, *.mod files are created + in the build tree rather than in a single directory .tmp_versions + ($MODVERDIR). They also do not provide path to the *.ko module file on + their first line as the path is the same (except for the suffix). + Update klp-symbols script to handle this new layout and format of *.mod + files to fix build of 5.3-rc1 and newer kernel. + Note: this is a quick band-aid to fix master branch build without risk of + breaking any other branch. A more proper cleanup will follow. +- commit c32f8e7 + ------------------------------------------------------------------- Sun Jul 21 19:42:03 CEST 2019 - mkubecek@suse.cz diff --git a/kernel-obs-qa.spec b/kernel-obs-qa.spec index 852cbd97..51fcd616 100644 --- a/kernel-obs-qa.spec +++ b/kernel-obs-qa.spec @@ -38,7 +38,7 @@ License: GPL-2.0 Group: SLES Version: 5.2.2 %if 0%{?is_kotd} -Release: .gadfddac +Release: .gafc4698 %else Release: 0 %endif diff --git a/kernel-pae.changes b/kernel-pae.changes index 8303859f..d2cd82ff 100644 --- a/kernel-pae.changes +++ b/kernel-pae.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Tue Jul 23 17:48:41 CEST 2019 - tiwai@suse.de + +- Add kernel module compression support (bsc#1135854) + For enabling the kernel module compress, add the item COMPRESS_MODULES="xz" + in config.sh, then mkspec will pass it to the spec file. +- commit cdf5806 + +------------------------------------------------------------------- +Tue Jul 23 00:11:24 CEST 2019 - jeffm@suse.com + +- config: enable PPPoE for kvmsmall (bsc#1133945). +- commit 72c928d + +------------------------------------------------------------------- +Mon Jul 22 16:43:10 CEST 2019 - mkubecek@suse.cz + +- rpm/klp-symbols: update to work with kernel >= 5.3 + Since mainline commit b7dca6dd1e59 ("kbuild: create *.mod with full + directory path and remove MODVERDIR") in v5.3-rc1, *.mod files are created + in the build tree rather than in a single directory .tmp_versions + ($MODVERDIR). They also do not provide path to the *.ko module file on + their first line as the path is the same (except for the suffix). + Update klp-symbols script to handle this new layout and format of *.mod + files to fix build of 5.3-rc1 and newer kernel. + Note: this is a quick band-aid to fix master branch build without risk of + breaking any other branch. A more proper cleanup will follow. +- commit c32f8e7 + ------------------------------------------------------------------- Sun Jul 21 19:42:03 CEST 2019 - mkubecek@suse.cz diff --git a/kernel-pae.spec b/kernel-pae.spec index 5f5ae6da..d463eb68 100644 --- a/kernel-pae.spec +++ b/kernel-pae.spec @@ -21,6 +21,7 @@ %define patchversion 5.2.2 %define variant %{nil} %define vanilla_only 0 +%define compress_modules none %include %_sourcedir/kernel-spec-macros @@ -64,7 +65,7 @@ License: GPL-2.0 Group: System/Kernel Version: 5.2.2 %if 0%{?is_kotd} -Release: .gadfddac +Release: .gafc4698 %else Release: 0 %endif @@ -169,10 +170,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-adfddac4f7170653097d38112dfc6922cfababd8 -Provides: kernel-srchash-adfddac4f7170653097d38112dfc6922cfababd8 +Provides: kernel-%build_flavor-base-srchash-afc46980b090099e95ee8b2e9b34470187e6796f +Provides: kernel-srchash-afc46980b090099e95ee8b2e9b34470187e6796f # END COMMON DEPS -Provides: %name-srchash-adfddac4f7170653097d38112dfc6922cfababd8 +Provides: %name-srchash-afc46980b090099e95ee8b2e9b34470187e6796f %ifarch %ix86 Provides: kernel-bigsmp = 2.6.17 Obsoletes: kernel-bigsmp <= 2.6.17 @@ -743,6 +744,9 @@ BRP_PESIGN_FILES="$BRP_PESIGN_FILES *.ko" BRP_PESIGN_FILES="" %endif export BRP_PESIGN_FILES +%if %{compress_modules} != "none" +export BRP_PESIGN_COMPRESS_MODULE=%{compress_modules} +%endif if test -x /usr/lib/rpm/pesign/gen-hmac; then $_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor diff --git a/kernel-source.changes b/kernel-source.changes index 8303859f..d2cd82ff 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Tue Jul 23 17:48:41 CEST 2019 - tiwai@suse.de + +- Add kernel module compression support (bsc#1135854) + For enabling the kernel module compress, add the item COMPRESS_MODULES="xz" + in config.sh, then mkspec will pass it to the spec file. +- commit cdf5806 + +------------------------------------------------------------------- +Tue Jul 23 00:11:24 CEST 2019 - jeffm@suse.com + +- config: enable PPPoE for kvmsmall (bsc#1133945). +- commit 72c928d + +------------------------------------------------------------------- +Mon Jul 22 16:43:10 CEST 2019 - mkubecek@suse.cz + +- rpm/klp-symbols: update to work with kernel >= 5.3 + Since mainline commit b7dca6dd1e59 ("kbuild: create *.mod with full + directory path and remove MODVERDIR") in v5.3-rc1, *.mod files are created + in the build tree rather than in a single directory .tmp_versions + ($MODVERDIR). They also do not provide path to the *.ko module file on + their first line as the path is the same (except for the suffix). + Update klp-symbols script to handle this new layout and format of *.mod + files to fix build of 5.3-rc1 and newer kernel. + Note: this is a quick band-aid to fix master branch build without risk of + breaking any other branch. A more proper cleanup will follow. +- commit c32f8e7 + ------------------------------------------------------------------- Sun Jul 21 19:42:03 CEST 2019 - mkubecek@suse.cz diff --git a/kernel-source.spec b/kernel-source.spec index cae42826..230914c2 100644 --- a/kernel-source.spec +++ b/kernel-source.spec @@ -32,7 +32,7 @@ License: GPL-2.0 Group: Development/Sources Version: 5.2.2 %if 0%{?is_kotd} -Release: .gadfddac +Release: .gafc4698 %else Release: 0 %endif @@ -43,7 +43,7 @@ BuildRequires: fdupes BuildRequires: sed Requires(post): coreutils sed Provides: %name = %version-%source_rel -Provides: %name-srchash-adfddac4f7170653097d38112dfc6922cfababd8 +Provides: %name-srchash-afc46980b090099e95ee8b2e9b34470187e6796f Provides: linux Provides: multiversion(kernel) Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz diff --git a/kernel-syms.changes b/kernel-syms.changes index 8303859f..d2cd82ff 100644 --- a/kernel-syms.changes +++ b/kernel-syms.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Tue Jul 23 17:48:41 CEST 2019 - tiwai@suse.de + +- Add kernel module compression support (bsc#1135854) + For enabling the kernel module compress, add the item COMPRESS_MODULES="xz" + in config.sh, then mkspec will pass it to the spec file. +- commit cdf5806 + +------------------------------------------------------------------- +Tue Jul 23 00:11:24 CEST 2019 - jeffm@suse.com + +- config: enable PPPoE for kvmsmall (bsc#1133945). +- commit 72c928d + +------------------------------------------------------------------- +Mon Jul 22 16:43:10 CEST 2019 - mkubecek@suse.cz + +- rpm/klp-symbols: update to work with kernel >= 5.3 + Since mainline commit b7dca6dd1e59 ("kbuild: create *.mod with full + directory path and remove MODVERDIR") in v5.3-rc1, *.mod files are created + in the build tree rather than in a single directory .tmp_versions + ($MODVERDIR). They also do not provide path to the *.ko module file on + their first line as the path is the same (except for the suffix). + Update klp-symbols script to handle this new layout and format of *.mod + files to fix build of 5.3-rc1 and newer kernel. + Note: this is a quick band-aid to fix master branch build without risk of + breaking any other branch. A more proper cleanup will follow. +- commit c32f8e7 + ------------------------------------------------------------------- Sun Jul 21 19:42:03 CEST 2019 - mkubecek@suse.cz diff --git a/kernel-syms.spec b/kernel-syms.spec index 408d8681..1a17fa23 100644 --- a/kernel-syms.spec +++ b/kernel-syms.spec @@ -27,7 +27,7 @@ Group: Development/Sources Version: 5.2.2 %if %using_buildservice %if 0%{?is_kotd} -Release: .gadfddac +Release: .gafc4698 %else Release: 0 %endif @@ -55,7 +55,7 @@ Requires: kernel-zfcpdump-devel = %version-%source_rel %endif Requires: pesign-obs-integration Provides: %name = %version-%source_rel -Provides: %name-srchash-adfddac4f7170653097d38112dfc6922cfababd8 +Provides: %name-srchash-afc46980b090099e95ee8b2e9b34470187e6796f Provides: multiversion(kernel) Source: README.KSYMS Requires: kernel-devel%variant = %version-%source_rel diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes index 8303859f..d2cd82ff 100644 --- a/kernel-vanilla.changes +++ b/kernel-vanilla.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Tue Jul 23 17:48:41 CEST 2019 - tiwai@suse.de + +- Add kernel module compression support (bsc#1135854) + For enabling the kernel module compress, add the item COMPRESS_MODULES="xz" + in config.sh, then mkspec will pass it to the spec file. +- commit cdf5806 + +------------------------------------------------------------------- +Tue Jul 23 00:11:24 CEST 2019 - jeffm@suse.com + +- config: enable PPPoE for kvmsmall (bsc#1133945). +- commit 72c928d + +------------------------------------------------------------------- +Mon Jul 22 16:43:10 CEST 2019 - mkubecek@suse.cz + +- rpm/klp-symbols: update to work with kernel >= 5.3 + Since mainline commit b7dca6dd1e59 ("kbuild: create *.mod with full + directory path and remove MODVERDIR") in v5.3-rc1, *.mod files are created + in the build tree rather than in a single directory .tmp_versions + ($MODVERDIR). They also do not provide path to the *.ko module file on + their first line as the path is the same (except for the suffix). + Update klp-symbols script to handle this new layout and format of *.mod + files to fix build of 5.3-rc1 and newer kernel. + Note: this is a quick band-aid to fix master branch build without risk of + breaking any other branch. A more proper cleanup will follow. +- commit c32f8e7 + ------------------------------------------------------------------- Sun Jul 21 19:42:03 CEST 2019 - mkubecek@suse.cz diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index 81ef98c0..6187f24d 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -21,6 +21,7 @@ %define patchversion 5.2.2 %define variant %{nil} %define vanilla_only 0 +%define compress_modules none %include %_sourcedir/kernel-spec-macros @@ -64,7 +65,7 @@ License: GPL-2.0 Group: System/Kernel Version: 5.2.2 %if 0%{?is_kotd} -Release: .gadfddac +Release: .gafc4698 %else Release: 0 %endif @@ -169,10 +170,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-adfddac4f7170653097d38112dfc6922cfababd8 -Provides: kernel-srchash-adfddac4f7170653097d38112dfc6922cfababd8 +Provides: kernel-%build_flavor-base-srchash-afc46980b090099e95ee8b2e9b34470187e6796f +Provides: kernel-srchash-afc46980b090099e95ee8b2e9b34470187e6796f # END COMMON DEPS -Provides: %name-srchash-adfddac4f7170653097d38112dfc6922cfababd8 +Provides: %name-srchash-afc46980b090099e95ee8b2e9b34470187e6796f %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source2: source-post.sh @@ -714,6 +715,9 @@ BRP_PESIGN_FILES="$BRP_PESIGN_FILES *.ko" BRP_PESIGN_FILES="" %endif export BRP_PESIGN_FILES +%if %{compress_modules} != "none" +export BRP_PESIGN_COMPRESS_MODULE=%{compress_modules} +%endif if test -x /usr/lib/rpm/pesign/gen-hmac; then $_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor diff --git a/kernel-zfcpdump.changes b/kernel-zfcpdump.changes index 8303859f..d2cd82ff 100644 --- a/kernel-zfcpdump.changes +++ b/kernel-zfcpdump.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Tue Jul 23 17:48:41 CEST 2019 - tiwai@suse.de + +- Add kernel module compression support (bsc#1135854) + For enabling the kernel module compress, add the item COMPRESS_MODULES="xz" + in config.sh, then mkspec will pass it to the spec file. +- commit cdf5806 + +------------------------------------------------------------------- +Tue Jul 23 00:11:24 CEST 2019 - jeffm@suse.com + +- config: enable PPPoE for kvmsmall (bsc#1133945). +- commit 72c928d + +------------------------------------------------------------------- +Mon Jul 22 16:43:10 CEST 2019 - mkubecek@suse.cz + +- rpm/klp-symbols: update to work with kernel >= 5.3 + Since mainline commit b7dca6dd1e59 ("kbuild: create *.mod with full + directory path and remove MODVERDIR") in v5.3-rc1, *.mod files are created + in the build tree rather than in a single directory .tmp_versions + ($MODVERDIR). They also do not provide path to the *.ko module file on + their first line as the path is the same (except for the suffix). + Update klp-symbols script to handle this new layout and format of *.mod + files to fix build of 5.3-rc1 and newer kernel. + Note: this is a quick band-aid to fix master branch build without risk of + breaking any other branch. A more proper cleanup will follow. +- commit c32f8e7 + ------------------------------------------------------------------- Sun Jul 21 19:42:03 CEST 2019 - mkubecek@suse.cz diff --git a/kernel-zfcpdump.spec b/kernel-zfcpdump.spec index 570fedf6..6dfcade0 100644 --- a/kernel-zfcpdump.spec +++ b/kernel-zfcpdump.spec @@ -21,6 +21,7 @@ %define patchversion 5.2.2 %define variant %{nil} %define vanilla_only 0 +%define compress_modules none %include %_sourcedir/kernel-spec-macros @@ -64,7 +65,7 @@ License: GPL-2.0 Group: System/Kernel Version: 5.2.2 %if 0%{?is_kotd} -Release: .gadfddac +Release: .gafc4698 %else Release: 0 %endif @@ -169,10 +170,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-adfddac4f7170653097d38112dfc6922cfababd8 -Provides: kernel-srchash-adfddac4f7170653097d38112dfc6922cfababd8 +Provides: kernel-%build_flavor-base-srchash-afc46980b090099e95ee8b2e9b34470187e6796f +Provides: kernel-srchash-afc46980b090099e95ee8b2e9b34470187e6796f # END COMMON DEPS -Provides: %name-srchash-adfddac4f7170653097d38112dfc6922cfababd8 +Provides: %name-srchash-afc46980b090099e95ee8b2e9b34470187e6796f %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source2: source-post.sh @@ -717,6 +718,9 @@ BRP_PESIGN_FILES="$BRP_PESIGN_FILES *.ko" BRP_PESIGN_FILES="" %endif export BRP_PESIGN_FILES +%if %{compress_modules} != "none" +export BRP_PESIGN_COMPRESS_MODULE=%{compress_modules} +%endif if test -x /usr/lib/rpm/pesign/gen-hmac; then $_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor diff --git a/klp-symbols b/klp-symbols index a3bd5f02..defff6d0 100644 --- a/klp-symbols +++ b/klp-symbols @@ -30,8 +30,13 @@ if ! test -f "$VMLINUX" ; then fi if ! test -d "$MODVER_DIR" ; then - echo "Error: Directory does not exist: $MODVER_DIR" >&2 - exit 1 + # kernel >= 5.3 has *.mod in the build tree + mod_cnt=$(find "$KERNEL_BUILD_DIR" -name '*.mod' | wc -l) + if [ $mod_cnt -eq 0 ]; then + echo "Error: Directory does not exist: $MODVER_DIR" >&2 + exit 1 + fi + MODVER_DIR="$KERNEL_BUILD_DIR" fi get_symbols() @@ -44,8 +49,13 @@ echo "*vmlinux" >> "$KLP_SYMBOLS" get_symbols "$VMLINUX" >> "$KLP_SYMBOLS" find "$MODVER_DIR" -iname '*.mod' | while read KMOD ; do - # read .ko path and file from .mod file - KO_FILE="$(head -n1 $KMOD)" + if [ "$MODVER_DIR" = "$KERNEL_BUILD_DIR" ]; then + # kernel >= 5.3, just replace the suffix + KO_FILE="${KMOD%.mod}.ko" + else + # kernel <= 5.2, read .ko path and file from .mod file + KO_FILE="$(head -n1 $KMOD)" + fi # obtain module name and its object file by processing .ko file name NO_SUFFIX="$(basename -s .ko $KO_FILE)" diff --git a/mkspec b/mkspec index cbc4113c..3940d179 100644 --- a/mkspec +++ b/mkspec @@ -37,6 +37,10 @@ my @kmps = read_kmps(); my %vars = parse_config_sh(); my ($srcversion, $variant, $vanilla_only) = ($vars{'SRCVERSION'}, $vars{'VARIANT'}, $vars{'VANILLA_ONLY'}); +my $compress_modules = 'none'; +if (defined($vars{'COMPRESS_MODULES'})) { + $compress_modules = $vars{'COMPRESS_MODULES'}; +} $vanilla_only ||= "0"; if (!defined ($rpmrelease)) { $rpmrelease = $vars{'RELEASE'} || 0; @@ -100,6 +104,7 @@ my %macros = ( UNPACK_PATCHES => $unpack_patches, SCRIPTS => $scripts, YEAR => (localtime time)[5] + 1900, + COMPRESS_MODULES => $compress_modules, ); # binary spec files diff --git a/source-timestamp b/source-timestamp index f6a9506f..44fd2f6c 100644 --- a/source-timestamp +++ b/source-timestamp @@ -1,3 +1,3 @@ -2019-07-22 10:29:33 +0000 -GIT Revision: adfddac4f7170653097d38112dfc6922cfababd8 +2019-07-24 07:23:58 +0000 +GIT Revision: afc46980b090099e95ee8b2e9b34470187e6796f GIT Branch: stable