Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2022-03-31 17:18:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-source (Old) and /work/SRC/openSUSE:Factory/.kernel-source.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kernel-source" Thu Mar 31 17:18:32 2022 rev:636 rq:966099 version:5.17.1 Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes 2022-03-19 22:22:16.596902818 +0100 +++ /work/SRC/openSUSE:Factory/.kernel-source.new.1900/dtb-aarch64.changes 2022-03-31 17:18:53.397135868 +0200 @@ -1,0 +2,248 @@ +Thu Mar 31 07:28:17 CEST 2022 - jslaby@suse.cz + +- Revert "config: Enable BPF LSM" (bsc#1197746) + This reverts commit c2c25b18721866d6211054f542987036ed6e0a50. +- commit 58205bc + +------------------------------------------------------------------- +Mon Mar 28 11:35:43 CEST 2022 - tiwai@suse.de + +- Revert "swiotlb: rework "fix info leak with DMA_FROM_DEVICE"" + (bsc#1197460). +- commit ffd9dce + +------------------------------------------------------------------- +Mon Mar 28 11:00:29 CEST 2022 - jslaby@suse.cz + +- block: restore the old set_task_ioprio() behaviour wrt + PF_EXITING (bsc#1197582). +- commit c349fed + +------------------------------------------------------------------- +Mon Mar 28 10:22:52 CEST 2022 - jslaby@suse.cz + +- Linux 5.17.1 (bsc#1012628). +- llc: only change llc->dev when bind() succeeds (bsc#1012628). +- drm/msm/gpu: Fix crash on devices without devfreq support (v2) + (bsc#1012628). +- nds32: fix access_ok() checks in get/put_user (bsc#1012628). +- m68k: fix access_ok for coldfire (bsc#1012628). +- wcn36xx: Differentiate wcn3660 from wcn3620 (bsc#1012628). +- tpm: use try_get_ops() in tpm-space.c (bsc#1012628). +- tpm: fix reference counting for struct tpm_chip (bsc#1012628). +- mac80211: fix potential double free on mesh join (bsc#1012628). +- uaccess: fix integer overflow on access_ok() (bsc#1012628). +- rcu: Don't deboost before reporting expedited quiescent state + (bsc#1012628). +- jbd2: fix use-after-free of transaction_t race (bsc#1012628). +- drm/virtio: Ensure that objs is not NULL in + virtio_gpu_array_put_free() (bsc#1012628). +- Revert "ath: add support for special 0x0 regulatory domain" + (bsc#1012628). +- Bluetooth: btusb: Use quirk to skip HCI_FLT_CLEAR_ALL on fake + CSR controllers (bsc#1012628). +- Bluetooth: hci_sync: Add a new quirk to skip HCI_FLT_CLEAR_ALL + (bsc#1012628). +- Bluetooth: btusb: Add one more Bluetooth part for the Realtek + RTL8852AE (bsc#1012628). +- crypto: qat - disable registration of algorithms (bsc#1012628). +- ACPI: video: Force backlight native for Clevo NL5xRU and NL5xNU + (bsc#1012628). +- ACPI: battery: Add device HID and quirk for Microsoft Surface + Go 3 (bsc#1012628). +- ACPI / x86: Work around broken XSDT on Advantech DAC-BJ01 board + (bsc#1012628). +- netfilter: nf_tables: validate registers coming from userspace + (bsc#1012628). +- netfilter: nf_tables: initialize registers in nft_do_chain() + (bsc#1012628). +- drivers: net: xgene: Fix regression in CRC stripping + (bsc#1012628). +- ALSA: pci: fix reading of swapped values from pcmreg in AC97 + codec (bsc#1012628). +- ALSA: cmipci: Restore aux vol on suspend/resume (bsc#1012628). +- ALSA: usb-audio: Add mute TLV for playback volumes on RODE + NT-USB (bsc#1012628). +- ALSA: pcm: Add stream lock during PCM reset ioctl operations + (bsc#1012628). +- ALSA: pcm: Fix races among concurrent prealloc proc writes + (bsc#1012628). +- ALSA: pcm: Fix races among concurrent prepare and + hw_params/hw_free calls (bsc#1012628). +- ALSA: pcm: Fix races among concurrent read/write and buffer + changes (bsc#1012628). +- ALSA: pcm: Fix races among concurrent hw_params and hw_free + calls (bsc#1012628). +- ALSA: hda/realtek: Add quirk for ASUS GA402 (bsc#1012628). +- ALSA: hda/realtek - Fix headset mic problem for a HP machine + with alc671 (bsc#1012628). +- ALSA: hda/realtek: Add quirk for Clevo NP50PNJ (bsc#1012628). +- ALSA: hda/realtek: Add quirk for Clevo NP70PNJ (bsc#1012628). +- ALSA: usb-audio: add mapping for new Corsair Virtuoso SE + (bsc#1012628). +- ALSA: oss: Fix PCM OSS buffer allocation overflow (bsc#1012628). +- ASoC: sti: Fix deadlock via snd_pcm_stop_xrun() call + (bsc#1012628). +- llc: fix netdevice reference leaks in llc_ui_bind() + (bsc#1012628). +- Bluetooth: btusb: Add another Realtek 8761BU (bsc#1012628). +- tpm: Fix error handling in async work (bsc#1012628). +- commit e830013 + +------------------------------------------------------------------- +Fri Mar 25 10:23:19 CET 2022 - mkubecek@suse.cz + +- series.conf: cleanup +- update mainline references and move into sorted section: + - patches.suse/Bluetooth-btusb-Add-missing-Chicony-device-for-Realt.patch + - patches.suse/bpf-add-config-to-allow-loading-modules-with-BTF-mis.patch +- commit 62d2682 + +------------------------------------------------------------------- +Fri Mar 25 10:14:04 CET 2022 - tiwai@suse.de + +- Revert "Input: clear BTN_RIGHT/MIDDLE on buttonpads" + (bsc#1197243). +- commit 7257225 + +------------------------------------------------------------------- +Fri Mar 25 10:11:56 CET 2022 - tiwai@suse.de + +- Drop HID multitouch fix patch (bsc#1197243) + Delete patches.suse/HID-multitouch-fix-Dell-Precision-7550-and-7750-butt.patch. + Replaced with another revert patch. +- commit 01821ca + +------------------------------------------------------------------- +Mon Mar 21 17:53:26 CET 2022 - dmueller@suse.com + +- rpm/constraints.in: skip SLOW_DISK workers for kernel-source +- commit e84694f + +------------------------------------------------------------------- +Mon Mar 21 15:04:49 CET 2022 - msuchanek@suse.de + +- Revert "rpm/macros.kernel-source: avoid %if's and %define's" + This reverts commit d0cec50d019c853336e26f5ff5df5a4c9c3ea120. +- commit b20736a + +------------------------------------------------------------------- +Mon Mar 21 13:19:17 CET 2022 - msuchanek@suse.de + +- macros.kernel-source: Fix conditional expansion. + Fixes: bb95fef3cf19 ("rpm: Use bash for %() expansion (jsc#SLE-18234).") +- commit 7e857f7 + +------------------------------------------------------------------- +Mon Mar 21 12:26:30 CET 2022 - jslaby@suse.cz + +- rpm/macros.kernel-source: avoid %if's and %define's + It's not supported in rpm macros scripts. So for now, resolve + %kernel_build_shell_package to bash-sh in stable branch unconditionally. + When this is fixed in the packaging branch, revert this. +- commit d0cec50 + +------------------------------------------------------------------- +Mon Mar 21 08:47:36 CET 2022 - jslaby@suse.cz + +- Refresh + patches.suse/Bluetooth-btusb-Add-missing-Chicony-device-for-Realt.patch. + Update upstream status. +- commit 36a1351 + +------------------------------------------------------------------- +Sun Mar 20 22:25:20 CET 2022 - mkubecek@suse.cz + +- Update to 5.17 final +- refresh configs (headers only) +- commit be2cbd1 + +------------------------------------------------------------------- +Sat Mar 19 18:07:17 CET 2022 - msuchanek@suse.de + +- rpm: Use bash for %() expansion (jsc#SLE-18234). + Since 15.4 alternatives for /bin/sh are provided by packages + <something>-sh. While the interpreter for the build script can be + selected the interpreter for %() cannot. + The kernel spec files use bashisms in %(). + While this could technically be fixed there is more serious underlying + problem: neither bash nor any of the alternatives are 100% POSIX + compliant nor bug-free. + It is not my intent to maintain bug compatibility with any number of + shells for shell scripts embedded in the kernel spec file. The spec file + syntax is not documented so embedding the shell script in it causes some + unspecified transformation to be applied to it. That means that + ultimately any changes must be tested by building the kernel, n times if + n shells are supported. + To reduce maintenance effort require that bash is used for kernel build + always. +- commit bb95fef + +------------------------------------------------------------------- +Sat Mar 19 15:19:05 CET 2022 - jslaby@suse.cz + +- Linux 5.16.16 (bsc#1012628). +- ice: Fix race condition during interface enslave (bsc#1012628). +- kselftest/vm: fix tests build with old libc (bsc#1012628). +- bnx2: Fix an error message (bsc#1012628). +- sfc: extend the locking on mcdi->seqno (bsc#1012628). +- tcp: make tcp_read_sock() more robust (bsc#1012628). +- nl80211: Update bss channel on channel switch for P2P_CLIENT + (bsc#1012628). +- drm/vrr: Set VRR capable prop only if it is attached to + connector (bsc#1012628). +- iwlwifi: don't advertise TWT support (bsc#1012628). +- Input: goodix - workaround Cherry Trail devices with a bogus + ACPI Interrupt() resource (bsc#1012628). +- Input: goodix - use the new soc_intel_is_byt() helper ++++ 409 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes ++++ and /work/SRC/openSUSE:Factory/.kernel-source.new.1900/dtb-aarch64.changes dtb-armv6l.changes: same change dtb-armv7l.changes: same change dtb-riscv64.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: ---- fdupes_relink linux-5.16.tar.xz New: ---- _buildconfig-standard-x86_64 _buildinfo-standard-x86_64.xml linux-5.17.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dtb-aarch64.spec ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:00.697053527 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:00.701053483 +0200 @@ -16,8 +16,8 @@ # -%define srcversion 5.16 -%define patchversion 5.16.15 +%define srcversion 5.17 +%define patchversion 5.17.1 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -26,12 +26,12 @@ %define dtc_symbols 1 %endif -%(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,splitflist,mergedep,moddep,modflist,kernel-subpackage-build,fdupes_relink}) +%(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,splitflist,mergedep,moddep,modflist,kernel-subpackage-build}) Name: dtb-aarch64 -Version: 5.16.15 +Version: 5.17.1 %if 0%{?is_kotd} -Release: <RELEASE>.gd8f0e40 +Release: <RELEASE>.g58205bc %else Release: 0 %endif @@ -100,7 +100,6 @@ Source83: kernel-subpackage-build Source84: kernel-subpackage-spec Source85: kernel-default-base.spec.txt -Source86: fdupes_relink Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -344,9 +343,9 @@ %build source=linux-%srcversion cp $source/COPYING . -SRCDIR=`pwd`/$source +SRCDIR=$PWD/$source mkdir pp -PPDIR=`pwd`/pp +PPDIR=$PWD/pp export DTC_FLAGS="-R 4 -p 0x1000" %if 0%{?dtc_symbols} DTC_FLAGS="$DTC_FLAGS -@" dtb-armv6l.spec: same change dtb-armv7l.spec: same change dtb-riscv64.spec: same change ++++++ kernel-64kb.spec ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:00.801052356 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:00.805052311 +0200 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 5.16 -%define patchversion 5.16.15 +%define srcversion 5.17 +%define patchversion 5.17.1 %define variant %{nil} %define vanilla_only 0 %define compress_modules zstd @@ -44,7 +44,7 @@ %define klp_symbols 1 %endif -%(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,splitflist,mergedep,moddep,modflist,kernel-subpackage-build,fdupes_relink}) +%(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,splitflist,mergedep,moddep,modflist,kernel-subpackage-build}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor @@ -107,13 +107,16 @@ Summary: Kernel with 64kb PAGE_SIZE License: GPL-2.0-only Group: System/Kernel -Version: 5.16.15 +Version: 5.17.1 %if 0%{?is_kotd} -Release: <RELEASE>.gd8f0e40 +Release: <RELEASE>.g58205bc %else Release: 0 %endif URL: https://www.kernel.org/ +%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150300 +BuildRequires: bash-sh +%endif BuildRequires: bc BuildRequires: bison BuildRequires: coreutils @@ -231,10 +234,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 -Provides: kernel-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 +Provides: kernel-%build_flavor-base-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb +Provides: kernel-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb # END COMMON DEPS -Provides: %name-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 +Provides: %name-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb %obsolete_rebuilds %name Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc @@ -288,7 +291,6 @@ Source83: kernel-subpackage-build Source84: kernel-subpackage-spec Source85: kernel-default-base.spec.txt -Source86: fdupes_relink Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -370,7 +372,6 @@ NoSource: 83 NoSource: 84 NoSource: 85 -NoSource: 86 NoSource: 100 NoSource: 101 NoSource: 102 @@ -919,7 +920,7 @@ # pointless to rely on its contents. Replacing by zeros to make the # checksums always the same for several builds of the same package. test -s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep && \ - dd if=/dev/zero of=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep ibs=`stat -c%s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep` count=1 + dd if=/dev/zero of=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep ibs=$(stat -c%s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep) count=1 res=0 if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then @@ -1193,14 +1194,14 @@ %endif %preun %if "%build_flavor" != "zfcpdump" -/usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %endif %postun %if "%build_flavor" != "zfcpdump" -/usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1259,13 +1260,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun extra -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-extra" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-extra" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun extra -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-extra" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-extra" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1325,13 +1326,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun optional -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-optional" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-optional" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun optional -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-optional" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-optional" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1492,13 +1493,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n cluster-md-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "cluster-md-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "cluster-md-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n cluster-md-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "cluster-md-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "cluster-md-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1539,13 +1540,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n dlm-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "dlm-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "dlm-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n dlm-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "dlm-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "dlm-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1586,13 +1587,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n gfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "gfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "gfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n gfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "gfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "gfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1648,13 +1649,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n kselftests-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "kselftests-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "kselftests-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n kselftests-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "kselftests-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "kselftests-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1696,13 +1697,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n ocfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "ocfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "ocfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n ocfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "ocfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "ocfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1743,13 +1744,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n reiserfs-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "reiserfs-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "reiserfs-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n reiserfs-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "reiserfs-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "reiserfs-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:00.829052041 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:00.837051950 +0200 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 5.16 -%define patchversion 5.16.15 +%define srcversion 5.17 +%define patchversion 5.17.1 %define variant %{nil} %define vanilla_only 0 %define compress_modules zstd @@ -44,7 +44,7 @@ %define klp_symbols 1 %endif -%(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,splitflist,mergedep,moddep,modflist,kernel-subpackage-build,fdupes_relink}) +%(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,splitflist,mergedep,moddep,modflist,kernel-subpackage-build}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor @@ -107,13 +107,16 @@ Summary: A Debug Version of the Kernel License: GPL-2.0-only Group: System/Kernel -Version: 5.16.15 +Version: 5.17.1 %if 0%{?is_kotd} -Release: <RELEASE>.gd8f0e40 +Release: <RELEASE>.g58205bc %else Release: 0 %endif URL: https://www.kernel.org/ +%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150300 +BuildRequires: bash-sh +%endif BuildRequires: bc BuildRequires: bison BuildRequires: coreutils @@ -231,10 +234,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 -Provides: kernel-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 +Provides: kernel-%build_flavor-base-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb +Provides: kernel-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb # END COMMON DEPS -Provides: %name-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 +Provides: %name-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb %ifarch ppc64 Provides: kernel-kdump = 2.6.28 Obsoletes: kernel-kdump <= 2.6.28 @@ -296,7 +299,6 @@ Source83: kernel-subpackage-build Source84: kernel-subpackage-spec Source85: kernel-default-base.spec.txt -Source86: fdupes_relink Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -378,7 +380,6 @@ NoSource: 83 NoSource: 84 NoSource: 85 -NoSource: 86 NoSource: 100 NoSource: 101 NoSource: 102 @@ -925,7 +926,7 @@ # pointless to rely on its contents. Replacing by zeros to make the # checksums always the same for several builds of the same package. test -s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep && \ - dd if=/dev/zero of=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep ibs=`stat -c%s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep` count=1 + dd if=/dev/zero of=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep ibs=$(stat -c%s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep) count=1 res=0 if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then @@ -1199,14 +1200,14 @@ %endif %preun %if "%build_flavor" != "zfcpdump" -/usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %endif %postun %if "%build_flavor" != "zfcpdump" -/usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1267,13 +1268,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun extra -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-extra" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-extra" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun extra -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-extra" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-extra" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1335,13 +1336,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun optional -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-optional" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-optional" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun optional -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-optional" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-optional" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1506,13 +1507,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n cluster-md-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "cluster-md-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "cluster-md-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n cluster-md-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "cluster-md-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "cluster-md-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1553,13 +1554,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n dlm-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "dlm-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "dlm-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n dlm-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "dlm-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "dlm-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1600,13 +1601,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n gfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "gfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "gfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n gfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "gfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "gfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1662,13 +1663,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n kselftests-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "kselftests-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "kselftests-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n kselftests-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "kselftests-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "kselftests-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1710,13 +1711,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n ocfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "ocfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "ocfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n ocfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "ocfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "ocfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1757,13 +1758,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n reiserfs-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "reiserfs-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "reiserfs-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n reiserfs-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "reiserfs-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "reiserfs-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:00.861051680 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:00.865051634 +0200 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 5.16 -%define patchversion 5.16.15 +%define srcversion 5.17 +%define patchversion 5.17.1 %define variant %{nil} %define vanilla_only 0 %define compress_modules zstd @@ -44,7 +44,7 @@ %define klp_symbols 1 %endif -%(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,splitflist,mergedep,moddep,modflist,kernel-subpackage-build,fdupes_relink}) +%(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,splitflist,mergedep,moddep,modflist,kernel-subpackage-build}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor @@ -107,13 +107,16 @@ Summary: The Standard Kernel License: GPL-2.0-only Group: System/Kernel -Version: 5.16.15 +Version: 5.17.1 %if 0%{?is_kotd} -Release: <RELEASE>.gd8f0e40 +Release: <RELEASE>.g58205bc %else Release: 0 %endif URL: https://www.kernel.org/ +%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150300 +BuildRequires: bash-sh +%endif BuildRequires: bc BuildRequires: bison BuildRequires: coreutils @@ -231,10 +234,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 -Provides: kernel-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 +Provides: kernel-%build_flavor-base-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb +Provides: kernel-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb # END COMMON DEPS -Provides: %name-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 +Provides: %name-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb %ifarch %ix86 Provides: kernel-smp = 2.6.17 Obsoletes: kernel-smp <= 2.6.17 @@ -340,7 +343,6 @@ Source83: kernel-subpackage-build Source84: kernel-subpackage-spec Source85: kernel-default-base.spec.txt -Source86: fdupes_relink Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -422,7 +424,6 @@ NoSource: 83 NoSource: 84 NoSource: 85 -NoSource: 86 NoSource: 100 NoSource: 101 NoSource: 102 @@ -968,7 +969,7 @@ # pointless to rely on its contents. Replacing by zeros to make the # checksums always the same for several builds of the same package. test -s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep && \ - dd if=/dev/zero of=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep ibs=`stat -c%s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep` count=1 + dd if=/dev/zero of=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep ibs=$(stat -c%s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep) count=1 res=0 if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then @@ -1242,14 +1243,14 @@ %endif %preun %if "%build_flavor" != "zfcpdump" -/usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %endif %postun %if "%build_flavor" != "zfcpdump" -/usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1329,13 +1330,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun extra -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-extra" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-extra" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun extra -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-extra" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-extra" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1416,13 +1417,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun optional -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-optional" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-optional" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun optional -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-optional" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-optional" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1607,13 +1608,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n cluster-md-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "cluster-md-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "cluster-md-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n cluster-md-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "cluster-md-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "cluster-md-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1654,13 +1655,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n dlm-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "dlm-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "dlm-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n dlm-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "dlm-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "dlm-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1701,13 +1702,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n gfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "gfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "gfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n gfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "gfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "gfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1763,13 +1764,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n kselftests-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "kselftests-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "kselftests-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n kselftests-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "kselftests-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "kselftests-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1811,13 +1812,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n ocfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "ocfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "ocfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n ocfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "ocfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "ocfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1858,13 +1859,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n reiserfs-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "reiserfs-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "reiserfs-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n reiserfs-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "reiserfs-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "reiserfs-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:00.889051364 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:00.893051318 +0200 @@ -16,8 +16,8 @@ # -%define srcversion 5.16 -%define patchversion 5.16.15 +%define srcversion 5.17 +%define patchversion 5.17.1 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -25,18 +25,21 @@ %define build_html 1 %define build_pdf 0 -%(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,splitflist,mergedep,moddep,modflist,kernel-subpackage-build,fdupes_relink}) +%(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,splitflist,mergedep,moddep,modflist,kernel-subpackage-build}) Name: kernel-docs Summary: Kernel Documentation License: GPL-2.0-only Group: Documentation/Man -Version: 5.16.15 +Version: 5.17.1 %if 0%{?is_kotd} -Release: <RELEASE>.gd8f0e40 +Release: <RELEASE>.g58205bc %else Release: 0 %endif +%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150300 +BuildRequires: bash-sh +%endif # TW (4.13 or later) no longer needs xmlto %if 0%{?sle_version} BuildRequires: xmlto @@ -64,7 +67,7 @@ %endif URL: https://www.kernel.org/ Provides: %name = %version-%source_rel -Provides: %name-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 +Provides: %name-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz @@ -119,7 +122,6 @@ Source83: kernel-subpackage-build Source84: kernel-subpackage-spec Source85: kernel-default-base.spec.txt -Source86: fdupes_relink Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -187,7 +189,6 @@ NoSource: 83 NoSource: 84 NoSource: 85 -NoSource: 86 NoSource: 100 NoSource: 101 NoSource: 102 ++++++ kernel-kvmsmall.spec ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:00.917051047 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:00.925050957 +0200 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 5.16 -%define patchversion 5.16.15 +%define srcversion 5.17 +%define patchversion 5.17.1 %define variant %{nil} %define vanilla_only 0 %define compress_modules zstd @@ -44,7 +44,7 @@ %define klp_symbols 1 %endif -%(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,splitflist,mergedep,moddep,modflist,kernel-subpackage-build,fdupes_relink}) +%(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,splitflist,mergedep,moddep,modflist,kernel-subpackage-build}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor @@ -107,13 +107,16 @@ Summary: The Small Developer Kernel for KVM License: GPL-2.0-only Group: System/Kernel -Version: 5.16.15 +Version: 5.17.1 %if 0%{?is_kotd} -Release: <RELEASE>.gd8f0e40 +Release: <RELEASE>.g58205bc %else Release: 0 %endif URL: https://www.kernel.org/ +%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150300 +BuildRequires: bash-sh +%endif BuildRequires: bc BuildRequires: bison BuildRequires: coreutils @@ -231,10 +234,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 -Provides: kernel-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 +Provides: kernel-%build_flavor-base-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb +Provides: kernel-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb # END COMMON DEPS -Provides: %name-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 +Provides: %name-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb %obsolete_rebuilds %name Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc @@ -288,7 +291,6 @@ Source83: kernel-subpackage-build Source84: kernel-subpackage-spec Source85: kernel-default-base.spec.txt -Source86: fdupes_relink Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -370,7 +372,6 @@ NoSource: 83 NoSource: 84 NoSource: 85 -NoSource: 86 NoSource: 100 NoSource: 101 NoSource: 102 @@ -923,7 +924,7 @@ # pointless to rely on its contents. Replacing by zeros to make the # checksums always the same for several builds of the same package. test -s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep && \ - dd if=/dev/zero of=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep ibs=`stat -c%s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep` count=1 + dd if=/dev/zero of=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep ibs=$(stat -c%s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep) count=1 res=0 if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then @@ -1197,14 +1198,14 @@ %endif %preun %if "%build_flavor" != "zfcpdump" -/usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %endif %postun %if "%build_flavor" != "zfcpdump" -/usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1267,13 +1268,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun extra -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-extra" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-extra" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun extra -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-extra" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-extra" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1337,13 +1338,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun optional -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-optional" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-optional" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun optional -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-optional" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-optional" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1504,13 +1505,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n cluster-md-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "cluster-md-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "cluster-md-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n cluster-md-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "cluster-md-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "cluster-md-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1551,13 +1552,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n dlm-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "dlm-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "dlm-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n dlm-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "dlm-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "dlm-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1598,13 +1599,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n gfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "gfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "gfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n gfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "gfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "gfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1660,13 +1661,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n kselftests-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "kselftests-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "kselftests-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n kselftests-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "kselftests-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "kselftests-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1708,13 +1709,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n ocfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "ocfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "ocfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n ocfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "ocfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "ocfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1755,13 +1756,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n reiserfs-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "reiserfs-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "reiserfs-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n reiserfs-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "reiserfs-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "reiserfs-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" kernel-lpae.spec: same change ++++++ kernel-obs-build.spec ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:00.981050326 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:00.981050326 +0200 @@ -19,7 +19,7 @@ #!BuildIgnore: post-build-checks -%define patchversion 5.16.15 +%define patchversion 5.17.1 %define variant %{nil} %define vanilla_only 0 @@ -45,7 +45,7 @@ %endif %endif %endif -BuildRequires: kernel%kernel_flavor-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 +BuildRequires: kernel%kernel_flavor-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb %if 0%{?rhel_version} BuildRequires: kernel @@ -64,9 +64,9 @@ Summary: package kernel and initrd for OBS VM builds License: GPL-2.0-only Group: SLES -Version: 5.16.15 +Version: 5.17.1 %if 0%{?is_kotd} -Release: <RELEASE>.gd8f0e40 +Release: <RELEASE>.g58205bc %else Release: 0 %endif @@ -157,7 +157,7 @@ %if 0%{?suse_version} > 1550 || 0%{?sle_version} > 150200 --compress "zstd -19 -T0" \ %endif - `echo /boot/%{kernel_name}-*%{kernel_flavor} | sed -n -e 's,[^-]*-\(.*'%{kernel_flavor}'\),\1,p'` + $(echo /boot/%{kernel_name}-*%{kernel_flavor} | sed -n -e 's,[^-]*-\(.*'%{kernel_flavor}'\),\1,p') %endif #cleanup ++++++ kernel-obs-qa.spec ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:01.005050055 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:01.013049965 +0200 @@ -17,7 +17,7 @@ # needsrootforbuild -%define patchversion 5.16.15 +%define patchversion 5.17.1 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -36,9 +36,9 @@ Summary: Basic QA tests for the kernel License: GPL-2.0-only Group: SLES -Version: 5.16.15 +Version: 5.17.1 %if 0%{?is_kotd} -Release: <RELEASE>.gd8f0e40 +Release: <RELEASE>.g58205bc %else Release: 0 %endif ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:01.041049649 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:01.045049604 +0200 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 5.16 -%define patchversion 5.16.15 +%define srcversion 5.17 +%define patchversion 5.17.1 %define variant %{nil} %define vanilla_only 0 %define compress_modules zstd @@ -44,7 +44,7 @@ %define klp_symbols 1 %endif -%(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,splitflist,mergedep,moddep,modflist,kernel-subpackage-build,fdupes_relink}) +%(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,splitflist,mergedep,moddep,modflist,kernel-subpackage-build}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor @@ -107,13 +107,16 @@ Summary: Kernel with PAE Support License: GPL-2.0-only Group: System/Kernel -Version: 5.16.15 +Version: 5.17.1 %if 0%{?is_kotd} -Release: <RELEASE>.gd8f0e40 +Release: <RELEASE>.g58205bc %else Release: 0 %endif URL: https://www.kernel.org/ +%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150300 +BuildRequires: bash-sh +%endif BuildRequires: bc BuildRequires: bison BuildRequires: coreutils @@ -231,10 +234,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 -Provides: kernel-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 +Provides: kernel-%build_flavor-base-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb +Provides: kernel-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb # END COMMON DEPS -Provides: %name-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 +Provides: %name-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb %ifarch %ix86 Provides: kernel-bigsmp = 2.6.17 Obsoletes: kernel-bigsmp <= 2.6.17 @@ -310,7 +313,6 @@ Source83: kernel-subpackage-build Source84: kernel-subpackage-spec Source85: kernel-default-base.spec.txt -Source86: fdupes_relink Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -392,7 +394,6 @@ NoSource: 83 NoSource: 84 NoSource: 85 -NoSource: 86 NoSource: 100 NoSource: 101 NoSource: 102 @@ -945,7 +946,7 @@ # pointless to rely on its contents. Replacing by zeros to make the # checksums always the same for several builds of the same package. test -s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep && \ - dd if=/dev/zero of=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep ibs=`stat -c%s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep` count=1 + dd if=/dev/zero of=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep ibs=$(stat -c%s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep) count=1 res=0 if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then @@ -1219,14 +1220,14 @@ %endif %preun %if "%build_flavor" != "zfcpdump" -/usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %endif %postun %if "%build_flavor" != "zfcpdump" -/usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1299,13 +1300,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun extra -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-extra" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-extra" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun extra -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-extra" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-extra" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1379,13 +1380,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun optional -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-optional" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-optional" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun optional -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-optional" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-optional" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1556,13 +1557,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n cluster-md-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "cluster-md-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "cluster-md-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n cluster-md-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "cluster-md-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "cluster-md-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1603,13 +1604,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n dlm-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "dlm-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "dlm-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n dlm-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "dlm-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "dlm-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1650,13 +1651,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n gfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "gfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "gfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n gfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "gfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "gfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1712,13 +1713,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n kselftests-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "kselftests-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "kselftests-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n kselftests-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "kselftests-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "kselftests-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1760,13 +1761,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n ocfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "ocfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "ocfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n ocfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "ocfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "ocfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1807,13 +1808,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n reiserfs-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "reiserfs-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "reiserfs-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n reiserfs-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "reiserfs-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "reiserfs-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:01.061049424 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:01.065049379 +0200 @@ -16,8 +16,8 @@ # -%define srcversion 5.16 -%define patchversion 5.16.15 +%define srcversion 5.17 +%define patchversion 5.17.1 %define variant %{nil} %define vanilla_only 0 @@ -31,9 +31,9 @@ %endif Name: kernel-source -Version: 5.16.15 +Version: 5.17.1 %if 0%{?is_kotd} -Release: <RELEASE>.gd8f0e40 +Release: <RELEASE>.g58205bc %else Release: 0 %endif @@ -42,12 +42,15 @@ Group: Development/Sources URL: https://www.kernel.org/ AutoReqProv: off +%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150300 +BuildRequires: bash-sh +%endif BuildRequires: coreutils BuildRequires: fdupes BuildRequires: sed Requires(post): coreutils sed Provides: %name = %version-%source_rel -Provides: %name-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 +Provides: %name-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb Provides: linux Provides: multiversion(kernel) Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz @@ -102,7 +105,6 @@ Source83: kernel-subpackage-build Source84: kernel-subpackage-spec Source85: kernel-default-base.spec.txt -Source86: fdupes_relink Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -133,7 +135,7 @@ %endif %obsolete_rebuilds %name -%(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,splitflist,mergedep,moddep,modflist,kernel-subpackage-build,fdupes_relink}) +%(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,splitflist,mergedep,moddep,modflist,kernel-subpackage-build}) # Force bzip2 instead of lzma compression to # 1) allow install on older dist versions, and @@ -226,6 +228,8 @@ cd linux-%kernelrelease-vanilla %_sourcedir/apply-patches --vanilla %_sourcedir/series.conf %my_builddir %symbols rm -f $(find . -name ".gitignore") +# Hardlink duplicate files automatically (from package fdupes). +%fdupes $PWD cd .. %endif @@ -237,11 +241,10 @@ if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion fi +# Hardlink duplicate files automatically (from package fdupes). +%fdupes $PWD cd .. %endif - -# Hardlink duplicate files. -fdupes -q -p -n -H -o name -r %{buildroot} | %_sourcedir/fdupes_relink popd %if ! %vanilla_only ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:01.093049063 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:01.097049018 +0200 @@ -24,10 +24,10 @@ Summary: Kernel Symbol Versions (modversions) License: GPL-2.0-only Group: Development/Sources -Version: 5.16.15 +Version: 5.17.1 %if %using_buildservice %if 0%{?is_kotd} -Release: <RELEASE>.gd8f0e40 +Release: <RELEASE>.g58205bc %else Release: 0 %endif @@ -52,7 +52,7 @@ %endif Requires: pesign-obs-integration Provides: %name = %version-%source_rel -Provides: %name-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 +Provides: %name-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb Provides: multiversion(kernel) Source: README.KSYMS Requires: kernel-devel%variant = %version-%source_rel ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:01.117048792 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:01.125048702 +0200 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 5.16 -%define patchversion 5.16.15 +%define srcversion 5.17 +%define patchversion 5.17.1 %define variant %{nil} %define vanilla_only 0 %define compress_modules zstd @@ -44,7 +44,7 @@ %define klp_symbols 1 %endif -%(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,splitflist,mergedep,moddep,modflist,kernel-subpackage-build,fdupes_relink}) +%(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,splitflist,mergedep,moddep,modflist,kernel-subpackage-build}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor @@ -107,13 +107,16 @@ Summary: The Standard Kernel - without any SUSE patches License: GPL-2.0-only Group: System/Kernel -Version: 5.16.15 +Version: 5.17.1 %if 0%{?is_kotd} -Release: <RELEASE>.gd8f0e40 +Release: <RELEASE>.g58205bc %else Release: 0 %endif URL: https://www.kernel.org/ +%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150300 +BuildRequires: bash-sh +%endif BuildRequires: bc BuildRequires: bison BuildRequires: coreutils @@ -231,10 +234,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 -Provides: kernel-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 +Provides: kernel-%build_flavor-base-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb +Provides: kernel-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb # END COMMON DEPS -Provides: %name-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 +Provides: %name-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb %obsolete_rebuilds %name Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc @@ -288,7 +291,6 @@ Source83: kernel-subpackage-build Source84: kernel-subpackage-spec Source85: kernel-default-base.spec.txt -Source86: fdupes_relink Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -370,7 +372,6 @@ NoSource: 83 NoSource: 84 NoSource: 85 -NoSource: 86 NoSource: 100 NoSource: 101 NoSource: 102 @@ -916,7 +917,7 @@ # pointless to rely on its contents. Replacing by zeros to make the # checksums always the same for several builds of the same package. test -s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep && \ - dd if=/dev/zero of=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep ibs=`stat -c%s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep` count=1 + dd if=/dev/zero of=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep ibs=$(stat -c%s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep) count=1 res=0 if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then @@ -1190,14 +1191,14 @@ %endif %preun %if "%build_flavor" != "zfcpdump" -/usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %endif %postun %if "%build_flavor" != "zfcpdump" -/usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1253,13 +1254,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun extra -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-extra" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-extra" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun extra -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-extra" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-extra" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1316,13 +1317,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun optional -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-optional" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-optional" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun optional -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-optional" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-optional" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1483,13 +1484,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n cluster-md-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "cluster-md-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "cluster-md-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n cluster-md-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "cluster-md-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "cluster-md-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1530,13 +1531,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n dlm-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "dlm-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "dlm-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n dlm-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "dlm-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "dlm-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1577,13 +1578,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n gfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "gfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "gfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n gfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "gfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "gfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1639,13 +1640,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n kselftests-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "kselftests-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "kselftests-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n kselftests-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "kselftests-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "kselftests-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1687,13 +1688,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n ocfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "ocfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "ocfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n ocfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "ocfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "ocfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1734,13 +1735,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n reiserfs-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "reiserfs-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "reiserfs-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n reiserfs-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "reiserfs-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "reiserfs-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" kernel-zfcpdump.spec: same change ++++++ _buildconfig-standard-x86_64 ++++++ ++++ 1570 lines (skipped) ++++++ _buildinfo-standard-x86_64.xml ++++++ <buildinfo project="Kernel:stable" repository="standard" downloadurl="https://download.opensuse.org/repositories"> <arch>x86_64</arch> <debuginfo>1</debuginfo> <subpack>kernel-default</subpack> <subpack>kernel-default-devel</subpack> <subpack>kernel-default-extra</subpack> <bdep name="liblua5_4-5" preinstall="1" notmeta="1" version="5.4.4" release="2.1" arch="x86_64" hdrmd5="3a1c089298ab20a27f03fd03fdbef4a8" project="openSUSE:Factory" repository="standard"/> <bdep name="aaa_base" preinstall="1" notmeta="1" version="84.87+git20220324.fca4619" release="1.1" arch="x86_64" hdrmd5="a1a26d2ce941c9b346bb870e8a1abdf2" project="openSUSE:Factory" repository="standard"/> <bdep name="filesystem" preinstall="1" notmeta="1" version="84.87" release="4.1" arch="x86_64" hdrmd5="e0cff458d94f929919e2bef68d765be7" project="openSUSE:Factory" repository="standard"/> <bdep name="attr" preinstall="1" notmeta="1" version="2.5.1" release="1.17" arch="x86_64" hdrmd5="a21ec4cc7751b1c27308527c8eda0198" project="openSUSE:Factory" repository="standard"/> <bdep name="bash" preinstall="1" notmeta="1" version="5.1.16" release="7.1" arch="x86_64" hdrmd5="be1ef0cca67466073fc97580514f4614" project="openSUSE:Factory" repository="standard"/> <bdep name="bash-sh" preinstall="1" version="5.1.16" release="7.1" arch="x86_64" hdrmd5="d159482f52254316f56314b0aa59fb2c" project="openSUSE:Factory" repository="standard"/> <bdep name="coreutils" preinstall="1" version="9.0" release="2.3" arch="x86_64" hdrmd5="97409685379a990f353a518b076a3a45" project="openSUSE:Factory" repository="standard"/> <bdep name="diffutils" preinstall="1" notmeta="1" version="3.8" release="2.5" arch="x86_64" hdrmd5="0a4ba6a3617f073df9a4e2e92c350dab" project="openSUSE:Factory" repository="standard"/> <bdep name="fillup" preinstall="1" notmeta="1" version="1.42" release="276.9" arch="x86_64" hdrmd5="72fd693f39133a6ef24ffee2c3e71025" project="openSUSE:Factory" repository="standard"/> <bdep name="glibc" preinstall="1" notmeta="1" version="2.35" release="2.1" arch="x86_64" hdrmd5="38cbec74ef87c3efb99f67ed57e624e9" project="openSUSE:Factory" repository="standard"/> <bdep name="grep" preinstall="1" notmeta="1" version="3.7" release="3.1" arch="x86_64" hdrmd5="c003454bdc71eb26844a03379c34ff58" project="openSUSE:Factory" repository="standard"/> <bdep name="pam" preinstall="1" notmeta="1" version="1.5.2" release="6.1" arch="x86_64" hdrmd5="c4f94b370afbf38f3c33e7960f730a76" project="openSUSE:Factory" repository="standard"/> <bdep name="permissions" preinstall="1" notmeta="1" version="20220309.1599" release="30.1" arch="x86_64" hdrmd5="95c3933c1f477df7c8cf9f910e81d832" project="openSUSE:Factory" repository="standard"/> <bdep name="rpm" preinstall="1" notmeta="1" version="4.17.0" release="5.1" arch="x86_64" hdrmd5="48f7aad98ecc028da6a683ef1460b603" project="openSUSE:Factory" repository="standard"/> <bdep name="rpm-config-SUSE" preinstall="1" notmeta="1" version="20220317" release="1.1" arch="noarch" hdrmd5="58250c69b58d5c85f1606c97aaeb1691" project="openSUSE:Factory" repository="standard"/> <bdep name="sed" preinstall="1" notmeta="1" version="4.8" release="3.10" arch="x86_64" hdrmd5="35b4c9fb9d5f544f42e79643bc336a12" project="openSUSE:Factory" repository="standard"/> <bdep name="tar" preinstall="1" notmeta="1" version="1.34" release="5.3" arch="x86_64" hdrmd5="bab5906c8e71347d41a0129f9be7ab29" project="openSUSE:Factory" repository="standard"/> <bdep name="libbz2-1" preinstall="1" notmeta="1" version="1.0.8" release="3.6" arch="x86_64" hdrmd5="3ac4b485f80ea21872f9a83401e856b9" project="openSUSE:Factory" repository="standard"/> <bdep name="libgcc_s1" preinstall="1" notmeta="1" version="11.2.1+git1406" release="1.1" arch="x86_64" hdrmd5="ded7b0ef62d9d0ac28d1c667d9595b7b" project="openSUSE:Factory" repository="standard"/> <bdep name="libncurses6" preinstall="1" notmeta="1" version="6.3.20220312" release="13.1" arch="x86_64" hdrmd5="56b24fef8ed3bc6d6f42e7c8592a2f27" project="openSUSE:Factory" repository="standard"/> <bdep name="libreadline8" preinstall="1" notmeta="1" version="8.1" release="3.3" arch="x86_64" hdrmd5="947e3d71f05758a9040072e699ab6a3d" project="openSUSE:Factory" repository="standard"/> <bdep name="libz1" preinstall="1" notmeta="1" version="1.2.11" release="18.21" arch="x86_64" hdrmd5="fccdccb205ba6b37509bf75b17c4bffc" project="openSUSE:Factory" repository="standard"/> <bdep name="libselinux1" preinstall="1" notmeta="1" version="3.3" release="2.1" arch="x86_64" hdrmd5="be4590fce7260b32685995a230091eaa" project="openSUSE:Factory" repository="standard"/> <bdep name="libgcrypt20" preinstall="1" notmeta="1" version="1.9.4" release="3.3" arch="x86_64" hdrmd5="211449e11b42a7be7f7cb4ff30ed2e19" project="openSUSE:Factory" repository="standard"/> <bdep name="libgpg-error0" preinstall="1" notmeta="1" version="1.44" release="1.3" arch="x86_64" hdrmd5="a6dfab364dc8de2dde686b566b738e2b" project="openSUSE:Factory" repository="standard"/> <bdep name="liblzma5" preinstall="1" notmeta="1" version="5.2.5" release="2.6" arch="x86_64" hdrmd5="b5d1e637b0588eafd9e74efb09a6ade2" project="openSUSE:Factory" repository="standard"/> <bdep name="libcap2" preinstall="1" notmeta="1" version="2.63" release="2.1" arch="x86_64" hdrmd5="b1c836a39fc87db295e73106d6960e19" project="openSUSE:Factory" repository="standard"/> <bdep name="libacl1" preinstall="1" notmeta="1" version="2.3.1" release="1.18" arch="x86_64" hdrmd5="a2b9475bd633b77f61aee618e6c602e0" project="openSUSE:Factory" repository="standard"/> <bdep name="libattr1" preinstall="1" notmeta="1" version="2.5.1" release="1.17" arch="x86_64" hdrmd5="eb06b784d8619db67067a0d629528a29" project="openSUSE:Factory" repository="standard"/> <bdep name="libpopt0" preinstall="1" notmeta="1" version="1.18" release="2.21" arch="x86_64" hdrmd5="c9e4a784005aef62973fb0107cd03d6e" project="openSUSE:Factory" repository="standard"/> <bdep name="libelf1" preinstall="1" notmeta="1" version="0.186" release="2.1" arch="x86_64" hdrmd5="72aeaedf132df0a110b3af845257cd34" project="openSUSE:Factory" repository="standard"/> <bdep name="libpcre1" preinstall="1" notmeta="1" version="8.45" release="1.5" arch="x86_64" hdrmd5="a222acbb4b91f202cfcfbe633949009d" project="openSUSE:Factory" repository="standard"/> <bdep name="libzstd1" preinstall="1" notmeta="1" version="1.5.2" release="1.3" arch="x86_64" hdrmd5="bdc713c042bef38de159839fcace1d96" project="openSUSE:Factory" repository="standard"/> <bdep name="libpcre2-8-0" preinstall="1" notmeta="1" version="10.39" release="1.5" arch="x86_64" hdrmd5="b7bcb9cbbc538ff20d7f875ffb06c98e" project="openSUSE:Factory" repository="standard"/> <bdep name="util-linux" vminstall="1" version="2.37.4" release="1.1" arch="x86_64" hdrmd5="b7651c423640c4c9c541384255832e0b" project="openSUSE:Factory" repository="standard"/> <bdep name="libmount1" vminstall="1" version="2.37.4" release="1.1" arch="x86_64" hdrmd5="e7cb2327a65b142d70ac884678df9c77" project="openSUSE:Factory" repository="standard"/> <bdep name="perl-base" vminstall="1" version="5.34.0" release="2.1" arch="x86_64" hdrmd5="a96cfb03c5f876d854d1018c9e741515" project="openSUSE:Factory" repository="standard"/> <bdep name="libdb-4_8" vminstall="1" notmeta="1" version="4.8.30" release="38.42" arch="x86_64" hdrmd5="8cdee2f54a428320391d933513f371d2" project="openSUSE:Factory" repository="standard"/> <bdep name="libblkid1" vminstall="1" version="2.37.4" release="1.1" arch="x86_64" hdrmd5="07578a9b95fb18d3025304bcb3624f87" project="openSUSE:Factory" repository="standard"/> <bdep name="libuuid1" vminstall="1" version="2.37.4" release="1.1" arch="x86_64" hdrmd5="37577cb286c0b50c0f3053acd42a41c1" project="openSUSE:Factory" repository="standard"/> <bdep name="libsmartcols1" vminstall="1" version="2.37.4" release="1.1" arch="x86_64" hdrmd5="5e51c42dc936a55b92a3d19b47d5a370" project="openSUSE:Factory" repository="standard"/> <bdep name="libcrypt1" vminstall="1" version="4.4.27" release="1.4" arch="x86_64" hdrmd5="d488933ee6caf372b1be966f97f664fd" project="openSUSE:Factory" repository="standard"/> <bdep name="kernel-obs-build" vminstall="1" notmeta="1" version="5.16.15" release="1.1" arch="x86_64" hdrmd5="7fc326781602569d554222caed047fd3" project="openSUSE:Factory" repository="standard"/> <bdep name="bc" version="1.07.1" release="4.20" arch="x86_64" hdrmd5="13c2e9d6129a53aa8676db6ba594f1b8" project="openSUSE:Factory" repository="standard"/> <bdep name="bison" version="3.8.2" release="2.5" arch="x86_64" hdrmd5="7ccda2608ec82552686aab642fe32f05" project="openSUSE:Factory" repository="standard"/> <bdep name="fdupes" version="2.1.2" release="2.1" arch="x86_64" hdrmd5="527373f696e47c0b5a76c3375bed726e" project="openSUSE:Factory" repository="standard"/> <bdep name="flex" version="2.6.4" release="6.16" arch="x86_64" hdrmd5="20386bc3f6a4cbd40e3f5598a4eb6cb4" project="openSUSE:Factory" repository="standard"/> <bdep name="hmaccalc" version="0.9.14" release="2.13" arch="x86_64" hdrmd5="8a665d84f1c51f8e8e462e0c5929fc26" project="openSUSE:Factory" repository="standard"/> <bdep name="libopenssl-devel" version="1.1.1n" release="1.1" arch="noarch" hdrmd5="21f478b5f77058c03ca4c91902ead1d8" project="openSUSE:Factory" repository="standard"/> <bdep name="openssl" version="1.1.1n" release="1.1" arch="noarch" hdrmd5="5b016c7fbc3b05db55659ea43da392fd" project="openSUSE:Factory" repository="standard"/> <bdep name="pesign-obs-integration" version="10.2+git20210804.ff18da1" release="2.1" arch="x86_64" hdrmd5="52a6ffbfb874f12e4fe7e1e90924c521" project="openSUSE:Factory" repository="standard"/> <bdep name="dwarves" version="1.22" release="2.3" arch="x86_64" hdrmd5="b2ff285738854934896cea7e972c65fd" project="openSUSE:Factory" repository="standard"/> <bdep name="libelf-devel" version="0.186" release="2.1" arch="x86_64" hdrmd5="60821fe7c5df30050c00ce5b20f4cf03" project="openSUSE:Factory" repository="standard"/> <bdep name="elfutils" version="0.186" release="2.1" arch="x86_64" hdrmd5="4608fa7ec694a15780c242cc58ca61b2" project="openSUSE:Factory" repository="standard"/> <bdep name="zstd" version="1.5.2" release="1.3" arch="x86_64" hdrmd5="5d3444ba387d8909faa1b6ed4eda0542" project="openSUSE:Factory" repository="standard"/> <bdep name="rpm-build" version="4.17.0" release="5.1" arch="x86_64" hdrmd5="990f0251576f523828bea931d8f498fa" project="openSUSE:Factory" repository="standard"/> <bdep name="gcc-PIE" version="11" release="5.3" arch="x86_64" hdrmd5="9a3e4b66c17715e3347a9b406c65306e" project="openSUSE:Factory" repository="standard"/> <bdep name="kmod" version="29" release="8.4" arch="x86_64" hdrmd5="29de7185630c011cdc89f923e1ff98e4" project="openSUSE:Factory" repository="standard"/> <bdep name="m4" version="1.4.18" release="6.6" arch="x86_64" hdrmd5="117d121ed02492bedad89ff3eadb307a" project="openSUSE:Factory" repository="standard"/> <bdep name="libgmp10" version="6.2.1" release="4.5" arch="x86_64" hdrmd5="c58a46f3234e3a1b4f21e3c96127abf0" project="openSUSE:Factory" repository="standard"/> <bdep name="libstdc++6" version="11.2.1+git1406" release="1.1" arch="x86_64" hdrmd5="45bce3aec82cfb83ecc8b43819a9df7d" project="openSUSE:Factory" repository="standard"/> <bdep name="libfl-devel" version="2.6.4" release="6.16" arch="x86_64" hdrmd5="c3c1851a5f612f5f2ac8db720980938a" project="openSUSE:Factory" repository="standard"/> <bdep name="mozilla-nss" version="3.75" release="2.1" arch="x86_64" hdrmd5="f45282dc4b10a97b9f02d210ce0fac2e" project="openSUSE:Factory" repository="standard"/> <bdep name="mozilla-nspr" version="4.33" release="1.3" arch="x86_64" hdrmd5="d699571224677ab40394444bce4adb82" project="openSUSE:Factory" repository="standard"/> <bdep name="pkgconf-pkg-config" version="1.8.0" release="1.6" arch="x86_64" hdrmd5="32db575c9995ac0b207b298ae525ca6b" project="openSUSE:Factory" repository="standard"/> <bdep name="libopenssl-1_1-devel" version="1.1.1n" release="1.1" arch="x86_64" hdrmd5="d7851e267014ca4b0cc5acc85cce7cd9" project="openSUSE:Factory" repository="standard"/> <bdep name="libopenssl1_1" version="1.1.1n" release="1.1" arch="x86_64" hdrmd5="bb00bd1e09700a8ef1133f06b8af8cf1" project="openSUSE:Factory" repository="standard"/> <bdep name="openssl-1_1" version="1.1.1n" release="1.1" arch="x86_64" hdrmd5="30efea33cc325253d0f74e2b1a6e0a60" project="openSUSE:Factory" repository="standard"/> <bdep name="fipscheck" version="1.5.0" release="4.22" arch="x86_64" hdrmd5="06ce1158c4f2c822edaa2d4cc55e7b57" project="openSUSE:Factory" repository="standard"/> <bdep name="mozilla-nss-tools" version="3.75" release="2.1" arch="x86_64" hdrmd5="63d61c38ebb2f100c5a1512d46e4143c" project="openSUSE:Factory" repository="standard"/> <bdep name="pesign" version="113" release="10.3" arch="x86_64" hdrmd5="8b1a30f37cf40a6a04a815f91ac668c2" project="openSUSE:Factory" repository="standard"/> <bdep name="suse-module-tools" version="16.0.19" release="1.3" arch="x86_64" hdrmd5="c81261025db21283bee73fc359239760" project="openSUSE:Factory" repository="standard"/> <bdep name="python38-base" version="3.8.12" release="4.1" arch="x86_64" hdrmd5="eb064eb1a8baa6f2177cbf33a2c63032" project="openSUSE:Factory" repository="standard"/> <bdep name="libbpf0" version="0.7.0" release="2.1" arch="x86_64" hdrmd5="7f89d77e7c3523cd1fd226332f459231" project="openSUSE:Factory" repository="standard"/> <bdep name="libdwarves1" version="1.22" release="2.3" arch="x86_64" hdrmd5="559675064145d35c09cf21ff50e52c87" project="openSUSE:Factory" repository="standard"/> <bdep name="glibc-devel" version="2.35" release="2.1" arch="x86_64" hdrmd5="bb609b208cf3044f4e4371b1579417e9" project="openSUSE:Factory" repository="standard"/> <bdep name="libdw1" version="0.186" release="2.1" arch="x86_64" hdrmd5="d55b3f0dfd9f2f4242754e09169469c5" project="openSUSE:Factory" repository="standard"/> <bdep name="libasm1" version="0.186" release="2.1" arch="x86_64" hdrmd5="ebee80aad3e5d54a72baa12425e53bc7" project="openSUSE:Factory" repository="standard"/> <bdep name="findutils" version="4.9.0" release="1.3" arch="x86_64" hdrmd5="8353611211ca8f951a85b4bf90261f36" project="openSUSE:Factory" repository="standard"/> <bdep name="xz" version="5.2.5" release="2.6" arch="x86_64" hdrmd5="b7d1132cf7b61a66997694e7630823c1" project="openSUSE:Factory" repository="standard"/> <bdep name="gcc" version="11" release="5.3" arch="x86_64" hdrmd5="4cf81e8a70d95977e3d48a49956b73fe" project="openSUSE:Factory" repository="standard"/> <bdep name="make" version="4.3" release="2.39" arch="x86_64" hdrmd5="9cb51272c6b2df2a4a04bc1c6148d0c8" project="openSUSE:Factory" repository="standard"/> <bdep name="cpio" version="2.13" release="4.5" arch="x86_64" hdrmd5="9eb5897d0acc364836fbc6edc24ee702" project="openSUSE:Factory" repository="standard"/> <bdep name="file" version="5.41" release="3.1" arch="x86_64" hdrmd5="b0fbde895791f46c93158585218d386f" project="openSUSE:Factory" repository="standard"/> <bdep name="bzip2" version="1.0.8" release="3.6" arch="x86_64" hdrmd5="88c3eb363589dd8e94dcd49a23dd85cc" project="openSUSE:Factory" repository="standard"/> <bdep name="gawk" version="5.1.1" release="3.5" arch="x86_64" hdrmd5="9982c5f0c9ec98031270def2540e9c96" project="openSUSE:Factory" repository="standard"/> <bdep name="binutils" version="2.38" release="3.1" arch="x86_64" hdrmd5="831315fcdd253fb60f556024ad939699" project="openSUSE:Factory" repository="standard"/> <bdep name="patch" version="2.7.6" release="4.5" arch="x86_64" hdrmd5="8bc7bc2d1780533053b5ea1a4881e0f8" project="openSUSE:Factory" repository="standard"/> <bdep name="which" version="2.21" release="4.49" arch="x86_64" hdrmd5="a16c29eaae5703d8630f542601ee1fa6" project="openSUSE:Factory" repository="standard"/> <bdep name="glibc-locale-base" version="2.35" release="2.1" arch="x86_64" hdrmd5="90fd7dca456f8e684a9b7a239a081431" project="openSUSE:Factory" repository="standard"/> <bdep name="systemd-rpm-macros" version="16" release="1.1" arch="noarch" hdrmd5="29bd5eee7846286ddf031711eca73891" project="openSUSE:Factory" repository="standard"/> <bdep name="dwz" version="0.14" release="3.3" arch="x86_64" hdrmd5="0a441759744f0bde41808410dd46920c" project="openSUSE:Factory" repository="standard"/> <bdep name="librpmbuild9" version="4.17.0" release="5.1" arch="x86_64" hdrmd5="d1be1d090b007e5dd0e37765cdb064ec" project="openSUSE:Factory" repository="standard"/> <bdep name="gcc11-PIE" version="11.2.1+git1406" release="1.1" arch="x86_64" hdrmd5="0addc9c900c5b6abc63e815aef6998b3" project="openSUSE:Factory" repository="standard"/> <bdep name="rpm-build-perl" version="4.17.0" release="5.1" arch="x86_64" hdrmd5="ad6657c4a2a8f5b2603b9e8f25028831" project="openSUSE:Factory" repository="standard"/> <bdep name="rpm-build-python" version="4.17.0" release="5.1" arch="x86_64" hdrmd5="fcc2c1c97c0f920089f8f394e505bf5f" project="openSUSE:Factory" repository="standard"/> <bdep name="libfl2" version="2.6.4" release="6.16" arch="x86_64" hdrmd5="2d7d7b1d6db4f0c0ce6e881a1ac46486" project="openSUSE:Factory" repository="standard"/> <bdep name="libfreebl3" version="3.75" release="2.1" arch="x86_64" hdrmd5="532415587bce659288700f6e4dd01f43" project="openSUSE:Factory" repository="standard"/> <bdep name="libsoftokn3" version="3.75" release="2.1" arch="x86_64" hdrmd5="aa3111969ced25cfeefdb58c6ea8b300" project="openSUSE:Factory" repository="standard"/> <bdep name="pkgconf" version="1.8.0" release="1.6" arch="x86_64" hdrmd5="38064342c0ee786f5dbaab2d77011acc" project="openSUSE:Factory" repository="standard"/> <bdep name="pkgconf-m4" version="1.8.0" release="1.6" arch="noarch" hdrmd5="13bfbada4004821cb3b497344f48550a" project="openSUSE:Factory" repository="standard"/> <bdep name="crypto-policies" version="20210917.c9d86d1" release="1.5" arch="noarch" hdrmd5="f135319d71167da5d3b210232deb5d2e" project="openSUSE:Factory" repository="standard"/> <bdep name="libfipscheck1" version="1.5.0" release="4.22" arch="x86_64" hdrmd5="ba09db07e2b5aa6ba96a309f73eeed8a" project="openSUSE:Factory" repository="standard"/> <bdep name="libefivar1" version="37" release="5.4" arch="x86_64" hdrmd5="a88aa2d06acfa15b4e6664e884677365" project="openSUSE:Factory" repository="standard"/> <bdep name="sysuser-shadow" version="3.1" release="4.3" arch="noarch" hdrmd5="c0b115e7ef6e1ca77c224c130b5b77f1" project="openSUSE:Factory" repository="standard"/> <bdep name="libpython3_8-1_0" version="3.8.12" release="4.1" arch="x86_64" hdrmd5="0ae63ea8e7f0cab5fb305ad44791f4d0" project="openSUSE:Factory" repository="standard"/> <bdep name="libexpat1" version="2.4.7" release="1.1" arch="x86_64" hdrmd5="305a75aa74fd02426b1d7d9c084441cb" project="openSUSE:Factory" repository="standard"/> <bdep name="libffi8" version="3.4.2" release="1.5" arch="x86_64" hdrmd5="5bf59ee9f65238685bc17558c1716b1a" project="openSUSE:Factory" repository="standard"/> <bdep name="libmpdec3" version="2.5.1" release="2.6" arch="x86_64" hdrmd5="92ca35da51d690a7f6a2aa5cf342ce5a" project="openSUSE:Factory" repository="standard"/> <bdep name="linux-glibc-devel" version="5.16" release="1.3" arch="x86_64" hdrmd5="be48d2b421b64b89d7ca06810dc116e1" project="openSUSE:Factory" repository="standard"/> <bdep name="libxcrypt-devel" version="4.4.27" release="1.4" arch="x86_64" hdrmd5="aeb0e4eb6904be0a8c2a1c3a6e9539ff" project="openSUSE:Factory" repository="standard"/> <bdep name="libaudit1" version="3.0.6" release="2.4" arch="x86_64" hdrmd5="748459ba43401447c42aebe3f4c05230" project="openSUSE:Factory" repository="standard"/> <bdep name="libcap-ng0" version="0.7.11" release="1.5" arch="x86_64" hdrmd5="5e5d7cba858d79da6906e38d7c5a6fd7" project="openSUSE:Factory" repository="standard"/> <bdep name="libeconf0" version="0.4.4+git20220104.962774f" release="1.4" arch="x86_64" hdrmd5="5a360578979b026376c47878ab199d59" project="openSUSE:Factory" repository="standard"/> <bdep name="libutempter0" version="1.2.0" release="3.19" arch="x86_64" hdrmd5="89a94da7156b5c027bd6d54adbbd58f1" project="openSUSE:Factory" repository="standard"/> <bdep name="libfdisk1" version="2.37.4" release="1.1" arch="x86_64" hdrmd5="4ee285915e2e823ebfb75a0da4781ac1" project="openSUSE:Factory" repository="standard"/> <bdep name="system-group-hardware" version="20170617" release="24.5" arch="noarch" hdrmd5="b8768a77bbc019a8eeb4b28584e5dad2" project="openSUSE:Factory" repository="standard"/> <bdep name="gcc11" version="11.2.1+git1406" release="1.1" arch="x86_64" hdrmd5="56ccecb9331e07f94eb915024fcee1a3" project="openSUSE:Factory" repository="standard"/> <bdep name="cpp" version="11" release="5.3" arch="x86_64" hdrmd5="1fe32e6c9773209f372bb98bcb7064c8" project="openSUSE:Factory" repository="standard"/> <bdep name="libseccomp2" version="2.5.3" release="4.5" arch="x86_64" hdrmd5="0b725656146b17cc948970a672a56f87" project="openSUSE:Factory" repository="standard"/> <bdep name="libmagic1" version="5.41" release="3.1" arch="x86_64" hdrmd5="2c6f8603361a1c02d52fa04f938d1e70" project="openSUSE:Factory" repository="standard"/> <bdep name="libmpfr6" version="4.1.0" release="2.18" arch="x86_64" hdrmd5="bc8666a238457a65717b6921376d17da" project="openSUSE:Factory" repository="standard"/> <bdep name="libctf-nobfd0" version="2.38" release="3.1" arch="x86_64" hdrmd5="07473f380c3de0f90471486faad487a4" project="openSUSE:Factory" repository="standard"/> <bdep name="libctf0" version="2.38" release="3.1" arch="x86_64" hdrmd5="7fb9b915f1fdf1aec42b688a39282e15" project="openSUSE:Factory" repository="standard"/> <bdep name="update-alternatives" version="1.21.1" release="1.1" arch="x86_64" hdrmd5="915e73a57ae680984da0cd123df94f0b" project="openSUSE:Factory" repository="standard"/> <bdep name="python-rpm-macros" version="20220106.80d3756" release="1.4" arch="noarch" hdrmd5="7854af9bf015a8100a73a83a899c2051" project="openSUSE:Factory" repository="standard"/> <bdep name="system-user-root" version="20190513" release="2.3" arch="noarch" hdrmd5="39a03749e48b34a202da01c77e8a5b60" project="openSUSE:Factory" repository="standard"/> <bdep name="compat-usrmerge-tools" version="84.87" release="5.6" arch="x86_64" hdrmd5="ae62447676061124e263750ff9df3d9c" project="openSUSE:Factory" repository="standard"/> <bdep name="terminfo-base" version="6.3.20220312" release="13.1" arch="x86_64" hdrmd5="a6ec9a4cd5de63fd8fe46e0d14d8e22d" project="openSUSE:Factory" repository="standard"/> <bdep name="libsqlite3-0" version="3.38.1" release="1.1" arch="x86_64" hdrmd5="7951a90b708bd24ebccc4f6229125496" project="openSUSE:Factory" repository="standard"/> <bdep name="libpkgconf3" version="1.8.0" release="1.6" arch="x86_64" hdrmd5="49d38e1fe01c13b6f9fa860e91f47629" project="openSUSE:Factory" repository="standard"/> <bdep name="pam_unix" version="1.5.2" release="6.1" arch="x86_64" hdrmd5="22ca7432f805ff864790c548f2c65b53" project="openSUSE:Factory" repository="standard"/> <bdep name="chkstat" version="1599_20220309" release="30.1" arch="x86_64" hdrmd5="39792980d7c24b2c88b59aa6cf9ede3e" project="openSUSE:Factory" repository="standard"/> <bdep name="permissions-config" version="1599_20220309" release="30.1" arch="x86_64" hdrmd5="9cbb775b83a1b3b02e1dad5bd1ed506e" project="openSUSE:Factory" repository="standard"/> <bdep name="libmpc3" version="1.2.1" release="1.19" arch="x86_64" hdrmd5="adf662a9a3b24178be77659331e658ea" project="openSUSE:Factory" repository="standard"/> <bdep name="libisl23" version="0.24" release="1.17" arch="x86_64" hdrmd5="1aa92b29dda73463d09c5e01854ca114" project="openSUSE:Factory" repository="standard"/> <bdep name="cpp11" version="11.2.1+git1406" release="1.1" arch="x86_64" hdrmd5="efe611ceac662611d923213c4f474c51" project="openSUSE:Factory" repository="standard"/> <bdep name="libasan6" version="11.2.1+git1406" release="1.1" arch="x86_64" hdrmd5="78a48a4ee5152be155f083b88b795952" project="openSUSE:Factory" repository="standard"/> <bdep name="libatomic1" version="11.2.1+git1406" release="1.1" arch="x86_64" hdrmd5="8cc4e209b82455d6b047fd0162470ed0" project="openSUSE:Factory" repository="standard"/> <bdep name="libgomp1" version="11.2.1+git1406" release="1.1" arch="x86_64" hdrmd5="f6904901f22ee0a0e81ececaabd3f036" project="openSUSE:Factory" repository="standard"/> <bdep name="libitm1" version="11.2.1+git1406" release="1.1" arch="x86_64" hdrmd5="4ef65e57d853ee7201b462286aa5ac86" project="openSUSE:Factory" repository="standard"/> <bdep name="liblsan0" version="11.2.1+git1406" release="1.1" arch="x86_64" hdrmd5="0d115caa58f42b70e961d79476ecb5df" project="openSUSE:Factory" repository="standard"/> <bdep name="libtsan0" version="11.2.1+git1406" release="1.1" arch="x86_64" hdrmd5="97f7638b08fb75cf61407bc9bcf520a7" project="openSUSE:Factory" repository="standard"/> <bdep name="libubsan1" version="11.2.1+git1406" release="1.1" arch="x86_64" hdrmd5="3c235e5c84fe1a0770830d4ba1f1d8e6" project="openSUSE:Factory" repository="standard"/> <bdep name="file-magic" version="5.41" release="3.1" arch="noarch" hdrmd5="03ab638fc37b0bc585f3f6fcd4b7d679" project="openSUSE:Factory" repository="standard"/> <bdep name="zlib-devel" version="1.2.11" release="18.21" arch="x86_64" hdrmd5="e278aca35f9ee65910c718b22f3746de" project="openSUSE:Factory" repository="standard"/> <bdep name="gzip" version="1.11" release="2.3" arch="x86_64" hdrmd5="ecf68b3859a27667118bbcb5f4f7e418" project="openSUSE:Factory" repository="standard"/> <bdep name="mozilla-nss-certs" version="3.75" release="2.1" arch="x86_64" hdrmd5="7a0e477fe9b9c107cf3fd18c740313cf" project="openSUSE:Factory" repository="standard"/> <bdep name="shadow" version="4.11.1" release="1.3" arch="x86_64" hdrmd5="a67884c66a54842072e15452399001fe" project="openSUSE:Factory" repository="standard"/> <bdep name="libsemanage2" version="3.3" release="2.3" arch="x86_64" hdrmd5="ddff7298fba8421427e61543e7e84195" project="openSUSE:Factory" repository="standard"/> <bdep name="libsubid4" version="4.11.1" release="1.3" arch="x86_64" hdrmd5="c54c503974139c6bad7e21d55fd9e21f" project="openSUSE:Factory" repository="standard"/> <bdep name="login_defs" version="4.11.1" release="1.3" arch="noarch" hdrmd5="56fd824ca7359e37a4e4a21ef6ae82a2" project="openSUSE:Factory" repository="standard"/> <bdep name="libsepol2" version="3.3" release="1.5" arch="x86_64" hdrmd5="6d1c7b36514f433a48b9a54f00d4bf3f" project="openSUSE:Factory" repository="standard"/> <bdep name="libsemanage-conf" version="3.3" release="2.3" arch="x86_64" hdrmd5="557141c464657e83e74f3ccb96f60455" project="openSUSE:Factory" repository="standard"/> <bdep name="vim-data" notmeta="1" version="8.2.4602" release="1.1" arch="noarch" hdrmd5="13487a08e8ca29df1b060056215539f5" project="openSUSE:Factory" repository="standard"/> <bdep name="perf" notmeta="1" version="5.16.15" release="74.1" arch="x86_64" hdrmd5="afa5117a5c0eaa611f3e50f143d57038" project="openSUSE:Factory" repository="standard"/> <bdep name="gdb" notmeta="1" version="11.1" release="7.1" arch="x86_64" hdrmd5="e5e27a57eab24cd88ddc846588480987" project="openSUSE:Factory" repository="standard"/> <bdep name="vim" notmeta="1" version="8.2.4602" release="1.1" arch="x86_64" hdrmd5="abd107bdb54681b1980f0902434ce744" project="openSUSE:Factory" repository="standard"/> <bdep name="strace" notmeta="1" version="5.17" release="1.1" arch="x86_64" hdrmd5="6098f1b6618718e1130bcc1dcccc9c52" project="openSUSE:Factory" repository="standard"/> <bdep name="less" notmeta="1" version="590" release="3.5" arch="x86_64" hdrmd5="bc004e9e232fc5fca0b38091d6df828b" project="openSUSE:Factory" repository="standard"/> <bdep name="rzsz" notmeta="1" version="0.12.21~rc" release="4.7" arch="x86_64" hdrmd5="f8a60049c2fed2d545d17b2172cbe8a6" project="openSUSE:Factory" repository="standard"/> <bdep name="perl" notmeta="1" version="5.34.0" release="2.1" arch="x86_64" hdrmd5="8114b8f9675e483821a81cae72e0c442" project="openSUSE:Factory" repository="standard"/> <bdep name="build-mkbaselibs" notmeta="1" version="20220315" release="1.1" arch="noarch" hdrmd5="b30104b4d72bb0a4c95cef0ab167dec6" project="openSUSE:Factory" repository="standard"/> <bdep name="compat-usrmerge-build" notmeta="1" version="84.87" release="5.6" arch="x86_64" hdrmd5="6966df2c8af0494dbc449ac039322b81" project="openSUSE:Factory" repository="standard"/> <bdep name="build-compare" notmeta="1" version="20220307T115648.b5abdde" release="1.1" arch="noarch" hdrmd5="a87b3edca5b6ca312ffccd4fcf643c3b" project="openSUSE:Factory" repository="standard"/> <bdep name="rpmlint-mini" notmeta="1" version="2.2.0+git20220325.40598ec" release="5.6" arch="x86_64" hdrmd5="4323845f6e9d7b787c9d4eeebfc1350b" project="openSUSE:Factory" repository="standard"/> <bdep name="vim-data-common" notmeta="1" version="8.2.4602" release="1.1" arch="noarch" hdrmd5="285d7f8686fd6bce19fbe7c773aa6cb5" project="openSUSE:Factory" repository="standard"/> <bdep name="libnuma1" notmeta="1" version="2.0.14.20.g4ee5e0c" release="1.4" arch="x86_64" hdrmd5="9a118ca181d2d7d05af0abb9e406b629" project="openSUSE:Factory" repository="standard"/> <bdep name="libunwind" notmeta="1" version="1.5.0" release="1.7" arch="x86_64" hdrmd5="d99a7e55aad88d7e95c3998cf60265fb" project="openSUSE:Factory" repository="standard"/> <bdep name="libslang2" notmeta="1" version="2.3.2" release="1.11" arch="x86_64" hdrmd5="ebb6c3cd46400475a162024bc88ac5dd" project="openSUSE:Factory" repository="standard"/> <bdep name="babeltrace" notmeta="1" version="1.5.8" release="3.2" arch="x86_64" hdrmd5="b8eba9a97d665e116cc4e8264d82fb3b" project="openSUSE:Factory" repository="standard"/> <bdep name="libtraceevent1" notmeta="1" version="1.5.0" release="3.1" arch="x86_64" hdrmd5="e3019009f1ecc03f7cc37617c02d51b6" project="openSUSE:Factory" repository="standard"/> <bdep name="libopencsd_c_api1" notmeta="1" version="1.2.0" release="1.3" arch="x86_64" hdrmd5="5d9aeeb60b9815070245a6fa82f86735" project="openSUSE:Factory" repository="standard"/> <bdep name="libsource-highlight4" notmeta="1" version="3.1.9" release="4.3" arch="x86_64" hdrmd5="8ee5aef24fb33430c2dfd0dcfc697030" project="openSUSE:Factory" repository="standard"/> <bdep name="alts" notmeta="1" version="1.2+3.b848aad" release="2.3" arch="x86_64" hdrmd5="f6077cb4370bd068b799ed9e51e9ca08" project="openSUSE:Factory" repository="standard"/> <bdep name="ncurses-utils" notmeta="1" version="6.3.20220312" release="13.1" arch="x86_64" hdrmd5="8d6ed6af84a0684832a2a8f2e3bf9b42" project="openSUSE:Factory" repository="standard"/> <bdep name="libgdbm6" notmeta="1" version="1.23" release="1.4" arch="x86_64" hdrmd5="063235da4b158151cfbfb2ce11bbd4e1" project="openSUSE:Factory" repository="standard"/> <bdep name="libgdbm_compat4" notmeta="1" version="1.23" release="1.4" arch="x86_64" hdrmd5="01a0e4fd430e70c578a6981c6e625fbe" project="openSUSE:Factory" repository="standard"/> <bdep name="polkit-default-privs" notmeta="1" version="1550+20220325.163dbdf" release="1.1" arch="noarch" hdrmd5="dcb31ba3772d779555f0412ef6c2bc9e" project="openSUSE:Factory" repository="standard"/> <bdep name="libglib-2_0-0" notmeta="1" version="2.72.0" release="1.1" arch="x86_64" hdrmd5="52f770c8f2e2e4ba3ac786752584a958" project="openSUSE:Factory" repository="standard"/> <bdep name="libgmodule-2_0-0" notmeta="1" version="2.72.0" release="1.1" arch="x86_64" hdrmd5="c5d6acc0964bd0f21b8aea06916dbad4" project="openSUSE:Factory" repository="standard"/> <bdep name="libopencsd1" notmeta="1" version="1.2.0" release="1.3" arch="x86_64" hdrmd5="260634084d0c9e3776690b63cd5b2a8b" project="openSUSE:Factory" repository="standard"/> <bdep name="libalternatives1" notmeta="1" version="1.2+3.b848aad" release="2.3" arch="x86_64" hdrmd5="5722007c3b3b96805950c7515ca09796" project="openSUSE:Factory" repository="standard"/> <bdep name="libdebuginfod1" notmeta="1" version="0.186" release="2.1" arch="x86_64" hdrmd5="99fddeecd4032a66c569548f57885a36" project="openSUSE:Factory" repository="standard"/> <bdep name="libcurl4" notmeta="1" version="7.82.0" release="1.1" arch="x86_64" hdrmd5="eaf7c53407f280f1a80a67ee00586e8f" project="openSUSE:Factory" repository="standard"/> <bdep name="libldap-2_4-2" notmeta="1" version="2.4.59" release="71.3" arch="x86_64" hdrmd5="af279f678b0d596402215487cafc68f9" project="openSUSE:Factory" repository="standard"/> <bdep name="libbrotlidec1" notmeta="1" version="1.0.9" release="1.7" arch="x86_64" hdrmd5="a5cc02ce509169501bb32dda4b8a1da4" project="openSUSE:Factory" repository="standard"/> <bdep name="libssh4" notmeta="1" version="0.9.6" release="3.2" arch="x86_64" hdrmd5="cde6ac920fb9cbed28f964291c9c36b4" project="openSUSE:Factory" repository="standard"/> <bdep name="libidn2-0" notmeta="1" version="2.3.2" release="1.4" arch="x86_64" hdrmd5="97e12d2aa26f24d1ba346036d495f832" project="openSUSE:Factory" repository="standard"/> <bdep name="libnghttp2-14" notmeta="1" version="1.47.0" release="1.1" arch="x86_64" hdrmd5="f8f859a77e74b378f899f5825c6b098b" project="openSUSE:Factory" repository="standard"/> <bdep name="libpsl5" notmeta="1" version="0.21.1" release="1.9" arch="x86_64" hdrmd5="8d15631c26c8c3179666eb42ccde930d" project="openSUSE:Factory" repository="standard"/> <bdep name="libsasl2-3" notmeta="1" version="2.1.28" release="1.1" arch="x86_64" hdrmd5="466872aaf42a614c2438042476fd656b" project="openSUSE:Factory" repository="standard"/> <bdep name="libbrotlicommon1" notmeta="1" version="1.0.9" release="1.7" arch="x86_64" hdrmd5="01b930d336d75ca894ce759d237314e6" project="openSUSE:Factory" repository="standard"/> <bdep name="libssh-config" notmeta="1" version="0.9.6" release="3.2" arch="x86_64" hdrmd5="c8c663d89d8a55339a303aab86c767c1" project="openSUSE:Factory" repository="standard"/> <bdep name="libunistring2" notmeta="1" version="0.9.10" release="2.13" arch="x86_64" hdrmd5="b0b60cca6566d5ee3a1f820d9110de16" project="openSUSE:Factory" repository="standard"/> <bdep name="krb5-mini" notmeta="1" version="1.19.2" release="4.3" arch="x86_64" hdrmd5="bf78426085475e1f81875ce783aae020" project="openSUSE:Factory" repository="standard"/> <bdep name="libcom_err2" notmeta="1" version="1.46.5" release="1.3" arch="x86_64" hdrmd5="6ce49fe157cbf451950ed472901feef2" project="openSUSE:Factory" repository="standard"/> <bdep name="libkeyutils1" notmeta="1" version="1.6.3" release="3.6" arch="x86_64" hdrmd5="61902d5722044471acd90e39e45a8724" project="openSUSE:Factory" repository="standard"/> <bdep name="libverto1" notmeta="1" version="0.3.1" release="1.20" arch="x86_64" hdrmd5="eea0a3adade656d295b807214a57d00d" project="openSUSE:Factory" repository="standard"/> <bdep name="lua54" notmeta="1" version="5.4.4" release="2.1" arch="x86_64" hdrmd5="0511c75d07c18184f3dac4737fed3de2" project="openSUSE:Factory" repository="standard"/> <path project="Kernel:stable" repository="standard" url="https://download.opensuse.org/repositories/Kernel:/stable/standard/"/> <path project="openSUSE:Factory" repository="standard" url="http://download.opensuse.org/tumbleweed/repo/oss/"/> </buildinfo> ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:01.305046672 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:01.309046626 +0200 @@ -45,6 +45,7 @@ <size unit="G">8</size> </disk> </hardware> + <hostlabel exclude="true">SLOW_DISK</hostlabel> </overwrite> <!-- 4GB for kernel-docs --> ++++++ arch-symbols ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:01.329046401 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:01.333046356 +0200 @@ -2,7 +2,7 @@ ############################################################################# # Copyright (c) 2003-2005,2009 Novell, Inc. -# All Rights Reserved. +# Copyright (c) 2010-2022 SUSE LLC # # This program is free software; you can redistribute it and/or # modify it under the terms of version 2 of the GNU General Public License as @@ -14,12 +14,11 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, contact Novell, Inc. +# along with this program; if not, contact https://www.suse.com/source-code/ # -# To contact Novell about this file by physical or electronic mail, -# you may find current contact information at www.novell.com ############################################################################# + # With --list, list all known architectures, otherwise print the generic # name for this architecture (or the one specified on command line). @@ -32,7 +31,7 @@ if [ -n "$1" ]; then ARCH="$1" else - ARCH="`arch`" + ARCH="$(arch)" fi case "$ARCH" in # from rpm --eval '%ix86' ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:01.409045498 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:01.409045498 +0200 @@ -1,5 +1,5 @@ # The version of the main tarball to use -SRCVERSION=5.16 +SRCVERSION=5.17 # variant of the kernel-source package, either empty or "-rt" VARIANT= # enable kernel module compression ++++++ config.tar.bz2 ++++++ ++++ 7676 lines of diff (skipped) ++++++ constraints.in ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:01.753041618 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:01.757041574 +0200 @@ -38,6 +38,7 @@ <size unit="G">8</size> </disk> </hardware> + <hostlabel exclude="true">SLOW_DISK</hostlabel> </overwrite> <!-- 4GB for kernel-docs --> ++++++ dtb.spec.in.in ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:01.785041257 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:01.789041213 +0200 @@ -65,9 +65,9 @@ %build source=linux-%srcversion cp $source/COPYING . -SRCDIR=`pwd`/$source +SRCDIR=$PWD/$source mkdir pp -PPDIR=`pwd`/pp +PPDIR=$PWD/pp export DTC_FLAGS="-R 4 -p 0x1000" %if 0%{?dtc_symbols} DTC_FLAGS="$DTC_FLAGS -@" ++++++ guards ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:01.809040987 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:01.813040942 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/perl -w -############################################################################# +############################################################################## # Copyright (c) 2003-2007,2009 Novell, Inc. -# All Rights Reserved. +# Copyright (c) 2010-2022 SUSE LLC # # This program is free software; you can redistribute it and/or # modify it under the terms of version 2 of the GNU General Public License as @@ -13,10 +13,8 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, contact Novell, Inc. +# along with this program; if not, contact https://www.suse.com/source-code/ # -# To contact Novell about this file by physical or electronic mail, -# you may find current contact information at www.novell.com ############################################################################# # # Guards: ++++++ kernel-binary.spec.in ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:01.857040446 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:01.861040401 +0200 @@ -114,6 +114,9 @@ Release: @RELEASE@ %endif URL: https://www.kernel.org/ +%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150300 +BuildRequires: bash-sh +%endif BuildRequires: bc BuildRequires: bison BuildRequires: coreutils @@ -786,7 +789,7 @@ # pointless to rely on its contents. Replacing by zeros to make the # checksums always the same for several builds of the same package. test -s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep && \ - dd if=/dev/zero of=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep ibs=`stat -c%s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep` count=1 + dd if=/dev/zero of=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep ibs=$(stat -c%s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep) count=1 res=0 if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then @@ -1060,14 +1063,14 @@ %endif %preun %if "%build_flavor" != "zfcpdump" -/usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %endif %postun %if "%build_flavor" != "zfcpdump" -/usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1124,13 +1127,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun extra -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-extra" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-extra" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun extra -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-extra" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-extra" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1188,13 +1191,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun optional -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-optional" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-optional" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun optional -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-optional" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-optional" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1355,13 +1358,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n @KMP_NAME@-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "@KMP_NAME@-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "@KMP_NAME@-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n @KMP_NAME@-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "@KMP_NAME@-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "@KMP_NAME@-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" ++++++ kernel-cert-subpackage ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:01.881040175 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:01.885040130 +0200 @@ -7,6 +7,15 @@ This package contains the UEFI Secure Boot certificate used to sign modules in the %{-n*}-kmp packages. +%define run_if_exists run_if_exists() { \ +if [ -x "$1" ] ; then \ + "$@" \ +else \ + echo Cannot execute "$1" >&2 \ +fi \ +} \ +run_if_exists + %pre -n %{-n*}-ueficert /usr/lib/module-init-tools/kernel-scriptlets/cert-pre --certs "@CERTS@" "$@" @@ -14,10 +23,10 @@ /usr/lib/module-init-tools/kernel-scriptlets/cert-post --certs "@CERTS@" "$@" %preun -n %{-n*}-ueficert -/usr/lib/module-init-tools/kernel-scriptlets/cert-preun --certs "@CERTS@" "$@" +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/cert-preun --certs "@CERTS@" "$@" %postun -n %{-n*}-ueficert -/usr/lib/module-init-tools/kernel-scriptlets/cert-postun --certs "@CERTS@" "$@" +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/cert-postun --certs "@CERTS@" "$@" %posttrans -n %{-n*}-ueficert /usr/lib/module-init-tools/kernel-scriptlets/cert-posttrans --certs "@CERTS@" "$@" ++++++ kernel-docs.spec.in ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:01.921039723 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:01.929039634 +0200 @@ -37,6 +37,9 @@ %else Release: @RELEASE@ %endif +%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150300 +BuildRequires: bash-sh +%endif # TW (4.13 or later) no longer needs xmlto %if 0%{?sle_version} BuildRequires: xmlto ++++++ kernel-module-subpackage ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:01.953039363 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:01.957039318 +0200 @@ -48,6 +48,16 @@ Obsoletes: %{-n*}-kmp-desktop %endif AutoReqProv: on + +%define run_if_exists run_if_exists() { \ +if [ -x "$1" ] ; then \ + "$@" \ +else \ + echo Cannot execute "$1" >&2 \ +fi \ +} \ +run_if_exists + %{-p:%{expand:%(cd %_sourcedir; cat %{-p*})}} %description -n %{-n*}-kmp-%1 %( @@ -80,11 +90,11 @@ --version "%_this_kmp_version" --release "%{-r*}" --kernelrelease "%2" \ --flavor "%1" --usrmerged "0%{?usrmerged}" "$@" %preun -n %{-n*}-kmp-%1 -%{-b:KMP_NEEDS_MKINITRD=1} /usr/lib/module-init-tools/kernel-scriptlets/kmp-preun --name "%{-n*}-kmp-%1" \ +%{-b:KMP_NEEDS_MKINITRD=1} %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/kmp-preun --name "%{-n*}-kmp-%1" \ --version "%_this_kmp_version" --release "%{-r*}" --kernelrelease "%2" \ --flavor "%1" --usrmerged "0%{?usrmerged}" "$@" %postun -n %{-n*}-kmp-%1 -%{-b:KMP_NEEDS_MKINITRD=1} /usr/lib/module-init-tools/kernel-scriptlets/kmp-postun --name "%{-n*}-kmp-%1" \ +%{-b:KMP_NEEDS_MKINITRD=1} %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/kmp-postun --name "%{-n*}-kmp-%1" \ --version "%_this_kmp_version" --release "%{-r*}" --kernelrelease "%2" \ --flavor "%1" --usrmerged "0%{?usrmerged}" "$@" %posttrans -n %{-n*}-kmp-%1 ++++++ kernel-obs-build.spec.in ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:01.981039047 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:01.985039002 +0200 @@ -157,7 +157,7 @@ %if 0%{?suse_version} > 1550 || 0%{?sle_version} > 150200 --compress "zstd -19 -T0" \ %endif - `echo /boot/%{kernel_name}-*%{kernel_flavor} | sed -n -e 's,[^-]*-\(.*'%{kernel_flavor}'\),\1,p'` + $(echo /boot/%{kernel_name}-*%{kernel_flavor} | sed -n -e 's,[^-]*-\(.*'%{kernel_flavor}'\),\1,p') %endif #cleanup ++++++ kernel-source.spec.in ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:02.037038415 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:02.037038415 +0200 @@ -42,6 +42,9 @@ Group: Development/Sources URL: https://www.kernel.org/ AutoReqProv: off +%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150300 +BuildRequires: bash-sh +%endif BuildRequires: coreutils BuildRequires: fdupes BuildRequires: sed @@ -102,7 +105,6 @@ Source83: kernel-subpackage-build Source84: kernel-subpackage-spec Source85: kernel-default-base.spec.txt -Source86: fdupes_relink Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -226,6 +228,8 @@ cd linux-%kernelrelease-vanilla %_sourcedir/apply-patches --vanilla %_sourcedir/series.conf %my_builddir %symbols rm -f $(find . -name ".gitignore") +# Hardlink duplicate files automatically (from package fdupes). +%fdupes $PWD cd .. %endif @@ -237,11 +241,10 @@ if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion fi +# Hardlink duplicate files automatically (from package fdupes). +%fdupes $PWD cd .. %endif - -# Hardlink duplicate files. -fdupes -q -p -n -H -o name -r %{buildroot} | %_sourcedir/fdupes_relink popd %if ! %vanilla_only ++++++ kernel-spec-macros ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:02.061038145 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:02.061038145 +0200 @@ -72,5 +72,15 @@ %define kernel_module_directory /lib/modules %endif +# Very basic macro for conditional execution. +%define run_if_exists run_if_exists() { \ +if [ -x "$1" ] ; then \ + "$@" \ +else \ + echo Cannot execute "$1" >&2 \ +fi \ +} \ +run_if_exists + # vim: ft=spec ++++++ linux-5.16.tar.xz -> linux-5.17.tar.xz ++++++ /work/SRC/openSUSE:Factory/kernel-source/linux-5.16.tar.xz /work/SRC/openSUSE:Factory/.kernel-source.new.1900/linux-5.17.tar.xz differ: char 13, line 1 ++++++ macros.kernel-source ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:02.157037062 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:02.161037016 +0200 @@ -1,6 +1,13 @@ # A few cross-distro definitions: +%kernel_build_shell_package %{lua: \ +if ((tonumber(rpm.expand("0%{?suse_version}")) > 1500) or (tonumber(rpm.expand("0%{?sle_version}")) > 150300)) then \ + print( "bash-sh" ) \ +else \ + print( "" ) \ +end \ +} %kernel_module_package_release 1 -%kernel_module_package_buildreqs modutils kernel-syms kmod-compat +%kernel_module_package_buildreqs modutils kernel-syms kmod-compat %kernel_build_shell_package %cpu_arch %(case %_target_cpu in \ # from rpm --eval '%ix86' \ ++++++ patches.kernel.org.tar.bz2 ++++++ ++++ 218239 lines of diff (skipped) ++++++ patches.rpmify.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/BTF-Don-t-break-ABI-when-debuginfo-is-disabled.patch new/patches.rpmify/BTF-Don-t-break-ABI-when-debuginfo-is-disabled.patch --- old/patches.rpmify/BTF-Don-t-break-ABI-when-debuginfo-is-disabled.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rpmify/BTF-Don-t-break-ABI-when-debuginfo-is-disabled.patch 2022-02-15 21:03:03.000000000 +0100 @@ -0,0 +1,35 @@ +From 3ade2c9958731789f7ec4ff4e71f1d058d041c5d Mon Sep 17 00:00:00 2001 +From: Michal Suchanek <msuchanek@suse.de> +Date: Fri, 11 Feb 2022 18:25:37 +0100 +Subject: [PATCH] BTF: Don't break ABI when debuginfo is disabled. + +Patch-mainline: Never, SUSE-specific +References: jsc#SLE-18805 + +Disabling BTF removes a member from struct modinfo breaking ABI all over +the place. We expect that disabling debuginfo builds the same kernel but +with BTF disabling debuginfo also disables BTF causing this brekage. + +Simply include the BTF member in struct modinfo always. + +Signed-off-by: Michal Suchanek <msuchanek@suse.de> +--- + include/linux/module.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/linux/module.h b/include/linux/module.h +index 12d310f7c0fc..8e2ed15b5d24 100644 +--- a/include/linux/module.h ++++ b/include/linux/module.h +@@ -470,7 +470,7 @@ struct module { + unsigned int num_bpf_raw_events; + struct bpf_raw_event_map *bpf_raw_events; + #endif +-#ifdef CONFIG_DEBUG_INFO_BTF_MODULES ++#if 1 + unsigned int btf_data_size; + void *btf_data; + #endif +-- +2.31.1 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/powerpc-64-BE-option-to-use-ELFv2-ABI-for-big-endian.patch new/patches.rpmify/powerpc-64-BE-option-to-use-ELFv2-ABI-for-big-endian.patch --- old/patches.rpmify/powerpc-64-BE-option-to-use-ELFv2-ABI-for-big-endian.patch 2021-09-26 23:30:32.000000000 +0200 +++ new/patches.rpmify/powerpc-64-BE-option-to-use-ELFv2-ABI-for-big-endian.patch 2022-02-15 21:03:03.000000000 +0100 @@ -24,14 +24,14 @@ --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig -@@ -163,6 +163,7 @@ config PPC +@@ -164,6 +164,7 @@ config PPC select ARCH_WEAK_RELEASE_ACQUIRE select BINFMT_ELF select BUILDTIME_TABLE_SORT + select BUILD_ELF_V2 if PPC64 && CPU_LITTLE_ENDIAN select CLONE_BACKWARDS + select CPUMASK_OFFSTACK if NR_CPUS >= 8192 select DCACHE_WORD_ACCESS if PPC64 && CPU_LITTLE_ENDIAN - select DMA_OPS_BYPASS if PPC64 @@ -561,6 +562,24 @@ config KEXEC_FILE config ARCH_HAS_KEXEC_PURGATORY def_bool KEXEC_FILE @@ -59,7 +59,7 @@ depends on PPC64 || (FLATMEM && (44x || FSL_BOOKE)) --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile -@@ -91,10 +91,14 @@ endif +@@ -89,10 +89,14 @@ endif ifdef CONFIG_PPC64 ifndef CONFIG_CC_IS_CLANG @@ -78,7 +78,7 @@ endif endif -@@ -142,7 +146,7 @@ endif +@@ -141,7 +145,7 @@ endif CFLAGS-$(CONFIG_PPC64) := $(call cc-option,-mtraceback=no) ifndef CONFIG_CC_IS_CLANG @@ -87,7 +87,7 @@ CFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mabi=elfv2,$(call cc-option,-mcall-aixdesc)) AFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mabi=elfv2) else -@@ -151,6 +155,7 @@ CFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mcall-aixdesc) +@@ -150,6 +154,7 @@ CFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mcall-aixdesc) AFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mabi=elfv1) endif endif @@ -97,7 +97,7 @@ --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile -@@ -46,6 +46,10 @@ endif +@@ -45,6 +45,10 @@ endif BOOTCFLAGS += -isystem $(shell $(BOOTCC) -print-file-name=include) ++++++ patches.suse.tar.bz2 ++++++ ++++ 2992 lines of diff (skipped) ++++++ series.conf ++++++ ++++ 2550 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kernel-source/series.conf ++++ and /work/SRC/openSUSE:Factory/.kernel-source.new.1900/series.conf ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:03.065026820 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:03.065026820 +0200 @@ -1,4 +1,4 @@ -2022-03-16 23:33:05 +0000 -GIT Revision: d8f0e4059e0e053d843c5cb54700bdc033e4c284 +2022-03-31 05:28:33 +0000 +GIT Revision: 58205bc0990184a0cddf884ee828b9f8bc9290bb GIT Branch: stable ++++++ try-disable-staging-driver ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:03.117026233 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:03.117026233 +0200 @@ -2,7 +2,7 @@ ############################################################################# # Copyright (c) 2011 Novell, Inc. -# All Rights Reserved. +# Copyright (c) 2012-2022 SUSE LLC # # This program is free software; you can redistribute it and/or # modify it under the terms of version 2 of the GNU General Public License as @@ -14,10 +14,8 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, contact Novell, Inc. +# along with this program; if not, contact https://www.suse.com/source-code/ # -# To contact Novell about this file by physical or electronic mail, -# you may find current contact information at www.novell.com #############################################################################