Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2018-11-12 09:21:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-source (Old) and /work/SRC/openSUSE:Factory/.kernel-source.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kernel-source" Mon Nov 12 09:21:25 2018 rev:460 rq:648208 version:4.19.1 Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes 2018-10-22 15:11:13.373784538 +0200 +++ /work/SRC/openSUSE:Factory/.kernel-source.new/dtb-aarch64.changes 2018-11-12 09:21:49.134715459 +0100 @@ -1,0 +2,225 @@ +Sun Nov 11 10:17:28 CET 2018 - [email protected] + +- vt: fix broken display when running aptitude (bnc#1114836). +- commit 5bec309 + +------------------------------------------------------------------- +Thu Nov 8 08:13:47 CET 2018 - [email protected] + +- doc/README.SUSE: correct GIT url + No more gitorious, github we use. +- commit 31864f3 + +------------------------------------------------------------------- +Tue Nov 6 13:33:13 CET 2018 - [email protected] + +- Remove Cell/PS3 support from ppc64 kernel (boo#1114846) +- commit c336d64 + +------------------------------------------------------------------- +Mon Nov 5 18:22:18 CET 2018 - [email protected] + +- 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 - [email protected] + +- Linux 4.19.1 (bnc#1012628). +- net: bridge: remove ipv6 zero address check in mcast queries + (bnc#1012628). +- sparc64: Wire up compat getpeername and getsockname + (bnc#1012628). +- sparc64: Make corrupted user stacks more debuggable + (bnc#1012628). +- sparc64: Export __node_distance (bnc#1012628). +- sctp: check policy more carefully when getting pr status + (bnc#1012628). +- Revert "be2net: remove desc field from be_eq_obj" (bnc#1012628). +- r8169: fix broken Wake-on-LAN from S5 (poweroff) (bnc#1012628). +- net: Properly unlink GRO packets on overflow (bnc#1012628). +- net: drop skb on failure in ip_check_defrag() (bnc#1012628). +- mlxsw: core: Fix devlink unregister flow (bnc#1012628). +- mlxsw: spectrum_switchdev: Don't ignore deletions of learned + MACs (bnc#1012628). +- net/smc: fix smc_buf_unuse to use the lgr pointer (bnc#1012628). +- net/ipv6: Allow onlink routes to have a device mismatch if it + is the default route (bnc#1012628). +- openvswitch: Fix push/pop ethernet validation (bnc#1012628). +- bonding: fix length of actor system (bnc#1012628). +- vhost: Fix Spectre V1 vulnerability (bnc#1012628). +- rtnetlink: Disallow FDB configuration for non-Ethernet device + (bnc#1012628). +- Revert "net: simplify sock_poll_wait" (bnc#1012628). +- net: udp: fix handling of CHECKSUM_COMPLETE packets + (bnc#1012628). +- net: stmmac: Fix stmmac_mdio_reset() when building stmmac as + modules (bnc#1012628). +- net: sched: gred: pass the right attribute to + gred_change_table_def() (bnc#1012628). +- net/mlx5e: fix csum adjustments caused by RXFCS (bnc#1012628). +- ipv6/ndisc: Preserve IPv6 control buffer if protocol error + handlers are called (bnc#1012628). +- bridge: do not add port to router list when receives query + with source 0.0.0.0 (bnc#1012628). +- commit 57135d7 + +------------------------------------------------------------------- +Sun Nov 4 13:36:43 CET 2018 - [email protected] + +- rpm: use syncconfig instead of silentoldconfig where available + Since mainline commit 0085b4191f3e ("kconfig: remove silentoldconfig + target"), "make silentoldconfig" can be no longer used. Use "make + syncconfig" instead if available. +- commit a239c6e + +------------------------------------------------------------------- +Fri Nov 2 14:52:15 CET 2018 - [email protected] + +- series.conf: more descriptive name for network driver section + We have two networking sections in series.conf: one for networking core and + one for network drivers. The latter is among other driver related sections + but it may not be obvious that it is not intended for core networking + patches. Change the label to "Network drivers" to make its purpose more + apparent. +- commit 7968e32 + +------------------------------------------------------------------- +Fri Nov 2 14:49:13 CET 2018 - [email protected] + +- config: enable SCSI_AACRAID on ppc64le and ppc64 (bsc#1114523) +- commit 5f3762b + +------------------------------------------------------------------- +Tue Oct 30 13:54:17 CET 2018 - [email protected] + +- Refresh + patches.suse/netfilter-bridge-define-INT_MIN-INT_MAX-in-userspace.patch. + Update upstream status. +- commit 37417fa + +------------------------------------------------------------------- +Mon Oct 29 16:24:59 CET 2018 - [email protected] + +- cdrom: fix improper type cast, which can leat to information + leak (CVE-2018-18710,bsc#1113751). +- commit 6216efb + +------------------------------------------------------------------- +Thu Oct 25 22:35:11 CEST 2018 - [email protected] + +- 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 - [email protected] + +- series.conf: move patches.suse/netfilter-bridge-define-INT_MIN-INT_MAX-in-userspace.patch to netfilter section +- commit 7656685 + +------------------------------------------------------------------- +Wed Oct 24 13:55:42 CEST 2018 - [email protected] + +- netfilter: bridge: define INT_MIN & INT_MAX in userspace + (4.19 fixes). +- commit e7213f6 + +------------------------------------------------------------------- +Mon Oct 22 10:12:05 CEST 2018 - [email protected] + +- Update to 4.19 final +- Refresh configs +- commit b4c35bb + +------------------------------------------------------------------- +Sat Oct 20 19:52:04 CEST 2018 - [email protected] + +- Linux 4.18.16 (bnc#1012628). +- ARC: build: Don't set CROSS_COMPILE in arch's Makefile + (bnc#1012628). +- ARC: build: Get rid of toolchain check (bnc#1012628). +- mremap: properly flush TLB before releasing the page + (bnc#1012628). +- Revert "vfs: fix freeze protection in mnt_want_write_file() + for overlayfs" (bnc#1012628). +- x86/boot: Fix kexec booting failure in the SEV bit detection + code (bnc#1012628). +- iommu/amd: Return devid as alias for ACPI HID devices + (bnc#1012628). +- powerpc/numa: Use associativity if VPHN hcall is successful + (bnc#1012628). +- powerpc/tm: Avoid possible userspace r1 corruption on reclaim + (bnc#1012628). +- powerpc/tm: Fix userspace r13 corruption (bnc#1012628). +- pinctrl/amd: poll InterruptEnable bits in amd_gpio_irq_set_type + (bnc#1012628). +- iommu/rockchip: Free irqs in shutdown handler (bnc#1012628). +- RISC-V: include linux/ftrace.h in asm-prototypes.h + (bnc#1012628). +- RDMA/bnxt_re: Fix system crash during RDMA resource + initialization (bnc#1012628). +- clocksource/drivers/fttmr010: Fix set_next_event handler + (bnc#1012628). +- net/mlx4: Use cpumask_available for eq->affinity_mask + (bnc#1012628). +- bpf: test_maps, only support ESTABLISHED socks (bnc#1012628). +- bpf: sockmap, fix transition through disconnect without close + (bnc#1012628). +- bpf: sockmap only allow ESTABLISHED sock state (bnc#1012628). +- scsi: sd: don't crash the host on invalid commands + (bnc#1012628). +- scsi: ipr: System hung while dlpar adding primary ipr adapter + back (bnc#1012628). +- drm: mali-dp: Call drm_crtc_vblank_reset on device init + (bnc#1012628). +- scsi: lpfc: Synchronize access to remoteport via rport + (bnc#1012628). +- RDMA/uverbs: Fix validity check for modify QP (bnc#1012628). +- PCI: dwc: Fix scheduling while atomic issues (bnc#1012628). +- qed: Do not add VLAN 0 tag to untagged frames in multi-function + mode (bnc#1012628). +- qed: Fix populating the invalid stag value in multi function + mode (bnc#1012628). +- net/smc: fix sizeof to int comparison (bnc#1012628). +- net/smc: fix non-blocking connect problem (bnc#1012628). +- ravb: do not write 1 to reserved bits (bnc#1012628). +- net: emac: fix fixed-link setup for the RTL8363SB switch + (bnc#1012628). +- selftests: pmtu: properly redirect stderr to /dev/null + (bnc#1012628). +- Input: atakbd - fix Atari CapsLock behaviour (bnc#1012628). +- Input: atakbd - fix Atari keymap (bnc#1012628). +- intel_th: pci: Add Ice Lake PCH support (bnc#1012628). +- scsi: ibmvscsis: Ensure partition name is properly NUL + terminated (bnc#1012628). ++++ 466 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes ++++ and /work/SRC/openSUSE:Factory/.kernel-source.new/dtb-aarch64.changes dtb-armv6l.changes: same change dtb-armv7l.changes: same change kernel-64kb.changes: same change kernel-debug.changes: same change kernel-default.changes: same change kernel-docs.changes: same change kernel-kvmsmall.changes: same change kernel-lpae.changes: same change kernel-obs-build.changes: same change kernel-obs-qa.changes: same change kernel-pae.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-vanilla.changes: same change kernel-zfcpdump.changes: same change Old: ---- linux-4.18.tar.xz New: ---- linux-4.19.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dtb-aarch64.spec ++++++ --- /var/tmp/diff_new_pack.krLUHJ/_old 2018-11-12 09:22:50.330638759 +0100 +++ /var/tmp/diff_new_pack.krLUHJ/_new 2018-11-12 09:22:50.334638753 +0100 @@ -16,8 +16,8 @@ # -%define srcversion 4.18 -%define patchversion 4.18.15 +%define srcversion 4.19 +%define patchversion 4.19.1 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -29,9 +29,9 @@ %(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb,check-module-license,klp-symbols}) Name: dtb-aarch64 -Version: 4.18.15 +Version: 4.19.1 %if 0%{?is_kotd} -Release: <RELEASE>.g5a53676 +Release: <RELEASE>.g5bec309 %else Release: 0 %endif dtb-armv6l.spec: same change dtb-armv7l.spec: same change ++++++ kernel-64kb.spec ++++++ --- /var/tmp/diff_new_pack.krLUHJ/_old 2018-11-12 09:22:50.490638558 +0100 +++ /var/tmp/diff_new_pack.krLUHJ/_new 2018-11-12 09:22:50.494638554 +0100 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 4.18 -%define patchversion 4.18.15 +%define srcversion 4.19 +%define patchversion 4.19.1 %define variant %{nil} %define vanilla_only 0 @@ -58,9 +58,9 @@ Summary: Kernel with 64kb PAGE_SIZE License: GPL-2.0 Group: System/Kernel -Version: 4.18.15 +Version: 4.19.1 %if 0%{?is_kotd} -Release: <RELEASE>.g5a53676 +Release: <RELEASE>.g5bec309 %else Release: 0 %endif @@ -165,10 +165,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = 5a5367670ecbb60484de04a2ef9f92a8e83931df -Provides: kernel-srchash = 5a5367670ecbb60484de04a2ef9f92a8e83931df +Provides: kernel-%build_flavor-base-srchash = 5bec309dbcefd9d86be13d86066d0d12d1318ecc +Provides: kernel-srchash = 5bec309dbcefd9d86be13d86066d0d12d1318ecc # END COMMON DEPS -Provides: %name-srchash = 5a5367670ecbb60484de04a2ef9f92a8e83931df +Provides: %name-srchash = 5bec309dbcefd9d86be13d86066d0d12d1318ecc %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz Source2: source-post.sh @@ -524,7 +524,13 @@ yes '' | make oldconfig $MAKE_ARGS $KERN_DIRS else cp .config .config.orig - make silentoldconfig $MAKE_ARGS $KERN_DIRS < /dev/null + if test -f ../scripts/kconfig/Makefile && \ + grep -q syncconfig ../scripts/kconfig/Makefile; then + syncconfig="syncconfig" + else + syncconfig="silentoldconfig" + fi + make $syncconfig $MAKE_ARGS $KERN_DIRS < /dev/null %_sourcedir/check-for-config-changes .config.orig .config rm .config.orig fi @@ -666,7 +672,11 @@ %endif %ifarch s390 s390x add_vmlinux --compressed - cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor + image=image + if test ! -f arch/s390/boot/$image; then + image=bzImage + fi + cp -p arch/s390/boot/$image %buildroot/boot/image-%kernelrelease-%build_flavor image=image if test -e arch/s390/boot/kerntypes.o; then cp -p arch/s390/boot/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor @@ -853,8 +863,9 @@ -e \ %endif %if ! %supported_modules_check - -i + -i \ %endif + %nil %if ! %split_extra cat %my_builddir/unsupported-modules >>%my_builddir/main-modules %endif @@ -895,7 +906,7 @@ 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 @@ -1000,6 +1011,30 @@ } > %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 <<EOF +# This file overrides the default from 10-unsupported-modules.conf. +# This is necessary to load kernel modules from the +# kernel-%{build_flavor}-extra package. +# +# WARNING: loading unsupported modules may compromise SLE support. +# Please read the comments in 10-unsupported-modules.conf. +allow_unsupported_modules 1 +EOF + echo "%%dir /etc/modprobe.d" >> %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 @@ -1097,8 +1132,8 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = 5a5367670ecbb60484de04a2ef9f92a8e83931df -Provides: kernel-srchash = 5a5367670ecbb60484de04a2ef9f92a8e83931df +Provides: kernel-%build_flavor-base-srchash = 5bec309dbcefd9d86be13d86066d0d12d1318ecc +Provides: kernel-srchash = 5bec309dbcefd9d86be13d86066d0d12d1318ecc %obsolete_rebuilds %name-base %ifarch %ix86 @@ -1405,7 +1440,7 @@ %defattr(-, root, root) %package -n kselftests-kmp-%build_flavor -Summary: kselftests kernel modules +Summary: Kernel sefltests Group: System/Kernel Requires: %name = %version-%source_rel Provides: kselftests-kmp = %version-%source_rel @@ -1415,7 +1450,23 @@ Requires(post): suse-module-tools >= 12.4 %description -n kselftests-kmp-%build_flavor -kselftests kernel modules. +This package contains kernel modules which are part of the upstream kernel +selftest effort. kselftest is the name of the upstream kernel target to build +and run all selftests. You can also run each test individually from the +respective upstream tools/testing/selftests/ directory, this package is +intended to be used using individial upstream selftest scripts given only +select supported selftest drivers are enabled. + +It should always be possible to always run the latest linux-next version of the +selftest scripts and tests against any older kernel selftest driver. Certain +tests facilities may be backported onto older kernels to enable further +testing. + +Selftests also provide for a vehicle or proof of concept issues to be +reproduced, verified and corrected. + +Selftest drivers are intended to be supported only in testing and QA +environments, they are not intended to be run on production systems. %post -n kselftests-kmp-%build_flavor wm2=/usr/lib/module-init-tools/weak-modules2 ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.krLUHJ/_old 2018-11-12 09:22:50.514638528 +0100 +++ /var/tmp/diff_new_pack.krLUHJ/_new 2018-11-12 09:22:50.518638523 +0100 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 4.18 -%define patchversion 4.18.15 +%define srcversion 4.19 +%define patchversion 4.19.1 %define variant %{nil} %define vanilla_only 0 @@ -58,9 +58,9 @@ Summary: A Debug Version of the Kernel License: GPL-2.0 Group: System/Kernel -Version: 4.18.15 +Version: 4.19.1 %if 0%{?is_kotd} -Release: <RELEASE>.g5a53676 +Release: <RELEASE>.g5bec309 %else Release: 0 %endif @@ -165,10 +165,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = 5a5367670ecbb60484de04a2ef9f92a8e83931df -Provides: kernel-srchash = 5a5367670ecbb60484de04a2ef9f92a8e83931df +Provides: kernel-%build_flavor-base-srchash = 5bec309dbcefd9d86be13d86066d0d12d1318ecc +Provides: kernel-srchash = 5bec309dbcefd9d86be13d86066d0d12d1318ecc # END COMMON DEPS -Provides: %name-srchash = 5a5367670ecbb60484de04a2ef9f92a8e83931df +Provides: %name-srchash = 5bec309dbcefd9d86be13d86066d0d12d1318ecc %ifarch ppc64 Provides: kernel-kdump = 2.6.28 Obsoletes: kernel-kdump <= 2.6.28 @@ -530,7 +530,13 @@ yes '' | make oldconfig $MAKE_ARGS $KERN_DIRS else cp .config .config.orig - make silentoldconfig $MAKE_ARGS $KERN_DIRS < /dev/null + if test -f ../scripts/kconfig/Makefile && \ + grep -q syncconfig ../scripts/kconfig/Makefile; then + syncconfig="syncconfig" + else + syncconfig="silentoldconfig" + fi + make $syncconfig $MAKE_ARGS $KERN_DIRS < /dev/null %_sourcedir/check-for-config-changes .config.orig .config rm .config.orig fi @@ -672,7 +678,11 @@ %endif %ifarch s390 s390x add_vmlinux --compressed - cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor + image=image + if test ! -f arch/s390/boot/$image; then + image=bzImage + fi + cp -p arch/s390/boot/$image %buildroot/boot/image-%kernelrelease-%build_flavor image=image if test -e arch/s390/boot/kerntypes.o; then cp -p arch/s390/boot/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor @@ -859,8 +869,9 @@ -e \ %endif %if ! %supported_modules_check - -i + -i \ %endif + %nil %if ! %split_extra cat %my_builddir/unsupported-modules >>%my_builddir/main-modules %endif @@ -901,7 +912,7 @@ 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 @@ -1006,6 +1017,30 @@ } > %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 <<EOF +# This file overrides the default from 10-unsupported-modules.conf. +# This is necessary to load kernel modules from the +# kernel-%{build_flavor}-extra package. +# +# WARNING: loading unsupported modules may compromise SLE support. +# Please read the comments in 10-unsupported-modules.conf. +allow_unsupported_modules 1 +EOF + echo "%%dir /etc/modprobe.d" >> %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 @@ -1103,8 +1138,8 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = 5a5367670ecbb60484de04a2ef9f92a8e83931df -Provides: kernel-srchash = 5a5367670ecbb60484de04a2ef9f92a8e83931df +Provides: kernel-%build_flavor-base-srchash = 5bec309dbcefd9d86be13d86066d0d12d1318ecc +Provides: kernel-srchash = 5bec309dbcefd9d86be13d86066d0d12d1318ecc %ifarch ppc64 Provides: kernel-kdump-base = 2.6.28 @@ -1419,7 +1454,7 @@ %defattr(-, root, root) %package -n kselftests-kmp-%build_flavor -Summary: kselftests kernel modules +Summary: Kernel sefltests Group: System/Kernel Requires: %name = %version-%source_rel Provides: kselftests-kmp = %version-%source_rel @@ -1429,7 +1464,23 @@ Requires(post): suse-module-tools >= 12.4 %description -n kselftests-kmp-%build_flavor -kselftests kernel modules. +This package contains kernel modules which are part of the upstream kernel +selftest effort. kselftest is the name of the upstream kernel target to build +and run all selftests. You can also run each test individually from the +respective upstream tools/testing/selftests/ directory, this package is +intended to be used using individial upstream selftest scripts given only +select supported selftest drivers are enabled. + +It should always be possible to always run the latest linux-next version of the +selftest scripts and tests against any older kernel selftest driver. Certain +tests facilities may be backported onto older kernels to enable further +testing. + +Selftests also provide for a vehicle or proof of concept issues to be +reproduced, verified and corrected. + +Selftest drivers are intended to be supported only in testing and QA +environments, they are not intended to be run on production systems. %post -n kselftests-kmp-%build_flavor wm2=/usr/lib/module-init-tools/weak-modules2 ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.krLUHJ/_old 2018-11-12 09:22:50.534638503 +0100 +++ /var/tmp/diff_new_pack.krLUHJ/_new 2018-11-12 09:22:50.542638493 +0100 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 4.18 -%define patchversion 4.18.15 +%define srcversion 4.19 +%define patchversion 4.19.1 %define variant %{nil} %define vanilla_only 0 @@ -58,9 +58,9 @@ Summary: The Standard Kernel License: GPL-2.0 Group: System/Kernel -Version: 4.18.15 +Version: 4.19.1 %if 0%{?is_kotd} -Release: <RELEASE>.g5a53676 +Release: <RELEASE>.g5bec309 %else Release: 0 %endif @@ -165,10 +165,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = 5a5367670ecbb60484de04a2ef9f92a8e83931df -Provides: kernel-srchash = 5a5367670ecbb60484de04a2ef9f92a8e83931df +Provides: kernel-%build_flavor-base-srchash = 5bec309dbcefd9d86be13d86066d0d12d1318ecc +Provides: kernel-srchash = 5bec309dbcefd9d86be13d86066d0d12d1318ecc # END COMMON DEPS -Provides: %name-srchash = 5a5367670ecbb60484de04a2ef9f92a8e83931df +Provides: %name-srchash = 5bec309dbcefd9d86be13d86066d0d12d1318ecc %ifarch %ix86 Provides: kernel-smp = 2.6.17 Obsoletes: kernel-smp <= 2.6.17 @@ -573,7 +573,13 @@ yes '' | make oldconfig $MAKE_ARGS $KERN_DIRS else cp .config .config.orig - make silentoldconfig $MAKE_ARGS $KERN_DIRS < /dev/null + if test -f ../scripts/kconfig/Makefile && \ + grep -q syncconfig ../scripts/kconfig/Makefile; then + syncconfig="syncconfig" + else + syncconfig="silentoldconfig" + fi + make $syncconfig $MAKE_ARGS $KERN_DIRS < /dev/null %_sourcedir/check-for-config-changes .config.orig .config rm .config.orig fi @@ -715,7 +721,11 @@ %endif %ifarch s390 s390x add_vmlinux --compressed - cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor + image=image + if test ! -f arch/s390/boot/$image; then + image=bzImage + fi + cp -p arch/s390/boot/$image %buildroot/boot/image-%kernelrelease-%build_flavor image=image if test -e arch/s390/boot/kerntypes.o; then cp -p arch/s390/boot/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor @@ -902,8 +912,9 @@ -e \ %endif %if ! %supported_modules_check - -i + -i \ %endif + %nil %if ! %split_extra cat %my_builddir/unsupported-modules >>%my_builddir/main-modules %endif @@ -944,7 +955,7 @@ 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 @@ -1049,6 +1060,30 @@ } > %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 <<EOF +# This file overrides the default from 10-unsupported-modules.conf. +# This is necessary to load kernel modules from the +# kernel-%{build_flavor}-extra package. +# +# WARNING: loading unsupported modules may compromise SLE support. +# Please read the comments in 10-unsupported-modules.conf. +allow_unsupported_modules 1 +EOF + echo "%%dir /etc/modprobe.d" >> %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 @@ -1146,8 +1181,8 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = 5a5367670ecbb60484de04a2ef9f92a8e83931df -Provides: kernel-srchash = 5a5367670ecbb60484de04a2ef9f92a8e83931df +Provides: kernel-%build_flavor-base-srchash = 5bec309dbcefd9d86be13d86066d0d12d1318ecc +Provides: kernel-srchash = 5bec309dbcefd9d86be13d86066d0d12d1318ecc %ifarch %ix86 Provides: kernel-trace-base = 3.13 @@ -1520,7 +1555,7 @@ %defattr(-, root, root) %package -n kselftests-kmp-%build_flavor -Summary: kselftests kernel modules +Summary: Kernel sefltests Group: System/Kernel Requires: %name = %version-%source_rel Provides: kselftests-kmp = %version-%source_rel @@ -1530,7 +1565,23 @@ Requires(post): suse-module-tools >= 12.4 %description -n kselftests-kmp-%build_flavor -kselftests kernel modules. +This package contains kernel modules which are part of the upstream kernel +selftest effort. kselftest is the name of the upstream kernel target to build +and run all selftests. You can also run each test individually from the +respective upstream tools/testing/selftests/ directory, this package is +intended to be used using individial upstream selftest scripts given only +select supported selftest drivers are enabled. + +It should always be possible to always run the latest linux-next version of the +selftest scripts and tests against any older kernel selftest driver. Certain +tests facilities may be backported onto older kernels to enable further +testing. + +Selftests also provide for a vehicle or proof of concept issues to be +reproduced, verified and corrected. + +Selftest drivers are intended to be supported only in testing and QA +environments, they are not intended to be run on production systems. %post -n kselftests-kmp-%build_flavor wm2=/usr/lib/module-init-tools/weak-modules2 ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.krLUHJ/_old 2018-11-12 09:22:50.558638473 +0100 +++ /var/tmp/diff_new_pack.krLUHJ/_new 2018-11-12 09:22:50.562638468 +0100 @@ -16,8 +16,8 @@ # -%define srcversion 4.18 -%define patchversion 4.18.15 +%define srcversion 4.19 +%define patchversion 4.19.1 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -31,9 +31,9 @@ Summary: Kernel Documentation License: GPL-2.0 Group: Documentation/Man -Version: 4.18.15 +Version: 4.19.1 %if 0%{?is_kotd} -Release: <RELEASE>.g5a53676 +Release: <RELEASE>.g5bec309 %else Release: 0 %endif @@ -63,7 +63,7 @@ %endif Url: http://www.kernel.org/ Provides: %name = %version-%source_rel -Provides: %name-srchash = 5a5367670ecbb60484de04a2ef9f92a8e83931df +Provides: %name-srchash = 5bec309dbcefd9d86be13d86066d0d12d1318ecc BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz ++++++ kernel-kvmsmall.spec ++++++ --- /var/tmp/diff_new_pack.krLUHJ/_old 2018-11-12 09:22:50.582638443 +0100 +++ /var/tmp/diff_new_pack.krLUHJ/_new 2018-11-12 09:22:50.586638438 +0100 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 4.18 -%define patchversion 4.18.15 +%define srcversion 4.19 +%define patchversion 4.19.1 %define variant %{nil} %define vanilla_only 0 @@ -58,9 +58,9 @@ Summary: The Small Developer Kernel for KVM License: GPL-2.0 Group: System/Kernel -Version: 4.18.15 +Version: 4.19.1 %if 0%{?is_kotd} -Release: <RELEASE>.g5a53676 +Release: <RELEASE>.g5bec309 %else Release: 0 %endif @@ -165,10 +165,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = 5a5367670ecbb60484de04a2ef9f92a8e83931df -Provides: kernel-srchash = 5a5367670ecbb60484de04a2ef9f92a8e83931df +Provides: kernel-%build_flavor-base-srchash = 5bec309dbcefd9d86be13d86066d0d12d1318ecc +Provides: kernel-srchash = 5bec309dbcefd9d86be13d86066d0d12d1318ecc # END COMMON DEPS -Provides: %name-srchash = 5a5367670ecbb60484de04a2ef9f92a8e83931df +Provides: %name-srchash = 5bec309dbcefd9d86be13d86066d0d12d1318ecc %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz Source2: source-post.sh @@ -528,7 +528,13 @@ yes '' | make oldconfig $MAKE_ARGS $KERN_DIRS else cp .config .config.orig - make silentoldconfig $MAKE_ARGS $KERN_DIRS < /dev/null + if test -f ../scripts/kconfig/Makefile && \ + grep -q syncconfig ../scripts/kconfig/Makefile; then + syncconfig="syncconfig" + else + syncconfig="silentoldconfig" + fi + make $syncconfig $MAKE_ARGS $KERN_DIRS < /dev/null %_sourcedir/check-for-config-changes .config.orig .config rm .config.orig fi @@ -670,7 +676,11 @@ %endif %ifarch s390 s390x add_vmlinux --compressed - cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor + image=image + if test ! -f arch/s390/boot/$image; then + image=bzImage + fi + cp -p arch/s390/boot/$image %buildroot/boot/image-%kernelrelease-%build_flavor image=image if test -e arch/s390/boot/kerntypes.o; then cp -p arch/s390/boot/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor @@ -857,8 +867,9 @@ -e \ %endif %if ! %supported_modules_check - -i + -i \ %endif + %nil %if ! %split_extra cat %my_builddir/unsupported-modules >>%my_builddir/main-modules %endif @@ -899,7 +910,7 @@ 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 @@ -1004,6 +1015,30 @@ } > %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 <<EOF +# This file overrides the default from 10-unsupported-modules.conf. +# This is necessary to load kernel modules from the +# kernel-%{build_flavor}-extra package. +# +# WARNING: loading unsupported modules may compromise SLE support. +# Please read the comments in 10-unsupported-modules.conf. +allow_unsupported_modules 1 +EOF + echo "%%dir /etc/modprobe.d" >> %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 @@ -1101,8 +1136,8 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = 5a5367670ecbb60484de04a2ef9f92a8e83931df -Provides: kernel-srchash = 5a5367670ecbb60484de04a2ef9f92a8e83931df +Provides: kernel-%build_flavor-base-srchash = 5bec309dbcefd9d86be13d86066d0d12d1318ecc +Provides: kernel-srchash = 5bec309dbcefd9d86be13d86066d0d12d1318ecc %obsolete_rebuilds %name-base %ifarch %ix86 @@ -1417,7 +1452,7 @@ %defattr(-, root, root) %package -n kselftests-kmp-%build_flavor -Summary: kselftests kernel modules +Summary: Kernel sefltests Group: System/Kernel Requires: %name = %version-%source_rel Provides: kselftests-kmp = %version-%source_rel @@ -1427,7 +1462,23 @@ Requires(post): suse-module-tools >= 12.4 %description -n kselftests-kmp-%build_flavor -kselftests kernel modules. +This package contains kernel modules which are part of the upstream kernel +selftest effort. kselftest is the name of the upstream kernel target to build +and run all selftests. You can also run each test individually from the +respective upstream tools/testing/selftests/ directory, this package is +intended to be used using individial upstream selftest scripts given only +select supported selftest drivers are enabled. + +It should always be possible to always run the latest linux-next version of the +selftest scripts and tests against any older kernel selftest driver. Certain +tests facilities may be backported onto older kernels to enable further +testing. + +Selftests also provide for a vehicle or proof of concept issues to be +reproduced, verified and corrected. + +Selftest drivers are intended to be supported only in testing and QA +environments, they are not intended to be run on production systems. %post -n kselftests-kmp-%build_flavor wm2=/usr/lib/module-init-tools/weak-modules2 kernel-lpae.spec: same change ++++++ kernel-obs-build.spec ++++++ --- /var/tmp/diff_new_pack.krLUHJ/_old 2018-11-12 09:22:50.658638348 +0100 +++ /var/tmp/diff_new_pack.krLUHJ/_new 2018-11-12 09:22:50.662638343 +0100 @@ -19,7 +19,7 @@ #!BuildIgnore: post-build-checks -%define patchversion 4.18.15 +%define patchversion 4.19.1 %define variant %{nil} %define vanilla_only 0 @@ -45,7 +45,7 @@ %endif %endif %endif -BuildRequires: kernel%kernel_flavor-srchash = 5a5367670ecbb60484de04a2ef9f92a8e83931df +BuildRequires: kernel%kernel_flavor-srchash = 5bec309dbcefd9d86be13d86066d0d12d1318ecc %if 0%{?rhel_version} BuildRequires: kernel @@ -64,9 +64,9 @@ Summary: package kernel and initrd for OBS VM builds License: GPL-2.0 Group: SLES -Version: 4.18.15 +Version: 4.19.1 %if 0%{?is_kotd} -Release: <RELEASE>.g5a53676 +Release: <RELEASE>.g5bec309 %else Release: 0 %endif ++++++ kernel-obs-qa.spec ++++++ --- /var/tmp/diff_new_pack.krLUHJ/_old 2018-11-12 09:22:50.698638298 +0100 +++ /var/tmp/diff_new_pack.krLUHJ/_new 2018-11-12 09:22:50.698638298 +0100 @@ -17,7 +17,7 @@ # needsrootforbuild -%define patchversion 4.18.15 +%define patchversion 4.19.1 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -36,9 +36,9 @@ Summary: Basic QA tests for the kernel License: GPL-2.0 Group: SLES -Version: 4.18.15 +Version: 4.19.1 %if 0%{?is_kotd} -Release: <RELEASE>.g5a53676 +Release: <RELEASE>.g5bec309 %else Release: 0 %endif ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.krLUHJ/_old 2018-11-12 09:22:50.746638238 +0100 +++ /var/tmp/diff_new_pack.krLUHJ/_new 2018-11-12 09:22:50.754638228 +0100 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 4.18 -%define patchversion 4.18.15 +%define srcversion 4.19 +%define patchversion 4.19.1 %define variant %{nil} %define vanilla_only 0 @@ -58,9 +58,9 @@ Summary: Kernel with PAE Support License: GPL-2.0 Group: System/Kernel -Version: 4.18.15 +Version: 4.19.1 %if 0%{?is_kotd} -Release: <RELEASE>.g5a53676 +Release: <RELEASE>.g5bec309 %else Release: 0 %endif @@ -165,10 +165,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = 5a5367670ecbb60484de04a2ef9f92a8e83931df -Provides: kernel-srchash = 5a5367670ecbb60484de04a2ef9f92a8e83931df +Provides: kernel-%build_flavor-base-srchash = 5bec309dbcefd9d86be13d86066d0d12d1318ecc +Provides: kernel-srchash = 5bec309dbcefd9d86be13d86066d0d12d1318ecc # END COMMON DEPS -Provides: %name-srchash = 5a5367670ecbb60484de04a2ef9f92a8e83931df +Provides: %name-srchash = 5bec309dbcefd9d86be13d86066d0d12d1318ecc %ifarch %ix86 Provides: kernel-bigsmp = 2.6.17 Obsoletes: kernel-bigsmp <= 2.6.17 @@ -550,7 +550,13 @@ yes '' | make oldconfig $MAKE_ARGS $KERN_DIRS else cp .config .config.orig - make silentoldconfig $MAKE_ARGS $KERN_DIRS < /dev/null + if test -f ../scripts/kconfig/Makefile && \ + grep -q syncconfig ../scripts/kconfig/Makefile; then + syncconfig="syncconfig" + else + syncconfig="silentoldconfig" + fi + make $syncconfig $MAKE_ARGS $KERN_DIRS < /dev/null %_sourcedir/check-for-config-changes .config.orig .config rm .config.orig fi @@ -692,7 +698,11 @@ %endif %ifarch s390 s390x add_vmlinux --compressed - cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor + image=image + if test ! -f arch/s390/boot/$image; then + image=bzImage + fi + cp -p arch/s390/boot/$image %buildroot/boot/image-%kernelrelease-%build_flavor image=image if test -e arch/s390/boot/kerntypes.o; then cp -p arch/s390/boot/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor @@ -879,8 +889,9 @@ -e \ %endif %if ! %supported_modules_check - -i + -i \ %endif + %nil %if ! %split_extra cat %my_builddir/unsupported-modules >>%my_builddir/main-modules %endif @@ -921,7 +932,7 @@ 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 @@ -1026,6 +1037,30 @@ } > %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 <<EOF +# This file overrides the default from 10-unsupported-modules.conf. +# This is necessary to load kernel modules from the +# kernel-%{build_flavor}-extra package. +# +# WARNING: loading unsupported modules may compromise SLE support. +# Please read the comments in 10-unsupported-modules.conf. +allow_unsupported_modules 1 +EOF + echo "%%dir /etc/modprobe.d" >> %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 @@ -1123,8 +1158,8 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = 5a5367670ecbb60484de04a2ef9f92a8e83931df -Provides: kernel-srchash = 5a5367670ecbb60484de04a2ef9f92a8e83931df +Provides: kernel-%build_flavor-base-srchash = 5bec309dbcefd9d86be13d86066d0d12d1318ecc +Provides: kernel-srchash = 5bec309dbcefd9d86be13d86066d0d12d1318ecc %ifarch %ix86 Provides: kernel-vmi-base = 2.6.38 @@ -1469,7 +1504,7 @@ %defattr(-, root, root) %package -n kselftests-kmp-%build_flavor -Summary: kselftests kernel modules +Summary: Kernel sefltests Group: System/Kernel Requires: %name = %version-%source_rel Provides: kselftests-kmp = %version-%source_rel @@ -1479,7 +1514,23 @@ Requires(post): suse-module-tools >= 12.4 %description -n kselftests-kmp-%build_flavor -kselftests kernel modules. +This package contains kernel modules which are part of the upstream kernel +selftest effort. kselftest is the name of the upstream kernel target to build +and run all selftests. You can also run each test individually from the +respective upstream tools/testing/selftests/ directory, this package is +intended to be used using individial upstream selftest scripts given only +select supported selftest drivers are enabled. + +It should always be possible to always run the latest linux-next version of the +selftest scripts and tests against any older kernel selftest driver. Certain +tests facilities may be backported onto older kernels to enable further +testing. + +Selftests also provide for a vehicle or proof of concept issues to be +reproduced, verified and corrected. + +Selftest drivers are intended to be supported only in testing and QA +environments, they are not intended to be run on production systems. %post -n kselftests-kmp-%build_flavor wm2=/usr/lib/module-init-tools/weak-modules2 ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.krLUHJ/_old 2018-11-12 09:22:50.818638148 +0100 +++ /var/tmp/diff_new_pack.krLUHJ/_new 2018-11-12 09:22:50.838638122 +0100 @@ -17,8 +17,8 @@ # icecream 0 -%define srcversion 4.18 -%define patchversion 4.18.15 +%define srcversion 4.19 +%define patchversion 4.19.1 %define variant %{nil} %define vanilla_only 0 @@ -30,9 +30,9 @@ Summary: The Linux Kernel Sources License: GPL-2.0 Group: Development/Sources -Version: 4.18.15 +Version: 4.19.1 %if 0%{?is_kotd} -Release: <RELEASE>.g5a53676 +Release: <RELEASE>.g5bec309 %else Release: 0 %endif @@ -43,7 +43,7 @@ BuildRequires: sed Requires(post): coreutils sed Provides: %name = %version-%source_rel -Provides: %name-srchash = 5a5367670ecbb60484de04a2ef9f92a8e83931df +Provides: %name-srchash = 5bec309dbcefd9d86be13d86066d0d12d1318ecc Provides: linux Provides: multiversion(kernel) Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.krLUHJ/_old 2018-11-12 09:22:50.886638062 +0100 +++ /var/tmp/diff_new_pack.krLUHJ/_new 2018-11-12 09:22:50.890638058 +0100 @@ -24,10 +24,10 @@ Summary: Kernel Symbol Versions (modversions) License: GPL-2.0 Group: Development/Sources -Version: 4.18.15 +Version: 4.19.1 %if %using_buildservice %if 0%{?is_kotd} -Release: <RELEASE>.g5a53676 +Release: <RELEASE>.g5bec309 %else Release: 0 %endif @@ -55,7 +55,7 @@ %endif Requires: pesign-obs-integration Provides: %name = %version-%source_rel -Provides: %name-srchash = 5a5367670ecbb60484de04a2ef9f92a8e83931df +Provides: %name-srchash = 5bec309dbcefd9d86be13d86066d0d12d1318ecc Provides: multiversion(kernel) Source: README.KSYMS Requires: kernel-devel%variant = %version-%source_rel ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.krLUHJ/_old 2018-11-12 09:22:50.914638028 +0100 +++ /var/tmp/diff_new_pack.krLUHJ/_new 2018-11-12 09:22:50.918638022 +0100 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 4.18 -%define patchversion 4.18.15 +%define srcversion 4.19 +%define patchversion 4.19.1 %define variant %{nil} %define vanilla_only 0 @@ -58,9 +58,9 @@ Summary: The Standard Kernel - without any SUSE patches License: GPL-2.0 Group: System/Kernel -Version: 4.18.15 +Version: 4.19.1 %if 0%{?is_kotd} -Release: <RELEASE>.g5a53676 +Release: <RELEASE>.g5bec309 %else Release: 0 %endif @@ -165,10 +165,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = 5a5367670ecbb60484de04a2ef9f92a8e83931df -Provides: kernel-srchash = 5a5367670ecbb60484de04a2ef9f92a8e83931df +Provides: kernel-%build_flavor-base-srchash = 5bec309dbcefd9d86be13d86066d0d12d1318ecc +Provides: kernel-srchash = 5bec309dbcefd9d86be13d86066d0d12d1318ecc # END COMMON DEPS -Provides: %name-srchash = 5a5367670ecbb60484de04a2ef9f92a8e83931df +Provides: %name-srchash = 5bec309dbcefd9d86be13d86066d0d12d1318ecc %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz Source2: source-post.sh @@ -521,7 +521,13 @@ yes '' | make oldconfig $MAKE_ARGS $KERN_DIRS else cp .config .config.orig - make silentoldconfig $MAKE_ARGS $KERN_DIRS < /dev/null + if test -f ../scripts/kconfig/Makefile && \ + grep -q syncconfig ../scripts/kconfig/Makefile; then + syncconfig="syncconfig" + else + syncconfig="silentoldconfig" + fi + make $syncconfig $MAKE_ARGS $KERN_DIRS < /dev/null %_sourcedir/check-for-config-changes .config.orig .config rm .config.orig fi @@ -663,7 +669,11 @@ %endif %ifarch s390 s390x add_vmlinux --compressed - cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor + image=image + if test ! -f arch/s390/boot/$image; then + image=bzImage + fi + cp -p arch/s390/boot/$image %buildroot/boot/image-%kernelrelease-%build_flavor image=image if test -e arch/s390/boot/kerntypes.o; then cp -p arch/s390/boot/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor @@ -850,8 +860,9 @@ -e \ %endif %if ! %supported_modules_check - -i + -i \ %endif + %nil %if ! %split_extra cat %my_builddir/unsupported-modules >>%my_builddir/main-modules %endif @@ -892,7 +903,7 @@ 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 @@ -997,6 +1008,30 @@ } > %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 <<EOF +# This file overrides the default from 10-unsupported-modules.conf. +# This is necessary to load kernel modules from the +# kernel-%{build_flavor}-extra package. +# +# WARNING: loading unsupported modules may compromise SLE support. +# Please read the comments in 10-unsupported-modules.conf. +allow_unsupported_modules 1 +EOF + echo "%%dir /etc/modprobe.d" >> %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 @@ -1094,8 +1129,8 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = 5a5367670ecbb60484de04a2ef9f92a8e83931df -Provides: kernel-srchash = 5a5367670ecbb60484de04a2ef9f92a8e83931df +Provides: kernel-%build_flavor-base-srchash = 5bec309dbcefd9d86be13d86066d0d12d1318ecc +Provides: kernel-srchash = 5bec309dbcefd9d86be13d86066d0d12d1318ecc %obsolete_rebuilds %name-base %ifarch %ix86 @@ -1396,7 +1431,7 @@ %defattr(-, root, root) %package -n kselftests-kmp-%build_flavor -Summary: kselftests kernel modules +Summary: Kernel sefltests Group: System/Kernel Requires: %name = %version-%source_rel Provides: kselftests-kmp = %version-%source_rel @@ -1406,7 +1441,23 @@ Requires(post): suse-module-tools >= 12.4 %description -n kselftests-kmp-%build_flavor -kselftests kernel modules. +This package contains kernel modules which are part of the upstream kernel +selftest effort. kselftest is the name of the upstream kernel target to build +and run all selftests. You can also run each test individually from the +respective upstream tools/testing/selftests/ directory, this package is +intended to be used using individial upstream selftest scripts given only +select supported selftest drivers are enabled. + +It should always be possible to always run the latest linux-next version of the +selftest scripts and tests against any older kernel selftest driver. Certain +tests facilities may be backported onto older kernels to enable further +testing. + +Selftests also provide for a vehicle or proof of concept issues to be +reproduced, verified and corrected. + +Selftest drivers are intended to be supported only in testing and QA +environments, they are not intended to be run on production systems. %post -n kselftests-kmp-%build_flavor wm2=/usr/lib/module-init-tools/weak-modules2 kernel-zfcpdump.spec: same change ++++++ README.SUSE ++++++ --- /var/tmp/diff_new_pack.krLUHJ/_old 2018-11-12 09:22:51.038637872 +0100 +++ /var/tmp/diff_new_pack.krLUHJ/_new 2018-11-12 09:22:51.042637866 +0100 @@ -36,7 +36,7 @@ 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 @@ -124,8 +124,7 @@ other installed kernels. (3) Configure the kernel (for example, ``make -C /usr/src/linux - O=$(pwd) oldconfig'' or ``make -C /usr/src/linux O=$(pwd) cloneconfig'', - see HOW TO CONFIGURE THE KERNEL SOURCES). + O=$(pwd) oldconfig'', see HOW TO CONFIGURE THE KERNEL SOURCES). (4) Build the kernel and all its modules (``make''). @@ -372,9 +371,9 @@ the need to specify the locations of the kernel source and the build directory. - For configuring the kernel to match the running kernel, there is a - shortcut ``make cloneconfig'' that expands the file /proc/config.gz - into .config, and then runs ``make oldconfig''. + For configuring the kernel to match the running kernel, you can use + the file /proc/config.gz, unpack it into into .config, and then run + ``make oldconfig''. HOW TO ADD CUSTOM PATCHES ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.krLUHJ/_old 2018-11-12 09:22:51.206637662 +0100 +++ /var/tmp/diff_new_pack.krLUHJ/_new 2018-11-12 09:22:51.206637662 +0100 @@ -1,5 +1,5 @@ # The version of the main tarball to use -SRCVERSION=4.18 +SRCVERSION=4.19 # variant of the kernel-source package, either empty or "-rt" VARIANT= # buildservice projects to build the kernel against ++++++ config.tar.bz2 ++++++ ++++ 20021 lines of diff (skipped) ++++++ kernel-binary.spec.in ++++++ --- /var/tmp/diff_new_pack.krLUHJ/_old 2018-11-12 09:22:51.730637005 +0100 +++ /var/tmp/diff_new_pack.krLUHJ/_new 2018-11-12 09:22:51.730637005 +0100 @@ -393,7 +393,13 @@ yes '' | make oldconfig $MAKE_ARGS $KERN_DIRS else cp .config .config.orig - make silentoldconfig $MAKE_ARGS $KERN_DIRS < /dev/null + if test -f ../scripts/kconfig/Makefile && \ + grep -q syncconfig ../scripts/kconfig/Makefile; then + syncconfig="syncconfig" + else + syncconfig="silentoldconfig" + fi + make $syncconfig $MAKE_ARGS $KERN_DIRS < /dev/null %_sourcedir/check-for-config-changes .config.orig .config rm .config.orig fi @@ -535,7 +541,11 @@ %endif %ifarch s390 s390x add_vmlinux --compressed - cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor + image=image + if test ! -f arch/s390/boot/$image; then + image=bzImage + fi + cp -p arch/s390/boot/$image %buildroot/boot/image-%kernelrelease-%build_flavor image=image if test -e arch/s390/boot/kerntypes.o; then cp -p arch/s390/boot/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor @@ -722,8 +732,9 @@ -e \ %endif %if ! %supported_modules_check - -i + -i \ %endif + %nil %if ! %split_extra cat %my_builddir/unsupported-modules >>%my_builddir/main-modules %endif @@ -764,7 +775,7 @@ 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 @@ -869,6 +880,30 @@ } > %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 <<EOF +# This file overrides the default from 10-unsupported-modules.conf. +# This is necessary to load kernel modules from the +# kernel-%{build_flavor}-extra package. +# +# WARNING: loading unsupported modules may compromise SLE support. +# Please read the comments in 10-unsupported-modules.conf. +allow_unsupported_modules 1 +EOF + echo "%%dir /etc/modprobe.d" >> %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 ++++++ linux-4.18.tar.xz -> linux-4.19.tar.xz ++++++ /work/SRC/openSUSE:Factory/kernel-source/linux-4.18.tar.xz /work/SRC/openSUSE:Factory/.kernel-source.new/linux-4.19.tar.xz differ: char 15, line 1 ++++++ macros.kernel-source ++++++ --- /var/tmp/diff_new_pack.krLUHJ/_old 2018-11-12 09:22:51.974636699 +0100 +++ /var/tmp/diff_new_pack.krLUHJ/_new 2018-11-12 09:22:51.974636699 +0100 @@ -79,9 +79,9 @@ # kernel_module_package: simply pass on all options and arguments. %kernel_module_package(n:v:r:t:f:xp:bc:) \ - %{expand:%%_kernel_module_package %{-x:-X} %{-n} %{-v} %{-r} %{-t} %{-f} %{-p} %*} + %{expand:%%_kernel_module_package %{-x:-X} %{-n} %{-v} %{-r} %{-t} %{-f} %{-p} %{-b} %*} # suse_kernel_module_package: invert the meaning of the -x flag. (You are not # supposed to understand why a simple %{-x:}%{!-x:-x} won't work.) %suse_kernel_module_package(n:v:r:s:f:xp:bc:) \ - %{expand:%%_kernel_module_package %{-x: }%{!-x:-X} %{-n} %{-v} %{-r} %{-s:-t %{-s*}} %{-f} %{-p} %*} + %{expand:%%_kernel_module_package %{-x: }%{!-x:-X} %{-n} %{-v} %{-r} %{-s:-t %{-s*}} %{-f} %{-p} %{-b} %*} ++++++ mkspec ++++++ --- /var/tmp/diff_new_pack.krLUHJ/_old 2018-11-12 09:22:51.986636685 +0100 +++ /var/tmp/diff_new_pack.krLUHJ/_new 2018-11-12 09:22:51.990636679 +0100 @@ -20,6 +20,14 @@ # subset to include in kernel-syms my %syms_flavor_archs = parse_config_conf("syms"); +my %all_archs = parse_config_conf("needs_updating"); +my @all_archs; + for my $flavor (keys(%all_archs)) { + push(@all_archs, arch2rpm(@{$all_archs{$flavor}})); + } +@all_archs = sort(uniq(@all_archs)); +my $all_archs = join(" ", @all_archs); + # template name -> template body my %templates = read_spec_templates(); @@ -155,25 +163,25 @@ do_spec('docs', "kernel-docs$variant.spec", %macros); } - my $all_archs; # kernel-syms.spec { my $requires = ""; - my %all_archs; + my %syms_archs; + my $syms_archs; for my $flavor (sort keys(%syms_flavor_archs)) { next if $flavor eq "vanilla"; my @archs = arch2rpm(@{$syms_flavor_archs{$flavor}}); - $all_archs{$_} = 1 for @archs; + $syms_archs{$_} = 1 for @archs; $requires .= "%ifarch @archs\n"; $requires .= "Requires: kernel-$flavor-devel = \%version-\%source_rel\n"; $requires .= "%endif\n"; } chomp $requires; - $all_archs = join(" ", sort(keys(%all_archs))); - if (keys(%all_archs)) { + $syms_archs = join(" ", sort(keys(%syms_archs))); + if (keys(%syms_archs)) { do_spec('syms', "kernel-syms$variant.spec", %macros, REQUIRES => $requires, - ARCHS => $all_archs); + ARCHS => $syms_archs); } } @@ -531,3 +539,7 @@ open($_[0], $_[1], $_[2]) or die "$_[2]: $!\n"; } +sub uniq { + my %seen; + return grep { !$seen{$_}++ } @_; +} ++++++ package-descriptions ++++++ --- /var/tmp/diff_new_pack.krLUHJ/_old 2018-11-12 09:22:52.074636575 +0100 +++ /var/tmp/diff_new_pack.krLUHJ/_new 2018-11-12 09:22:52.074636575 +0100 @@ -144,3 +144,30 @@ OCFS2 is the Oracle Cluster Filesystem, a filesystem for shared devices accessible simultaneously from multiple nodes of a cluster. + +=== kselftests-kmp === +Kernel sefltests + +This package contains kernel modules which are part of the upstream kernel +selftest effort. kselftest is the name of the upstream kernel target to build +and run all selftests. You can also run each test individually from the +respective upstream tools/testing/selftests/ directory, this package is +intended to be used using individial upstream selftest scripts given only +select supported selftest drivers are enabled. + +It should always be possible to always run the latest linux-next version of the +selftest scripts and tests against any older kernel selftest driver. Certain +tests facilities may be backported onto older kernels to enable further +testing. + +Selftests also provide for a vehicle or proof of concept issues to be +reproduced, verified and corrected. + +Selftest drivers are intended to be supported only in testing and QA +environments, they are not intended to be run on production systems. + +=== reiserfs-kmp === +Reiserfs kernel module + +The reiserfs file system is no longer supported in SLE15. This package +provides the reiserfs module for the installation system. ++++++ patches.kernel.org.tar.bz2 ++++++ ++++ 141368 lines of diff (skipped) ++++++ patches.rpmify.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/Add-ksym-provides-tool.patch new/patches.rpmify/Add-ksym-provides-tool.patch --- old/patches.rpmify/Add-ksym-provides-tool.patch 2018-07-26 09:46:02.000000000 +0200 +++ new/patches.rpmify/Add-ksym-provides-tool.patch 2018-08-29 21:06:19.000000000 +0200 @@ -8,13 +8,11 @@ Signed-off-by: Michal Suchanek <[email protected]> --- - scripts/mod/Makefile | 6 ++- - scripts/mod/ksym-provides.c | 124 ++++++++++++++++++++++++++++++++++++++++++++ + scripts/mod/Makefile | 6 +- + scripts/mod/ksym-provides.c | 124 ++++++++++++++++++++++++++++++++++++ 2 files changed, 129 insertions(+), 1 deletion(-) create mode 100644 scripts/mod/ksym-provides.c -diff --git a/scripts/mod/Makefile b/scripts/mod/Makefile -index 42c5d50f2bcc..32b6e33987bf 100644 --- a/scripts/mod/Makefile +++ b/scripts/mod/Makefile @@ -1,11 +1,15 @@ @@ -29,14 +27,11 @@ +ksym-provides-objs := ksym-provides.o + -+HOSTLOADLIBES_ksym-provides := -lelf ++HOSTLDLIBS_ksym-provides := -lelf + devicetable-offsets-file := devicetable-offsets.h $(obj)/$(devicetable-offsets-file): $(obj)/devicetable-offsets.s FORCE -diff --git a/scripts/mod/ksym-provides.c b/scripts/mod/ksym-provides.c -new file mode 100644 -index 000000000000..c71fb79d4640 --- /dev/null +++ b/scripts/mod/ksym-provides.c @@ -0,0 +1,124 @@ @@ -164,6 +159,3 @@ + close(fd); + return 1; +} --- -2.13.6 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/powerpc-boot-Fix-missing-crc32poly.h-when-building-w.patch new/patches.rpmify/powerpc-boot-Fix-missing-crc32poly.h-when-building-w.patch --- old/patches.rpmify/powerpc-boot-Fix-missing-crc32poly.h-when-building-w.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rpmify/powerpc-boot-Fix-missing-crc32poly.h-when-building-w.patch 2018-08-29 21:06:19.000000000 +0200 @@ -0,0 +1,42 @@ +From: Krzysztof Kozlowski <[email protected]> +Date: Wed, 29 Aug 2018 09:32:23 +0200 +Subject: [PATCH] powerpc/boot: Fix missing crc32poly.h when building with KERNEL_XZ +Patch-mainline: Submitted - 20180829 +References: none + +After commit faa16bc404d7 ("lib: Use existing define with +polynomial") the lib/xz/xz_crc32.c includes a header from include/linux +directory thus any other user of this code should define proper include +path. + +This fixes the build error on powerpc with CONFIG_KERNEL_XZ: + + In file included from ../arch/powerpc/boot/../../../lib/decompress_unxz.c:233:0, + from ../arch/powerpc/boot/decompress.c:42: + ../arch/powerpc/boot/../../../lib/xz/xz_crc32.c:18:29: fatal error: linux/crc32poly.h: No such file or directory + +Reported-by: Michal Kubecek <[email protected]> +Fixes: faa16bc404d7 ("lib: Use existing define with polynomial") +Signed-off-by: Krzysztof Kozlowski <[email protected]> +Tested-by: Michal Kubecek <[email protected]> +Acked-by: Michal Kubecek <[email protected]> +--- + arch/powerpc/boot/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile +index 0fb96c26136f..ba4182fb185d 100644 +--- a/arch/powerpc/boot/Makefile ++++ b/arch/powerpc/boot/Makefile +@@ -63,7 +63,7 @@ ifeq ($(call cc-option-yn, -fstack-protector),y) + BOOTCFLAGS += -fno-stack-protector + endif + +-BOOTCFLAGS += -I$(objtree)/$(obj) -I$(srctree)/$(obj) ++BOOTCFLAGS += -I$(objtree)/$(obj) -I$(srctree)/$(obj) -I$(srctree)/include + + DTC_FLAGS ?= -p 1024 + +-- +2.18.0 + ++++++ patches.suse.tar.bz2 ++++++ ++++ 1901 lines of diff (skipped) ++++++ series.conf ++++++ ++++ 1798 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kernel-source/series.conf ++++ and /work/SRC/openSUSE:Factory/.kernel-source.new/series.conf ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.krLUHJ/_old 2018-11-12 09:22:52.994635422 +0100 +++ /var/tmp/diff_new_pack.krLUHJ/_new 2018-11-12 09:22:52.998635417 +0100 @@ -1,3 +1,3 @@ -2018-10-18 08:56:17 +0000 -GIT Revision: 5a5367670ecbb60484de04a2ef9f92a8e83931df +2018-11-11 09:17:28 +0000 +GIT Revision: 5bec309dbcefd9d86be13d86066d0d12d1318ecc GIT Branch: stable ++++++ try-disable-staging-driver ++++++ --- /var/tmp/diff_new_pack.krLUHJ/_old 2018-11-12 09:22:53.042635362 +0100 +++ /var/tmp/diff_new_pack.krLUHJ/_new 2018-11-12 09:22:53.042635362 +0100 @@ -30,6 +30,12 @@ else source="." fi +if test -f ${source}/scripts/kconfig/Makefile && \ + grep -q syncconfig ${source}/scripts/kconfig/Makefile; then + syncconfig="syncconfig" +else + syncconfig="silentoldconfig" +fi makefile="$source/drivers/staging/Makefile" skipped_options=staging-skipped-options logfile=$1 @@ -70,7 +76,7 @@ echo "Trying to disable $option" "$source/scripts/config" --disable "$option" -if ! make silentoldconfig $MAKE_ARGS || grep "^$option" .config; then +if ! make $syncconfig $MAKE_ARGS || grep "^$option" .config; then echo "Could not disable $option" >&2 exit 1 fi
