From ed4a37fbb0b940d63305e179a33a4722e6cf39178e5955e848681961b006da1c Mon Sep 17 00:00:00 2001 From: Michal Suchanek Date: Fri, 9 Nov 2018 08:04:32 +0000 Subject: [PATCH] commit 0f31a13932d8c55a0ad94fe58eb537f13e960e5a OBS-URL: https://build.opensuse.org/package/show/Kernel:stable/kernel-source?expand=0&rev=958 --- README.SUSE | 2 +- dtb-aarch64.changes | 41 ++++++++++++++++++++++++++++++++++++++++ dtb-aarch64.spec | 2 +- dtb-armv6l.changes | 41 ++++++++++++++++++++++++++++++++++++++++ dtb-armv6l.spec | 2 +- dtb-armv7l.changes | 41 ++++++++++++++++++++++++++++++++++++++++ dtb-armv7l.spec | 2 +- kernel-64kb.changes | 41 ++++++++++++++++++++++++++++++++++++++++ kernel-64kb.spec | 38 ++++++++++++++++++++++++++++++------- kernel-binary.spec.in | 26 ++++++++++++++++++++++++- kernel-debug.changes | 41 ++++++++++++++++++++++++++++++++++++++++ kernel-debug.spec | 38 ++++++++++++++++++++++++++++++------- kernel-default.changes | 41 ++++++++++++++++++++++++++++++++++++++++ kernel-default.spec | 38 ++++++++++++++++++++++++++++++------- kernel-docs.changes | 41 ++++++++++++++++++++++++++++++++++++++++ kernel-docs.spec | 4 ++-- kernel-kvmsmall.changes | 41 ++++++++++++++++++++++++++++++++++++++++ kernel-kvmsmall.spec | 38 ++++++++++++++++++++++++++++++------- kernel-lpae.changes | 41 ++++++++++++++++++++++++++++++++++++++++ kernel-lpae.spec | 38 ++++++++++++++++++++++++++++++------- kernel-obs-build.changes | 41 ++++++++++++++++++++++++++++++++++++++++ kernel-obs-build.spec | 4 ++-- kernel-obs-qa.changes | 41 ++++++++++++++++++++++++++++++++++++++++ kernel-obs-qa.spec | 2 +- kernel-pae.changes | 41 ++++++++++++++++++++++++++++++++++++++++ kernel-pae.spec | 38 ++++++++++++++++++++++++++++++------- kernel-source.changes | 41 ++++++++++++++++++++++++++++++++++++++++ kernel-source.spec | 4 ++-- kernel-syms.changes | 41 ++++++++++++++++++++++++++++++++++++++++ kernel-syms.spec | 4 ++-- kernel-vanilla.changes | 41 ++++++++++++++++++++++++++++++++++++++++ kernel-vanilla.spec | 38 ++++++++++++++++++++++++++++++------- kernel-zfcpdump.changes | 41 ++++++++++++++++++++++++++++++++++++++++ kernel-zfcpdump.spec | 38 ++++++++++++++++++++++++++++++------- source-timestamp | 4 ++-- 35 files changed, 944 insertions(+), 72 deletions(-) diff --git a/README.SUSE b/README.SUSE index 7db652b6..8ab9b1be 100644 --- a/README.SUSE +++ b/README.SUSE @@ -36,7 +36,7 @@ resulting in a binary kernel. The add-on patches and configuration files are maintained in a GIT repository at - http://gitorious.org/opensuse/kernel-source + https://github.com/openSUSE/kernel-source A script (scripts/tar-up.sh) packs up the files in the repository in a form suitable for rpmbuild. When building the RPM packages, the diff --git a/dtb-aarch64.changes b/dtb-aarch64.changes index 379d123f..fded7343 100644 --- a/dtb-aarch64.changes +++ b/dtb-aarch64.changes @@ -1,9 +1,24 @@ +------------------------------------------------------------------- +Thu Nov 8 08:13:47 CET 2018 - jslaby@suse.cz + +- doc/README.SUSE: correct GIT url + No more gitorious, github we use. +- commit 31864f3 + ------------------------------------------------------------------- Tue Nov 6 13:33:13 CET 2018 - agraf@suse.de - Remove Cell/PS3 support from ppc64 kernel (boo#1114846) - commit c336d64 +------------------------------------------------------------------- +Mon Nov 5 18:22:18 CET 2018 - mkubecek@suse.cz + +- rpm/kernel-binary.spec.in: add macros.s into kernel-*-devel + Starting with 4.20-rc1, file arch/*/kernel/macros.s is needed to build out + of tree modules. Add it to kernel-${flavor}-devel packages if it exists. +- commit 09d14c8 + ------------------------------------------------------------------- Mon Nov 5 08:18:35 CET 2018 - jslaby@suse.cz @@ -87,6 +102,13 @@ Mon Oct 29 16:24:59 CET 2018 - tiwai@suse.de leak (CVE-2018-18710,bsc#1113751). - commit 6216efb +------------------------------------------------------------------- +Thu Oct 25 22:35:11 CEST 2018 - mwilck@suse.com + +- rpm/kernel-binary.spec.in: allow unsupported modules for -extra + (bsc#1111183). SLE-15 and later only. +- commit 0d585a8 + ------------------------------------------------------------------- Wed Oct 24 19:37:20 CEST 2018 - mkubecek@suse.cz @@ -515,6 +537,25 @@ Sat Oct 13 20:49:01 CEST 2018 - jslaby@suse.cz (bnc#1012628). - commit ce1c446 +------------------------------------------------------------------- +Fri Oct 12 10:10:00 CEST 2018 - tzimmermann@suse.de + +- README: Clean-up trailing whitespace +- commit 06542f9 + +------------------------------------------------------------------- +Thu Oct 11 15:46:10 CEST 2018 - tzimmermann@suse.de + +- README: Update documentation wrt. Patch-mainline + Common practice is to set Patch-mainline to a Linux release tag. More + than 95% of all patches follow this convention. The remaining 5% have + been fixed accordingly in SLE15. + The README file is inconsistent wrt. to the content of Patch-mainline. + In some places it refers to a release tag, in others it refers to a version + number. With this cleanup, it refers to release tags everywhere. + This change is a follow-up for commit 1d81d2699cd3. +- commit 57326f5 + ------------------------------------------------------------------- Wed Oct 10 20:47:09 CEST 2018 - jslaby@suse.cz diff --git a/dtb-aarch64.spec b/dtb-aarch64.spec index 88336e86..a849b6e9 100644 --- a/dtb-aarch64.spec +++ b/dtb-aarch64.spec @@ -31,7 +31,7 @@ Name: dtb-aarch64 Version: 4.19.1 %if 0%{?is_kotd} -Release: .gc336d64 +Release: .g0f31a13 %else Release: 0 %endif diff --git a/dtb-armv6l.changes b/dtb-armv6l.changes index 379d123f..fded7343 100644 --- a/dtb-armv6l.changes +++ b/dtb-armv6l.changes @@ -1,9 +1,24 @@ +------------------------------------------------------------------- +Thu Nov 8 08:13:47 CET 2018 - jslaby@suse.cz + +- doc/README.SUSE: correct GIT url + No more gitorious, github we use. +- commit 31864f3 + ------------------------------------------------------------------- Tue Nov 6 13:33:13 CET 2018 - agraf@suse.de - Remove Cell/PS3 support from ppc64 kernel (boo#1114846) - commit c336d64 +------------------------------------------------------------------- +Mon Nov 5 18:22:18 CET 2018 - mkubecek@suse.cz + +- rpm/kernel-binary.spec.in: add macros.s into kernel-*-devel + Starting with 4.20-rc1, file arch/*/kernel/macros.s is needed to build out + of tree modules. Add it to kernel-${flavor}-devel packages if it exists. +- commit 09d14c8 + ------------------------------------------------------------------- Mon Nov 5 08:18:35 CET 2018 - jslaby@suse.cz @@ -87,6 +102,13 @@ Mon Oct 29 16:24:59 CET 2018 - tiwai@suse.de leak (CVE-2018-18710,bsc#1113751). - commit 6216efb +------------------------------------------------------------------- +Thu Oct 25 22:35:11 CEST 2018 - mwilck@suse.com + +- rpm/kernel-binary.spec.in: allow unsupported modules for -extra + (bsc#1111183). SLE-15 and later only. +- commit 0d585a8 + ------------------------------------------------------------------- Wed Oct 24 19:37:20 CEST 2018 - mkubecek@suse.cz @@ -515,6 +537,25 @@ Sat Oct 13 20:49:01 CEST 2018 - jslaby@suse.cz (bnc#1012628). - commit ce1c446 +------------------------------------------------------------------- +Fri Oct 12 10:10:00 CEST 2018 - tzimmermann@suse.de + +- README: Clean-up trailing whitespace +- commit 06542f9 + +------------------------------------------------------------------- +Thu Oct 11 15:46:10 CEST 2018 - tzimmermann@suse.de + +- README: Update documentation wrt. Patch-mainline + Common practice is to set Patch-mainline to a Linux release tag. More + than 95% of all patches follow this convention. The remaining 5% have + been fixed accordingly in SLE15. + The README file is inconsistent wrt. to the content of Patch-mainline. + In some places it refers to a release tag, in others it refers to a version + number. With this cleanup, it refers to release tags everywhere. + This change is a follow-up for commit 1d81d2699cd3. +- commit 57326f5 + ------------------------------------------------------------------- Wed Oct 10 20:47:09 CEST 2018 - jslaby@suse.cz diff --git a/dtb-armv6l.spec b/dtb-armv6l.spec index 02a1e64a..44cad6cc 100644 --- a/dtb-armv6l.spec +++ b/dtb-armv6l.spec @@ -31,7 +31,7 @@ Name: dtb-armv6l Version: 4.19.1 %if 0%{?is_kotd} -Release: .gc336d64 +Release: .g0f31a13 %else Release: 0 %endif diff --git a/dtb-armv7l.changes b/dtb-armv7l.changes index 379d123f..fded7343 100644 --- a/dtb-armv7l.changes +++ b/dtb-armv7l.changes @@ -1,9 +1,24 @@ +------------------------------------------------------------------- +Thu Nov 8 08:13:47 CET 2018 - jslaby@suse.cz + +- doc/README.SUSE: correct GIT url + No more gitorious, github we use. +- commit 31864f3 + ------------------------------------------------------------------- Tue Nov 6 13:33:13 CET 2018 - agraf@suse.de - Remove Cell/PS3 support from ppc64 kernel (boo#1114846) - commit c336d64 +------------------------------------------------------------------- +Mon Nov 5 18:22:18 CET 2018 - mkubecek@suse.cz + +- rpm/kernel-binary.spec.in: add macros.s into kernel-*-devel + Starting with 4.20-rc1, file arch/*/kernel/macros.s is needed to build out + of tree modules. Add it to kernel-${flavor}-devel packages if it exists. +- commit 09d14c8 + ------------------------------------------------------------------- Mon Nov 5 08:18:35 CET 2018 - jslaby@suse.cz @@ -87,6 +102,13 @@ Mon Oct 29 16:24:59 CET 2018 - tiwai@suse.de leak (CVE-2018-18710,bsc#1113751). - commit 6216efb +------------------------------------------------------------------- +Thu Oct 25 22:35:11 CEST 2018 - mwilck@suse.com + +- rpm/kernel-binary.spec.in: allow unsupported modules for -extra + (bsc#1111183). SLE-15 and later only. +- commit 0d585a8 + ------------------------------------------------------------------- Wed Oct 24 19:37:20 CEST 2018 - mkubecek@suse.cz @@ -515,6 +537,25 @@ Sat Oct 13 20:49:01 CEST 2018 - jslaby@suse.cz (bnc#1012628). - commit ce1c446 +------------------------------------------------------------------- +Fri Oct 12 10:10:00 CEST 2018 - tzimmermann@suse.de + +- README: Clean-up trailing whitespace +- commit 06542f9 + +------------------------------------------------------------------- +Thu Oct 11 15:46:10 CEST 2018 - tzimmermann@suse.de + +- README: Update documentation wrt. Patch-mainline + Common practice is to set Patch-mainline to a Linux release tag. More + than 95% of all patches follow this convention. The remaining 5% have + been fixed accordingly in SLE15. + The README file is inconsistent wrt. to the content of Patch-mainline. + In some places it refers to a release tag, in others it refers to a version + number. With this cleanup, it refers to release tags everywhere. + This change is a follow-up for commit 1d81d2699cd3. +- commit 57326f5 + ------------------------------------------------------------------- Wed Oct 10 20:47:09 CEST 2018 - jslaby@suse.cz diff --git a/dtb-armv7l.spec b/dtb-armv7l.spec index 868f1831..2e4eeda0 100644 --- a/dtb-armv7l.spec +++ b/dtb-armv7l.spec @@ -31,7 +31,7 @@ Name: dtb-armv7l Version: 4.19.1 %if 0%{?is_kotd} -Release: .gc336d64 +Release: .g0f31a13 %else Release: 0 %endif diff --git a/kernel-64kb.changes b/kernel-64kb.changes index 379d123f..fded7343 100644 --- a/kernel-64kb.changes +++ b/kernel-64kb.changes @@ -1,9 +1,24 @@ +------------------------------------------------------------------- +Thu Nov 8 08:13:47 CET 2018 - jslaby@suse.cz + +- doc/README.SUSE: correct GIT url + No more gitorious, github we use. +- commit 31864f3 + ------------------------------------------------------------------- Tue Nov 6 13:33:13 CET 2018 - agraf@suse.de - Remove Cell/PS3 support from ppc64 kernel (boo#1114846) - commit c336d64 +------------------------------------------------------------------- +Mon Nov 5 18:22:18 CET 2018 - mkubecek@suse.cz + +- rpm/kernel-binary.spec.in: add macros.s into kernel-*-devel + Starting with 4.20-rc1, file arch/*/kernel/macros.s is needed to build out + of tree modules. Add it to kernel-${flavor}-devel packages if it exists. +- commit 09d14c8 + ------------------------------------------------------------------- Mon Nov 5 08:18:35 CET 2018 - jslaby@suse.cz @@ -87,6 +102,13 @@ Mon Oct 29 16:24:59 CET 2018 - tiwai@suse.de leak (CVE-2018-18710,bsc#1113751). - commit 6216efb +------------------------------------------------------------------- +Thu Oct 25 22:35:11 CEST 2018 - mwilck@suse.com + +- rpm/kernel-binary.spec.in: allow unsupported modules for -extra + (bsc#1111183). SLE-15 and later only. +- commit 0d585a8 + ------------------------------------------------------------------- Wed Oct 24 19:37:20 CEST 2018 - mkubecek@suse.cz @@ -515,6 +537,25 @@ Sat Oct 13 20:49:01 CEST 2018 - jslaby@suse.cz (bnc#1012628). - commit ce1c446 +------------------------------------------------------------------- +Fri Oct 12 10:10:00 CEST 2018 - tzimmermann@suse.de + +- README: Clean-up trailing whitespace +- commit 06542f9 + +------------------------------------------------------------------- +Thu Oct 11 15:46:10 CEST 2018 - tzimmermann@suse.de + +- README: Update documentation wrt. Patch-mainline + Common practice is to set Patch-mainline to a Linux release tag. More + than 95% of all patches follow this convention. The remaining 5% have + been fixed accordingly in SLE15. + The README file is inconsistent wrt. to the content of Patch-mainline. + In some places it refers to a release tag, in others it refers to a version + number. With this cleanup, it refers to release tags everywhere. + This change is a follow-up for commit 1d81d2699cd3. +- commit 57326f5 + ------------------------------------------------------------------- Wed Oct 10 20:47:09 CEST 2018 - jslaby@suse.cz diff --git a/kernel-64kb.spec b/kernel-64kb.spec index 438efcfb..e3ae4152 100644 --- a/kernel-64kb.spec +++ b/kernel-64kb.spec @@ -60,7 +60,7 @@ License: GPL-2.0 Group: System/Kernel Version: 4.19.1 %if 0%{?is_kotd} -Release: .gc336d64 +Release: .g0f31a13 %else Release: 0 %endif @@ -165,10 +165,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b -Provides: kernel-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b +Provides: kernel-%build_flavor-base-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a +Provides: kernel-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a # END COMMON DEPS -Provides: %name-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b +Provides: %name-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz Source2: source-post.sh @@ -906,7 +906,7 @@ if [ %CONFIG_MODULES = y ]; then fi # These files are required for building external modules - for FILE in arch/powerpc/lib/crtsavres.o arch/arm64/kernel/ftrace-mod.o; do + for FILE in arch/powerpc/lib/crtsavres.o arch/arm64/kernel/ftrace-mod.o arch/*/kernel/macros.s; do if [ -f %kernel_build_dir/$FILE ]; then echo $FILE >> %my_builddir/obj-files fi @@ -1011,6 +1011,30 @@ done | add_dirs_to_filelist >%my_builddir/kernel-devel.files } > %my_builddir/kernel-main.files %if %split_extra add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files + +%if 0%{?sle_version} >= 150000 + # By default, loading unsupported modules is disabled on SLE through + # /etc/modprobe.d/10-unsupported-modules.conf from the suse-module-tools + # package. + # modules in kernel-$flavor-extra don't have the supported flag set, + # yet loading them should be possible if the package is installed. + # CAUTION PACKAGERS: The file content below must not change between + # kernel versions, otherwise file conflicts might arise with + # multiversion(kernel). + + mkdir -p %buildroot/etc/modprobe.d + cat >%buildroot/etc/modprobe.d/20-kernel-%{build_flavor}-extra.conf <> %my_builddir/kernel-extra.files + echo '%%config(noreplace) /etc/modprobe.d/20-kernel-%{build_flavor}-extra.conf' >> %my_builddir/kernel-extra.files +%endif %endif for f in %my_builddir/*-kmp-modules; do f2=${f%%-modules}.files @@ -1108,8 +1132,8 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b -Provides: kernel-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b +Provides: kernel-%build_flavor-base-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a +Provides: kernel-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a %obsolete_rebuilds %name-base %ifarch %ix86 diff --git a/kernel-binary.spec.in b/kernel-binary.spec.in index 9b17031b..0632d4f1 100644 --- a/kernel-binary.spec.in +++ b/kernel-binary.spec.in @@ -775,7 +775,7 @@ if [ %CONFIG_MODULES = y ]; then fi # These files are required for building external modules - for FILE in arch/powerpc/lib/crtsavres.o arch/arm64/kernel/ftrace-mod.o; do + for FILE in arch/powerpc/lib/crtsavres.o arch/arm64/kernel/ftrace-mod.o arch/*/kernel/macros.s; do if [ -f %kernel_build_dir/$FILE ]; then echo $FILE >> %my_builddir/obj-files fi @@ -880,6 +880,30 @@ done | add_dirs_to_filelist >%my_builddir/kernel-devel.files } > %my_builddir/kernel-main.files %if %split_extra add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files + +%if 0%{?sle_version} >= 150000 + # By default, loading unsupported modules is disabled on SLE through + # /etc/modprobe.d/10-unsupported-modules.conf from the suse-module-tools + # package. + # modules in kernel-$flavor-extra don't have the supported flag set, + # yet loading them should be possible if the package is installed. + # CAUTION PACKAGERS: The file content below must not change between + # kernel versions, otherwise file conflicts might arise with + # multiversion(kernel). + + mkdir -p %buildroot/etc/modprobe.d + cat >%buildroot/etc/modprobe.d/20-kernel-%{build_flavor}-extra.conf <> %my_builddir/kernel-extra.files + echo '%%config(noreplace) /etc/modprobe.d/20-kernel-%{build_flavor}-extra.conf' >> %my_builddir/kernel-extra.files +%endif %endif for f in %my_builddir/*-kmp-modules; do f2=${f%%-modules}.files diff --git a/kernel-debug.changes b/kernel-debug.changes index 379d123f..fded7343 100644 --- a/kernel-debug.changes +++ b/kernel-debug.changes @@ -1,9 +1,24 @@ +------------------------------------------------------------------- +Thu Nov 8 08:13:47 CET 2018 - jslaby@suse.cz + +- doc/README.SUSE: correct GIT url + No more gitorious, github we use. +- commit 31864f3 + ------------------------------------------------------------------- Tue Nov 6 13:33:13 CET 2018 - agraf@suse.de - Remove Cell/PS3 support from ppc64 kernel (boo#1114846) - commit c336d64 +------------------------------------------------------------------- +Mon Nov 5 18:22:18 CET 2018 - mkubecek@suse.cz + +- rpm/kernel-binary.spec.in: add macros.s into kernel-*-devel + Starting with 4.20-rc1, file arch/*/kernel/macros.s is needed to build out + of tree modules. Add it to kernel-${flavor}-devel packages if it exists. +- commit 09d14c8 + ------------------------------------------------------------------- Mon Nov 5 08:18:35 CET 2018 - jslaby@suse.cz @@ -87,6 +102,13 @@ Mon Oct 29 16:24:59 CET 2018 - tiwai@suse.de leak (CVE-2018-18710,bsc#1113751). - commit 6216efb +------------------------------------------------------------------- +Thu Oct 25 22:35:11 CEST 2018 - mwilck@suse.com + +- rpm/kernel-binary.spec.in: allow unsupported modules for -extra + (bsc#1111183). SLE-15 and later only. +- commit 0d585a8 + ------------------------------------------------------------------- Wed Oct 24 19:37:20 CEST 2018 - mkubecek@suse.cz @@ -515,6 +537,25 @@ Sat Oct 13 20:49:01 CEST 2018 - jslaby@suse.cz (bnc#1012628). - commit ce1c446 +------------------------------------------------------------------- +Fri Oct 12 10:10:00 CEST 2018 - tzimmermann@suse.de + +- README: Clean-up trailing whitespace +- commit 06542f9 + +------------------------------------------------------------------- +Thu Oct 11 15:46:10 CEST 2018 - tzimmermann@suse.de + +- README: Update documentation wrt. Patch-mainline + Common practice is to set Patch-mainline to a Linux release tag. More + than 95% of all patches follow this convention. The remaining 5% have + been fixed accordingly in SLE15. + The README file is inconsistent wrt. to the content of Patch-mainline. + In some places it refers to a release tag, in others it refers to a version + number. With this cleanup, it refers to release tags everywhere. + This change is a follow-up for commit 1d81d2699cd3. +- commit 57326f5 + ------------------------------------------------------------------- Wed Oct 10 20:47:09 CEST 2018 - jslaby@suse.cz diff --git a/kernel-debug.spec b/kernel-debug.spec index 91bed7ab..228c31b4 100644 --- a/kernel-debug.spec +++ b/kernel-debug.spec @@ -60,7 +60,7 @@ License: GPL-2.0 Group: System/Kernel Version: 4.19.1 %if 0%{?is_kotd} -Release: .gc336d64 +Release: .g0f31a13 %else Release: 0 %endif @@ -165,10 +165,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b -Provides: kernel-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b +Provides: kernel-%build_flavor-base-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a +Provides: kernel-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a # END COMMON DEPS -Provides: %name-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b +Provides: %name-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a %ifarch ppc64 Provides: kernel-kdump = 2.6.28 Obsoletes: kernel-kdump <= 2.6.28 @@ -912,7 +912,7 @@ if [ %CONFIG_MODULES = y ]; then fi # These files are required for building external modules - for FILE in arch/powerpc/lib/crtsavres.o arch/arm64/kernel/ftrace-mod.o; do + for FILE in arch/powerpc/lib/crtsavres.o arch/arm64/kernel/ftrace-mod.o arch/*/kernel/macros.s; do if [ -f %kernel_build_dir/$FILE ]; then echo $FILE >> %my_builddir/obj-files fi @@ -1017,6 +1017,30 @@ done | add_dirs_to_filelist >%my_builddir/kernel-devel.files } > %my_builddir/kernel-main.files %if %split_extra add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files + +%if 0%{?sle_version} >= 150000 + # By default, loading unsupported modules is disabled on SLE through + # /etc/modprobe.d/10-unsupported-modules.conf from the suse-module-tools + # package. + # modules in kernel-$flavor-extra don't have the supported flag set, + # yet loading them should be possible if the package is installed. + # CAUTION PACKAGERS: The file content below must not change between + # kernel versions, otherwise file conflicts might arise with + # multiversion(kernel). + + mkdir -p %buildroot/etc/modprobe.d + cat >%buildroot/etc/modprobe.d/20-kernel-%{build_flavor}-extra.conf <> %my_builddir/kernel-extra.files + echo '%%config(noreplace) /etc/modprobe.d/20-kernel-%{build_flavor}-extra.conf' >> %my_builddir/kernel-extra.files +%endif %endif for f in %my_builddir/*-kmp-modules; do f2=${f%%-modules}.files @@ -1114,8 +1138,8 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b -Provides: kernel-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b +Provides: kernel-%build_flavor-base-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a +Provides: kernel-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a %ifarch ppc64 Provides: kernel-kdump-base = 2.6.28 diff --git a/kernel-default.changes b/kernel-default.changes index 379d123f..fded7343 100644 --- a/kernel-default.changes +++ b/kernel-default.changes @@ -1,9 +1,24 @@ +------------------------------------------------------------------- +Thu Nov 8 08:13:47 CET 2018 - jslaby@suse.cz + +- doc/README.SUSE: correct GIT url + No more gitorious, github we use. +- commit 31864f3 + ------------------------------------------------------------------- Tue Nov 6 13:33:13 CET 2018 - agraf@suse.de - Remove Cell/PS3 support from ppc64 kernel (boo#1114846) - commit c336d64 +------------------------------------------------------------------- +Mon Nov 5 18:22:18 CET 2018 - mkubecek@suse.cz + +- rpm/kernel-binary.spec.in: add macros.s into kernel-*-devel + Starting with 4.20-rc1, file arch/*/kernel/macros.s is needed to build out + of tree modules. Add it to kernel-${flavor}-devel packages if it exists. +- commit 09d14c8 + ------------------------------------------------------------------- Mon Nov 5 08:18:35 CET 2018 - jslaby@suse.cz @@ -87,6 +102,13 @@ Mon Oct 29 16:24:59 CET 2018 - tiwai@suse.de leak (CVE-2018-18710,bsc#1113751). - commit 6216efb +------------------------------------------------------------------- +Thu Oct 25 22:35:11 CEST 2018 - mwilck@suse.com + +- rpm/kernel-binary.spec.in: allow unsupported modules for -extra + (bsc#1111183). SLE-15 and later only. +- commit 0d585a8 + ------------------------------------------------------------------- Wed Oct 24 19:37:20 CEST 2018 - mkubecek@suse.cz @@ -515,6 +537,25 @@ Sat Oct 13 20:49:01 CEST 2018 - jslaby@suse.cz (bnc#1012628). - commit ce1c446 +------------------------------------------------------------------- +Fri Oct 12 10:10:00 CEST 2018 - tzimmermann@suse.de + +- README: Clean-up trailing whitespace +- commit 06542f9 + +------------------------------------------------------------------- +Thu Oct 11 15:46:10 CEST 2018 - tzimmermann@suse.de + +- README: Update documentation wrt. Patch-mainline + Common practice is to set Patch-mainline to a Linux release tag. More + than 95% of all patches follow this convention. The remaining 5% have + been fixed accordingly in SLE15. + The README file is inconsistent wrt. to the content of Patch-mainline. + In some places it refers to a release tag, in others it refers to a version + number. With this cleanup, it refers to release tags everywhere. + This change is a follow-up for commit 1d81d2699cd3. +- commit 57326f5 + ------------------------------------------------------------------- Wed Oct 10 20:47:09 CEST 2018 - jslaby@suse.cz diff --git a/kernel-default.spec b/kernel-default.spec index 75dcb375..0b6e56af 100644 --- a/kernel-default.spec +++ b/kernel-default.spec @@ -60,7 +60,7 @@ License: GPL-2.0 Group: System/Kernel Version: 4.19.1 %if 0%{?is_kotd} -Release: .gc336d64 +Release: .g0f31a13 %else Release: 0 %endif @@ -165,10 +165,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b -Provides: kernel-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b +Provides: kernel-%build_flavor-base-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a +Provides: kernel-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a # END COMMON DEPS -Provides: %name-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b +Provides: %name-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a %ifarch %ix86 Provides: kernel-smp = 2.6.17 Obsoletes: kernel-smp <= 2.6.17 @@ -955,7 +955,7 @@ if [ %CONFIG_MODULES = y ]; then fi # These files are required for building external modules - for FILE in arch/powerpc/lib/crtsavres.o arch/arm64/kernel/ftrace-mod.o; do + for FILE in arch/powerpc/lib/crtsavres.o arch/arm64/kernel/ftrace-mod.o arch/*/kernel/macros.s; do if [ -f %kernel_build_dir/$FILE ]; then echo $FILE >> %my_builddir/obj-files fi @@ -1060,6 +1060,30 @@ done | add_dirs_to_filelist >%my_builddir/kernel-devel.files } > %my_builddir/kernel-main.files %if %split_extra add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files + +%if 0%{?sle_version} >= 150000 + # By default, loading unsupported modules is disabled on SLE through + # /etc/modprobe.d/10-unsupported-modules.conf from the suse-module-tools + # package. + # modules in kernel-$flavor-extra don't have the supported flag set, + # yet loading them should be possible if the package is installed. + # CAUTION PACKAGERS: The file content below must not change between + # kernel versions, otherwise file conflicts might arise with + # multiversion(kernel). + + mkdir -p %buildroot/etc/modprobe.d + cat >%buildroot/etc/modprobe.d/20-kernel-%{build_flavor}-extra.conf <> %my_builddir/kernel-extra.files + echo '%%config(noreplace) /etc/modprobe.d/20-kernel-%{build_flavor}-extra.conf' >> %my_builddir/kernel-extra.files +%endif %endif for f in %my_builddir/*-kmp-modules; do f2=${f%%-modules}.files @@ -1157,8 +1181,8 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b -Provides: kernel-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b +Provides: kernel-%build_flavor-base-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a +Provides: kernel-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a %ifarch %ix86 Provides: kernel-trace-base = 3.13 diff --git a/kernel-docs.changes b/kernel-docs.changes index 379d123f..fded7343 100644 --- a/kernel-docs.changes +++ b/kernel-docs.changes @@ -1,9 +1,24 @@ +------------------------------------------------------------------- +Thu Nov 8 08:13:47 CET 2018 - jslaby@suse.cz + +- doc/README.SUSE: correct GIT url + No more gitorious, github we use. +- commit 31864f3 + ------------------------------------------------------------------- Tue Nov 6 13:33:13 CET 2018 - agraf@suse.de - Remove Cell/PS3 support from ppc64 kernel (boo#1114846) - commit c336d64 +------------------------------------------------------------------- +Mon Nov 5 18:22:18 CET 2018 - mkubecek@suse.cz + +- rpm/kernel-binary.spec.in: add macros.s into kernel-*-devel + Starting with 4.20-rc1, file arch/*/kernel/macros.s is needed to build out + of tree modules. Add it to kernel-${flavor}-devel packages if it exists. +- commit 09d14c8 + ------------------------------------------------------------------- Mon Nov 5 08:18:35 CET 2018 - jslaby@suse.cz @@ -87,6 +102,13 @@ Mon Oct 29 16:24:59 CET 2018 - tiwai@suse.de leak (CVE-2018-18710,bsc#1113751). - commit 6216efb +------------------------------------------------------------------- +Thu Oct 25 22:35:11 CEST 2018 - mwilck@suse.com + +- rpm/kernel-binary.spec.in: allow unsupported modules for -extra + (bsc#1111183). SLE-15 and later only. +- commit 0d585a8 + ------------------------------------------------------------------- Wed Oct 24 19:37:20 CEST 2018 - mkubecek@suse.cz @@ -515,6 +537,25 @@ Sat Oct 13 20:49:01 CEST 2018 - jslaby@suse.cz (bnc#1012628). - commit ce1c446 +------------------------------------------------------------------- +Fri Oct 12 10:10:00 CEST 2018 - tzimmermann@suse.de + +- README: Clean-up trailing whitespace +- commit 06542f9 + +------------------------------------------------------------------- +Thu Oct 11 15:46:10 CEST 2018 - tzimmermann@suse.de + +- README: Update documentation wrt. Patch-mainline + Common practice is to set Patch-mainline to a Linux release tag. More + than 95% of all patches follow this convention. The remaining 5% have + been fixed accordingly in SLE15. + The README file is inconsistent wrt. to the content of Patch-mainline. + In some places it refers to a release tag, in others it refers to a version + number. With this cleanup, it refers to release tags everywhere. + This change is a follow-up for commit 1d81d2699cd3. +- commit 57326f5 + ------------------------------------------------------------------- Wed Oct 10 20:47:09 CEST 2018 - jslaby@suse.cz diff --git a/kernel-docs.spec b/kernel-docs.spec index bee1f163..7931534e 100644 --- a/kernel-docs.spec +++ b/kernel-docs.spec @@ -33,7 +33,7 @@ License: GPL-2.0 Group: Documentation/Man Version: 4.19.1 %if 0%{?is_kotd} -Release: .gc336d64 +Release: .g0f31a13 %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 = c336d64bb17272c0b916f0ecaa1b605d252f617b +Provides: %name-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz diff --git a/kernel-kvmsmall.changes b/kernel-kvmsmall.changes index 379d123f..fded7343 100644 --- a/kernel-kvmsmall.changes +++ b/kernel-kvmsmall.changes @@ -1,9 +1,24 @@ +------------------------------------------------------------------- +Thu Nov 8 08:13:47 CET 2018 - jslaby@suse.cz + +- doc/README.SUSE: correct GIT url + No more gitorious, github we use. +- commit 31864f3 + ------------------------------------------------------------------- Tue Nov 6 13:33:13 CET 2018 - agraf@suse.de - Remove Cell/PS3 support from ppc64 kernel (boo#1114846) - commit c336d64 +------------------------------------------------------------------- +Mon Nov 5 18:22:18 CET 2018 - mkubecek@suse.cz + +- rpm/kernel-binary.spec.in: add macros.s into kernel-*-devel + Starting with 4.20-rc1, file arch/*/kernel/macros.s is needed to build out + of tree modules. Add it to kernel-${flavor}-devel packages if it exists. +- commit 09d14c8 + ------------------------------------------------------------------- Mon Nov 5 08:18:35 CET 2018 - jslaby@suse.cz @@ -87,6 +102,13 @@ Mon Oct 29 16:24:59 CET 2018 - tiwai@suse.de leak (CVE-2018-18710,bsc#1113751). - commit 6216efb +------------------------------------------------------------------- +Thu Oct 25 22:35:11 CEST 2018 - mwilck@suse.com + +- rpm/kernel-binary.spec.in: allow unsupported modules for -extra + (bsc#1111183). SLE-15 and later only. +- commit 0d585a8 + ------------------------------------------------------------------- Wed Oct 24 19:37:20 CEST 2018 - mkubecek@suse.cz @@ -515,6 +537,25 @@ Sat Oct 13 20:49:01 CEST 2018 - jslaby@suse.cz (bnc#1012628). - commit ce1c446 +------------------------------------------------------------------- +Fri Oct 12 10:10:00 CEST 2018 - tzimmermann@suse.de + +- README: Clean-up trailing whitespace +- commit 06542f9 + +------------------------------------------------------------------- +Thu Oct 11 15:46:10 CEST 2018 - tzimmermann@suse.de + +- README: Update documentation wrt. Patch-mainline + Common practice is to set Patch-mainline to a Linux release tag. More + than 95% of all patches follow this convention. The remaining 5% have + been fixed accordingly in SLE15. + The README file is inconsistent wrt. to the content of Patch-mainline. + In some places it refers to a release tag, in others it refers to a version + number. With this cleanup, it refers to release tags everywhere. + This change is a follow-up for commit 1d81d2699cd3. +- commit 57326f5 + ------------------------------------------------------------------- Wed Oct 10 20:47:09 CEST 2018 - jslaby@suse.cz diff --git a/kernel-kvmsmall.spec b/kernel-kvmsmall.spec index 000c644f..0aac86a7 100644 --- a/kernel-kvmsmall.spec +++ b/kernel-kvmsmall.spec @@ -60,7 +60,7 @@ License: GPL-2.0 Group: System/Kernel Version: 4.19.1 %if 0%{?is_kotd} -Release: .gc336d64 +Release: .g0f31a13 %else Release: 0 %endif @@ -165,10 +165,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b -Provides: kernel-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b +Provides: kernel-%build_flavor-base-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a +Provides: kernel-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a # END COMMON DEPS -Provides: %name-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b +Provides: %name-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz Source2: source-post.sh @@ -910,7 +910,7 @@ if [ %CONFIG_MODULES = y ]; then fi # These files are required for building external modules - for FILE in arch/powerpc/lib/crtsavres.o arch/arm64/kernel/ftrace-mod.o; do + for FILE in arch/powerpc/lib/crtsavres.o arch/arm64/kernel/ftrace-mod.o arch/*/kernel/macros.s; do if [ -f %kernel_build_dir/$FILE ]; then echo $FILE >> %my_builddir/obj-files fi @@ -1015,6 +1015,30 @@ done | add_dirs_to_filelist >%my_builddir/kernel-devel.files } > %my_builddir/kernel-main.files %if %split_extra add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files + +%if 0%{?sle_version} >= 150000 + # By default, loading unsupported modules is disabled on SLE through + # /etc/modprobe.d/10-unsupported-modules.conf from the suse-module-tools + # package. + # modules in kernel-$flavor-extra don't have the supported flag set, + # yet loading them should be possible if the package is installed. + # CAUTION PACKAGERS: The file content below must not change between + # kernel versions, otherwise file conflicts might arise with + # multiversion(kernel). + + mkdir -p %buildroot/etc/modprobe.d + cat >%buildroot/etc/modprobe.d/20-kernel-%{build_flavor}-extra.conf <> %my_builddir/kernel-extra.files + echo '%%config(noreplace) /etc/modprobe.d/20-kernel-%{build_flavor}-extra.conf' >> %my_builddir/kernel-extra.files +%endif %endif for f in %my_builddir/*-kmp-modules; do f2=${f%%-modules}.files @@ -1112,8 +1136,8 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b -Provides: kernel-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b +Provides: kernel-%build_flavor-base-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a +Provides: kernel-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a %obsolete_rebuilds %name-base %ifarch %ix86 diff --git a/kernel-lpae.changes b/kernel-lpae.changes index 379d123f..fded7343 100644 --- a/kernel-lpae.changes +++ b/kernel-lpae.changes @@ -1,9 +1,24 @@ +------------------------------------------------------------------- +Thu Nov 8 08:13:47 CET 2018 - jslaby@suse.cz + +- doc/README.SUSE: correct GIT url + No more gitorious, github we use. +- commit 31864f3 + ------------------------------------------------------------------- Tue Nov 6 13:33:13 CET 2018 - agraf@suse.de - Remove Cell/PS3 support from ppc64 kernel (boo#1114846) - commit c336d64 +------------------------------------------------------------------- +Mon Nov 5 18:22:18 CET 2018 - mkubecek@suse.cz + +- rpm/kernel-binary.spec.in: add macros.s into kernel-*-devel + Starting with 4.20-rc1, file arch/*/kernel/macros.s is needed to build out + of tree modules. Add it to kernel-${flavor}-devel packages if it exists. +- commit 09d14c8 + ------------------------------------------------------------------- Mon Nov 5 08:18:35 CET 2018 - jslaby@suse.cz @@ -87,6 +102,13 @@ Mon Oct 29 16:24:59 CET 2018 - tiwai@suse.de leak (CVE-2018-18710,bsc#1113751). - commit 6216efb +------------------------------------------------------------------- +Thu Oct 25 22:35:11 CEST 2018 - mwilck@suse.com + +- rpm/kernel-binary.spec.in: allow unsupported modules for -extra + (bsc#1111183). SLE-15 and later only. +- commit 0d585a8 + ------------------------------------------------------------------- Wed Oct 24 19:37:20 CEST 2018 - mkubecek@suse.cz @@ -515,6 +537,25 @@ Sat Oct 13 20:49:01 CEST 2018 - jslaby@suse.cz (bnc#1012628). - commit ce1c446 +------------------------------------------------------------------- +Fri Oct 12 10:10:00 CEST 2018 - tzimmermann@suse.de + +- README: Clean-up trailing whitespace +- commit 06542f9 + +------------------------------------------------------------------- +Thu Oct 11 15:46:10 CEST 2018 - tzimmermann@suse.de + +- README: Update documentation wrt. Patch-mainline + Common practice is to set Patch-mainline to a Linux release tag. More + than 95% of all patches follow this convention. The remaining 5% have + been fixed accordingly in SLE15. + The README file is inconsistent wrt. to the content of Patch-mainline. + In some places it refers to a release tag, in others it refers to a version + number. With this cleanup, it refers to release tags everywhere. + This change is a follow-up for commit 1d81d2699cd3. +- commit 57326f5 + ------------------------------------------------------------------- Wed Oct 10 20:47:09 CEST 2018 - jslaby@suse.cz diff --git a/kernel-lpae.spec b/kernel-lpae.spec index a78eeff5..f7333126 100644 --- a/kernel-lpae.spec +++ b/kernel-lpae.spec @@ -60,7 +60,7 @@ License: GPL-2.0 Group: System/Kernel Version: 4.19.1 %if 0%{?is_kotd} -Release: .gc336d64 +Release: .g0f31a13 %else Release: 0 %endif @@ -165,10 +165,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b -Provides: kernel-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b +Provides: kernel-%build_flavor-base-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a +Provides: kernel-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a # END COMMON DEPS -Provides: %name-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b +Provides: %name-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz Source2: source-post.sh @@ -904,7 +904,7 @@ if [ %CONFIG_MODULES = y ]; then fi # These files are required for building external modules - for FILE in arch/powerpc/lib/crtsavres.o arch/arm64/kernel/ftrace-mod.o; do + for FILE in arch/powerpc/lib/crtsavres.o arch/arm64/kernel/ftrace-mod.o arch/*/kernel/macros.s; do if [ -f %kernel_build_dir/$FILE ]; then echo $FILE >> %my_builddir/obj-files fi @@ -1009,6 +1009,30 @@ done | add_dirs_to_filelist >%my_builddir/kernel-devel.files } > %my_builddir/kernel-main.files %if %split_extra add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files + +%if 0%{?sle_version} >= 150000 + # By default, loading unsupported modules is disabled on SLE through + # /etc/modprobe.d/10-unsupported-modules.conf from the suse-module-tools + # package. + # modules in kernel-$flavor-extra don't have the supported flag set, + # yet loading them should be possible if the package is installed. + # CAUTION PACKAGERS: The file content below must not change between + # kernel versions, otherwise file conflicts might arise with + # multiversion(kernel). + + mkdir -p %buildroot/etc/modprobe.d + cat >%buildroot/etc/modprobe.d/20-kernel-%{build_flavor}-extra.conf <> %my_builddir/kernel-extra.files + echo '%%config(noreplace) /etc/modprobe.d/20-kernel-%{build_flavor}-extra.conf' >> %my_builddir/kernel-extra.files +%endif %endif for f in %my_builddir/*-kmp-modules; do f2=${f%%-modules}.files @@ -1106,8 +1130,8 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b -Provides: kernel-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b +Provides: kernel-%build_flavor-base-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a +Provides: kernel-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a %obsolete_rebuilds %name-base %ifarch %ix86 diff --git a/kernel-obs-build.changes b/kernel-obs-build.changes index 379d123f..fded7343 100644 --- a/kernel-obs-build.changes +++ b/kernel-obs-build.changes @@ -1,9 +1,24 @@ +------------------------------------------------------------------- +Thu Nov 8 08:13:47 CET 2018 - jslaby@suse.cz + +- doc/README.SUSE: correct GIT url + No more gitorious, github we use. +- commit 31864f3 + ------------------------------------------------------------------- Tue Nov 6 13:33:13 CET 2018 - agraf@suse.de - Remove Cell/PS3 support from ppc64 kernel (boo#1114846) - commit c336d64 +------------------------------------------------------------------- +Mon Nov 5 18:22:18 CET 2018 - mkubecek@suse.cz + +- rpm/kernel-binary.spec.in: add macros.s into kernel-*-devel + Starting with 4.20-rc1, file arch/*/kernel/macros.s is needed to build out + of tree modules. Add it to kernel-${flavor}-devel packages if it exists. +- commit 09d14c8 + ------------------------------------------------------------------- Mon Nov 5 08:18:35 CET 2018 - jslaby@suse.cz @@ -87,6 +102,13 @@ Mon Oct 29 16:24:59 CET 2018 - tiwai@suse.de leak (CVE-2018-18710,bsc#1113751). - commit 6216efb +------------------------------------------------------------------- +Thu Oct 25 22:35:11 CEST 2018 - mwilck@suse.com + +- rpm/kernel-binary.spec.in: allow unsupported modules for -extra + (bsc#1111183). SLE-15 and later only. +- commit 0d585a8 + ------------------------------------------------------------------- Wed Oct 24 19:37:20 CEST 2018 - mkubecek@suse.cz @@ -515,6 +537,25 @@ Sat Oct 13 20:49:01 CEST 2018 - jslaby@suse.cz (bnc#1012628). - commit ce1c446 +------------------------------------------------------------------- +Fri Oct 12 10:10:00 CEST 2018 - tzimmermann@suse.de + +- README: Clean-up trailing whitespace +- commit 06542f9 + +------------------------------------------------------------------- +Thu Oct 11 15:46:10 CEST 2018 - tzimmermann@suse.de + +- README: Update documentation wrt. Patch-mainline + Common practice is to set Patch-mainline to a Linux release tag. More + than 95% of all patches follow this convention. The remaining 5% have + been fixed accordingly in SLE15. + The README file is inconsistent wrt. to the content of Patch-mainline. + In some places it refers to a release tag, in others it refers to a version + number. With this cleanup, it refers to release tags everywhere. + This change is a follow-up for commit 1d81d2699cd3. +- commit 57326f5 + ------------------------------------------------------------------- Wed Oct 10 20:47:09 CEST 2018 - jslaby@suse.cz diff --git a/kernel-obs-build.spec b/kernel-obs-build.spec index 5b64d59b..006700c0 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 = c336d64bb17272c0b916f0ecaa1b605d252f617b +BuildRequires: kernel%kernel_flavor-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a %if 0%{?rhel_version} BuildRequires: kernel @@ -66,7 +66,7 @@ License: GPL-2.0 Group: SLES Version: 4.19.1 %if 0%{?is_kotd} -Release: .gc336d64 +Release: .g0f31a13 %else Release: 0 %endif diff --git a/kernel-obs-qa.changes b/kernel-obs-qa.changes index 379d123f..fded7343 100644 --- a/kernel-obs-qa.changes +++ b/kernel-obs-qa.changes @@ -1,9 +1,24 @@ +------------------------------------------------------------------- +Thu Nov 8 08:13:47 CET 2018 - jslaby@suse.cz + +- doc/README.SUSE: correct GIT url + No more gitorious, github we use. +- commit 31864f3 + ------------------------------------------------------------------- Tue Nov 6 13:33:13 CET 2018 - agraf@suse.de - Remove Cell/PS3 support from ppc64 kernel (boo#1114846) - commit c336d64 +------------------------------------------------------------------- +Mon Nov 5 18:22:18 CET 2018 - mkubecek@suse.cz + +- rpm/kernel-binary.spec.in: add macros.s into kernel-*-devel + Starting with 4.20-rc1, file arch/*/kernel/macros.s is needed to build out + of tree modules. Add it to kernel-${flavor}-devel packages if it exists. +- commit 09d14c8 + ------------------------------------------------------------------- Mon Nov 5 08:18:35 CET 2018 - jslaby@suse.cz @@ -87,6 +102,13 @@ Mon Oct 29 16:24:59 CET 2018 - tiwai@suse.de leak (CVE-2018-18710,bsc#1113751). - commit 6216efb +------------------------------------------------------------------- +Thu Oct 25 22:35:11 CEST 2018 - mwilck@suse.com + +- rpm/kernel-binary.spec.in: allow unsupported modules for -extra + (bsc#1111183). SLE-15 and later only. +- commit 0d585a8 + ------------------------------------------------------------------- Wed Oct 24 19:37:20 CEST 2018 - mkubecek@suse.cz @@ -515,6 +537,25 @@ Sat Oct 13 20:49:01 CEST 2018 - jslaby@suse.cz (bnc#1012628). - commit ce1c446 +------------------------------------------------------------------- +Fri Oct 12 10:10:00 CEST 2018 - tzimmermann@suse.de + +- README: Clean-up trailing whitespace +- commit 06542f9 + +------------------------------------------------------------------- +Thu Oct 11 15:46:10 CEST 2018 - tzimmermann@suse.de + +- README: Update documentation wrt. Patch-mainline + Common practice is to set Patch-mainline to a Linux release tag. More + than 95% of all patches follow this convention. The remaining 5% have + been fixed accordingly in SLE15. + The README file is inconsistent wrt. to the content of Patch-mainline. + In some places it refers to a release tag, in others it refers to a version + number. With this cleanup, it refers to release tags everywhere. + This change is a follow-up for commit 1d81d2699cd3. +- commit 57326f5 + ------------------------------------------------------------------- Wed Oct 10 20:47:09 CEST 2018 - jslaby@suse.cz diff --git a/kernel-obs-qa.spec b/kernel-obs-qa.spec index 330ade87..3e2dd7ce 100644 --- a/kernel-obs-qa.spec +++ b/kernel-obs-qa.spec @@ -38,7 +38,7 @@ License: GPL-2.0 Group: SLES Version: 4.19.1 %if 0%{?is_kotd} -Release: .gc336d64 +Release: .g0f31a13 %else Release: 0 %endif diff --git a/kernel-pae.changes b/kernel-pae.changes index 379d123f..fded7343 100644 --- a/kernel-pae.changes +++ b/kernel-pae.changes @@ -1,9 +1,24 @@ +------------------------------------------------------------------- +Thu Nov 8 08:13:47 CET 2018 - jslaby@suse.cz + +- doc/README.SUSE: correct GIT url + No more gitorious, github we use. +- commit 31864f3 + ------------------------------------------------------------------- Tue Nov 6 13:33:13 CET 2018 - agraf@suse.de - Remove Cell/PS3 support from ppc64 kernel (boo#1114846) - commit c336d64 +------------------------------------------------------------------- +Mon Nov 5 18:22:18 CET 2018 - mkubecek@suse.cz + +- rpm/kernel-binary.spec.in: add macros.s into kernel-*-devel + Starting with 4.20-rc1, file arch/*/kernel/macros.s is needed to build out + of tree modules. Add it to kernel-${flavor}-devel packages if it exists. +- commit 09d14c8 + ------------------------------------------------------------------- Mon Nov 5 08:18:35 CET 2018 - jslaby@suse.cz @@ -87,6 +102,13 @@ Mon Oct 29 16:24:59 CET 2018 - tiwai@suse.de leak (CVE-2018-18710,bsc#1113751). - commit 6216efb +------------------------------------------------------------------- +Thu Oct 25 22:35:11 CEST 2018 - mwilck@suse.com + +- rpm/kernel-binary.spec.in: allow unsupported modules for -extra + (bsc#1111183). SLE-15 and later only. +- commit 0d585a8 + ------------------------------------------------------------------- Wed Oct 24 19:37:20 CEST 2018 - mkubecek@suse.cz @@ -515,6 +537,25 @@ Sat Oct 13 20:49:01 CEST 2018 - jslaby@suse.cz (bnc#1012628). - commit ce1c446 +------------------------------------------------------------------- +Fri Oct 12 10:10:00 CEST 2018 - tzimmermann@suse.de + +- README: Clean-up trailing whitespace +- commit 06542f9 + +------------------------------------------------------------------- +Thu Oct 11 15:46:10 CEST 2018 - tzimmermann@suse.de + +- README: Update documentation wrt. Patch-mainline + Common practice is to set Patch-mainline to a Linux release tag. More + than 95% of all patches follow this convention. The remaining 5% have + been fixed accordingly in SLE15. + The README file is inconsistent wrt. to the content of Patch-mainline. + In some places it refers to a release tag, in others it refers to a version + number. With this cleanup, it refers to release tags everywhere. + This change is a follow-up for commit 1d81d2699cd3. +- commit 57326f5 + ------------------------------------------------------------------- Wed Oct 10 20:47:09 CEST 2018 - jslaby@suse.cz diff --git a/kernel-pae.spec b/kernel-pae.spec index 3b903d1a..be7a6c14 100644 --- a/kernel-pae.spec +++ b/kernel-pae.spec @@ -60,7 +60,7 @@ License: GPL-2.0 Group: System/Kernel Version: 4.19.1 %if 0%{?is_kotd} -Release: .gc336d64 +Release: .g0f31a13 %else Release: 0 %endif @@ -165,10 +165,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b -Provides: kernel-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b +Provides: kernel-%build_flavor-base-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a +Provides: kernel-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a # END COMMON DEPS -Provides: %name-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b +Provides: %name-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a %ifarch %ix86 Provides: kernel-bigsmp = 2.6.17 Obsoletes: kernel-bigsmp <= 2.6.17 @@ -932,7 +932,7 @@ if [ %CONFIG_MODULES = y ]; then fi # These files are required for building external modules - for FILE in arch/powerpc/lib/crtsavres.o arch/arm64/kernel/ftrace-mod.o; do + for FILE in arch/powerpc/lib/crtsavres.o arch/arm64/kernel/ftrace-mod.o arch/*/kernel/macros.s; do if [ -f %kernel_build_dir/$FILE ]; then echo $FILE >> %my_builddir/obj-files fi @@ -1037,6 +1037,30 @@ done | add_dirs_to_filelist >%my_builddir/kernel-devel.files } > %my_builddir/kernel-main.files %if %split_extra add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files + +%if 0%{?sle_version} >= 150000 + # By default, loading unsupported modules is disabled on SLE through + # /etc/modprobe.d/10-unsupported-modules.conf from the suse-module-tools + # package. + # modules in kernel-$flavor-extra don't have the supported flag set, + # yet loading them should be possible if the package is installed. + # CAUTION PACKAGERS: The file content below must not change between + # kernel versions, otherwise file conflicts might arise with + # multiversion(kernel). + + mkdir -p %buildroot/etc/modprobe.d + cat >%buildroot/etc/modprobe.d/20-kernel-%{build_flavor}-extra.conf <> %my_builddir/kernel-extra.files + echo '%%config(noreplace) /etc/modprobe.d/20-kernel-%{build_flavor}-extra.conf' >> %my_builddir/kernel-extra.files +%endif %endif for f in %my_builddir/*-kmp-modules; do f2=${f%%-modules}.files @@ -1134,8 +1158,8 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b -Provides: kernel-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b +Provides: kernel-%build_flavor-base-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a +Provides: kernel-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a %ifarch %ix86 Provides: kernel-vmi-base = 2.6.38 diff --git a/kernel-source.changes b/kernel-source.changes index 379d123f..fded7343 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,9 +1,24 @@ +------------------------------------------------------------------- +Thu Nov 8 08:13:47 CET 2018 - jslaby@suse.cz + +- doc/README.SUSE: correct GIT url + No more gitorious, github we use. +- commit 31864f3 + ------------------------------------------------------------------- Tue Nov 6 13:33:13 CET 2018 - agraf@suse.de - Remove Cell/PS3 support from ppc64 kernel (boo#1114846) - commit c336d64 +------------------------------------------------------------------- +Mon Nov 5 18:22:18 CET 2018 - mkubecek@suse.cz + +- rpm/kernel-binary.spec.in: add macros.s into kernel-*-devel + Starting with 4.20-rc1, file arch/*/kernel/macros.s is needed to build out + of tree modules. Add it to kernel-${flavor}-devel packages if it exists. +- commit 09d14c8 + ------------------------------------------------------------------- Mon Nov 5 08:18:35 CET 2018 - jslaby@suse.cz @@ -87,6 +102,13 @@ Mon Oct 29 16:24:59 CET 2018 - tiwai@suse.de leak (CVE-2018-18710,bsc#1113751). - commit 6216efb +------------------------------------------------------------------- +Thu Oct 25 22:35:11 CEST 2018 - mwilck@suse.com + +- rpm/kernel-binary.spec.in: allow unsupported modules for -extra + (bsc#1111183). SLE-15 and later only. +- commit 0d585a8 + ------------------------------------------------------------------- Wed Oct 24 19:37:20 CEST 2018 - mkubecek@suse.cz @@ -515,6 +537,25 @@ Sat Oct 13 20:49:01 CEST 2018 - jslaby@suse.cz (bnc#1012628). - commit ce1c446 +------------------------------------------------------------------- +Fri Oct 12 10:10:00 CEST 2018 - tzimmermann@suse.de + +- README: Clean-up trailing whitespace +- commit 06542f9 + +------------------------------------------------------------------- +Thu Oct 11 15:46:10 CEST 2018 - tzimmermann@suse.de + +- README: Update documentation wrt. Patch-mainline + Common practice is to set Patch-mainline to a Linux release tag. More + than 95% of all patches follow this convention. The remaining 5% have + been fixed accordingly in SLE15. + The README file is inconsistent wrt. to the content of Patch-mainline. + In some places it refers to a release tag, in others it refers to a version + number. With this cleanup, it refers to release tags everywhere. + This change is a follow-up for commit 1d81d2699cd3. +- commit 57326f5 + ------------------------------------------------------------------- Wed Oct 10 20:47:09 CEST 2018 - jslaby@suse.cz diff --git a/kernel-source.spec b/kernel-source.spec index 1af9a320..b5e5e844 100644 --- a/kernel-source.spec +++ b/kernel-source.spec @@ -32,7 +32,7 @@ License: GPL-2.0 Group: Development/Sources Version: 4.19.1 %if 0%{?is_kotd} -Release: .gc336d64 +Release: .g0f31a13 %else Release: 0 %endif @@ -43,7 +43,7 @@ BuildRequires: fdupes BuildRequires: sed Requires(post): coreutils sed Provides: %name = %version-%source_rel -Provides: %name-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b +Provides: %name-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a Provides: linux Provides: multiversion(kernel) Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz diff --git a/kernel-syms.changes b/kernel-syms.changes index 379d123f..fded7343 100644 --- a/kernel-syms.changes +++ b/kernel-syms.changes @@ -1,9 +1,24 @@ +------------------------------------------------------------------- +Thu Nov 8 08:13:47 CET 2018 - jslaby@suse.cz + +- doc/README.SUSE: correct GIT url + No more gitorious, github we use. +- commit 31864f3 + ------------------------------------------------------------------- Tue Nov 6 13:33:13 CET 2018 - agraf@suse.de - Remove Cell/PS3 support from ppc64 kernel (boo#1114846) - commit c336d64 +------------------------------------------------------------------- +Mon Nov 5 18:22:18 CET 2018 - mkubecek@suse.cz + +- rpm/kernel-binary.spec.in: add macros.s into kernel-*-devel + Starting with 4.20-rc1, file arch/*/kernel/macros.s is needed to build out + of tree modules. Add it to kernel-${flavor}-devel packages if it exists. +- commit 09d14c8 + ------------------------------------------------------------------- Mon Nov 5 08:18:35 CET 2018 - jslaby@suse.cz @@ -87,6 +102,13 @@ Mon Oct 29 16:24:59 CET 2018 - tiwai@suse.de leak (CVE-2018-18710,bsc#1113751). - commit 6216efb +------------------------------------------------------------------- +Thu Oct 25 22:35:11 CEST 2018 - mwilck@suse.com + +- rpm/kernel-binary.spec.in: allow unsupported modules for -extra + (bsc#1111183). SLE-15 and later only. +- commit 0d585a8 + ------------------------------------------------------------------- Wed Oct 24 19:37:20 CEST 2018 - mkubecek@suse.cz @@ -515,6 +537,25 @@ Sat Oct 13 20:49:01 CEST 2018 - jslaby@suse.cz (bnc#1012628). - commit ce1c446 +------------------------------------------------------------------- +Fri Oct 12 10:10:00 CEST 2018 - tzimmermann@suse.de + +- README: Clean-up trailing whitespace +- commit 06542f9 + +------------------------------------------------------------------- +Thu Oct 11 15:46:10 CEST 2018 - tzimmermann@suse.de + +- README: Update documentation wrt. Patch-mainline + Common practice is to set Patch-mainline to a Linux release tag. More + than 95% of all patches follow this convention. The remaining 5% have + been fixed accordingly in SLE15. + The README file is inconsistent wrt. to the content of Patch-mainline. + In some places it refers to a release tag, in others it refers to a version + number. With this cleanup, it refers to release tags everywhere. + This change is a follow-up for commit 1d81d2699cd3. +- commit 57326f5 + ------------------------------------------------------------------- Wed Oct 10 20:47:09 CEST 2018 - jslaby@suse.cz diff --git a/kernel-syms.spec b/kernel-syms.spec index a5277236..cb7f92d5 100644 --- a/kernel-syms.spec +++ b/kernel-syms.spec @@ -27,7 +27,7 @@ Group: Development/Sources Version: 4.19.1 %if %using_buildservice %if 0%{?is_kotd} -Release: .gc336d64 +Release: .g0f31a13 %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 = c336d64bb17272c0b916f0ecaa1b605d252f617b +Provides: %name-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a Provides: multiversion(kernel) Source: README.KSYMS Requires: kernel-devel%variant = %version-%source_rel diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes index 379d123f..fded7343 100644 --- a/kernel-vanilla.changes +++ b/kernel-vanilla.changes @@ -1,9 +1,24 @@ +------------------------------------------------------------------- +Thu Nov 8 08:13:47 CET 2018 - jslaby@suse.cz + +- doc/README.SUSE: correct GIT url + No more gitorious, github we use. +- commit 31864f3 + ------------------------------------------------------------------- Tue Nov 6 13:33:13 CET 2018 - agraf@suse.de - Remove Cell/PS3 support from ppc64 kernel (boo#1114846) - commit c336d64 +------------------------------------------------------------------- +Mon Nov 5 18:22:18 CET 2018 - mkubecek@suse.cz + +- rpm/kernel-binary.spec.in: add macros.s into kernel-*-devel + Starting with 4.20-rc1, file arch/*/kernel/macros.s is needed to build out + of tree modules. Add it to kernel-${flavor}-devel packages if it exists. +- commit 09d14c8 + ------------------------------------------------------------------- Mon Nov 5 08:18:35 CET 2018 - jslaby@suse.cz @@ -87,6 +102,13 @@ Mon Oct 29 16:24:59 CET 2018 - tiwai@suse.de leak (CVE-2018-18710,bsc#1113751). - commit 6216efb +------------------------------------------------------------------- +Thu Oct 25 22:35:11 CEST 2018 - mwilck@suse.com + +- rpm/kernel-binary.spec.in: allow unsupported modules for -extra + (bsc#1111183). SLE-15 and later only. +- commit 0d585a8 + ------------------------------------------------------------------- Wed Oct 24 19:37:20 CEST 2018 - mkubecek@suse.cz @@ -515,6 +537,25 @@ Sat Oct 13 20:49:01 CEST 2018 - jslaby@suse.cz (bnc#1012628). - commit ce1c446 +------------------------------------------------------------------- +Fri Oct 12 10:10:00 CEST 2018 - tzimmermann@suse.de + +- README: Clean-up trailing whitespace +- commit 06542f9 + +------------------------------------------------------------------- +Thu Oct 11 15:46:10 CEST 2018 - tzimmermann@suse.de + +- README: Update documentation wrt. Patch-mainline + Common practice is to set Patch-mainline to a Linux release tag. More + than 95% of all patches follow this convention. The remaining 5% have + been fixed accordingly in SLE15. + The README file is inconsistent wrt. to the content of Patch-mainline. + In some places it refers to a release tag, in others it refers to a version + number. With this cleanup, it refers to release tags everywhere. + This change is a follow-up for commit 1d81d2699cd3. +- commit 57326f5 + ------------------------------------------------------------------- Wed Oct 10 20:47:09 CEST 2018 - jslaby@suse.cz diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index dd39bd29..eefdc54a 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -60,7 +60,7 @@ License: GPL-2.0 Group: System/Kernel Version: 4.19.1 %if 0%{?is_kotd} -Release: .gc336d64 +Release: .g0f31a13 %else Release: 0 %endif @@ -165,10 +165,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b -Provides: kernel-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b +Provides: kernel-%build_flavor-base-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a +Provides: kernel-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a # END COMMON DEPS -Provides: %name-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b +Provides: %name-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz Source2: source-post.sh @@ -903,7 +903,7 @@ if [ %CONFIG_MODULES = y ]; then fi # These files are required for building external modules - for FILE in arch/powerpc/lib/crtsavres.o arch/arm64/kernel/ftrace-mod.o; do + for FILE in arch/powerpc/lib/crtsavres.o arch/arm64/kernel/ftrace-mod.o arch/*/kernel/macros.s; do if [ -f %kernel_build_dir/$FILE ]; then echo $FILE >> %my_builddir/obj-files fi @@ -1008,6 +1008,30 @@ done | add_dirs_to_filelist >%my_builddir/kernel-devel.files } > %my_builddir/kernel-main.files %if %split_extra add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files + +%if 0%{?sle_version} >= 150000 + # By default, loading unsupported modules is disabled on SLE through + # /etc/modprobe.d/10-unsupported-modules.conf from the suse-module-tools + # package. + # modules in kernel-$flavor-extra don't have the supported flag set, + # yet loading them should be possible if the package is installed. + # CAUTION PACKAGERS: The file content below must not change between + # kernel versions, otherwise file conflicts might arise with + # multiversion(kernel). + + mkdir -p %buildroot/etc/modprobe.d + cat >%buildroot/etc/modprobe.d/20-kernel-%{build_flavor}-extra.conf <> %my_builddir/kernel-extra.files + echo '%%config(noreplace) /etc/modprobe.d/20-kernel-%{build_flavor}-extra.conf' >> %my_builddir/kernel-extra.files +%endif %endif for f in %my_builddir/*-kmp-modules; do f2=${f%%-modules}.files @@ -1105,8 +1129,8 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b -Provides: kernel-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b +Provides: kernel-%build_flavor-base-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a +Provides: kernel-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a %obsolete_rebuilds %name-base %ifarch %ix86 diff --git a/kernel-zfcpdump.changes b/kernel-zfcpdump.changes index 379d123f..fded7343 100644 --- a/kernel-zfcpdump.changes +++ b/kernel-zfcpdump.changes @@ -1,9 +1,24 @@ +------------------------------------------------------------------- +Thu Nov 8 08:13:47 CET 2018 - jslaby@suse.cz + +- doc/README.SUSE: correct GIT url + No more gitorious, github we use. +- commit 31864f3 + ------------------------------------------------------------------- Tue Nov 6 13:33:13 CET 2018 - agraf@suse.de - Remove Cell/PS3 support from ppc64 kernel (boo#1114846) - commit c336d64 +------------------------------------------------------------------- +Mon Nov 5 18:22:18 CET 2018 - mkubecek@suse.cz + +- rpm/kernel-binary.spec.in: add macros.s into kernel-*-devel + Starting with 4.20-rc1, file arch/*/kernel/macros.s is needed to build out + of tree modules. Add it to kernel-${flavor}-devel packages if it exists. +- commit 09d14c8 + ------------------------------------------------------------------- Mon Nov 5 08:18:35 CET 2018 - jslaby@suse.cz @@ -87,6 +102,13 @@ Mon Oct 29 16:24:59 CET 2018 - tiwai@suse.de leak (CVE-2018-18710,bsc#1113751). - commit 6216efb +------------------------------------------------------------------- +Thu Oct 25 22:35:11 CEST 2018 - mwilck@suse.com + +- rpm/kernel-binary.spec.in: allow unsupported modules for -extra + (bsc#1111183). SLE-15 and later only. +- commit 0d585a8 + ------------------------------------------------------------------- Wed Oct 24 19:37:20 CEST 2018 - mkubecek@suse.cz @@ -515,6 +537,25 @@ Sat Oct 13 20:49:01 CEST 2018 - jslaby@suse.cz (bnc#1012628). - commit ce1c446 +------------------------------------------------------------------- +Fri Oct 12 10:10:00 CEST 2018 - tzimmermann@suse.de + +- README: Clean-up trailing whitespace +- commit 06542f9 + +------------------------------------------------------------------- +Thu Oct 11 15:46:10 CEST 2018 - tzimmermann@suse.de + +- README: Update documentation wrt. Patch-mainline + Common practice is to set Patch-mainline to a Linux release tag. More + than 95% of all patches follow this convention. The remaining 5% have + been fixed accordingly in SLE15. + The README file is inconsistent wrt. to the content of Patch-mainline. + In some places it refers to a release tag, in others it refers to a version + number. With this cleanup, it refers to release tags everywhere. + This change is a follow-up for commit 1d81d2699cd3. +- commit 57326f5 + ------------------------------------------------------------------- Wed Oct 10 20:47:09 CEST 2018 - jslaby@suse.cz diff --git a/kernel-zfcpdump.spec b/kernel-zfcpdump.spec index 4330f681..8d452f5f 100644 --- a/kernel-zfcpdump.spec +++ b/kernel-zfcpdump.spec @@ -60,7 +60,7 @@ License: GPL-2.0 Group: System/Kernel Version: 4.19.1 %if 0%{?is_kotd} -Release: .gc336d64 +Release: .g0f31a13 %else Release: 0 %endif @@ -165,10 +165,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b -Provides: kernel-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b +Provides: kernel-%build_flavor-base-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a +Provides: kernel-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a # END COMMON DEPS -Provides: %name-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b +Provides: %name-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz Source2: source-post.sh @@ -906,7 +906,7 @@ if [ %CONFIG_MODULES = y ]; then fi # These files are required for building external modules - for FILE in arch/powerpc/lib/crtsavres.o arch/arm64/kernel/ftrace-mod.o; do + for FILE in arch/powerpc/lib/crtsavres.o arch/arm64/kernel/ftrace-mod.o arch/*/kernel/macros.s; do if [ -f %kernel_build_dir/$FILE ]; then echo $FILE >> %my_builddir/obj-files fi @@ -1011,6 +1011,30 @@ done | add_dirs_to_filelist >%my_builddir/kernel-devel.files } > %my_builddir/kernel-main.files %if %split_extra add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files + +%if 0%{?sle_version} >= 150000 + # By default, loading unsupported modules is disabled on SLE through + # /etc/modprobe.d/10-unsupported-modules.conf from the suse-module-tools + # package. + # modules in kernel-$flavor-extra don't have the supported flag set, + # yet loading them should be possible if the package is installed. + # CAUTION PACKAGERS: The file content below must not change between + # kernel versions, otherwise file conflicts might arise with + # multiversion(kernel). + + mkdir -p %buildroot/etc/modprobe.d + cat >%buildroot/etc/modprobe.d/20-kernel-%{build_flavor}-extra.conf <> %my_builddir/kernel-extra.files + echo '%%config(noreplace) /etc/modprobe.d/20-kernel-%{build_flavor}-extra.conf' >> %my_builddir/kernel-extra.files +%endif %endif for f in %my_builddir/*-kmp-modules; do f2=${f%%-modules}.files @@ -1108,8 +1132,8 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b -Provides: kernel-srchash = c336d64bb17272c0b916f0ecaa1b605d252f617b +Provides: kernel-%build_flavor-base-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a +Provides: kernel-srchash = 0f31a13932d8c55a0ad94fe58eb537f13e960e5a %obsolete_rebuilds %name-base %ifarch %ix86 diff --git a/source-timestamp b/source-timestamp index e883ef3f..87478ec0 100644 --- a/source-timestamp +++ b/source-timestamp @@ -1,3 +1,3 @@ -2018-11-06 14:30:11 +0000 -GIT Revision: c336d64bb17272c0b916f0ecaa1b605d252f617b +2018-11-08 08:48:25 +0000 +GIT Revision: 0f31a13932d8c55a0ad94fe58eb537f13e960e5a GIT Branch: stable