From 8c78f055f0d11c89addf5f591ea7924c278c9b0d1df069893c19ebf0ee47320a Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Thu, 3 Feb 2022 06:04:09 +0000 Subject: [PATCH] commit 1af400994313af6f8e7783f70a6b0777b0087dc1 OBS-URL: https://build.opensuse.org/package/show/Kernel:stable/kernel-source?expand=0&rev=1663 --- dtb-aarch64.changes | 16 ++++++++++++++++ dtb-aarch64.spec | 2 +- dtb-armv6l.changes | 16 ++++++++++++++++ dtb-armv6l.spec | 2 +- dtb-armv7l.changes | 16 ++++++++++++++++ dtb-armv7l.spec | 2 +- dtb-riscv64.changes | 16 ++++++++++++++++ dtb-riscv64.spec | 2 +- kernel-64kb.changes | 16 ++++++++++++++++ kernel-64kb.spec | 24 ++++++++++++++++-------- kernel-binary.spec.in | 16 ++++++++++++---- kernel-debug.changes | 16 ++++++++++++++++ kernel-debug.spec | 24 ++++++++++++++++-------- kernel-default.changes | 16 ++++++++++++++++ kernel-default.spec | 24 ++++++++++++++++-------- kernel-docs.changes | 16 ++++++++++++++++ kernel-docs.spec | 4 ++-- kernel-kvmsmall.changes | 16 ++++++++++++++++ kernel-kvmsmall.spec | 24 ++++++++++++++++-------- kernel-lpae.changes | 16 ++++++++++++++++ kernel-lpae.spec | 24 ++++++++++++++++-------- kernel-obs-build.changes | 16 ++++++++++++++++ kernel-obs-build.spec | 6 +++--- kernel-obs-build.spec.in | 2 +- kernel-obs-qa.changes | 16 ++++++++++++++++ kernel-obs-qa.spec | 2 +- kernel-pae.changes | 16 ++++++++++++++++ kernel-pae.spec | 24 ++++++++++++++++-------- kernel-source.changes | 16 ++++++++++++++++ kernel-source.spec | 4 ++-- kernel-syms.changes | 16 ++++++++++++++++ kernel-syms.spec | 4 ++-- kernel-vanilla.changes | 16 ++++++++++++++++ kernel-vanilla.spec | 24 ++++++++++++++++-------- kernel-zfcpdump.changes | 16 ++++++++++++++++ kernel-zfcpdump.spec | 24 ++++++++++++++++-------- source-timestamp | 4 ++-- 37 files changed, 429 insertions(+), 85 deletions(-) diff --git a/dtb-aarch64.changes b/dtb-aarch64.changes index 445976a0..6f573e9a 100644 --- a/dtb-aarch64.changes +++ b/dtb-aarch64.changes @@ -348,6 +348,15 @@ Tue Feb 1 15:23:26 CET 2022 - tiwai@suse.de - Input: synaptics: retry query upon error (bsc#1194086). - commit 5277fb2 +------------------------------------------------------------------- +Mon Jan 31 15:20:36 CET 2022 - ludwig.nussel@suse.de + +- kernel-obs-build: include 9p (boo#1195353) + To be able to share files between host and the qemu vm of the build + script, the 9p and 9p_virtio kernel modules need to be included in + the initrd of kernel-obs-build. +- commit 0cfe67a + ------------------------------------------------------------------- Sat Jan 29 13:57:02 CET 2022 - jslaby@suse.cz @@ -2147,6 +2156,13 @@ Mon Jan 24 19:27:48 CET 2022 - jslaby@suse.cz Add CVE reference. - commit 0d710a8 +------------------------------------------------------------------- +Mon Jan 24 16:58:21 CET 2022 - msuchanek@suse.de + +- kernel-binary.spec.in: Move 20-kernel-default-extra.conf to the correctr + directory (bsc#1195051). +- commit c80b5de + ------------------------------------------------------------------- Mon Jan 24 11:55:17 CET 2022 - tiwai@suse.de diff --git a/dtb-aarch64.spec b/dtb-aarch64.spec index 69462e1c..8aa4699c 100644 --- a/dtb-aarch64.spec +++ b/dtb-aarch64.spec @@ -31,7 +31,7 @@ Name: dtb-aarch64 Version: 5.16.5 %if 0%{?is_kotd} -Release: .g5277fb2 +Release: .g1af4009 %else Release: 0 %endif diff --git a/dtb-armv6l.changes b/dtb-armv6l.changes index 445976a0..6f573e9a 100644 --- a/dtb-armv6l.changes +++ b/dtb-armv6l.changes @@ -348,6 +348,15 @@ Tue Feb 1 15:23:26 CET 2022 - tiwai@suse.de - Input: synaptics: retry query upon error (bsc#1194086). - commit 5277fb2 +------------------------------------------------------------------- +Mon Jan 31 15:20:36 CET 2022 - ludwig.nussel@suse.de + +- kernel-obs-build: include 9p (boo#1195353) + To be able to share files between host and the qemu vm of the build + script, the 9p and 9p_virtio kernel modules need to be included in + the initrd of kernel-obs-build. +- commit 0cfe67a + ------------------------------------------------------------------- Sat Jan 29 13:57:02 CET 2022 - jslaby@suse.cz @@ -2147,6 +2156,13 @@ Mon Jan 24 19:27:48 CET 2022 - jslaby@suse.cz Add CVE reference. - commit 0d710a8 +------------------------------------------------------------------- +Mon Jan 24 16:58:21 CET 2022 - msuchanek@suse.de + +- kernel-binary.spec.in: Move 20-kernel-default-extra.conf to the correctr + directory (bsc#1195051). +- commit c80b5de + ------------------------------------------------------------------- Mon Jan 24 11:55:17 CET 2022 - tiwai@suse.de diff --git a/dtb-armv6l.spec b/dtb-armv6l.spec index a0878050..5d22664e 100644 --- a/dtb-armv6l.spec +++ b/dtb-armv6l.spec @@ -31,7 +31,7 @@ Name: dtb-armv6l Version: 5.16.5 %if 0%{?is_kotd} -Release: .g5277fb2 +Release: .g1af4009 %else Release: 0 %endif diff --git a/dtb-armv7l.changes b/dtb-armv7l.changes index 445976a0..6f573e9a 100644 --- a/dtb-armv7l.changes +++ b/dtb-armv7l.changes @@ -348,6 +348,15 @@ Tue Feb 1 15:23:26 CET 2022 - tiwai@suse.de - Input: synaptics: retry query upon error (bsc#1194086). - commit 5277fb2 +------------------------------------------------------------------- +Mon Jan 31 15:20:36 CET 2022 - ludwig.nussel@suse.de + +- kernel-obs-build: include 9p (boo#1195353) + To be able to share files between host and the qemu vm of the build + script, the 9p and 9p_virtio kernel modules need to be included in + the initrd of kernel-obs-build. +- commit 0cfe67a + ------------------------------------------------------------------- Sat Jan 29 13:57:02 CET 2022 - jslaby@suse.cz @@ -2147,6 +2156,13 @@ Mon Jan 24 19:27:48 CET 2022 - jslaby@suse.cz Add CVE reference. - commit 0d710a8 +------------------------------------------------------------------- +Mon Jan 24 16:58:21 CET 2022 - msuchanek@suse.de + +- kernel-binary.spec.in: Move 20-kernel-default-extra.conf to the correctr + directory (bsc#1195051). +- commit c80b5de + ------------------------------------------------------------------- Mon Jan 24 11:55:17 CET 2022 - tiwai@suse.de diff --git a/dtb-armv7l.spec b/dtb-armv7l.spec index 89eba800..ab350eb0 100644 --- a/dtb-armv7l.spec +++ b/dtb-armv7l.spec @@ -31,7 +31,7 @@ Name: dtb-armv7l Version: 5.16.5 %if 0%{?is_kotd} -Release: .g5277fb2 +Release: .g1af4009 %else Release: 0 %endif diff --git a/dtb-riscv64.changes b/dtb-riscv64.changes index 445976a0..6f573e9a 100644 --- a/dtb-riscv64.changes +++ b/dtb-riscv64.changes @@ -348,6 +348,15 @@ Tue Feb 1 15:23:26 CET 2022 - tiwai@suse.de - Input: synaptics: retry query upon error (bsc#1194086). - commit 5277fb2 +------------------------------------------------------------------- +Mon Jan 31 15:20:36 CET 2022 - ludwig.nussel@suse.de + +- kernel-obs-build: include 9p (boo#1195353) + To be able to share files between host and the qemu vm of the build + script, the 9p and 9p_virtio kernel modules need to be included in + the initrd of kernel-obs-build. +- commit 0cfe67a + ------------------------------------------------------------------- Sat Jan 29 13:57:02 CET 2022 - jslaby@suse.cz @@ -2147,6 +2156,13 @@ Mon Jan 24 19:27:48 CET 2022 - jslaby@suse.cz Add CVE reference. - commit 0d710a8 +------------------------------------------------------------------- +Mon Jan 24 16:58:21 CET 2022 - msuchanek@suse.de + +- kernel-binary.spec.in: Move 20-kernel-default-extra.conf to the correctr + directory (bsc#1195051). +- commit c80b5de + ------------------------------------------------------------------- Mon Jan 24 11:55:17 CET 2022 - tiwai@suse.de diff --git a/dtb-riscv64.spec b/dtb-riscv64.spec index af91c1a6..94d35d84 100644 --- a/dtb-riscv64.spec +++ b/dtb-riscv64.spec @@ -31,7 +31,7 @@ Name: dtb-riscv64 Version: 5.16.5 %if 0%{?is_kotd} -Release: .g5277fb2 +Release: .g1af4009 %else Release: 0 %endif diff --git a/kernel-64kb.changes b/kernel-64kb.changes index 445976a0..6f573e9a 100644 --- a/kernel-64kb.changes +++ b/kernel-64kb.changes @@ -348,6 +348,15 @@ Tue Feb 1 15:23:26 CET 2022 - tiwai@suse.de - Input: synaptics: retry query upon error (bsc#1194086). - commit 5277fb2 +------------------------------------------------------------------- +Mon Jan 31 15:20:36 CET 2022 - ludwig.nussel@suse.de + +- kernel-obs-build: include 9p (boo#1195353) + To be able to share files between host and the qemu vm of the build + script, the 9p and 9p_virtio kernel modules need to be included in + the initrd of kernel-obs-build. +- commit 0cfe67a + ------------------------------------------------------------------- Sat Jan 29 13:57:02 CET 2022 - jslaby@suse.cz @@ -2147,6 +2156,13 @@ Mon Jan 24 19:27:48 CET 2022 - jslaby@suse.cz Add CVE reference. - commit 0d710a8 +------------------------------------------------------------------- +Mon Jan 24 16:58:21 CET 2022 - msuchanek@suse.de + +- kernel-binary.spec.in: Move 20-kernel-default-extra.conf to the correctr + directory (bsc#1195051). +- commit c80b5de + ------------------------------------------------------------------- Mon Jan 24 11:55:17 CET 2022 - tiwai@suse.de diff --git a/kernel-64kb.spec b/kernel-64kb.spec index ce65fb93..5e513bf4 100644 --- a/kernel-64kb.spec +++ b/kernel-64kb.spec @@ -109,7 +109,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 5.16.5 %if 0%{?is_kotd} -Release: .g5277fb2 +Release: .g1af4009 %else Release: 0 %endif @@ -231,10 +231,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-5277fb2179273c5a5c7d9e7544a817918cecc719 -Provides: kernel-srchash-5277fb2179273c5a5c7d9e7544a817918cecc719 +Provides: kernel-%build_flavor-base-srchash-1af400994313af6f8e7783f70a6b0777b0087dc1 +Provides: kernel-srchash-1af400994313af6f8e7783f70a6b0777b0087dc1 # END COMMON DEPS -Provides: %name-srchash-5277fb2179273c5a5c7d9e7544a817918cecc719 +Provides: %name-srchash-1af400994313af6f8e7783f70a6b0777b0087dc1 %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc @@ -1112,8 +1112,16 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files # kernel versions, otherwise file conflicts might arise with # multiversion(kernel). - mkdir -p %buildroot/etc/modprobe.d - cat >%buildroot/etc/modprobe.d/20-kernel-%{build_flavor}-extra.conf < 150300 + modprobe_d_dir=/lib/modprobe.d + %endif + %if 0%{?usrmerged} + modprobe_d_dir=/usr/lib/modprobe.d + %endif + + mkdir -p %buildroot$modprobe_d_dir + cat >%buildroot$modprobe_d_dir/20-kernel-%{build_flavor}-extra.conf <> %my_builddir/kernel-devel.files # Please read the comments in 10-unsupported-modules.conf. allow_unsupported_modules 1 EOF - echo "%%dir /etc/modprobe.d" >> %my_builddir/kernel-extra.files - echo '%%config(noreplace) /etc/modprobe.d/20-kernel-%{build_flavor}-extra.conf' >> %my_builddir/kernel-extra.files + echo "%%dir $modprobe_d_dir" >> %my_builddir/kernel-extra.files + echo "%%config(noreplace) $modprobe_d_dir/20-kernel-%{build_flavor}-extra.conf" >> %my_builddir/kernel-extra.files %endif %endif for f in %my_builddir/*-kmp-modules; do diff --git a/kernel-binary.spec.in b/kernel-binary.spec.in index f04b99c7..d6e60d36 100644 --- a/kernel-binary.spec.in +++ b/kernel-binary.spec.in @@ -981,8 +981,16 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files # kernel versions, otherwise file conflicts might arise with # multiversion(kernel). - mkdir -p %buildroot/etc/modprobe.d - cat >%buildroot/etc/modprobe.d/20-kernel-%{build_flavor}-extra.conf < 150300 + modprobe_d_dir=/lib/modprobe.d + %endif + %if 0%{?usrmerged} + modprobe_d_dir=/usr/lib/modprobe.d + %endif + + mkdir -p %buildroot$modprobe_d_dir + cat >%buildroot$modprobe_d_dir/20-kernel-%{build_flavor}-extra.conf <> %my_builddir/kernel-devel.files # Please read the comments in 10-unsupported-modules.conf. allow_unsupported_modules 1 EOF - echo "%%dir /etc/modprobe.d" >> %my_builddir/kernel-extra.files - echo '%%config(noreplace) /etc/modprobe.d/20-kernel-%{build_flavor}-extra.conf' >> %my_builddir/kernel-extra.files + echo "%%dir $modprobe_d_dir" >> %my_builddir/kernel-extra.files + echo "%%config(noreplace) $modprobe_d_dir/20-kernel-%{build_flavor}-extra.conf" >> %my_builddir/kernel-extra.files %endif %endif for f in %my_builddir/*-kmp-modules; do diff --git a/kernel-debug.changes b/kernel-debug.changes index 445976a0..6f573e9a 100644 --- a/kernel-debug.changes +++ b/kernel-debug.changes @@ -348,6 +348,15 @@ Tue Feb 1 15:23:26 CET 2022 - tiwai@suse.de - Input: synaptics: retry query upon error (bsc#1194086). - commit 5277fb2 +------------------------------------------------------------------- +Mon Jan 31 15:20:36 CET 2022 - ludwig.nussel@suse.de + +- kernel-obs-build: include 9p (boo#1195353) + To be able to share files between host and the qemu vm of the build + script, the 9p and 9p_virtio kernel modules need to be included in + the initrd of kernel-obs-build. +- commit 0cfe67a + ------------------------------------------------------------------- Sat Jan 29 13:57:02 CET 2022 - jslaby@suse.cz @@ -2147,6 +2156,13 @@ Mon Jan 24 19:27:48 CET 2022 - jslaby@suse.cz Add CVE reference. - commit 0d710a8 +------------------------------------------------------------------- +Mon Jan 24 16:58:21 CET 2022 - msuchanek@suse.de + +- kernel-binary.spec.in: Move 20-kernel-default-extra.conf to the correctr + directory (bsc#1195051). +- commit c80b5de + ------------------------------------------------------------------- Mon Jan 24 11:55:17 CET 2022 - tiwai@suse.de diff --git a/kernel-debug.spec b/kernel-debug.spec index 2e19d336..812d3c4f 100644 --- a/kernel-debug.spec +++ b/kernel-debug.spec @@ -109,7 +109,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 5.16.5 %if 0%{?is_kotd} -Release: .g5277fb2 +Release: .g1af4009 %else Release: 0 %endif @@ -231,10 +231,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-5277fb2179273c5a5c7d9e7544a817918cecc719 -Provides: kernel-srchash-5277fb2179273c5a5c7d9e7544a817918cecc719 +Provides: kernel-%build_flavor-base-srchash-1af400994313af6f8e7783f70a6b0777b0087dc1 +Provides: kernel-srchash-1af400994313af6f8e7783f70a6b0777b0087dc1 # END COMMON DEPS -Provides: %name-srchash-5277fb2179273c5a5c7d9e7544a817918cecc719 +Provides: %name-srchash-1af400994313af6f8e7783f70a6b0777b0087dc1 %ifarch ppc64 Provides: kernel-kdump = 2.6.28 Obsoletes: kernel-kdump <= 2.6.28 @@ -1118,8 +1118,16 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files # kernel versions, otherwise file conflicts might arise with # multiversion(kernel). - mkdir -p %buildroot/etc/modprobe.d - cat >%buildroot/etc/modprobe.d/20-kernel-%{build_flavor}-extra.conf < 150300 + modprobe_d_dir=/lib/modprobe.d + %endif + %if 0%{?usrmerged} + modprobe_d_dir=/usr/lib/modprobe.d + %endif + + mkdir -p %buildroot$modprobe_d_dir + cat >%buildroot$modprobe_d_dir/20-kernel-%{build_flavor}-extra.conf <> %my_builddir/kernel-devel.files # Please read the comments in 10-unsupported-modules.conf. allow_unsupported_modules 1 EOF - echo "%%dir /etc/modprobe.d" >> %my_builddir/kernel-extra.files - echo '%%config(noreplace) /etc/modprobe.d/20-kernel-%{build_flavor}-extra.conf' >> %my_builddir/kernel-extra.files + echo "%%dir $modprobe_d_dir" >> %my_builddir/kernel-extra.files + echo "%%config(noreplace) $modprobe_d_dir/20-kernel-%{build_flavor}-extra.conf" >> %my_builddir/kernel-extra.files %endif %endif for f in %my_builddir/*-kmp-modules; do diff --git a/kernel-default.changes b/kernel-default.changes index 445976a0..6f573e9a 100644 --- a/kernel-default.changes +++ b/kernel-default.changes @@ -348,6 +348,15 @@ Tue Feb 1 15:23:26 CET 2022 - tiwai@suse.de - Input: synaptics: retry query upon error (bsc#1194086). - commit 5277fb2 +------------------------------------------------------------------- +Mon Jan 31 15:20:36 CET 2022 - ludwig.nussel@suse.de + +- kernel-obs-build: include 9p (boo#1195353) + To be able to share files between host and the qemu vm of the build + script, the 9p and 9p_virtio kernel modules need to be included in + the initrd of kernel-obs-build. +- commit 0cfe67a + ------------------------------------------------------------------- Sat Jan 29 13:57:02 CET 2022 - jslaby@suse.cz @@ -2147,6 +2156,13 @@ Mon Jan 24 19:27:48 CET 2022 - jslaby@suse.cz Add CVE reference. - commit 0d710a8 +------------------------------------------------------------------- +Mon Jan 24 16:58:21 CET 2022 - msuchanek@suse.de + +- kernel-binary.spec.in: Move 20-kernel-default-extra.conf to the correctr + directory (bsc#1195051). +- commit c80b5de + ------------------------------------------------------------------- Mon Jan 24 11:55:17 CET 2022 - tiwai@suse.de diff --git a/kernel-default.spec b/kernel-default.spec index 0466b242..f54d6825 100644 --- a/kernel-default.spec +++ b/kernel-default.spec @@ -109,7 +109,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 5.16.5 %if 0%{?is_kotd} -Release: .g5277fb2 +Release: .g1af4009 %else Release: 0 %endif @@ -231,10 +231,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-5277fb2179273c5a5c7d9e7544a817918cecc719 -Provides: kernel-srchash-5277fb2179273c5a5c7d9e7544a817918cecc719 +Provides: kernel-%build_flavor-base-srchash-1af400994313af6f8e7783f70a6b0777b0087dc1 +Provides: kernel-srchash-1af400994313af6f8e7783f70a6b0777b0087dc1 # END COMMON DEPS -Provides: %name-srchash-5277fb2179273c5a5c7d9e7544a817918cecc719 +Provides: %name-srchash-1af400994313af6f8e7783f70a6b0777b0087dc1 %ifarch %ix86 Provides: kernel-smp = 2.6.17 Obsoletes: kernel-smp <= 2.6.17 @@ -1161,8 +1161,16 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files # kernel versions, otherwise file conflicts might arise with # multiversion(kernel). - mkdir -p %buildroot/etc/modprobe.d - cat >%buildroot/etc/modprobe.d/20-kernel-%{build_flavor}-extra.conf < 150300 + modprobe_d_dir=/lib/modprobe.d + %endif + %if 0%{?usrmerged} + modprobe_d_dir=/usr/lib/modprobe.d + %endif + + mkdir -p %buildroot$modprobe_d_dir + cat >%buildroot$modprobe_d_dir/20-kernel-%{build_flavor}-extra.conf <> %my_builddir/kernel-devel.files # Please read the comments in 10-unsupported-modules.conf. allow_unsupported_modules 1 EOF - echo "%%dir /etc/modprobe.d" >> %my_builddir/kernel-extra.files - echo '%%config(noreplace) /etc/modprobe.d/20-kernel-%{build_flavor}-extra.conf' >> %my_builddir/kernel-extra.files + echo "%%dir $modprobe_d_dir" >> %my_builddir/kernel-extra.files + echo "%%config(noreplace) $modprobe_d_dir/20-kernel-%{build_flavor}-extra.conf" >> %my_builddir/kernel-extra.files %endif %endif for f in %my_builddir/*-kmp-modules; do diff --git a/kernel-docs.changes b/kernel-docs.changes index 445976a0..6f573e9a 100644 --- a/kernel-docs.changes +++ b/kernel-docs.changes @@ -348,6 +348,15 @@ Tue Feb 1 15:23:26 CET 2022 - tiwai@suse.de - Input: synaptics: retry query upon error (bsc#1194086). - commit 5277fb2 +------------------------------------------------------------------- +Mon Jan 31 15:20:36 CET 2022 - ludwig.nussel@suse.de + +- kernel-obs-build: include 9p (boo#1195353) + To be able to share files between host and the qemu vm of the build + script, the 9p and 9p_virtio kernel modules need to be included in + the initrd of kernel-obs-build. +- commit 0cfe67a + ------------------------------------------------------------------- Sat Jan 29 13:57:02 CET 2022 - jslaby@suse.cz @@ -2147,6 +2156,13 @@ Mon Jan 24 19:27:48 CET 2022 - jslaby@suse.cz Add CVE reference. - commit 0d710a8 +------------------------------------------------------------------- +Mon Jan 24 16:58:21 CET 2022 - msuchanek@suse.de + +- kernel-binary.spec.in: Move 20-kernel-default-extra.conf to the correctr + directory (bsc#1195051). +- commit c80b5de + ------------------------------------------------------------------- Mon Jan 24 11:55:17 CET 2022 - tiwai@suse.de diff --git a/kernel-docs.spec b/kernel-docs.spec index bf3b1401..4253c641 100644 --- a/kernel-docs.spec +++ b/kernel-docs.spec @@ -33,7 +33,7 @@ License: GPL-2.0-only Group: Documentation/Man Version: 5.16.5 %if 0%{?is_kotd} -Release: .g5277fb2 +Release: .g1af4009 %else Release: 0 %endif @@ -64,7 +64,7 @@ BuildRequires: texlive-zapfding %endif Url: http://www.kernel.org/ Provides: %name = %version-%source_rel -Provides: %name-srchash-5277fb2179273c5a5c7d9e7544a817918cecc719 +Provides: %name-srchash-1af400994313af6f8e7783f70a6b0777b0087dc1 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz diff --git a/kernel-kvmsmall.changes b/kernel-kvmsmall.changes index 445976a0..6f573e9a 100644 --- a/kernel-kvmsmall.changes +++ b/kernel-kvmsmall.changes @@ -348,6 +348,15 @@ Tue Feb 1 15:23:26 CET 2022 - tiwai@suse.de - Input: synaptics: retry query upon error (bsc#1194086). - commit 5277fb2 +------------------------------------------------------------------- +Mon Jan 31 15:20:36 CET 2022 - ludwig.nussel@suse.de + +- kernel-obs-build: include 9p (boo#1195353) + To be able to share files between host and the qemu vm of the build + script, the 9p and 9p_virtio kernel modules need to be included in + the initrd of kernel-obs-build. +- commit 0cfe67a + ------------------------------------------------------------------- Sat Jan 29 13:57:02 CET 2022 - jslaby@suse.cz @@ -2147,6 +2156,13 @@ Mon Jan 24 19:27:48 CET 2022 - jslaby@suse.cz Add CVE reference. - commit 0d710a8 +------------------------------------------------------------------- +Mon Jan 24 16:58:21 CET 2022 - msuchanek@suse.de + +- kernel-binary.spec.in: Move 20-kernel-default-extra.conf to the correctr + directory (bsc#1195051). +- commit c80b5de + ------------------------------------------------------------------- Mon Jan 24 11:55:17 CET 2022 - tiwai@suse.de diff --git a/kernel-kvmsmall.spec b/kernel-kvmsmall.spec index ec730eb8..fe52cfc3 100644 --- a/kernel-kvmsmall.spec +++ b/kernel-kvmsmall.spec @@ -109,7 +109,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 5.16.5 %if 0%{?is_kotd} -Release: .g5277fb2 +Release: .g1af4009 %else Release: 0 %endif @@ -231,10 +231,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-5277fb2179273c5a5c7d9e7544a817918cecc719 -Provides: kernel-srchash-5277fb2179273c5a5c7d9e7544a817918cecc719 +Provides: kernel-%build_flavor-base-srchash-1af400994313af6f8e7783f70a6b0777b0087dc1 +Provides: kernel-srchash-1af400994313af6f8e7783f70a6b0777b0087dc1 # END COMMON DEPS -Provides: %name-srchash-5277fb2179273c5a5c7d9e7544a817918cecc719 +Provides: %name-srchash-1af400994313af6f8e7783f70a6b0777b0087dc1 %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc @@ -1116,8 +1116,16 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files # kernel versions, otherwise file conflicts might arise with # multiversion(kernel). - mkdir -p %buildroot/etc/modprobe.d - cat >%buildroot/etc/modprobe.d/20-kernel-%{build_flavor}-extra.conf < 150300 + modprobe_d_dir=/lib/modprobe.d + %endif + %if 0%{?usrmerged} + modprobe_d_dir=/usr/lib/modprobe.d + %endif + + mkdir -p %buildroot$modprobe_d_dir + cat >%buildroot$modprobe_d_dir/20-kernel-%{build_flavor}-extra.conf <> %my_builddir/kernel-devel.files # Please read the comments in 10-unsupported-modules.conf. allow_unsupported_modules 1 EOF - echo "%%dir /etc/modprobe.d" >> %my_builddir/kernel-extra.files - echo '%%config(noreplace) /etc/modprobe.d/20-kernel-%{build_flavor}-extra.conf' >> %my_builddir/kernel-extra.files + echo "%%dir $modprobe_d_dir" >> %my_builddir/kernel-extra.files + echo "%%config(noreplace) $modprobe_d_dir/20-kernel-%{build_flavor}-extra.conf" >> %my_builddir/kernel-extra.files %endif %endif for f in %my_builddir/*-kmp-modules; do diff --git a/kernel-lpae.changes b/kernel-lpae.changes index 445976a0..6f573e9a 100644 --- a/kernel-lpae.changes +++ b/kernel-lpae.changes @@ -348,6 +348,15 @@ Tue Feb 1 15:23:26 CET 2022 - tiwai@suse.de - Input: synaptics: retry query upon error (bsc#1194086). - commit 5277fb2 +------------------------------------------------------------------- +Mon Jan 31 15:20:36 CET 2022 - ludwig.nussel@suse.de + +- kernel-obs-build: include 9p (boo#1195353) + To be able to share files between host and the qemu vm of the build + script, the 9p and 9p_virtio kernel modules need to be included in + the initrd of kernel-obs-build. +- commit 0cfe67a + ------------------------------------------------------------------- Sat Jan 29 13:57:02 CET 2022 - jslaby@suse.cz @@ -2147,6 +2156,13 @@ Mon Jan 24 19:27:48 CET 2022 - jslaby@suse.cz Add CVE reference. - commit 0d710a8 +------------------------------------------------------------------- +Mon Jan 24 16:58:21 CET 2022 - msuchanek@suse.de + +- kernel-binary.spec.in: Move 20-kernel-default-extra.conf to the correctr + directory (bsc#1195051). +- commit c80b5de + ------------------------------------------------------------------- Mon Jan 24 11:55:17 CET 2022 - tiwai@suse.de diff --git a/kernel-lpae.spec b/kernel-lpae.spec index eb72965c..0a1d4bb8 100644 --- a/kernel-lpae.spec +++ b/kernel-lpae.spec @@ -109,7 +109,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 5.16.5 %if 0%{?is_kotd} -Release: .g5277fb2 +Release: .g1af4009 %else Release: 0 %endif @@ -231,10 +231,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-5277fb2179273c5a5c7d9e7544a817918cecc719 -Provides: kernel-srchash-5277fb2179273c5a5c7d9e7544a817918cecc719 +Provides: kernel-%build_flavor-base-srchash-1af400994313af6f8e7783f70a6b0777b0087dc1 +Provides: kernel-srchash-1af400994313af6f8e7783f70a6b0777b0087dc1 # END COMMON DEPS -Provides: %name-srchash-5277fb2179273c5a5c7d9e7544a817918cecc719 +Provides: %name-srchash-1af400994313af6f8e7783f70a6b0777b0087dc1 %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc @@ -1110,8 +1110,16 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files # kernel versions, otherwise file conflicts might arise with # multiversion(kernel). - mkdir -p %buildroot/etc/modprobe.d - cat >%buildroot/etc/modprobe.d/20-kernel-%{build_flavor}-extra.conf < 150300 + modprobe_d_dir=/lib/modprobe.d + %endif + %if 0%{?usrmerged} + modprobe_d_dir=/usr/lib/modprobe.d + %endif + + mkdir -p %buildroot$modprobe_d_dir + cat >%buildroot$modprobe_d_dir/20-kernel-%{build_flavor}-extra.conf <> %my_builddir/kernel-devel.files # Please read the comments in 10-unsupported-modules.conf. allow_unsupported_modules 1 EOF - echo "%%dir /etc/modprobe.d" >> %my_builddir/kernel-extra.files - echo '%%config(noreplace) /etc/modprobe.d/20-kernel-%{build_flavor}-extra.conf' >> %my_builddir/kernel-extra.files + echo "%%dir $modprobe_d_dir" >> %my_builddir/kernel-extra.files + echo "%%config(noreplace) $modprobe_d_dir/20-kernel-%{build_flavor}-extra.conf" >> %my_builddir/kernel-extra.files %endif %endif for f in %my_builddir/*-kmp-modules; do diff --git a/kernel-obs-build.changes b/kernel-obs-build.changes index 445976a0..6f573e9a 100644 --- a/kernel-obs-build.changes +++ b/kernel-obs-build.changes @@ -348,6 +348,15 @@ Tue Feb 1 15:23:26 CET 2022 - tiwai@suse.de - Input: synaptics: retry query upon error (bsc#1194086). - commit 5277fb2 +------------------------------------------------------------------- +Mon Jan 31 15:20:36 CET 2022 - ludwig.nussel@suse.de + +- kernel-obs-build: include 9p (boo#1195353) + To be able to share files between host and the qemu vm of the build + script, the 9p and 9p_virtio kernel modules need to be included in + the initrd of kernel-obs-build. +- commit 0cfe67a + ------------------------------------------------------------------- Sat Jan 29 13:57:02 CET 2022 - jslaby@suse.cz @@ -2147,6 +2156,13 @@ Mon Jan 24 19:27:48 CET 2022 - jslaby@suse.cz Add CVE reference. - commit 0d710a8 +------------------------------------------------------------------- +Mon Jan 24 16:58:21 CET 2022 - msuchanek@suse.de + +- kernel-binary.spec.in: Move 20-kernel-default-extra.conf to the correctr + directory (bsc#1195051). +- commit c80b5de + ------------------------------------------------------------------- Mon Jan 24 11:55:17 CET 2022 - tiwai@suse.de diff --git a/kernel-obs-build.spec b/kernel-obs-build.spec index 58b001f8..6e9c0ec2 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-5277fb2179273c5a5c7d9e7544a817918cecc719 +BuildRequires: kernel%kernel_flavor-srchash-1af400994313af6f8e7783f70a6b0777b0087dc1 %if 0%{?rhel_version} BuildRequires: kernel @@ -66,7 +66,7 @@ License: GPL-2.0-only Group: SLES Version: 5.16.5 %if 0%{?is_kotd} -Release: .g5277fb2 +Release: .g1af4009 %else Release: 0 %endif @@ -121,7 +121,7 @@ echo "DefaultTasksAccounting=no" >> /etc/systemd/system.conf # a longer list to have them also available for qemu cross builds where x86_64 kernel runs in eg. arm env. # this list of modules where available on build workers of build.opensuse.org, so we stay compatible. -export KERNEL_MODULES="loop dm-crypt essiv dm-mod dm-snapshot binfmt-misc fuse kqemu squashfs ext2 ext3 ext4 reiserfs btrfs xfs nf_conntrack_ipv6 binfmt_misc virtio_pci virtio_mmio virtio_blk virtio_rng fat vfat nls_cp437 nls_iso8859-1 ibmvscsi sd_mod e1000 ibmveth overlay" +export KERNEL_MODULES="loop dm-crypt essiv dm-mod dm-snapshot binfmt-misc fuse kqemu squashfs ext2 ext3 ext4 reiserfs btrfs xfs nf_conntrack_ipv6 binfmt_misc virtio_pci virtio_mmio virtio_blk virtio_rng fat vfat nls_cp437 nls_iso8859-1 ibmvscsi sd_mod e1000 ibmveth overlay 9p 9pnet_virtio" # manually load all modules to make sure they're available for i in $KERNEL_MODULES; do diff --git a/kernel-obs-build.spec.in b/kernel-obs-build.spec.in index ddd6fe24..9889a81d 100644 --- a/kernel-obs-build.spec.in +++ b/kernel-obs-build.spec.in @@ -121,7 +121,7 @@ echo "DefaultTasksAccounting=no" >> /etc/systemd/system.conf # a longer list to have them also available for qemu cross builds where x86_64 kernel runs in eg. arm env. # this list of modules where available on build workers of build.opensuse.org, so we stay compatible. -export KERNEL_MODULES="loop dm-crypt essiv dm-mod dm-snapshot binfmt-misc fuse kqemu squashfs ext2 ext3 ext4 reiserfs btrfs xfs nf_conntrack_ipv6 binfmt_misc virtio_pci virtio_mmio virtio_blk virtio_rng fat vfat nls_cp437 nls_iso8859-1 ibmvscsi sd_mod e1000 ibmveth overlay" +export KERNEL_MODULES="loop dm-crypt essiv dm-mod dm-snapshot binfmt-misc fuse kqemu squashfs ext2 ext3 ext4 reiserfs btrfs xfs nf_conntrack_ipv6 binfmt_misc virtio_pci virtio_mmio virtio_blk virtio_rng fat vfat nls_cp437 nls_iso8859-1 ibmvscsi sd_mod e1000 ibmveth overlay 9p 9pnet_virtio" # manually load all modules to make sure they're available for i in $KERNEL_MODULES; do diff --git a/kernel-obs-qa.changes b/kernel-obs-qa.changes index 445976a0..6f573e9a 100644 --- a/kernel-obs-qa.changes +++ b/kernel-obs-qa.changes @@ -348,6 +348,15 @@ Tue Feb 1 15:23:26 CET 2022 - tiwai@suse.de - Input: synaptics: retry query upon error (bsc#1194086). - commit 5277fb2 +------------------------------------------------------------------- +Mon Jan 31 15:20:36 CET 2022 - ludwig.nussel@suse.de + +- kernel-obs-build: include 9p (boo#1195353) + To be able to share files between host and the qemu vm of the build + script, the 9p and 9p_virtio kernel modules need to be included in + the initrd of kernel-obs-build. +- commit 0cfe67a + ------------------------------------------------------------------- Sat Jan 29 13:57:02 CET 2022 - jslaby@suse.cz @@ -2147,6 +2156,13 @@ Mon Jan 24 19:27:48 CET 2022 - jslaby@suse.cz Add CVE reference. - commit 0d710a8 +------------------------------------------------------------------- +Mon Jan 24 16:58:21 CET 2022 - msuchanek@suse.de + +- kernel-binary.spec.in: Move 20-kernel-default-extra.conf to the correctr + directory (bsc#1195051). +- commit c80b5de + ------------------------------------------------------------------- Mon Jan 24 11:55:17 CET 2022 - tiwai@suse.de diff --git a/kernel-obs-qa.spec b/kernel-obs-qa.spec index 029b5262..fbab46cb 100644 --- a/kernel-obs-qa.spec +++ b/kernel-obs-qa.spec @@ -38,7 +38,7 @@ License: GPL-2.0-only Group: SLES Version: 5.16.5 %if 0%{?is_kotd} -Release: .g5277fb2 +Release: .g1af4009 %else Release: 0 %endif diff --git a/kernel-pae.changes b/kernel-pae.changes index 445976a0..6f573e9a 100644 --- a/kernel-pae.changes +++ b/kernel-pae.changes @@ -348,6 +348,15 @@ Tue Feb 1 15:23:26 CET 2022 - tiwai@suse.de - Input: synaptics: retry query upon error (bsc#1194086). - commit 5277fb2 +------------------------------------------------------------------- +Mon Jan 31 15:20:36 CET 2022 - ludwig.nussel@suse.de + +- kernel-obs-build: include 9p (boo#1195353) + To be able to share files between host and the qemu vm of the build + script, the 9p and 9p_virtio kernel modules need to be included in + the initrd of kernel-obs-build. +- commit 0cfe67a + ------------------------------------------------------------------- Sat Jan 29 13:57:02 CET 2022 - jslaby@suse.cz @@ -2147,6 +2156,13 @@ Mon Jan 24 19:27:48 CET 2022 - jslaby@suse.cz Add CVE reference. - commit 0d710a8 +------------------------------------------------------------------- +Mon Jan 24 16:58:21 CET 2022 - msuchanek@suse.de + +- kernel-binary.spec.in: Move 20-kernel-default-extra.conf to the correctr + directory (bsc#1195051). +- commit c80b5de + ------------------------------------------------------------------- Mon Jan 24 11:55:17 CET 2022 - tiwai@suse.de diff --git a/kernel-pae.spec b/kernel-pae.spec index 90548c37..2df4a52c 100644 --- a/kernel-pae.spec +++ b/kernel-pae.spec @@ -109,7 +109,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 5.16.5 %if 0%{?is_kotd} -Release: .g5277fb2 +Release: .g1af4009 %else Release: 0 %endif @@ -231,10 +231,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-5277fb2179273c5a5c7d9e7544a817918cecc719 -Provides: kernel-srchash-5277fb2179273c5a5c7d9e7544a817918cecc719 +Provides: kernel-%build_flavor-base-srchash-1af400994313af6f8e7783f70a6b0777b0087dc1 +Provides: kernel-srchash-1af400994313af6f8e7783f70a6b0777b0087dc1 # END COMMON DEPS -Provides: %name-srchash-5277fb2179273c5a5c7d9e7544a817918cecc719 +Provides: %name-srchash-1af400994313af6f8e7783f70a6b0777b0087dc1 %ifarch %ix86 Provides: kernel-bigsmp = 2.6.17 Obsoletes: kernel-bigsmp <= 2.6.17 @@ -1138,8 +1138,16 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files # kernel versions, otherwise file conflicts might arise with # multiversion(kernel). - mkdir -p %buildroot/etc/modprobe.d - cat >%buildroot/etc/modprobe.d/20-kernel-%{build_flavor}-extra.conf < 150300 + modprobe_d_dir=/lib/modprobe.d + %endif + %if 0%{?usrmerged} + modprobe_d_dir=/usr/lib/modprobe.d + %endif + + mkdir -p %buildroot$modprobe_d_dir + cat >%buildroot$modprobe_d_dir/20-kernel-%{build_flavor}-extra.conf <> %my_builddir/kernel-devel.files # Please read the comments in 10-unsupported-modules.conf. allow_unsupported_modules 1 EOF - echo "%%dir /etc/modprobe.d" >> %my_builddir/kernel-extra.files - echo '%%config(noreplace) /etc/modprobe.d/20-kernel-%{build_flavor}-extra.conf' >> %my_builddir/kernel-extra.files + echo "%%dir $modprobe_d_dir" >> %my_builddir/kernel-extra.files + echo "%%config(noreplace) $modprobe_d_dir/20-kernel-%{build_flavor}-extra.conf" >> %my_builddir/kernel-extra.files %endif %endif for f in %my_builddir/*-kmp-modules; do diff --git a/kernel-source.changes b/kernel-source.changes index 445976a0..6f573e9a 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -348,6 +348,15 @@ Tue Feb 1 15:23:26 CET 2022 - tiwai@suse.de - Input: synaptics: retry query upon error (bsc#1194086). - commit 5277fb2 +------------------------------------------------------------------- +Mon Jan 31 15:20:36 CET 2022 - ludwig.nussel@suse.de + +- kernel-obs-build: include 9p (boo#1195353) + To be able to share files between host and the qemu vm of the build + script, the 9p and 9p_virtio kernel modules need to be included in + the initrd of kernel-obs-build. +- commit 0cfe67a + ------------------------------------------------------------------- Sat Jan 29 13:57:02 CET 2022 - jslaby@suse.cz @@ -2147,6 +2156,13 @@ Mon Jan 24 19:27:48 CET 2022 - jslaby@suse.cz Add CVE reference. - commit 0d710a8 +------------------------------------------------------------------- +Mon Jan 24 16:58:21 CET 2022 - msuchanek@suse.de + +- kernel-binary.spec.in: Move 20-kernel-default-extra.conf to the correctr + directory (bsc#1195051). +- commit c80b5de + ------------------------------------------------------------------- Mon Jan 24 11:55:17 CET 2022 - tiwai@suse.de diff --git a/kernel-source.spec b/kernel-source.spec index 29447e61..e9913dc2 100644 --- a/kernel-source.spec +++ b/kernel-source.spec @@ -37,7 +37,7 @@ License: GPL-2.0-only Group: Development/Sources Version: 5.16.5 %if 0%{?is_kotd} -Release: .g5277fb2 +Release: .g1af4009 %else Release: 0 %endif @@ -48,7 +48,7 @@ BuildRequires: fdupes BuildRequires: sed Requires(post): coreutils sed Provides: %name = %version-%source_rel -Provides: %name-srchash-5277fb2179273c5a5c7d9e7544a817918cecc719 +Provides: %name-srchash-1af400994313af6f8e7783f70a6b0777b0087dc1 Provides: linux Provides: multiversion(kernel) Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz diff --git a/kernel-syms.changes b/kernel-syms.changes index 445976a0..6f573e9a 100644 --- a/kernel-syms.changes +++ b/kernel-syms.changes @@ -348,6 +348,15 @@ Tue Feb 1 15:23:26 CET 2022 - tiwai@suse.de - Input: synaptics: retry query upon error (bsc#1194086). - commit 5277fb2 +------------------------------------------------------------------- +Mon Jan 31 15:20:36 CET 2022 - ludwig.nussel@suse.de + +- kernel-obs-build: include 9p (boo#1195353) + To be able to share files between host and the qemu vm of the build + script, the 9p and 9p_virtio kernel modules need to be included in + the initrd of kernel-obs-build. +- commit 0cfe67a + ------------------------------------------------------------------- Sat Jan 29 13:57:02 CET 2022 - jslaby@suse.cz @@ -2147,6 +2156,13 @@ Mon Jan 24 19:27:48 CET 2022 - jslaby@suse.cz Add CVE reference. - commit 0d710a8 +------------------------------------------------------------------- +Mon Jan 24 16:58:21 CET 2022 - msuchanek@suse.de + +- kernel-binary.spec.in: Move 20-kernel-default-extra.conf to the correctr + directory (bsc#1195051). +- commit c80b5de + ------------------------------------------------------------------- Mon Jan 24 11:55:17 CET 2022 - tiwai@suse.de diff --git a/kernel-syms.spec b/kernel-syms.spec index 586547d2..55bd7761 100644 --- a/kernel-syms.spec +++ b/kernel-syms.spec @@ -27,7 +27,7 @@ Group: Development/Sources Version: 5.16.5 %if %using_buildservice %if 0%{?is_kotd} -Release: .g5277fb2 +Release: .g1af4009 %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-5277fb2179273c5a5c7d9e7544a817918cecc719 +Provides: %name-srchash-1af400994313af6f8e7783f70a6b0777b0087dc1 Provides: multiversion(kernel) Source: README.KSYMS Requires: kernel-devel%variant = %version-%source_rel diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes index 445976a0..6f573e9a 100644 --- a/kernel-vanilla.changes +++ b/kernel-vanilla.changes @@ -348,6 +348,15 @@ Tue Feb 1 15:23:26 CET 2022 - tiwai@suse.de - Input: synaptics: retry query upon error (bsc#1194086). - commit 5277fb2 +------------------------------------------------------------------- +Mon Jan 31 15:20:36 CET 2022 - ludwig.nussel@suse.de + +- kernel-obs-build: include 9p (boo#1195353) + To be able to share files between host and the qemu vm of the build + script, the 9p and 9p_virtio kernel modules need to be included in + the initrd of kernel-obs-build. +- commit 0cfe67a + ------------------------------------------------------------------- Sat Jan 29 13:57:02 CET 2022 - jslaby@suse.cz @@ -2147,6 +2156,13 @@ Mon Jan 24 19:27:48 CET 2022 - jslaby@suse.cz Add CVE reference. - commit 0d710a8 +------------------------------------------------------------------- +Mon Jan 24 16:58:21 CET 2022 - msuchanek@suse.de + +- kernel-binary.spec.in: Move 20-kernel-default-extra.conf to the correctr + directory (bsc#1195051). +- commit c80b5de + ------------------------------------------------------------------- Mon Jan 24 11:55:17 CET 2022 - tiwai@suse.de diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index 5771b595..6171a800 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -109,7 +109,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 5.16.5 %if 0%{?is_kotd} -Release: .g5277fb2 +Release: .g1af4009 %else Release: 0 %endif @@ -231,10 +231,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-5277fb2179273c5a5c7d9e7544a817918cecc719 -Provides: kernel-srchash-5277fb2179273c5a5c7d9e7544a817918cecc719 +Provides: kernel-%build_flavor-base-srchash-1af400994313af6f8e7783f70a6b0777b0087dc1 +Provides: kernel-srchash-1af400994313af6f8e7783f70a6b0777b0087dc1 # END COMMON DEPS -Provides: %name-srchash-5277fb2179273c5a5c7d9e7544a817918cecc719 +Provides: %name-srchash-1af400994313af6f8e7783f70a6b0777b0087dc1 %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc @@ -1109,8 +1109,16 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files # kernel versions, otherwise file conflicts might arise with # multiversion(kernel). - mkdir -p %buildroot/etc/modprobe.d - cat >%buildroot/etc/modprobe.d/20-kernel-%{build_flavor}-extra.conf < 150300 + modprobe_d_dir=/lib/modprobe.d + %endif + %if 0%{?usrmerged} + modprobe_d_dir=/usr/lib/modprobe.d + %endif + + mkdir -p %buildroot$modprobe_d_dir + cat >%buildroot$modprobe_d_dir/20-kernel-%{build_flavor}-extra.conf <> %my_builddir/kernel-devel.files # Please read the comments in 10-unsupported-modules.conf. allow_unsupported_modules 1 EOF - echo "%%dir /etc/modprobe.d" >> %my_builddir/kernel-extra.files - echo '%%config(noreplace) /etc/modprobe.d/20-kernel-%{build_flavor}-extra.conf' >> %my_builddir/kernel-extra.files + echo "%%dir $modprobe_d_dir" >> %my_builddir/kernel-extra.files + echo "%%config(noreplace) $modprobe_d_dir/20-kernel-%{build_flavor}-extra.conf" >> %my_builddir/kernel-extra.files %endif %endif for f in %my_builddir/*-kmp-modules; do diff --git a/kernel-zfcpdump.changes b/kernel-zfcpdump.changes index 445976a0..6f573e9a 100644 --- a/kernel-zfcpdump.changes +++ b/kernel-zfcpdump.changes @@ -348,6 +348,15 @@ Tue Feb 1 15:23:26 CET 2022 - tiwai@suse.de - Input: synaptics: retry query upon error (bsc#1194086). - commit 5277fb2 +------------------------------------------------------------------- +Mon Jan 31 15:20:36 CET 2022 - ludwig.nussel@suse.de + +- kernel-obs-build: include 9p (boo#1195353) + To be able to share files between host and the qemu vm of the build + script, the 9p and 9p_virtio kernel modules need to be included in + the initrd of kernel-obs-build. +- commit 0cfe67a + ------------------------------------------------------------------- Sat Jan 29 13:57:02 CET 2022 - jslaby@suse.cz @@ -2147,6 +2156,13 @@ Mon Jan 24 19:27:48 CET 2022 - jslaby@suse.cz Add CVE reference. - commit 0d710a8 +------------------------------------------------------------------- +Mon Jan 24 16:58:21 CET 2022 - msuchanek@suse.de + +- kernel-binary.spec.in: Move 20-kernel-default-extra.conf to the correctr + directory (bsc#1195051). +- commit c80b5de + ------------------------------------------------------------------- Mon Jan 24 11:55:17 CET 2022 - tiwai@suse.de diff --git a/kernel-zfcpdump.spec b/kernel-zfcpdump.spec index 01095e88..2473e7db 100644 --- a/kernel-zfcpdump.spec +++ b/kernel-zfcpdump.spec @@ -109,7 +109,7 @@ License: GPL-2.0-only Group: System/Kernel Version: 5.16.5 %if 0%{?is_kotd} -Release: .g5277fb2 +Release: .g1af4009 %else Release: 0 %endif @@ -231,10 +231,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-5277fb2179273c5a5c7d9e7544a817918cecc719 -Provides: kernel-srchash-5277fb2179273c5a5c7d9e7544a817918cecc719 +Provides: kernel-%build_flavor-base-srchash-1af400994313af6f8e7783f70a6b0777b0087dc1 +Provides: kernel-srchash-1af400994313af6f8e7783f70a6b0777b0087dc1 # END COMMON DEPS -Provides: %name-srchash-5277fb2179273c5a5c7d9e7544a817918cecc719 +Provides: %name-srchash-1af400994313af6f8e7783f70a6b0777b0087dc1 %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc @@ -1112,8 +1112,16 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files # kernel versions, otherwise file conflicts might arise with # multiversion(kernel). - mkdir -p %buildroot/etc/modprobe.d - cat >%buildroot/etc/modprobe.d/20-kernel-%{build_flavor}-extra.conf < 150300 + modprobe_d_dir=/lib/modprobe.d + %endif + %if 0%{?usrmerged} + modprobe_d_dir=/usr/lib/modprobe.d + %endif + + mkdir -p %buildroot$modprobe_d_dir + cat >%buildroot$modprobe_d_dir/20-kernel-%{build_flavor}-extra.conf <> %my_builddir/kernel-devel.files # Please read the comments in 10-unsupported-modules.conf. allow_unsupported_modules 1 EOF - echo "%%dir /etc/modprobe.d" >> %my_builddir/kernel-extra.files - echo '%%config(noreplace) /etc/modprobe.d/20-kernel-%{build_flavor}-extra.conf' >> %my_builddir/kernel-extra.files + echo "%%dir $modprobe_d_dir" >> %my_builddir/kernel-extra.files + echo "%%config(noreplace) $modprobe_d_dir/20-kernel-%{build_flavor}-extra.conf" >> %my_builddir/kernel-extra.files %endif %endif for f in %my_builddir/*-kmp-modules; do diff --git a/source-timestamp b/source-timestamp index ce37abff..046b469e 100644 --- a/source-timestamp +++ b/source-timestamp @@ -1,3 +1,3 @@ -2022-02-02 08:33:57 +0000 -GIT Revision: 5277fb2179273c5a5c7d9e7544a817918cecc719 +2022-02-03 05:26:48 +0000 +GIT Revision: 1af400994313af6f8e7783f70a6b0777b0087dc1 GIT Branch: stable