From 53bcd1ea315455d800de4c3243148decd3f2cccc97ff9b910f7b1eedd17ab5b3 Mon Sep 17 00:00:00 2001 From: Kernel Bugs Date: Wed, 12 Apr 2023 08:09:57 +0000 Subject: [PATCH] commit 965999287869830862e110699e56eaad05d9c946 OBS-URL: https://build.opensuse.org/package/show/Kernel:stable/kernel-source?expand=0&rev=1912 --- dtb-aarch64.changes | 22 ++++++++++++++++++++++ dtb-aarch64.spec | 2 +- dtb-armv6l.changes | 22 ++++++++++++++++++++++ dtb-armv6l.spec | 2 +- dtb-armv7l.changes | 22 ++++++++++++++++++++++ dtb-armv7l.spec | 2 +- dtb-riscv64.changes | 22 ++++++++++++++++++++++ dtb-riscv64.spec | 2 +- kernel-64kb.changes | 22 ++++++++++++++++++++++ kernel-64kb.spec | 14 +++++++------- kernel-binary.spec.in | 6 +++--- kernel-debug.changes | 22 ++++++++++++++++++++++ kernel-debug.spec | 14 +++++++------- kernel-default.changes | 22 ++++++++++++++++++++++ kernel-default.spec | 14 +++++++------- kernel-docs.changes | 22 ++++++++++++++++++++++ kernel-docs.spec | 4 ++-- kernel-kvmsmall.changes | 22 ++++++++++++++++++++++ kernel-kvmsmall.spec | 14 +++++++------- kernel-lpae.changes | 22 ++++++++++++++++++++++ kernel-lpae.spec | 14 +++++++------- kernel-obs-build.changes | 22 ++++++++++++++++++++++ kernel-obs-build.spec | 9 ++++----- kernel-obs-build.spec.in | 5 ++--- kernel-obs-qa.changes | 22 ++++++++++++++++++++++ kernel-obs-qa.spec | 2 +- kernel-pae.changes | 22 ++++++++++++++++++++++ kernel-pae.spec | 14 +++++++------- kernel-source.changes | 22 ++++++++++++++++++++++ kernel-source.spec | 15 ++------------- kernel-source.spec.in | 11 ----------- kernel-syms.changes | 22 ++++++++++++++++++++++ kernel-syms.spec | 4 ++-- kernel-vanilla.changes | 22 ++++++++++++++++++++++ kernel-vanilla.spec | 14 +++++++------- kernel-zfcpdump.changes | 22 ++++++++++++++++++++++ kernel-zfcpdump.spec | 14 +++++++------- mkspec | 22 ++++++++++++---------- patches.kernel.org.tar.bz2 | 4 ++-- source-timestamp | 4 ++-- 40 files changed, 466 insertions(+), 114 deletions(-) diff --git a/dtb-aarch64.changes b/dtb-aarch64.changes index 99eac0e5..36e02b34 100644 --- a/dtb-aarch64.changes +++ b/dtb-aarch64.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 11 11:31:54 CEST 2023 - msuchanek@suse.de + +- Update patches.kernel.org/6.2.10-153-powerpc-pseries-vas-Ignore-VAS-update-for-DLPA.patch + (bsc#1012628 bsc#1210216 ltc#202189). +- commit 4e944ba + ------------------------------------------------------------------- Thu Apr 6 12:36:55 CEST 2023 - jslaby@suse.cz @@ -317,6 +324,21 @@ Thu Apr 6 12:36:55 CEST 2023 - jslaby@suse.cz *again*" (bsc#1012628). - commit ba7816e +------------------------------------------------------------------- +Tue Apr 4 14:51:56 CEST 2023 - msuchanek@suse.de + +- Define kernel-vanilla as source variant + The vanilla_only macro is overloaded. It is used for determining if + there should be two kernel sources built as well as for the purpose of + determmioning if vanilla kernel should be used for kernel-obs-build. + While the former can be determined at build time the latter needs to be + baked into the spec file template. Separate the two while also making + the latter more generic. + $build_dtbs is enabled on every single rt and azure branch since 15.3 + when the setting was introduced, gate on the new $obs_build_variant + setting as well. +- commit 36ba909 + ------------------------------------------------------------------- Tue Apr 4 07:17:34 CEST 2023 - jslaby@suse.cz diff --git a/dtb-aarch64.spec b/dtb-aarch64.spec index 39ab6178..67da80b2 100644 --- a/dtb-aarch64.spec +++ b/dtb-aarch64.spec @@ -31,7 +31,7 @@ Name: dtb-aarch64 Version: 6.2.10 %if 0%{?is_kotd} -Release: .gba7816e +Release: .g9659992 %else Release: 0 %endif diff --git a/dtb-armv6l.changes b/dtb-armv6l.changes index 99eac0e5..36e02b34 100644 --- a/dtb-armv6l.changes +++ b/dtb-armv6l.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 11 11:31:54 CEST 2023 - msuchanek@suse.de + +- Update patches.kernel.org/6.2.10-153-powerpc-pseries-vas-Ignore-VAS-update-for-DLPA.patch + (bsc#1012628 bsc#1210216 ltc#202189). +- commit 4e944ba + ------------------------------------------------------------------- Thu Apr 6 12:36:55 CEST 2023 - jslaby@suse.cz @@ -317,6 +324,21 @@ Thu Apr 6 12:36:55 CEST 2023 - jslaby@suse.cz *again*" (bsc#1012628). - commit ba7816e +------------------------------------------------------------------- +Tue Apr 4 14:51:56 CEST 2023 - msuchanek@suse.de + +- Define kernel-vanilla as source variant + The vanilla_only macro is overloaded. It is used for determining if + there should be two kernel sources built as well as for the purpose of + determmioning if vanilla kernel should be used for kernel-obs-build. + While the former can be determined at build time the latter needs to be + baked into the spec file template. Separate the two while also making + the latter more generic. + $build_dtbs is enabled on every single rt and azure branch since 15.3 + when the setting was introduced, gate on the new $obs_build_variant + setting as well. +- commit 36ba909 + ------------------------------------------------------------------- Tue Apr 4 07:17:34 CEST 2023 - jslaby@suse.cz diff --git a/dtb-armv6l.spec b/dtb-armv6l.spec index a06b889f..8ef09860 100644 --- a/dtb-armv6l.spec +++ b/dtb-armv6l.spec @@ -31,7 +31,7 @@ Name: dtb-armv6l Version: 6.2.10 %if 0%{?is_kotd} -Release: .gba7816e +Release: .g9659992 %else Release: 0 %endif diff --git a/dtb-armv7l.changes b/dtb-armv7l.changes index 99eac0e5..36e02b34 100644 --- a/dtb-armv7l.changes +++ b/dtb-armv7l.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 11 11:31:54 CEST 2023 - msuchanek@suse.de + +- Update patches.kernel.org/6.2.10-153-powerpc-pseries-vas-Ignore-VAS-update-for-DLPA.patch + (bsc#1012628 bsc#1210216 ltc#202189). +- commit 4e944ba + ------------------------------------------------------------------- Thu Apr 6 12:36:55 CEST 2023 - jslaby@suse.cz @@ -317,6 +324,21 @@ Thu Apr 6 12:36:55 CEST 2023 - jslaby@suse.cz *again*" (bsc#1012628). - commit ba7816e +------------------------------------------------------------------- +Tue Apr 4 14:51:56 CEST 2023 - msuchanek@suse.de + +- Define kernel-vanilla as source variant + The vanilla_only macro is overloaded. It is used for determining if + there should be two kernel sources built as well as for the purpose of + determmioning if vanilla kernel should be used for kernel-obs-build. + While the former can be determined at build time the latter needs to be + baked into the spec file template. Separate the two while also making + the latter more generic. + $build_dtbs is enabled on every single rt and azure branch since 15.3 + when the setting was introduced, gate on the new $obs_build_variant + setting as well. +- commit 36ba909 + ------------------------------------------------------------------- Tue Apr 4 07:17:34 CEST 2023 - jslaby@suse.cz diff --git a/dtb-armv7l.spec b/dtb-armv7l.spec index decceb6f..53c23c7b 100644 --- a/dtb-armv7l.spec +++ b/dtb-armv7l.spec @@ -31,7 +31,7 @@ Name: dtb-armv7l Version: 6.2.10 %if 0%{?is_kotd} -Release: .gba7816e +Release: .g9659992 %else Release: 0 %endif diff --git a/dtb-riscv64.changes b/dtb-riscv64.changes index 99eac0e5..36e02b34 100644 --- a/dtb-riscv64.changes +++ b/dtb-riscv64.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 11 11:31:54 CEST 2023 - msuchanek@suse.de + +- Update patches.kernel.org/6.2.10-153-powerpc-pseries-vas-Ignore-VAS-update-for-DLPA.patch + (bsc#1012628 bsc#1210216 ltc#202189). +- commit 4e944ba + ------------------------------------------------------------------- Thu Apr 6 12:36:55 CEST 2023 - jslaby@suse.cz @@ -317,6 +324,21 @@ Thu Apr 6 12:36:55 CEST 2023 - jslaby@suse.cz *again*" (bsc#1012628). - commit ba7816e +------------------------------------------------------------------- +Tue Apr 4 14:51:56 CEST 2023 - msuchanek@suse.de + +- Define kernel-vanilla as source variant + The vanilla_only macro is overloaded. It is used for determining if + there should be two kernel sources built as well as for the purpose of + determmioning if vanilla kernel should be used for kernel-obs-build. + While the former can be determined at build time the latter needs to be + baked into the spec file template. Separate the two while also making + the latter more generic. + $build_dtbs is enabled on every single rt and azure branch since 15.3 + when the setting was introduced, gate on the new $obs_build_variant + setting as well. +- commit 36ba909 + ------------------------------------------------------------------- Tue Apr 4 07:17:34 CEST 2023 - jslaby@suse.cz diff --git a/dtb-riscv64.spec b/dtb-riscv64.spec index f8f16861..1ee18db8 100644 --- a/dtb-riscv64.spec +++ b/dtb-riscv64.spec @@ -31,7 +31,7 @@ Name: dtb-riscv64 Version: 6.2.10 %if 0%{?is_kotd} -Release: .gba7816e +Release: .g9659992 %else Release: 0 %endif diff --git a/kernel-64kb.changes b/kernel-64kb.changes index 99eac0e5..36e02b34 100644 --- a/kernel-64kb.changes +++ b/kernel-64kb.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 11 11:31:54 CEST 2023 - msuchanek@suse.de + +- Update patches.kernel.org/6.2.10-153-powerpc-pseries-vas-Ignore-VAS-update-for-DLPA.patch + (bsc#1012628 bsc#1210216 ltc#202189). +- commit 4e944ba + ------------------------------------------------------------------- Thu Apr 6 12:36:55 CEST 2023 - jslaby@suse.cz @@ -317,6 +324,21 @@ Thu Apr 6 12:36:55 CEST 2023 - jslaby@suse.cz *again*" (bsc#1012628). - commit ba7816e +------------------------------------------------------------------- +Tue Apr 4 14:51:56 CEST 2023 - msuchanek@suse.de + +- Define kernel-vanilla as source variant + The vanilla_only macro is overloaded. It is used for determining if + there should be two kernel sources built as well as for the purpose of + determmioning if vanilla kernel should be used for kernel-obs-build. + While the former can be determined at build time the latter needs to be + baked into the spec file template. Separate the two while also making + the latter more generic. + $build_dtbs is enabled on every single rt and azure branch since 15.3 + when the setting was introduced, gate on the new $obs_build_variant + setting as well. +- commit 36ba909 + ------------------------------------------------------------------- Tue Apr 4 07:17:34 CEST 2023 - jslaby@suse.cz diff --git a/kernel-64kb.spec b/kernel-64kb.spec index 6002b188..ca72f104 100644 --- a/kernel-64kb.spec +++ b/kernel-64kb.spec @@ -20,7 +20,6 @@ %define srcversion 6.2 %define patchversion 6.2.10 %define variant %{nil} -%define vanilla_only 0 %define compress_modules zstd %define compress_vmlinux xz %define livepatch livepatch%{nil} @@ -31,6 +30,7 @@ %define build_flavor 64kb %define build_default ("%build_flavor" == "default") %define build_vanilla ("%build_flavor" == "vanilla") +%define vanilla_only %{lua: if (rpm.expand("%variant") == "-vanilla") then print(1) else print(0) end} %if ! %build_vanilla %define src_install_dir /usr/src/linux-%kernelrelease%variant @@ -113,7 +113,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 6.2.10 %if 0%{?is_kotd} -Release: .gba7816e +Release: .g9659992 %else Release: 0 %endif @@ -238,10 +238,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-ba7816e0ae08661ece79de1c621443536811787f -Provides: kernel-srchash-ba7816e0ae08661ece79de1c621443536811787f +Provides: kernel-%build_flavor-base-srchash-965999287869830862e110699e56eaad05d9c946 +Provides: kernel-srchash-965999287869830862e110699e56eaad05d9c946 # END COMMON DEPS -Provides: %name-srchash-ba7816e0ae08661ece79de1c621443536811787f +Provides: %name-srchash-965999287869830862e110699e56eaad05d9c946 %obsolete_rebuilds %name Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc @@ -471,7 +471,7 @@ awk '{ cd linux-%srcversion %_sourcedir/apply-patches \ -%if %{build_vanilla} +%if %{build_vanilla} && ! %vanilla_only --vanilla \ %endif %_sourcedir/series.conf .. $SYMBOLS @@ -1409,7 +1409,7 @@ Summary: Development files necessary for building kernel modules Group: Development/Sources Provides: %name-devel = %version-%source_rel Provides: multiversion(kernel) -%if ! %build_vanilla +%if ! %build_vanilla && ! %vanilla_only Requires: kernel-devel%variant = %version-%source_rel Recommends: make Recommends: gcc diff --git a/kernel-binary.spec.in b/kernel-binary.spec.in index fd6abc6b..682e6508 100644 --- a/kernel-binary.spec.in +++ b/kernel-binary.spec.in @@ -20,7 +20,6 @@ %define srcversion @SRCVERSION@ %define patchversion @PATCHVERSION@ %define variant @VARIANT@%{nil} -%define vanilla_only @VANILLA_ONLY@ %define compress_modules @COMPRESS_MODULES@ %define compress_vmlinux @COMPRESS_VMLINUX@ %define livepatch @LIVEPATCH@%{nil} @@ -31,6 +30,7 @@ %define build_flavor @FLAVOR@ %define build_default ("%build_flavor" == "default") %define build_vanilla ("%build_flavor" == "vanilla") +%define vanilla_only %{lua: if (rpm.expand("%variant") == "-vanilla") then print(1) else print(0) end} %if ! %build_vanilla %define src_install_dir /usr/src/linux-%kernelrelease%variant @@ -338,7 +338,7 @@ awk '{ cd linux-%srcversion %_sourcedir/apply-patches \ -%if %{build_vanilla} +%if %{build_vanilla} && ! %vanilla_only --vanilla \ %endif %_sourcedir/series.conf .. $SYMBOLS @@ -1272,7 +1272,7 @@ Summary: Development files necessary for building kernel modules Group: Development/Sources Provides: %name-devel = %version-%source_rel Provides: multiversion(kernel) -%if ! %build_vanilla +%if ! %build_vanilla && ! %vanilla_only Requires: kernel-devel%variant = %version-%source_rel Recommends: make Recommends: gcc diff --git a/kernel-debug.changes b/kernel-debug.changes index 99eac0e5..36e02b34 100644 --- a/kernel-debug.changes +++ b/kernel-debug.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 11 11:31:54 CEST 2023 - msuchanek@suse.de + +- Update patches.kernel.org/6.2.10-153-powerpc-pseries-vas-Ignore-VAS-update-for-DLPA.patch + (bsc#1012628 bsc#1210216 ltc#202189). +- commit 4e944ba + ------------------------------------------------------------------- Thu Apr 6 12:36:55 CEST 2023 - jslaby@suse.cz @@ -317,6 +324,21 @@ Thu Apr 6 12:36:55 CEST 2023 - jslaby@suse.cz *again*" (bsc#1012628). - commit ba7816e +------------------------------------------------------------------- +Tue Apr 4 14:51:56 CEST 2023 - msuchanek@suse.de + +- Define kernel-vanilla as source variant + The vanilla_only macro is overloaded. It is used for determining if + there should be two kernel sources built as well as for the purpose of + determmioning if vanilla kernel should be used for kernel-obs-build. + While the former can be determined at build time the latter needs to be + baked into the spec file template. Separate the two while also making + the latter more generic. + $build_dtbs is enabled on every single rt and azure branch since 15.3 + when the setting was introduced, gate on the new $obs_build_variant + setting as well. +- commit 36ba909 + ------------------------------------------------------------------- Tue Apr 4 07:17:34 CEST 2023 - jslaby@suse.cz diff --git a/kernel-debug.spec b/kernel-debug.spec index 9caaf05a..1ceb1c18 100644 --- a/kernel-debug.spec +++ b/kernel-debug.spec @@ -20,7 +20,6 @@ %define srcversion 6.2 %define patchversion 6.2.10 %define variant %{nil} -%define vanilla_only 0 %define compress_modules zstd %define compress_vmlinux xz %define livepatch livepatch%{nil} @@ -31,6 +30,7 @@ %define build_flavor debug %define build_default ("%build_flavor" == "default") %define build_vanilla ("%build_flavor" == "vanilla") +%define vanilla_only %{lua: if (rpm.expand("%variant") == "-vanilla") then print(1) else print(0) end} %if ! %build_vanilla %define src_install_dir /usr/src/linux-%kernelrelease%variant @@ -113,7 +113,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 6.2.10 %if 0%{?is_kotd} -Release: .gba7816e +Release: .g9659992 %else Release: 0 %endif @@ -238,10 +238,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-ba7816e0ae08661ece79de1c621443536811787f -Provides: kernel-srchash-ba7816e0ae08661ece79de1c621443536811787f +Provides: kernel-%build_flavor-base-srchash-965999287869830862e110699e56eaad05d9c946 +Provides: kernel-srchash-965999287869830862e110699e56eaad05d9c946 # END COMMON DEPS -Provides: %name-srchash-ba7816e0ae08661ece79de1c621443536811787f +Provides: %name-srchash-965999287869830862e110699e56eaad05d9c946 %ifarch ppc64 Provides: kernel-kdump = 2.6.28 Obsoletes: kernel-kdump <= 2.6.28 @@ -477,7 +477,7 @@ awk '{ cd linux-%srcversion %_sourcedir/apply-patches \ -%if %{build_vanilla} +%if %{build_vanilla} && ! %vanilla_only --vanilla \ %endif %_sourcedir/series.conf .. $SYMBOLS @@ -1419,7 +1419,7 @@ Summary: Development files necessary for building kernel modules Group: Development/Sources Provides: %name-devel = %version-%source_rel Provides: multiversion(kernel) -%if ! %build_vanilla +%if ! %build_vanilla && ! %vanilla_only Requires: kernel-devel%variant = %version-%source_rel Recommends: make Recommends: gcc diff --git a/kernel-default.changes b/kernel-default.changes index 99eac0e5..36e02b34 100644 --- a/kernel-default.changes +++ b/kernel-default.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 11 11:31:54 CEST 2023 - msuchanek@suse.de + +- Update patches.kernel.org/6.2.10-153-powerpc-pseries-vas-Ignore-VAS-update-for-DLPA.patch + (bsc#1012628 bsc#1210216 ltc#202189). +- commit 4e944ba + ------------------------------------------------------------------- Thu Apr 6 12:36:55 CEST 2023 - jslaby@suse.cz @@ -317,6 +324,21 @@ Thu Apr 6 12:36:55 CEST 2023 - jslaby@suse.cz *again*" (bsc#1012628). - commit ba7816e +------------------------------------------------------------------- +Tue Apr 4 14:51:56 CEST 2023 - msuchanek@suse.de + +- Define kernel-vanilla as source variant + The vanilla_only macro is overloaded. It is used for determining if + there should be two kernel sources built as well as for the purpose of + determmioning if vanilla kernel should be used for kernel-obs-build. + While the former can be determined at build time the latter needs to be + baked into the spec file template. Separate the two while also making + the latter more generic. + $build_dtbs is enabled on every single rt and azure branch since 15.3 + when the setting was introduced, gate on the new $obs_build_variant + setting as well. +- commit 36ba909 + ------------------------------------------------------------------- Tue Apr 4 07:17:34 CEST 2023 - jslaby@suse.cz diff --git a/kernel-default.spec b/kernel-default.spec index e5a74a1e..97460187 100644 --- a/kernel-default.spec +++ b/kernel-default.spec @@ -20,7 +20,6 @@ %define srcversion 6.2 %define patchversion 6.2.10 %define variant %{nil} -%define vanilla_only 0 %define compress_modules zstd %define compress_vmlinux xz %define livepatch livepatch%{nil} @@ -31,6 +30,7 @@ %define build_flavor default %define build_default ("%build_flavor" == "default") %define build_vanilla ("%build_flavor" == "vanilla") +%define vanilla_only %{lua: if (rpm.expand("%variant") == "-vanilla") then print(1) else print(0) end} %if ! %build_vanilla %define src_install_dir /usr/src/linux-%kernelrelease%variant @@ -113,7 +113,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 6.2.10 %if 0%{?is_kotd} -Release: .gba7816e +Release: .g9659992 %else Release: 0 %endif @@ -238,10 +238,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-ba7816e0ae08661ece79de1c621443536811787f -Provides: kernel-srchash-ba7816e0ae08661ece79de1c621443536811787f +Provides: kernel-%build_flavor-base-srchash-965999287869830862e110699e56eaad05d9c946 +Provides: kernel-srchash-965999287869830862e110699e56eaad05d9c946 # END COMMON DEPS -Provides: %name-srchash-ba7816e0ae08661ece79de1c621443536811787f +Provides: %name-srchash-965999287869830862e110699e56eaad05d9c946 %ifarch %ix86 Provides: kernel-smp = 2.6.17 Obsoletes: kernel-smp <= 2.6.17 @@ -520,7 +520,7 @@ awk '{ cd linux-%srcversion %_sourcedir/apply-patches \ -%if %{build_vanilla} +%if %{build_vanilla} && ! %vanilla_only --vanilla \ %endif %_sourcedir/series.conf .. $SYMBOLS @@ -1500,7 +1500,7 @@ Summary: Development files necessary for building kernel modules Group: Development/Sources Provides: %name-devel = %version-%source_rel Provides: multiversion(kernel) -%if ! %build_vanilla +%if ! %build_vanilla && ! %vanilla_only Requires: kernel-devel%variant = %version-%source_rel Recommends: make Recommends: gcc diff --git a/kernel-docs.changes b/kernel-docs.changes index 99eac0e5..36e02b34 100644 --- a/kernel-docs.changes +++ b/kernel-docs.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 11 11:31:54 CEST 2023 - msuchanek@suse.de + +- Update patches.kernel.org/6.2.10-153-powerpc-pseries-vas-Ignore-VAS-update-for-DLPA.patch + (bsc#1012628 bsc#1210216 ltc#202189). +- commit 4e944ba + ------------------------------------------------------------------- Thu Apr 6 12:36:55 CEST 2023 - jslaby@suse.cz @@ -317,6 +324,21 @@ Thu Apr 6 12:36:55 CEST 2023 - jslaby@suse.cz *again*" (bsc#1012628). - commit ba7816e +------------------------------------------------------------------- +Tue Apr 4 14:51:56 CEST 2023 - msuchanek@suse.de + +- Define kernel-vanilla as source variant + The vanilla_only macro is overloaded. It is used for determining if + there should be two kernel sources built as well as for the purpose of + determmioning if vanilla kernel should be used for kernel-obs-build. + While the former can be determined at build time the latter needs to be + baked into the spec file template. Separate the two while also making + the latter more generic. + $build_dtbs is enabled on every single rt and azure branch since 15.3 + when the setting was introduced, gate on the new $obs_build_variant + setting as well. +- commit 36ba909 + ------------------------------------------------------------------- Tue Apr 4 07:17:34 CEST 2023 - jslaby@suse.cz diff --git a/kernel-docs.spec b/kernel-docs.spec index d1c7bc33..4e755cbe 100644 --- a/kernel-docs.spec +++ b/kernel-docs.spec @@ -33,7 +33,7 @@ License: GPL-2.0-only Group: Documentation/Man Version: 6.2.10 %if 0%{?is_kotd} -Release: .gba7816e +Release: .g9659992 %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-ba7816e0ae08661ece79de1c621443536811787f +Provides: %name-srchash-965999287869830862e110699e56eaad05d9c946 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz diff --git a/kernel-kvmsmall.changes b/kernel-kvmsmall.changes index 99eac0e5..36e02b34 100644 --- a/kernel-kvmsmall.changes +++ b/kernel-kvmsmall.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 11 11:31:54 CEST 2023 - msuchanek@suse.de + +- Update patches.kernel.org/6.2.10-153-powerpc-pseries-vas-Ignore-VAS-update-for-DLPA.patch + (bsc#1012628 bsc#1210216 ltc#202189). +- commit 4e944ba + ------------------------------------------------------------------- Thu Apr 6 12:36:55 CEST 2023 - jslaby@suse.cz @@ -317,6 +324,21 @@ Thu Apr 6 12:36:55 CEST 2023 - jslaby@suse.cz *again*" (bsc#1012628). - commit ba7816e +------------------------------------------------------------------- +Tue Apr 4 14:51:56 CEST 2023 - msuchanek@suse.de + +- Define kernel-vanilla as source variant + The vanilla_only macro is overloaded. It is used for determining if + there should be two kernel sources built as well as for the purpose of + determmioning if vanilla kernel should be used for kernel-obs-build. + While the former can be determined at build time the latter needs to be + baked into the spec file template. Separate the two while also making + the latter more generic. + $build_dtbs is enabled on every single rt and azure branch since 15.3 + when the setting was introduced, gate on the new $obs_build_variant + setting as well. +- commit 36ba909 + ------------------------------------------------------------------- Tue Apr 4 07:17:34 CEST 2023 - jslaby@suse.cz diff --git a/kernel-kvmsmall.spec b/kernel-kvmsmall.spec index 994e46b3..d404cb65 100644 --- a/kernel-kvmsmall.spec +++ b/kernel-kvmsmall.spec @@ -20,7 +20,6 @@ %define srcversion 6.2 %define patchversion 6.2.10 %define variant %{nil} -%define vanilla_only 0 %define compress_modules zstd %define compress_vmlinux xz %define livepatch livepatch%{nil} @@ -31,6 +30,7 @@ %define build_flavor kvmsmall %define build_default ("%build_flavor" == "default") %define build_vanilla ("%build_flavor" == "vanilla") +%define vanilla_only %{lua: if (rpm.expand("%variant") == "-vanilla") then print(1) else print(0) end} %if ! %build_vanilla %define src_install_dir /usr/src/linux-%kernelrelease%variant @@ -113,7 +113,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 6.2.10 %if 0%{?is_kotd} -Release: .gba7816e +Release: .g9659992 %else Release: 0 %endif @@ -238,10 +238,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-ba7816e0ae08661ece79de1c621443536811787f -Provides: kernel-srchash-ba7816e0ae08661ece79de1c621443536811787f +Provides: kernel-%build_flavor-base-srchash-965999287869830862e110699e56eaad05d9c946 +Provides: kernel-srchash-965999287869830862e110699e56eaad05d9c946 # END COMMON DEPS -Provides: %name-srchash-ba7816e0ae08661ece79de1c621443536811787f +Provides: %name-srchash-965999287869830862e110699e56eaad05d9c946 %obsolete_rebuilds %name Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc @@ -475,7 +475,7 @@ awk '{ cd linux-%srcversion %_sourcedir/apply-patches \ -%if %{build_vanilla} +%if %{build_vanilla} && ! %vanilla_only --vanilla \ %endif %_sourcedir/series.conf .. $SYMBOLS @@ -1421,7 +1421,7 @@ Summary: Development files necessary for building kernel modules Group: Development/Sources Provides: %name-devel = %version-%source_rel Provides: multiversion(kernel) -%if ! %build_vanilla +%if ! %build_vanilla && ! %vanilla_only Requires: kernel-devel%variant = %version-%source_rel Recommends: make Recommends: gcc diff --git a/kernel-lpae.changes b/kernel-lpae.changes index 99eac0e5..36e02b34 100644 --- a/kernel-lpae.changes +++ b/kernel-lpae.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 11 11:31:54 CEST 2023 - msuchanek@suse.de + +- Update patches.kernel.org/6.2.10-153-powerpc-pseries-vas-Ignore-VAS-update-for-DLPA.patch + (bsc#1012628 bsc#1210216 ltc#202189). +- commit 4e944ba + ------------------------------------------------------------------- Thu Apr 6 12:36:55 CEST 2023 - jslaby@suse.cz @@ -317,6 +324,21 @@ Thu Apr 6 12:36:55 CEST 2023 - jslaby@suse.cz *again*" (bsc#1012628). - commit ba7816e +------------------------------------------------------------------- +Tue Apr 4 14:51:56 CEST 2023 - msuchanek@suse.de + +- Define kernel-vanilla as source variant + The vanilla_only macro is overloaded. It is used for determining if + there should be two kernel sources built as well as for the purpose of + determmioning if vanilla kernel should be used for kernel-obs-build. + While the former can be determined at build time the latter needs to be + baked into the spec file template. Separate the two while also making + the latter more generic. + $build_dtbs is enabled on every single rt and azure branch since 15.3 + when the setting was introduced, gate on the new $obs_build_variant + setting as well. +- commit 36ba909 + ------------------------------------------------------------------- Tue Apr 4 07:17:34 CEST 2023 - jslaby@suse.cz diff --git a/kernel-lpae.spec b/kernel-lpae.spec index aa3fff21..45efc808 100644 --- a/kernel-lpae.spec +++ b/kernel-lpae.spec @@ -20,7 +20,6 @@ %define srcversion 6.2 %define patchversion 6.2.10 %define variant %{nil} -%define vanilla_only 0 %define compress_modules zstd %define compress_vmlinux xz %define livepatch livepatch%{nil} @@ -31,6 +30,7 @@ %define build_flavor lpae %define build_default ("%build_flavor" == "default") %define build_vanilla ("%build_flavor" == "vanilla") +%define vanilla_only %{lua: if (rpm.expand("%variant") == "-vanilla") then print(1) else print(0) end} %if ! %build_vanilla %define src_install_dir /usr/src/linux-%kernelrelease%variant @@ -113,7 +113,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 6.2.10 %if 0%{?is_kotd} -Release: .gba7816e +Release: .g9659992 %else Release: 0 %endif @@ -238,10 +238,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-ba7816e0ae08661ece79de1c621443536811787f -Provides: kernel-srchash-ba7816e0ae08661ece79de1c621443536811787f +Provides: kernel-%build_flavor-base-srchash-965999287869830862e110699e56eaad05d9c946 +Provides: kernel-srchash-965999287869830862e110699e56eaad05d9c946 # END COMMON DEPS -Provides: %name-srchash-ba7816e0ae08661ece79de1c621443536811787f +Provides: %name-srchash-965999287869830862e110699e56eaad05d9c946 %obsolete_rebuilds %name Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc @@ -469,7 +469,7 @@ awk '{ cd linux-%srcversion %_sourcedir/apply-patches \ -%if %{build_vanilla} +%if %{build_vanilla} && ! %vanilla_only --vanilla \ %endif %_sourcedir/series.conf .. $SYMBOLS @@ -1403,7 +1403,7 @@ Summary: Development files necessary for building kernel modules Group: Development/Sources Provides: %name-devel = %version-%source_rel Provides: multiversion(kernel) -%if ! %build_vanilla +%if ! %build_vanilla && ! %vanilla_only Requires: kernel-devel%variant = %version-%source_rel Recommends: make Recommends: gcc diff --git a/kernel-obs-build.changes b/kernel-obs-build.changes index 99eac0e5..36e02b34 100644 --- a/kernel-obs-build.changes +++ b/kernel-obs-build.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 11 11:31:54 CEST 2023 - msuchanek@suse.de + +- Update patches.kernel.org/6.2.10-153-powerpc-pseries-vas-Ignore-VAS-update-for-DLPA.patch + (bsc#1012628 bsc#1210216 ltc#202189). +- commit 4e944ba + ------------------------------------------------------------------- Thu Apr 6 12:36:55 CEST 2023 - jslaby@suse.cz @@ -317,6 +324,21 @@ Thu Apr 6 12:36:55 CEST 2023 - jslaby@suse.cz *again*" (bsc#1012628). - commit ba7816e +------------------------------------------------------------------- +Tue Apr 4 14:51:56 CEST 2023 - msuchanek@suse.de + +- Define kernel-vanilla as source variant + The vanilla_only macro is overloaded. It is used for determining if + there should be two kernel sources built as well as for the purpose of + determmioning if vanilla kernel should be used for kernel-obs-build. + While the former can be determined at build time the latter needs to be + baked into the spec file template. Separate the two while also making + the latter more generic. + $build_dtbs is enabled on every single rt and azure branch since 15.3 + when the setting was introduced, gate on the new $obs_build_variant + setting as well. +- commit 36ba909 + ------------------------------------------------------------------- Tue Apr 4 07:17:34 CEST 2023 - jslaby@suse.cz diff --git a/kernel-obs-build.spec b/kernel-obs-build.spec index 8f7bad2d..b2e38e7f 100644 --- a/kernel-obs-build.spec +++ b/kernel-obs-build.spec @@ -21,7 +21,6 @@ %define patchversion 6.2.10 %define variant %{nil} -%define vanilla_only 0 %include %_sourcedir/kernel-spec-macros @@ -31,8 +30,8 @@ BuildRequires: device-mapper BuildRequires: util-linux %if 0%{?suse_version} -%if %vanilla_only -%define kernel_flavor -vanilla +%if "%{nil}" +%define kernel_flavor %{nil} %else %ifarch %ix86 %define kernel_flavor -pae @@ -45,7 +44,7 @@ BuildRequires: util-linux %endif %endif %endif -BuildRequires: kernel%kernel_flavor-srchash-ba7816e0ae08661ece79de1c621443536811787f +BuildRequires: kernel%kernel_flavor-srchash-965999287869830862e110699e56eaad05d9c946 %if 0%{?rhel_version} BuildRequires: kernel @@ -59,7 +58,7 @@ License: GPL-2.0-only Group: SLES Version: 6.2.10 %if 0%{?is_kotd} -Release: .gba7816e +Release: .g9659992 %else Release: 0 %endif diff --git a/kernel-obs-build.spec.in b/kernel-obs-build.spec.in index b8273646..ddec8579 100644 --- a/kernel-obs-build.spec.in +++ b/kernel-obs-build.spec.in @@ -21,7 +21,6 @@ %define patchversion @PATCHVERSION@ %define variant @VARIANT@%{nil} -%define vanilla_only @VANILLA_ONLY@ %include %_sourcedir/kernel-spec-macros @@ -31,8 +30,8 @@ BuildRequires: device-mapper BuildRequires: util-linux %if 0%{?suse_version} -%if %vanilla_only -%define kernel_flavor -vanilla +%if "@OBS_BUILD_VARIANT@" +%define kernel_flavor @OBS_BUILD_VARIANT@ %else %ifarch %ix86 %define kernel_flavor -pae diff --git a/kernel-obs-qa.changes b/kernel-obs-qa.changes index 99eac0e5..36e02b34 100644 --- a/kernel-obs-qa.changes +++ b/kernel-obs-qa.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 11 11:31:54 CEST 2023 - msuchanek@suse.de + +- Update patches.kernel.org/6.2.10-153-powerpc-pseries-vas-Ignore-VAS-update-for-DLPA.patch + (bsc#1012628 bsc#1210216 ltc#202189). +- commit 4e944ba + ------------------------------------------------------------------- Thu Apr 6 12:36:55 CEST 2023 - jslaby@suse.cz @@ -317,6 +324,21 @@ Thu Apr 6 12:36:55 CEST 2023 - jslaby@suse.cz *again*" (bsc#1012628). - commit ba7816e +------------------------------------------------------------------- +Tue Apr 4 14:51:56 CEST 2023 - msuchanek@suse.de + +- Define kernel-vanilla as source variant + The vanilla_only macro is overloaded. It is used for determining if + there should be two kernel sources built as well as for the purpose of + determmioning if vanilla kernel should be used for kernel-obs-build. + While the former can be determined at build time the latter needs to be + baked into the spec file template. Separate the two while also making + the latter more generic. + $build_dtbs is enabled on every single rt and azure branch since 15.3 + when the setting was introduced, gate on the new $obs_build_variant + setting as well. +- commit 36ba909 + ------------------------------------------------------------------- Tue Apr 4 07:17:34 CEST 2023 - jslaby@suse.cz diff --git a/kernel-obs-qa.spec b/kernel-obs-qa.spec index 4481efae..cfc4aaf1 100644 --- a/kernel-obs-qa.spec +++ b/kernel-obs-qa.spec @@ -38,7 +38,7 @@ License: GPL-2.0-only Group: SLES Version: 6.2.10 %if 0%{?is_kotd} -Release: .gba7816e +Release: .g9659992 %else Release: 0 %endif diff --git a/kernel-pae.changes b/kernel-pae.changes index 99eac0e5..36e02b34 100644 --- a/kernel-pae.changes +++ b/kernel-pae.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 11 11:31:54 CEST 2023 - msuchanek@suse.de + +- Update patches.kernel.org/6.2.10-153-powerpc-pseries-vas-Ignore-VAS-update-for-DLPA.patch + (bsc#1012628 bsc#1210216 ltc#202189). +- commit 4e944ba + ------------------------------------------------------------------- Thu Apr 6 12:36:55 CEST 2023 - jslaby@suse.cz @@ -317,6 +324,21 @@ Thu Apr 6 12:36:55 CEST 2023 - jslaby@suse.cz *again*" (bsc#1012628). - commit ba7816e +------------------------------------------------------------------- +Tue Apr 4 14:51:56 CEST 2023 - msuchanek@suse.de + +- Define kernel-vanilla as source variant + The vanilla_only macro is overloaded. It is used for determining if + there should be two kernel sources built as well as for the purpose of + determmioning if vanilla kernel should be used for kernel-obs-build. + While the former can be determined at build time the latter needs to be + baked into the spec file template. Separate the two while also making + the latter more generic. + $build_dtbs is enabled on every single rt and azure branch since 15.3 + when the setting was introduced, gate on the new $obs_build_variant + setting as well. +- commit 36ba909 + ------------------------------------------------------------------- Tue Apr 4 07:17:34 CEST 2023 - jslaby@suse.cz diff --git a/kernel-pae.spec b/kernel-pae.spec index a5a43795..543d9d9b 100644 --- a/kernel-pae.spec +++ b/kernel-pae.spec @@ -20,7 +20,6 @@ %define srcversion 6.2 %define patchversion 6.2.10 %define variant %{nil} -%define vanilla_only 0 %define compress_modules zstd %define compress_vmlinux xz %define livepatch livepatch%{nil} @@ -31,6 +30,7 @@ %define build_flavor pae %define build_default ("%build_flavor" == "default") %define build_vanilla ("%build_flavor" == "vanilla") +%define vanilla_only %{lua: if (rpm.expand("%variant") == "-vanilla") then print(1) else print(0) end} %if ! %build_vanilla %define src_install_dir /usr/src/linux-%kernelrelease%variant @@ -113,7 +113,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 6.2.10 %if 0%{?is_kotd} -Release: .gba7816e +Release: .g9659992 %else Release: 0 %endif @@ -238,10 +238,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-ba7816e0ae08661ece79de1c621443536811787f -Provides: kernel-srchash-ba7816e0ae08661ece79de1c621443536811787f +Provides: kernel-%build_flavor-base-srchash-965999287869830862e110699e56eaad05d9c946 +Provides: kernel-srchash-965999287869830862e110699e56eaad05d9c946 # END COMMON DEPS -Provides: %name-srchash-ba7816e0ae08661ece79de1c621443536811787f +Provides: %name-srchash-965999287869830862e110699e56eaad05d9c946 %ifarch %ix86 Provides: kernel-bigsmp = 2.6.17 Obsoletes: kernel-bigsmp <= 2.6.17 @@ -497,7 +497,7 @@ awk '{ cd linux-%srcversion %_sourcedir/apply-patches \ -%if %{build_vanilla} +%if %{build_vanilla} && ! %vanilla_only --vanilla \ %endif %_sourcedir/series.conf .. $SYMBOLS @@ -1463,7 +1463,7 @@ Summary: Development files necessary for building kernel modules Group: Development/Sources Provides: %name-devel = %version-%source_rel Provides: multiversion(kernel) -%if ! %build_vanilla +%if ! %build_vanilla && ! %vanilla_only Requires: kernel-devel%variant = %version-%source_rel Recommends: make Recommends: gcc diff --git a/kernel-source.changes b/kernel-source.changes index 99eac0e5..36e02b34 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 11 11:31:54 CEST 2023 - msuchanek@suse.de + +- Update patches.kernel.org/6.2.10-153-powerpc-pseries-vas-Ignore-VAS-update-for-DLPA.patch + (bsc#1012628 bsc#1210216 ltc#202189). +- commit 4e944ba + ------------------------------------------------------------------- Thu Apr 6 12:36:55 CEST 2023 - jslaby@suse.cz @@ -317,6 +324,21 @@ Thu Apr 6 12:36:55 CEST 2023 - jslaby@suse.cz *again*" (bsc#1012628). - commit ba7816e +------------------------------------------------------------------- +Tue Apr 4 14:51:56 CEST 2023 - msuchanek@suse.de + +- Define kernel-vanilla as source variant + The vanilla_only macro is overloaded. It is used for determining if + there should be two kernel sources built as well as for the purpose of + determmioning if vanilla kernel should be used for kernel-obs-build. + While the former can be determined at build time the latter needs to be + baked into the spec file template. Separate the two while also making + the latter more generic. + $build_dtbs is enabled on every single rt and azure branch since 15.3 + when the setting was introduced, gate on the new $obs_build_variant + setting as well. +- commit 36ba909 + ------------------------------------------------------------------- Tue Apr 4 07:17:34 CEST 2023 - jslaby@suse.cz diff --git a/kernel-source.spec b/kernel-source.spec index 422005d5..9ff6f006 100644 --- a/kernel-source.spec +++ b/kernel-source.spec @@ -19,7 +19,6 @@ %define srcversion 6.2 %define patchversion 6.2.10 %define variant %{nil} -%define vanilla_only 0 %include %_sourcedir/kernel-spec-macros @@ -33,7 +32,7 @@ Name: kernel-source Version: 6.2.10 %if 0%{?is_kotd} -Release: .gba7816e +Release: .g9659992 %else Release: 0 %endif @@ -50,7 +49,7 @@ BuildRequires: fdupes BuildRequires: sed Requires(post): coreutils sed Provides: %name = %version-%source_rel -Provides: %name-srchash-ba7816e0ae08661ece79de1c621443536811787f +Provides: %name-srchash-965999287869830862e110699e56eaad05d9c946 Provides: linux Provides: multiversion(kernel) Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz @@ -231,11 +230,7 @@ sed -ie 's,/lib/modules/,%{kernel_module_directory}/,' linux-%kernelrelease%vari %endif %if %do_vanilla -%if %vanilla_only - mv \ -%else cp -al \ -%endif linux-%kernelrelease%variant linux-%kernelrelease-vanilla cd linux-%kernelrelease-vanilla %_sourcedir/apply-patches --vanilla %_sourcedir/series.conf %my_builddir %symbols @@ -245,7 +240,6 @@ rm -f $(find . -name ".gitignore") cd .. %endif -%if ! %vanilla_only cd linux-%kernelrelease%variant %_sourcedir/apply-patches %_sourcedir/series.conf %my_builddir %symbols rm -f $(find . -name ".gitignore") @@ -256,10 +250,8 @@ fi # Hardlink duplicate files automatically (from package fdupes). %fdupes $PWD cd .. -%endif popd -%if ! %vanilla_only # Install the documentation and example Kernel Module Package. DOC=/usr/share/doc/packages/%name-%kernelrelease mkdir -p %buildroot/$DOC @@ -286,7 +278,6 @@ perl "%_sourcedir/group-source-files.pl" \ -D "$OLDPWD/devel.files" -N "$OLDPWD/nondevel.files" \ -L "%src_install_dir" popd -%endif find %{buildroot}/usr/src/linux* -type f -name '*.[ch]' -perm /0111 -exec chmod -v a-x {} + # OBS checks don't like /usr/bin/env in script interpreter lines @@ -301,7 +292,6 @@ done ts="$(head -n1 %_sourcedir/source-timestamp)" find %buildroot/usr/src/linux* ! -type l | xargs touch -d "$ts" -%if ! %vanilla_only %post %relink_function @@ -329,7 +319,6 @@ relink linux-%kernelrelease%variant /usr/src/linux%variant /usr/lib/rpm/kernel/* %endif -%endif %if %do_vanilla diff --git a/kernel-source.spec.in b/kernel-source.spec.in index 1cbb2890..748062b3 100644 --- a/kernel-source.spec.in +++ b/kernel-source.spec.in @@ -19,7 +19,6 @@ %define srcversion @SRCVERSION@ %define patchversion @PATCHVERSION@ %define variant @VARIANT@%{nil} -%define vanilla_only @VANILLA_ONLY@ %include %_sourcedir/kernel-spec-macros @@ -231,11 +230,7 @@ sed -ie 's,/lib/modules/,%{kernel_module_directory}/,' linux-%kernelrelease%vari %endif %if %do_vanilla -%if %vanilla_only - mv \ -%else cp -al \ -%endif linux-%kernelrelease%variant linux-%kernelrelease-vanilla cd linux-%kernelrelease-vanilla %_sourcedir/apply-patches --vanilla %_sourcedir/series.conf %my_builddir %symbols @@ -245,7 +240,6 @@ rm -f $(find . -name ".gitignore") cd .. %endif -%if ! %vanilla_only cd linux-%kernelrelease%variant %_sourcedir/apply-patches %_sourcedir/series.conf %my_builddir %symbols rm -f $(find . -name ".gitignore") @@ -256,10 +250,8 @@ fi # Hardlink duplicate files automatically (from package fdupes). %fdupes $PWD cd .. -%endif popd -%if ! %vanilla_only # Install the documentation and example Kernel Module Package. DOC=/usr/share/doc/packages/%name-%kernelrelease mkdir -p %buildroot/$DOC @@ -286,7 +278,6 @@ perl "%_sourcedir/group-source-files.pl" \ -D "$OLDPWD/devel.files" -N "$OLDPWD/nondevel.files" \ -L "%src_install_dir" popd -%endif find %{buildroot}/usr/src/linux* -type f -name '*.[ch]' -perm /0111 -exec chmod -v a-x {} + # OBS checks don't like /usr/bin/env in script interpreter lines @@ -301,7 +292,6 @@ done ts="$(head -n1 %_sourcedir/source-timestamp)" find %buildroot/usr/src/linux* ! -type l | xargs touch -d "$ts" -%if ! %vanilla_only %post %relink_function @@ -329,7 +319,6 @@ relink linux-%kernelrelease%variant /usr/src/linux%variant /usr/lib/rpm/kernel/* %endif -%endif %if %do_vanilla diff --git a/kernel-syms.changes b/kernel-syms.changes index 99eac0e5..36e02b34 100644 --- a/kernel-syms.changes +++ b/kernel-syms.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 11 11:31:54 CEST 2023 - msuchanek@suse.de + +- Update patches.kernel.org/6.2.10-153-powerpc-pseries-vas-Ignore-VAS-update-for-DLPA.patch + (bsc#1012628 bsc#1210216 ltc#202189). +- commit 4e944ba + ------------------------------------------------------------------- Thu Apr 6 12:36:55 CEST 2023 - jslaby@suse.cz @@ -317,6 +324,21 @@ Thu Apr 6 12:36:55 CEST 2023 - jslaby@suse.cz *again*" (bsc#1012628). - commit ba7816e +------------------------------------------------------------------- +Tue Apr 4 14:51:56 CEST 2023 - msuchanek@suse.de + +- Define kernel-vanilla as source variant + The vanilla_only macro is overloaded. It is used for determining if + there should be two kernel sources built as well as for the purpose of + determmioning if vanilla kernel should be used for kernel-obs-build. + While the former can be determined at build time the latter needs to be + baked into the spec file template. Separate the two while also making + the latter more generic. + $build_dtbs is enabled on every single rt and azure branch since 15.3 + when the setting was introduced, gate on the new $obs_build_variant + setting as well. +- commit 36ba909 + ------------------------------------------------------------------- Tue Apr 4 07:17:34 CEST 2023 - jslaby@suse.cz diff --git a/kernel-syms.spec b/kernel-syms.spec index ae8a5b1a..67aef5bd 100644 --- a/kernel-syms.spec +++ b/kernel-syms.spec @@ -27,7 +27,7 @@ Group: Development/Sources Version: 6.2.10 %if %using_buildservice %if 0%{?is_kotd} -Release: .gba7816e +Release: .g9659992 %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-ba7816e0ae08661ece79de1c621443536811787f +Provides: %name-srchash-965999287869830862e110699e56eaad05d9c946 Provides: multiversion(kernel) Source: README.KSYMS Requires: kernel-devel%variant = %version-%source_rel diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes index 99eac0e5..36e02b34 100644 --- a/kernel-vanilla.changes +++ b/kernel-vanilla.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 11 11:31:54 CEST 2023 - msuchanek@suse.de + +- Update patches.kernel.org/6.2.10-153-powerpc-pseries-vas-Ignore-VAS-update-for-DLPA.patch + (bsc#1012628 bsc#1210216 ltc#202189). +- commit 4e944ba + ------------------------------------------------------------------- Thu Apr 6 12:36:55 CEST 2023 - jslaby@suse.cz @@ -317,6 +324,21 @@ Thu Apr 6 12:36:55 CEST 2023 - jslaby@suse.cz *again*" (bsc#1012628). - commit ba7816e +------------------------------------------------------------------- +Tue Apr 4 14:51:56 CEST 2023 - msuchanek@suse.de + +- Define kernel-vanilla as source variant + The vanilla_only macro is overloaded. It is used for determining if + there should be two kernel sources built as well as for the purpose of + determmioning if vanilla kernel should be used for kernel-obs-build. + While the former can be determined at build time the latter needs to be + baked into the spec file template. Separate the two while also making + the latter more generic. + $build_dtbs is enabled on every single rt and azure branch since 15.3 + when the setting was introduced, gate on the new $obs_build_variant + setting as well. +- commit 36ba909 + ------------------------------------------------------------------- Tue Apr 4 07:17:34 CEST 2023 - jslaby@suse.cz diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index 555ac873..91b289ad 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -20,7 +20,6 @@ %define srcversion 6.2 %define patchversion 6.2.10 %define variant %{nil} -%define vanilla_only 0 %define compress_modules zstd %define compress_vmlinux xz %define livepatch livepatch%{nil} @@ -31,6 +30,7 @@ %define build_flavor vanilla %define build_default ("%build_flavor" == "default") %define build_vanilla ("%build_flavor" == "vanilla") +%define vanilla_only %{lua: if (rpm.expand("%variant") == "-vanilla") then print(1) else print(0) end} %if ! %build_vanilla %define src_install_dir /usr/src/linux-%kernelrelease%variant @@ -113,7 +113,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 6.2.10 %if 0%{?is_kotd} -Release: .gba7816e +Release: .g9659992 %else Release: 0 %endif @@ -238,10 +238,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-ba7816e0ae08661ece79de1c621443536811787f -Provides: kernel-srchash-ba7816e0ae08661ece79de1c621443536811787f +Provides: kernel-%build_flavor-base-srchash-965999287869830862e110699e56eaad05d9c946 +Provides: kernel-srchash-965999287869830862e110699e56eaad05d9c946 # END COMMON DEPS -Provides: %name-srchash-ba7816e0ae08661ece79de1c621443536811787f +Provides: %name-srchash-965999287869830862e110699e56eaad05d9c946 %obsolete_rebuilds %name Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc @@ -468,7 +468,7 @@ awk '{ cd linux-%srcversion %_sourcedir/apply-patches \ -%if %{build_vanilla} +%if %{build_vanilla} && ! %vanilla_only --vanilla \ %endif %_sourcedir/series.conf .. $SYMBOLS @@ -1400,7 +1400,7 @@ Summary: Development files necessary for building kernel modules Group: Development/Sources Provides: %name-devel = %version-%source_rel Provides: multiversion(kernel) -%if ! %build_vanilla +%if ! %build_vanilla && ! %vanilla_only Requires: kernel-devel%variant = %version-%source_rel Recommends: make Recommends: gcc diff --git a/kernel-zfcpdump.changes b/kernel-zfcpdump.changes index 99eac0e5..36e02b34 100644 --- a/kernel-zfcpdump.changes +++ b/kernel-zfcpdump.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 11 11:31:54 CEST 2023 - msuchanek@suse.de + +- Update patches.kernel.org/6.2.10-153-powerpc-pseries-vas-Ignore-VAS-update-for-DLPA.patch + (bsc#1012628 bsc#1210216 ltc#202189). +- commit 4e944ba + ------------------------------------------------------------------- Thu Apr 6 12:36:55 CEST 2023 - jslaby@suse.cz @@ -317,6 +324,21 @@ Thu Apr 6 12:36:55 CEST 2023 - jslaby@suse.cz *again*" (bsc#1012628). - commit ba7816e +------------------------------------------------------------------- +Tue Apr 4 14:51:56 CEST 2023 - msuchanek@suse.de + +- Define kernel-vanilla as source variant + The vanilla_only macro is overloaded. It is used for determining if + there should be two kernel sources built as well as for the purpose of + determmioning if vanilla kernel should be used for kernel-obs-build. + While the former can be determined at build time the latter needs to be + baked into the spec file template. Separate the two while also making + the latter more generic. + $build_dtbs is enabled on every single rt and azure branch since 15.3 + when the setting was introduced, gate on the new $obs_build_variant + setting as well. +- commit 36ba909 + ------------------------------------------------------------------- Tue Apr 4 07:17:34 CEST 2023 - jslaby@suse.cz diff --git a/kernel-zfcpdump.spec b/kernel-zfcpdump.spec index 56e78486..fcb2eaf7 100644 --- a/kernel-zfcpdump.spec +++ b/kernel-zfcpdump.spec @@ -20,7 +20,6 @@ %define srcversion 6.2 %define patchversion 6.2.10 %define variant %{nil} -%define vanilla_only 0 %define compress_modules zstd %define compress_vmlinux xz %define livepatch livepatch%{nil} @@ -31,6 +30,7 @@ %define build_flavor zfcpdump %define build_default ("%build_flavor" == "default") %define build_vanilla ("%build_flavor" == "vanilla") +%define vanilla_only %{lua: if (rpm.expand("%variant") == "-vanilla") then print(1) else print(0) end} %if ! %build_vanilla %define src_install_dir /usr/src/linux-%kernelrelease%variant @@ -113,7 +113,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 6.2.10 %if 0%{?is_kotd} -Release: .gba7816e +Release: .g9659992 %else Release: 0 %endif @@ -238,10 +238,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-ba7816e0ae08661ece79de1c621443536811787f -Provides: kernel-srchash-ba7816e0ae08661ece79de1c621443536811787f +Provides: kernel-%build_flavor-base-srchash-965999287869830862e110699e56eaad05d9c946 +Provides: kernel-srchash-965999287869830862e110699e56eaad05d9c946 # END COMMON DEPS -Provides: %name-srchash-ba7816e0ae08661ece79de1c621443536811787f +Provides: %name-srchash-965999287869830862e110699e56eaad05d9c946 %obsolete_rebuilds %name Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc @@ -471,7 +471,7 @@ awk '{ cd linux-%srcversion %_sourcedir/apply-patches \ -%if %{build_vanilla} +%if %{build_vanilla} && ! %vanilla_only --vanilla \ %endif %_sourcedir/series.conf .. $SYMBOLS @@ -1409,7 +1409,7 @@ Summary: Development files necessary for building kernel modules Group: Development/Sources Provides: %name-devel = %version-%source_rel Provides: multiversion(kernel) -%if ! %build_vanilla +%if ! %build_vanilla && ! %vanilla_only Requires: kernel-devel%variant = %version-%source_rel Recommends: make Recommends: gcc diff --git a/mkspec b/mkspec index 96e4bdd7..7a327a2a 100644 --- a/mkspec +++ b/mkspec @@ -35,8 +35,9 @@ my @kmps = read_kmps(); # config.sh variables my %vars = parse_config_sh(); -my ($srcversion, $variant, $vanilla_only) = - ($vars{'SRCVERSION'}, $vars{'VARIANT'}, $vars{'VANILLA_ONLY'}); +my ($srcversion, $variant, $obs_build_variant) = + ($vars{'SRCVERSION'}, $vars{'VARIANT'}, $vars{'OBS_BUILD_VARIANT'}); +$obs_build_variant = ($obs_build_variant ? $variant : "" ); my $compress_modules = 'none'; my $compress_vmlinux = 'gz'; my $build_dtbs = (); @@ -60,7 +61,6 @@ if (defined($vars{'LIVEPATCH_RT'})) { $livepatch_rt = $vars{'LIVEPATCH_RT'}; $livepatch_rt = "" if $livepatch_rt =~ /^(0+|no|none)$/i; } -$vanilla_only ||= "0"; if (!defined ($rpmrelease)) { $rpmrelease = $vars{'RELEASE'} || 0; } @@ -114,7 +114,7 @@ my $commit_full = get_commit(1); my %macros = ( VARIANT => $variant, - VANILLA_ONLY => $vanilla_only, + OBS_BUILD_VARIANT => $obs_build_variant . "%{nil}", SRCVERSION => $srcversion, PATCHVERSION => $patchversion, RPMVERSION => $rpmversion, @@ -216,14 +216,16 @@ if ($variant eq "") { } # kernel-obs-*.spec -if (!$variant) { +if (!$variant || $obs_build_variant) { my @default_archs; - - if ($vanilla_only) { - @default_archs = arch2rpm(@{$flavor_archs{vanilla}}); + my $flavor = $obs_build_variant; + if ($flavor) { + $flavor =~ s/^-//; } else { - @default_archs = arch2rpm(@{$flavor_archs{default}}); + $flavor = 'default'; } + + @default_archs = arch2rpm(@{$flavor_archs{$flavor}}); # No kernel-obs-* for 32bit ppc and x86 @default_archs = grep { $_ ne "ppc" && $_ ne '%ix86' } @default_archs; my $default_archs = join(" ", @default_archs); @@ -234,7 +236,7 @@ if (!$variant) { } # dtb-*.spec -if (!$variant && $build_dtbs) { +if ((!$variant || $obs_build_variant) && $build_dtbs) { do_spec('dtb', "dtb.spec.in", %macros); print "./mkspec-dtb $all_archs\n"; system("./mkspec-dtb $all_archs\n"); diff --git a/patches.kernel.org.tar.bz2 b/patches.kernel.org.tar.bz2 index 4ae9c731..06e45615 100644 --- a/patches.kernel.org.tar.bz2 +++ b/patches.kernel.org.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c65e96a550e3e0b13e9d9032faf1c8fd4669a34287b27bb8f13604b239b2a95 -size 1457859 +oid sha256:b41f5b1ec505dbfe372adbee01c1a7ee7b75ff7f97c2aca6cca537a724a41f7e +size 1457219 diff --git a/source-timestamp b/source-timestamp index 28bac00f..1ea442c1 100644 --- a/source-timestamp +++ b/source-timestamp @@ -1,3 +1,3 @@ -2023-04-06 10:36:55 +0000 -GIT Revision: ba7816e0ae08661ece79de1c621443536811787f +2023-04-11 12:18:05 +0000 +GIT Revision: 965999287869830862e110699e56eaad05d9c946 GIT Branch: stable