From 7e370e12671d122df4bab68925e843858e1b9010f92d007cb997d63cd279c3a6 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Tue, 22 Mar 2022 06:11:57 +0000 Subject: [PATCH] commit 37738df2e7d572e123b9a4fa6e8b55a8dfd2ad62 OBS-URL: https://build.opensuse.org/package/show/Kernel:stable/kernel-source?expand=0&rev=1695 --- dtb-aarch64.changes | 27 ++++++++++++++++++++++++ dtb-aarch64.spec | 2 +- dtb-armv6l.changes | 27 ++++++++++++++++++++++++ dtb-armv6l.spec | 2 +- dtb-armv7l.changes | 27 ++++++++++++++++++++++++ dtb-armv7l.spec | 2 +- dtb-riscv64.changes | 27 ++++++++++++++++++++++++ dtb-riscv64.spec | 2 +- kernel-64kb.changes | 27 ++++++++++++++++++++++++ kernel-64kb.spec | 44 ++++++++++++++++++++-------------------- kernel-binary.spec.in | 16 +++++++-------- kernel-cert-subpackage | 13 ++++++++++-- kernel-debug.changes | 27 ++++++++++++++++++++++++ kernel-debug.spec | 44 ++++++++++++++++++++-------------------- kernel-default.changes | 27 ++++++++++++++++++++++++ kernel-default.spec | 44 ++++++++++++++++++++-------------------- kernel-docs.changes | 27 ++++++++++++++++++++++++ kernel-docs.spec | 4 ++-- kernel-kvmsmall.changes | 27 ++++++++++++++++++++++++ kernel-kvmsmall.spec | 44 ++++++++++++++++++++-------------------- kernel-lpae.changes | 27 ++++++++++++++++++++++++ kernel-lpae.spec | 44 ++++++++++++++++++++-------------------- kernel-module-subpackage | 14 +++++++++++-- kernel-obs-build.changes | 27 ++++++++++++++++++++++++ kernel-obs-build.spec | 4 ++-- kernel-obs-qa.changes | 27 ++++++++++++++++++++++++ kernel-obs-qa.spec | 2 +- kernel-pae.changes | 27 ++++++++++++++++++++++++ kernel-pae.spec | 44 ++++++++++++++++++++-------------------- kernel-source.changes | 27 ++++++++++++++++++++++++ kernel-source.spec | 4 ++-- kernel-spec-macros | 10 +++++++++ kernel-syms.changes | 27 ++++++++++++++++++++++++ kernel-syms.spec | 4 ++-- kernel-vanilla.changes | 27 ++++++++++++++++++++++++ kernel-vanilla.spec | 44 ++++++++++++++++++++-------------------- kernel-zfcpdump.changes | 27 ++++++++++++++++++++++++ kernel-zfcpdump.spec | 44 ++++++++++++++++++++-------------------- macros.kernel-source | 8 +++++++- source-timestamp | 4 ++-- 40 files changed, 698 insertions(+), 204 deletions(-) diff --git a/dtb-aarch64.changes b/dtb-aarch64.changes index 87ac523e..cb9b6bb9 100644 --- a/dtb-aarch64.changes +++ b/dtb-aarch64.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +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 @@ -323,6 +337,19 @@ Wed Mar 16 19:29:49 CET 2022 - ailiop@suse.com - config: enable XFS_RT (bsc#1197190) - commit d8f0e40 +------------------------------------------------------------------- +Wed Mar 16 17:55:51 CET 2022 - msuchanek@suse.de + +- rpm: Run external scriptlets on uninstall only when available + (bsc#1196514 bsc#1196114 bsc#1196942). + When dependency cycles are encountered package dependencies may not be + fulfilled during zypper transaction at the time scriptlets are run. + This is a problem for kernel scriptlets provided by suse-module-tools + when migrating to a SLE release that provides these scriptlets only as + part of LTSS. The suse-module-tools that provides kernel scriptlets may + be removed early causing migration to fail. +- commit ab8dd2d + ------------------------------------------------------------------- Wed Mar 16 11:10:48 CET 2022 - msuchanek@suse.de diff --git a/dtb-aarch64.spec b/dtb-aarch64.spec index 48f0307e..8ba93b67 100644 --- a/dtb-aarch64.spec +++ b/dtb-aarch64.spec @@ -31,7 +31,7 @@ Name: dtb-aarch64 Version: 5.17.0 %if 0%{?is_kotd} -Release: .gd0cec50 +Release: .g37738df %else Release: 0 %endif diff --git a/dtb-armv6l.changes b/dtb-armv6l.changes index 87ac523e..cb9b6bb9 100644 --- a/dtb-armv6l.changes +++ b/dtb-armv6l.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +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 @@ -323,6 +337,19 @@ Wed Mar 16 19:29:49 CET 2022 - ailiop@suse.com - config: enable XFS_RT (bsc#1197190) - commit d8f0e40 +------------------------------------------------------------------- +Wed Mar 16 17:55:51 CET 2022 - msuchanek@suse.de + +- rpm: Run external scriptlets on uninstall only when available + (bsc#1196514 bsc#1196114 bsc#1196942). + When dependency cycles are encountered package dependencies may not be + fulfilled during zypper transaction at the time scriptlets are run. + This is a problem for kernel scriptlets provided by suse-module-tools + when migrating to a SLE release that provides these scriptlets only as + part of LTSS. The suse-module-tools that provides kernel scriptlets may + be removed early causing migration to fail. +- commit ab8dd2d + ------------------------------------------------------------------- Wed Mar 16 11:10:48 CET 2022 - msuchanek@suse.de diff --git a/dtb-armv6l.spec b/dtb-armv6l.spec index dd4eecfb..8e20d258 100644 --- a/dtb-armv6l.spec +++ b/dtb-armv6l.spec @@ -31,7 +31,7 @@ Name: dtb-armv6l Version: 5.17.0 %if 0%{?is_kotd} -Release: .gd0cec50 +Release: .g37738df %else Release: 0 %endif diff --git a/dtb-armv7l.changes b/dtb-armv7l.changes index 87ac523e..cb9b6bb9 100644 --- a/dtb-armv7l.changes +++ b/dtb-armv7l.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +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 @@ -323,6 +337,19 @@ Wed Mar 16 19:29:49 CET 2022 - ailiop@suse.com - config: enable XFS_RT (bsc#1197190) - commit d8f0e40 +------------------------------------------------------------------- +Wed Mar 16 17:55:51 CET 2022 - msuchanek@suse.de + +- rpm: Run external scriptlets on uninstall only when available + (bsc#1196514 bsc#1196114 bsc#1196942). + When dependency cycles are encountered package dependencies may not be + fulfilled during zypper transaction at the time scriptlets are run. + This is a problem for kernel scriptlets provided by suse-module-tools + when migrating to a SLE release that provides these scriptlets only as + part of LTSS. The suse-module-tools that provides kernel scriptlets may + be removed early causing migration to fail. +- commit ab8dd2d + ------------------------------------------------------------------- Wed Mar 16 11:10:48 CET 2022 - msuchanek@suse.de diff --git a/dtb-armv7l.spec b/dtb-armv7l.spec index 5cf1a154..6ad4780f 100644 --- a/dtb-armv7l.spec +++ b/dtb-armv7l.spec @@ -31,7 +31,7 @@ Name: dtb-armv7l Version: 5.17.0 %if 0%{?is_kotd} -Release: .gd0cec50 +Release: .g37738df %else Release: 0 %endif diff --git a/dtb-riscv64.changes b/dtb-riscv64.changes index 87ac523e..cb9b6bb9 100644 --- a/dtb-riscv64.changes +++ b/dtb-riscv64.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +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 @@ -323,6 +337,19 @@ Wed Mar 16 19:29:49 CET 2022 - ailiop@suse.com - config: enable XFS_RT (bsc#1197190) - commit d8f0e40 +------------------------------------------------------------------- +Wed Mar 16 17:55:51 CET 2022 - msuchanek@suse.de + +- rpm: Run external scriptlets on uninstall only when available + (bsc#1196514 bsc#1196114 bsc#1196942). + When dependency cycles are encountered package dependencies may not be + fulfilled during zypper transaction at the time scriptlets are run. + This is a problem for kernel scriptlets provided by suse-module-tools + when migrating to a SLE release that provides these scriptlets only as + part of LTSS. The suse-module-tools that provides kernel scriptlets may + be removed early causing migration to fail. +- commit ab8dd2d + ------------------------------------------------------------------- Wed Mar 16 11:10:48 CET 2022 - msuchanek@suse.de diff --git a/dtb-riscv64.spec b/dtb-riscv64.spec index 0cd7fbff..4489e27d 100644 --- a/dtb-riscv64.spec +++ b/dtb-riscv64.spec @@ -31,7 +31,7 @@ Name: dtb-riscv64 Version: 5.17.0 %if 0%{?is_kotd} -Release: .gd0cec50 +Release: .g37738df %else Release: 0 %endif diff --git a/kernel-64kb.changes b/kernel-64kb.changes index 87ac523e..cb9b6bb9 100644 --- a/kernel-64kb.changes +++ b/kernel-64kb.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +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 @@ -323,6 +337,19 @@ Wed Mar 16 19:29:49 CET 2022 - ailiop@suse.com - config: enable XFS_RT (bsc#1197190) - commit d8f0e40 +------------------------------------------------------------------- +Wed Mar 16 17:55:51 CET 2022 - msuchanek@suse.de + +- rpm: Run external scriptlets on uninstall only when available + (bsc#1196514 bsc#1196114 bsc#1196942). + When dependency cycles are encountered package dependencies may not be + fulfilled during zypper transaction at the time scriptlets are run. + This is a problem for kernel scriptlets provided by suse-module-tools + when migrating to a SLE release that provides these scriptlets only as + part of LTSS. The suse-module-tools that provides kernel scriptlets may + be removed early causing migration to fail. +- commit ab8dd2d + ------------------------------------------------------------------- Wed Mar 16 11:10:48 CET 2022 - msuchanek@suse.de diff --git a/kernel-64kb.spec b/kernel-64kb.spec index 71c30f84..fc9acf85 100644 --- a/kernel-64kb.spec +++ b/kernel-64kb.spec @@ -109,7 +109,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 5.17.0 %if 0%{?is_kotd} -Release: .gd0cec50 +Release: .g37738df %else Release: 0 %endif @@ -234,10 +234,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-d0cec50d019c853336e26f5ff5df5a4c9c3ea120 -Provides: kernel-srchash-d0cec50d019c853336e26f5ff5df5a4c9c3ea120 +Provides: kernel-%build_flavor-base-srchash-37738df2e7d572e123b9a4fa6e8b55a8dfd2ad62 +Provides: kernel-srchash-37738df2e7d572e123b9a4fa6e8b55a8dfd2ad62 # END COMMON DEPS -Provides: %name-srchash-d0cec50d019c853336e26f5ff5df5a4c9c3ea120 +Provides: %name-srchash-37738df2e7d572e123b9a4fa6e8b55a8dfd2ad62 %obsolete_rebuilds %name Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc @@ -1194,14 +1194,14 @@ fi %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" "$@" @@ -1260,13 +1260,13 @@ This package contains additional modules not supported by SUSE. --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" "$@" @@ -1326,13 +1326,13 @@ This package contains optional modules only for openSUSE Leap. --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" "$@" @@ -1493,13 +1493,13 @@ nodes in the cluster can access the MD devices simultaneously. --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" "$@" @@ -1540,13 +1540,13 @@ shared resources over the cluster. --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" "$@" @@ -1587,13 +1587,13 @@ GFS2 is Global Filesystem, a shared device filesystem. --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" "$@" @@ -1649,13 +1649,13 @@ environments, they are not intended to be run on production systems. --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" "$@" @@ -1697,13 +1697,13 @@ accessible simultaneously from multiple nodes of a cluster. --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" "$@" @@ -1744,13 +1744,13 @@ provides the reiserfs module for the installation system. --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" "$@" diff --git a/kernel-binary.spec.in b/kernel-binary.spec.in index 9416d216..83c4d2d7 100644 --- a/kernel-binary.spec.in +++ b/kernel-binary.spec.in @@ -1063,14 +1063,14 @@ fi %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" "$@" @@ -1127,13 +1127,13 @@ This package contains additional modules not supported by SUSE. --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" "$@" @@ -1191,13 +1191,13 @@ This package contains optional modules only for openSUSE Leap. --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" "$@" @@ -1358,13 +1358,13 @@ Requires(post): suse-module-tools >= 12.4 --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" "$@" diff --git a/kernel-cert-subpackage b/kernel-cert-subpackage index 4c1e832c..a2495f5f 100644 --- a/kernel-cert-subpackage +++ b/kernel-cert-subpackage @@ -7,6 +7,15 @@ Requires(postun): suse-kernel-rpm-scriptlets 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 @@ modules in the %{-n*}-kmp packages. /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@" "$@" diff --git a/kernel-debug.changes b/kernel-debug.changes index 87ac523e..cb9b6bb9 100644 --- a/kernel-debug.changes +++ b/kernel-debug.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +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 @@ -323,6 +337,19 @@ Wed Mar 16 19:29:49 CET 2022 - ailiop@suse.com - config: enable XFS_RT (bsc#1197190) - commit d8f0e40 +------------------------------------------------------------------- +Wed Mar 16 17:55:51 CET 2022 - msuchanek@suse.de + +- rpm: Run external scriptlets on uninstall only when available + (bsc#1196514 bsc#1196114 bsc#1196942). + When dependency cycles are encountered package dependencies may not be + fulfilled during zypper transaction at the time scriptlets are run. + This is a problem for kernel scriptlets provided by suse-module-tools + when migrating to a SLE release that provides these scriptlets only as + part of LTSS. The suse-module-tools that provides kernel scriptlets may + be removed early causing migration to fail. +- commit ab8dd2d + ------------------------------------------------------------------- Wed Mar 16 11:10:48 CET 2022 - msuchanek@suse.de diff --git a/kernel-debug.spec b/kernel-debug.spec index f22605da..d886c3a2 100644 --- a/kernel-debug.spec +++ b/kernel-debug.spec @@ -109,7 +109,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 5.17.0 %if 0%{?is_kotd} -Release: .gd0cec50 +Release: .g37738df %else Release: 0 %endif @@ -234,10 +234,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-d0cec50d019c853336e26f5ff5df5a4c9c3ea120 -Provides: kernel-srchash-d0cec50d019c853336e26f5ff5df5a4c9c3ea120 +Provides: kernel-%build_flavor-base-srchash-37738df2e7d572e123b9a4fa6e8b55a8dfd2ad62 +Provides: kernel-srchash-37738df2e7d572e123b9a4fa6e8b55a8dfd2ad62 # END COMMON DEPS -Provides: %name-srchash-d0cec50d019c853336e26f5ff5df5a4c9c3ea120 +Provides: %name-srchash-37738df2e7d572e123b9a4fa6e8b55a8dfd2ad62 %ifarch ppc64 Provides: kernel-kdump = 2.6.28 Obsoletes: kernel-kdump <= 2.6.28 @@ -1200,14 +1200,14 @@ fi %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" "$@" @@ -1268,13 +1268,13 @@ This package contains additional modules not supported by SUSE. --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" "$@" @@ -1336,13 +1336,13 @@ This package contains optional modules only for openSUSE Leap. --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" "$@" @@ -1507,13 +1507,13 @@ nodes in the cluster can access the MD devices simultaneously. --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" "$@" @@ -1554,13 +1554,13 @@ shared resources over the cluster. --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" "$@" @@ -1601,13 +1601,13 @@ GFS2 is Global Filesystem, a shared device filesystem. --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" "$@" @@ -1663,13 +1663,13 @@ environments, they are not intended to be run on production systems. --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" "$@" @@ -1711,13 +1711,13 @@ accessible simultaneously from multiple nodes of a cluster. --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" "$@" @@ -1758,13 +1758,13 @@ provides the reiserfs module for the installation system. --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" "$@" diff --git a/kernel-default.changes b/kernel-default.changes index 87ac523e..cb9b6bb9 100644 --- a/kernel-default.changes +++ b/kernel-default.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +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 @@ -323,6 +337,19 @@ Wed Mar 16 19:29:49 CET 2022 - ailiop@suse.com - config: enable XFS_RT (bsc#1197190) - commit d8f0e40 +------------------------------------------------------------------- +Wed Mar 16 17:55:51 CET 2022 - msuchanek@suse.de + +- rpm: Run external scriptlets on uninstall only when available + (bsc#1196514 bsc#1196114 bsc#1196942). + When dependency cycles are encountered package dependencies may not be + fulfilled during zypper transaction at the time scriptlets are run. + This is a problem for kernel scriptlets provided by suse-module-tools + when migrating to a SLE release that provides these scriptlets only as + part of LTSS. The suse-module-tools that provides kernel scriptlets may + be removed early causing migration to fail. +- commit ab8dd2d + ------------------------------------------------------------------- Wed Mar 16 11:10:48 CET 2022 - msuchanek@suse.de diff --git a/kernel-default.spec b/kernel-default.spec index 14642152..5fe74775 100644 --- a/kernel-default.spec +++ b/kernel-default.spec @@ -109,7 +109,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 5.17.0 %if 0%{?is_kotd} -Release: .gd0cec50 +Release: .g37738df %else Release: 0 %endif @@ -234,10 +234,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-d0cec50d019c853336e26f5ff5df5a4c9c3ea120 -Provides: kernel-srchash-d0cec50d019c853336e26f5ff5df5a4c9c3ea120 +Provides: kernel-%build_flavor-base-srchash-37738df2e7d572e123b9a4fa6e8b55a8dfd2ad62 +Provides: kernel-srchash-37738df2e7d572e123b9a4fa6e8b55a8dfd2ad62 # END COMMON DEPS -Provides: %name-srchash-d0cec50d019c853336e26f5ff5df5a4c9c3ea120 +Provides: %name-srchash-37738df2e7d572e123b9a4fa6e8b55a8dfd2ad62 %ifarch %ix86 Provides: kernel-smp = 2.6.17 Obsoletes: kernel-smp <= 2.6.17 @@ -1243,14 +1243,14 @@ fi %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" "$@" @@ -1330,13 +1330,13 @@ This package contains additional modules not supported by SUSE. --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" "$@" @@ -1417,13 +1417,13 @@ This package contains optional modules only for openSUSE Leap. --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" "$@" @@ -1608,13 +1608,13 @@ nodes in the cluster can access the MD devices simultaneously. --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" "$@" @@ -1655,13 +1655,13 @@ shared resources over the cluster. --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" "$@" @@ -1702,13 +1702,13 @@ GFS2 is Global Filesystem, a shared device filesystem. --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" "$@" @@ -1764,13 +1764,13 @@ environments, they are not intended to be run on production systems. --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" "$@" @@ -1812,13 +1812,13 @@ accessible simultaneously from multiple nodes of a cluster. --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" "$@" @@ -1859,13 +1859,13 @@ provides the reiserfs module for the installation system. --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" "$@" diff --git a/kernel-docs.changes b/kernel-docs.changes index 87ac523e..cb9b6bb9 100644 --- a/kernel-docs.changes +++ b/kernel-docs.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +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 @@ -323,6 +337,19 @@ Wed Mar 16 19:29:49 CET 2022 - ailiop@suse.com - config: enable XFS_RT (bsc#1197190) - commit d8f0e40 +------------------------------------------------------------------- +Wed Mar 16 17:55:51 CET 2022 - msuchanek@suse.de + +- rpm: Run external scriptlets on uninstall only when available + (bsc#1196514 bsc#1196114 bsc#1196942). + When dependency cycles are encountered package dependencies may not be + fulfilled during zypper transaction at the time scriptlets are run. + This is a problem for kernel scriptlets provided by suse-module-tools + when migrating to a SLE release that provides these scriptlets only as + part of LTSS. The suse-module-tools that provides kernel scriptlets may + be removed early causing migration to fail. +- commit ab8dd2d + ------------------------------------------------------------------- Wed Mar 16 11:10:48 CET 2022 - msuchanek@suse.de diff --git a/kernel-docs.spec b/kernel-docs.spec index 8819ee32..ba3a5da1 100644 --- a/kernel-docs.spec +++ b/kernel-docs.spec @@ -33,7 +33,7 @@ License: GPL-2.0-only Group: Documentation/Man Version: 5.17.0 %if 0%{?is_kotd} -Release: .gd0cec50 +Release: .g37738df %else Release: 0 %endif @@ -67,7 +67,7 @@ BuildRequires: texlive-zapfding %endif URL: https://www.kernel.org/ Provides: %name = %version-%source_rel -Provides: %name-srchash-d0cec50d019c853336e26f5ff5df5a4c9c3ea120 +Provides: %name-srchash-37738df2e7d572e123b9a4fa6e8b55a8dfd2ad62 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz diff --git a/kernel-kvmsmall.changes b/kernel-kvmsmall.changes index 87ac523e..cb9b6bb9 100644 --- a/kernel-kvmsmall.changes +++ b/kernel-kvmsmall.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +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 @@ -323,6 +337,19 @@ Wed Mar 16 19:29:49 CET 2022 - ailiop@suse.com - config: enable XFS_RT (bsc#1197190) - commit d8f0e40 +------------------------------------------------------------------- +Wed Mar 16 17:55:51 CET 2022 - msuchanek@suse.de + +- rpm: Run external scriptlets on uninstall only when available + (bsc#1196514 bsc#1196114 bsc#1196942). + When dependency cycles are encountered package dependencies may not be + fulfilled during zypper transaction at the time scriptlets are run. + This is a problem for kernel scriptlets provided by suse-module-tools + when migrating to a SLE release that provides these scriptlets only as + part of LTSS. The suse-module-tools that provides kernel scriptlets may + be removed early causing migration to fail. +- commit ab8dd2d + ------------------------------------------------------------------- Wed Mar 16 11:10:48 CET 2022 - msuchanek@suse.de diff --git a/kernel-kvmsmall.spec b/kernel-kvmsmall.spec index 9301167b..eaa6e0d0 100644 --- a/kernel-kvmsmall.spec +++ b/kernel-kvmsmall.spec @@ -109,7 +109,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 5.17.0 %if 0%{?is_kotd} -Release: .gd0cec50 +Release: .g37738df %else Release: 0 %endif @@ -234,10 +234,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-d0cec50d019c853336e26f5ff5df5a4c9c3ea120 -Provides: kernel-srchash-d0cec50d019c853336e26f5ff5df5a4c9c3ea120 +Provides: kernel-%build_flavor-base-srchash-37738df2e7d572e123b9a4fa6e8b55a8dfd2ad62 +Provides: kernel-srchash-37738df2e7d572e123b9a4fa6e8b55a8dfd2ad62 # END COMMON DEPS -Provides: %name-srchash-d0cec50d019c853336e26f5ff5df5a4c9c3ea120 +Provides: %name-srchash-37738df2e7d572e123b9a4fa6e8b55a8dfd2ad62 %obsolete_rebuilds %name Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc @@ -1198,14 +1198,14 @@ fi %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" "$@" @@ -1268,13 +1268,13 @@ This package contains additional modules not supported by SUSE. --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" "$@" @@ -1338,13 +1338,13 @@ This package contains optional modules only for openSUSE Leap. --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" "$@" @@ -1505,13 +1505,13 @@ nodes in the cluster can access the MD devices simultaneously. --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" "$@" @@ -1552,13 +1552,13 @@ shared resources over the cluster. --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" "$@" @@ -1599,13 +1599,13 @@ GFS2 is Global Filesystem, a shared device filesystem. --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" "$@" @@ -1661,13 +1661,13 @@ environments, they are not intended to be run on production systems. --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" "$@" @@ -1709,13 +1709,13 @@ accessible simultaneously from multiple nodes of a cluster. --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" "$@" @@ -1756,13 +1756,13 @@ provides the reiserfs module for the installation system. --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" "$@" diff --git a/kernel-lpae.changes b/kernel-lpae.changes index 87ac523e..cb9b6bb9 100644 --- a/kernel-lpae.changes +++ b/kernel-lpae.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +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 @@ -323,6 +337,19 @@ Wed Mar 16 19:29:49 CET 2022 - ailiop@suse.com - config: enable XFS_RT (bsc#1197190) - commit d8f0e40 +------------------------------------------------------------------- +Wed Mar 16 17:55:51 CET 2022 - msuchanek@suse.de + +- rpm: Run external scriptlets on uninstall only when available + (bsc#1196514 bsc#1196114 bsc#1196942). + When dependency cycles are encountered package dependencies may not be + fulfilled during zypper transaction at the time scriptlets are run. + This is a problem for kernel scriptlets provided by suse-module-tools + when migrating to a SLE release that provides these scriptlets only as + part of LTSS. The suse-module-tools that provides kernel scriptlets may + be removed early causing migration to fail. +- commit ab8dd2d + ------------------------------------------------------------------- Wed Mar 16 11:10:48 CET 2022 - msuchanek@suse.de diff --git a/kernel-lpae.spec b/kernel-lpae.spec index 57096846..b80e5695 100644 --- a/kernel-lpae.spec +++ b/kernel-lpae.spec @@ -109,7 +109,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 5.17.0 %if 0%{?is_kotd} -Release: .gd0cec50 +Release: .g37738df %else Release: 0 %endif @@ -234,10 +234,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-d0cec50d019c853336e26f5ff5df5a4c9c3ea120 -Provides: kernel-srchash-d0cec50d019c853336e26f5ff5df5a4c9c3ea120 +Provides: kernel-%build_flavor-base-srchash-37738df2e7d572e123b9a4fa6e8b55a8dfd2ad62 +Provides: kernel-srchash-37738df2e7d572e123b9a4fa6e8b55a8dfd2ad62 # END COMMON DEPS -Provides: %name-srchash-d0cec50d019c853336e26f5ff5df5a4c9c3ea120 +Provides: %name-srchash-37738df2e7d572e123b9a4fa6e8b55a8dfd2ad62 %obsolete_rebuilds %name Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc @@ -1192,14 +1192,14 @@ fi %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" "$@" @@ -1256,13 +1256,13 @@ This package contains additional modules not supported by SUSE. --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" "$@" @@ -1320,13 +1320,13 @@ This package contains optional modules only for openSUSE Leap. --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" "$@" @@ -1487,13 +1487,13 @@ nodes in the cluster can access the MD devices simultaneously. --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" "$@" @@ -1534,13 +1534,13 @@ shared resources over the cluster. --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" "$@" @@ -1581,13 +1581,13 @@ GFS2 is Global Filesystem, a shared device filesystem. --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" "$@" @@ -1643,13 +1643,13 @@ environments, they are not intended to be run on production systems. --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" "$@" @@ -1691,13 +1691,13 @@ accessible simultaneously from multiple nodes of a cluster. --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" "$@" @@ -1738,13 +1738,13 @@ provides the reiserfs module for the installation system. --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" "$@" diff --git a/kernel-module-subpackage b/kernel-module-subpackage index ee0674b9..cbd4736b 100644 --- a/kernel-module-subpackage +++ b/kernel-module-subpackage @@ -48,6 +48,16 @@ Obsoletes: %{-n*}-kmp-xen 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 @@ END { exit(! good) } --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 diff --git a/kernel-obs-build.changes b/kernel-obs-build.changes index 87ac523e..cb9b6bb9 100644 --- a/kernel-obs-build.changes +++ b/kernel-obs-build.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +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 @@ -323,6 +337,19 @@ Wed Mar 16 19:29:49 CET 2022 - ailiop@suse.com - config: enable XFS_RT (bsc#1197190) - commit d8f0e40 +------------------------------------------------------------------- +Wed Mar 16 17:55:51 CET 2022 - msuchanek@suse.de + +- rpm: Run external scriptlets on uninstall only when available + (bsc#1196514 bsc#1196114 bsc#1196942). + When dependency cycles are encountered package dependencies may not be + fulfilled during zypper transaction at the time scriptlets are run. + This is a problem for kernel scriptlets provided by suse-module-tools + when migrating to a SLE release that provides these scriptlets only as + part of LTSS. The suse-module-tools that provides kernel scriptlets may + be removed early causing migration to fail. +- commit ab8dd2d + ------------------------------------------------------------------- Wed Mar 16 11:10:48 CET 2022 - msuchanek@suse.de diff --git a/kernel-obs-build.spec b/kernel-obs-build.spec index 4154b6e2..8a65c394 100644 --- a/kernel-obs-build.spec +++ b/kernel-obs-build.spec @@ -45,7 +45,7 @@ BuildRequires: util-linux %endif %endif %endif -BuildRequires: kernel%kernel_flavor-srchash-d0cec50d019c853336e26f5ff5df5a4c9c3ea120 +BuildRequires: kernel%kernel_flavor-srchash-37738df2e7d572e123b9a4fa6e8b55a8dfd2ad62 %if 0%{?rhel_version} BuildRequires: kernel @@ -66,7 +66,7 @@ License: GPL-2.0-only Group: SLES Version: 5.17.0 %if 0%{?is_kotd} -Release: .gd0cec50 +Release: .g37738df %else Release: 0 %endif diff --git a/kernel-obs-qa.changes b/kernel-obs-qa.changes index 87ac523e..cb9b6bb9 100644 --- a/kernel-obs-qa.changes +++ b/kernel-obs-qa.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +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 @@ -323,6 +337,19 @@ Wed Mar 16 19:29:49 CET 2022 - ailiop@suse.com - config: enable XFS_RT (bsc#1197190) - commit d8f0e40 +------------------------------------------------------------------- +Wed Mar 16 17:55:51 CET 2022 - msuchanek@suse.de + +- rpm: Run external scriptlets on uninstall only when available + (bsc#1196514 bsc#1196114 bsc#1196942). + When dependency cycles are encountered package dependencies may not be + fulfilled during zypper transaction at the time scriptlets are run. + This is a problem for kernel scriptlets provided by suse-module-tools + when migrating to a SLE release that provides these scriptlets only as + part of LTSS. The suse-module-tools that provides kernel scriptlets may + be removed early causing migration to fail. +- commit ab8dd2d + ------------------------------------------------------------------- Wed Mar 16 11:10:48 CET 2022 - msuchanek@suse.de diff --git a/kernel-obs-qa.spec b/kernel-obs-qa.spec index 6db2eca3..2c24435b 100644 --- a/kernel-obs-qa.spec +++ b/kernel-obs-qa.spec @@ -38,7 +38,7 @@ License: GPL-2.0-only Group: SLES Version: 5.17.0 %if 0%{?is_kotd} -Release: .gd0cec50 +Release: .g37738df %else Release: 0 %endif diff --git a/kernel-pae.changes b/kernel-pae.changes index 87ac523e..cb9b6bb9 100644 --- a/kernel-pae.changes +++ b/kernel-pae.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +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 @@ -323,6 +337,19 @@ Wed Mar 16 19:29:49 CET 2022 - ailiop@suse.com - config: enable XFS_RT (bsc#1197190) - commit d8f0e40 +------------------------------------------------------------------- +Wed Mar 16 17:55:51 CET 2022 - msuchanek@suse.de + +- rpm: Run external scriptlets on uninstall only when available + (bsc#1196514 bsc#1196114 bsc#1196942). + When dependency cycles are encountered package dependencies may not be + fulfilled during zypper transaction at the time scriptlets are run. + This is a problem for kernel scriptlets provided by suse-module-tools + when migrating to a SLE release that provides these scriptlets only as + part of LTSS. The suse-module-tools that provides kernel scriptlets may + be removed early causing migration to fail. +- commit ab8dd2d + ------------------------------------------------------------------- Wed Mar 16 11:10:48 CET 2022 - msuchanek@suse.de diff --git a/kernel-pae.spec b/kernel-pae.spec index 4c171c5e..aad4d8cc 100644 --- a/kernel-pae.spec +++ b/kernel-pae.spec @@ -109,7 +109,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 5.17.0 %if 0%{?is_kotd} -Release: .gd0cec50 +Release: .g37738df %else Release: 0 %endif @@ -234,10 +234,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-d0cec50d019c853336e26f5ff5df5a4c9c3ea120 -Provides: kernel-srchash-d0cec50d019c853336e26f5ff5df5a4c9c3ea120 +Provides: kernel-%build_flavor-base-srchash-37738df2e7d572e123b9a4fa6e8b55a8dfd2ad62 +Provides: kernel-srchash-37738df2e7d572e123b9a4fa6e8b55a8dfd2ad62 # END COMMON DEPS -Provides: %name-srchash-d0cec50d019c853336e26f5ff5df5a4c9c3ea120 +Provides: %name-srchash-37738df2e7d572e123b9a4fa6e8b55a8dfd2ad62 %ifarch %ix86 Provides: kernel-bigsmp = 2.6.17 Obsoletes: kernel-bigsmp <= 2.6.17 @@ -1220,14 +1220,14 @@ fi %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" "$@" @@ -1300,13 +1300,13 @@ This package contains additional modules not supported by SUSE. --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" "$@" @@ -1380,13 +1380,13 @@ This package contains optional modules only for openSUSE Leap. --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" "$@" @@ -1557,13 +1557,13 @@ nodes in the cluster can access the MD devices simultaneously. --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" "$@" @@ -1604,13 +1604,13 @@ shared resources over the cluster. --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" "$@" @@ -1651,13 +1651,13 @@ GFS2 is Global Filesystem, a shared device filesystem. --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" "$@" @@ -1713,13 +1713,13 @@ environments, they are not intended to be run on production systems. --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" "$@" @@ -1761,13 +1761,13 @@ accessible simultaneously from multiple nodes of a cluster. --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" "$@" @@ -1808,13 +1808,13 @@ provides the reiserfs module for the installation system. --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" "$@" diff --git a/kernel-source.changes b/kernel-source.changes index 87ac523e..cb9b6bb9 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +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 @@ -323,6 +337,19 @@ Wed Mar 16 19:29:49 CET 2022 - ailiop@suse.com - config: enable XFS_RT (bsc#1197190) - commit d8f0e40 +------------------------------------------------------------------- +Wed Mar 16 17:55:51 CET 2022 - msuchanek@suse.de + +- rpm: Run external scriptlets on uninstall only when available + (bsc#1196514 bsc#1196114 bsc#1196942). + When dependency cycles are encountered package dependencies may not be + fulfilled during zypper transaction at the time scriptlets are run. + This is a problem for kernel scriptlets provided by suse-module-tools + when migrating to a SLE release that provides these scriptlets only as + part of LTSS. The suse-module-tools that provides kernel scriptlets may + be removed early causing migration to fail. +- commit ab8dd2d + ------------------------------------------------------------------- Wed Mar 16 11:10:48 CET 2022 - msuchanek@suse.de diff --git a/kernel-source.spec b/kernel-source.spec index 38bb0d7f..009e47d4 100644 --- a/kernel-source.spec +++ b/kernel-source.spec @@ -33,7 +33,7 @@ Name: kernel-source Version: 5.17.0 %if 0%{?is_kotd} -Release: .gd0cec50 +Release: .g37738df %else Release: 0 %endif @@ -50,7 +50,7 @@ BuildRequires: fdupes BuildRequires: sed Requires(post): coreutils sed Provides: %name = %version-%source_rel -Provides: %name-srchash-d0cec50d019c853336e26f5ff5df5a4c9c3ea120 +Provides: %name-srchash-37738df2e7d572e123b9a4fa6e8b55a8dfd2ad62 Provides: linux Provides: multiversion(kernel) Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz diff --git a/kernel-spec-macros b/kernel-spec-macros index b81d43ad..af6a69cc 100644 --- a/kernel-spec-macros +++ b/kernel-spec-macros @@ -72,4 +72,14 @@ %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 diff --git a/kernel-syms.changes b/kernel-syms.changes index 87ac523e..cb9b6bb9 100644 --- a/kernel-syms.changes +++ b/kernel-syms.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +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 @@ -323,6 +337,19 @@ Wed Mar 16 19:29:49 CET 2022 - ailiop@suse.com - config: enable XFS_RT (bsc#1197190) - commit d8f0e40 +------------------------------------------------------------------- +Wed Mar 16 17:55:51 CET 2022 - msuchanek@suse.de + +- rpm: Run external scriptlets on uninstall only when available + (bsc#1196514 bsc#1196114 bsc#1196942). + When dependency cycles are encountered package dependencies may not be + fulfilled during zypper transaction at the time scriptlets are run. + This is a problem for kernel scriptlets provided by suse-module-tools + when migrating to a SLE release that provides these scriptlets only as + part of LTSS. The suse-module-tools that provides kernel scriptlets may + be removed early causing migration to fail. +- commit ab8dd2d + ------------------------------------------------------------------- Wed Mar 16 11:10:48 CET 2022 - msuchanek@suse.de diff --git a/kernel-syms.spec b/kernel-syms.spec index 69c6852c..de6e4e42 100644 --- a/kernel-syms.spec +++ b/kernel-syms.spec @@ -27,7 +27,7 @@ Group: Development/Sources Version: 5.17.0 %if %using_buildservice %if 0%{?is_kotd} -Release: .gd0cec50 +Release: .g37738df %else Release: 0 %endif @@ -52,7 +52,7 @@ Requires: kernel-pae-devel = %version-%source_rel %endif Requires: pesign-obs-integration Provides: %name = %version-%source_rel -Provides: %name-srchash-d0cec50d019c853336e26f5ff5df5a4c9c3ea120 +Provides: %name-srchash-37738df2e7d572e123b9a4fa6e8b55a8dfd2ad62 Provides: multiversion(kernel) Source: README.KSYMS Requires: kernel-devel%variant = %version-%source_rel diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes index 87ac523e..cb9b6bb9 100644 --- a/kernel-vanilla.changes +++ b/kernel-vanilla.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +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 @@ -323,6 +337,19 @@ Wed Mar 16 19:29:49 CET 2022 - ailiop@suse.com - config: enable XFS_RT (bsc#1197190) - commit d8f0e40 +------------------------------------------------------------------- +Wed Mar 16 17:55:51 CET 2022 - msuchanek@suse.de + +- rpm: Run external scriptlets on uninstall only when available + (bsc#1196514 bsc#1196114 bsc#1196942). + When dependency cycles are encountered package dependencies may not be + fulfilled during zypper transaction at the time scriptlets are run. + This is a problem for kernel scriptlets provided by suse-module-tools + when migrating to a SLE release that provides these scriptlets only as + part of LTSS. The suse-module-tools that provides kernel scriptlets may + be removed early causing migration to fail. +- commit ab8dd2d + ------------------------------------------------------------------- Wed Mar 16 11:10:48 CET 2022 - msuchanek@suse.de diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index b4a704ae..bd400aac 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -109,7 +109,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 5.17.0 %if 0%{?is_kotd} -Release: .gd0cec50 +Release: .g37738df %else Release: 0 %endif @@ -234,10 +234,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-d0cec50d019c853336e26f5ff5df5a4c9c3ea120 -Provides: kernel-srchash-d0cec50d019c853336e26f5ff5df5a4c9c3ea120 +Provides: kernel-%build_flavor-base-srchash-37738df2e7d572e123b9a4fa6e8b55a8dfd2ad62 +Provides: kernel-srchash-37738df2e7d572e123b9a4fa6e8b55a8dfd2ad62 # END COMMON DEPS -Provides: %name-srchash-d0cec50d019c853336e26f5ff5df5a4c9c3ea120 +Provides: %name-srchash-37738df2e7d572e123b9a4fa6e8b55a8dfd2ad62 %obsolete_rebuilds %name Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc @@ -1191,14 +1191,14 @@ fi %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" "$@" @@ -1254,13 +1254,13 @@ This package contains additional modules not supported by SUSE. --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" "$@" @@ -1317,13 +1317,13 @@ This package contains optional modules only for openSUSE Leap. --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" "$@" @@ -1484,13 +1484,13 @@ nodes in the cluster can access the MD devices simultaneously. --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" "$@" @@ -1531,13 +1531,13 @@ shared resources over the cluster. --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" "$@" @@ -1578,13 +1578,13 @@ GFS2 is Global Filesystem, a shared device filesystem. --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" "$@" @@ -1640,13 +1640,13 @@ environments, they are not intended to be run on production systems. --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" "$@" @@ -1688,13 +1688,13 @@ accessible simultaneously from multiple nodes of a cluster. --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" "$@" @@ -1735,13 +1735,13 @@ provides the reiserfs module for the installation system. --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" "$@" diff --git a/kernel-zfcpdump.changes b/kernel-zfcpdump.changes index 87ac523e..cb9b6bb9 100644 --- a/kernel-zfcpdump.changes +++ b/kernel-zfcpdump.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +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 @@ -323,6 +337,19 @@ Wed Mar 16 19:29:49 CET 2022 - ailiop@suse.com - config: enable XFS_RT (bsc#1197190) - commit d8f0e40 +------------------------------------------------------------------- +Wed Mar 16 17:55:51 CET 2022 - msuchanek@suse.de + +- rpm: Run external scriptlets on uninstall only when available + (bsc#1196514 bsc#1196114 bsc#1196942). + When dependency cycles are encountered package dependencies may not be + fulfilled during zypper transaction at the time scriptlets are run. + This is a problem for kernel scriptlets provided by suse-module-tools + when migrating to a SLE release that provides these scriptlets only as + part of LTSS. The suse-module-tools that provides kernel scriptlets may + be removed early causing migration to fail. +- commit ab8dd2d + ------------------------------------------------------------------- Wed Mar 16 11:10:48 CET 2022 - msuchanek@suse.de diff --git a/kernel-zfcpdump.spec b/kernel-zfcpdump.spec index 1c2dabe2..4ee83beb 100644 --- a/kernel-zfcpdump.spec +++ b/kernel-zfcpdump.spec @@ -109,7 +109,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 5.17.0 %if 0%{?is_kotd} -Release: .gd0cec50 +Release: .g37738df %else Release: 0 %endif @@ -234,10 +234,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-d0cec50d019c853336e26f5ff5df5a4c9c3ea120 -Provides: kernel-srchash-d0cec50d019c853336e26f5ff5df5a4c9c3ea120 +Provides: kernel-%build_flavor-base-srchash-37738df2e7d572e123b9a4fa6e8b55a8dfd2ad62 +Provides: kernel-srchash-37738df2e7d572e123b9a4fa6e8b55a8dfd2ad62 # END COMMON DEPS -Provides: %name-srchash-d0cec50d019c853336e26f5ff5df5a4c9c3ea120 +Provides: %name-srchash-37738df2e7d572e123b9a4fa6e8b55a8dfd2ad62 %obsolete_rebuilds %name Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc @@ -1194,14 +1194,14 @@ fi %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" "$@" @@ -1260,13 +1260,13 @@ This package contains additional modules not supported by SUSE. --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" "$@" @@ -1326,13 +1326,13 @@ This package contains optional modules only for openSUSE Leap. --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" "$@" @@ -1493,13 +1493,13 @@ nodes in the cluster can access the MD devices simultaneously. --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" "$@" @@ -1540,13 +1540,13 @@ shared resources over the cluster. --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" "$@" @@ -1587,13 +1587,13 @@ GFS2 is Global Filesystem, a shared device filesystem. --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" "$@" @@ -1649,13 +1649,13 @@ environments, they are not intended to be run on production systems. --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" "$@" @@ -1697,13 +1697,13 @@ accessible simultaneously from multiple nodes of a cluster. --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" "$@" @@ -1744,13 +1744,13 @@ provides the reiserfs module for the installation system. --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" "$@" diff --git a/macros.kernel-source b/macros.kernel-source index 91aacfba..05668cb4 100644 --- a/macros.kernel-source +++ b/macros.kernel-source @@ -1,5 +1,11 @@ # A few cross-distro definitions: -%kernel_build_shell_package bash-sh +%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_build_shell_package diff --git a/source-timestamp b/source-timestamp index a21c9bf6..8d576461 100644 --- a/source-timestamp +++ b/source-timestamp @@ -1,3 +1,3 @@ -2022-03-21 11:26:30 +0000 -GIT Revision: d0cec50d019c853336e26f5ff5df5a4c9c3ea120 +2022-03-22 05:53:25 +0000 +GIT Revision: 37738df2e7d572e123b9a4fa6e8b55a8dfd2ad62 GIT Branch: stable