From 9de60b93e3bf3e4cf5e3bd1f54f12379c697942b Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 4 Oct 2021 08:28:48 -0500 Subject: kernel-5.15-0.rc4.33 * Mon Oct 04 2021 Fedora Kernel Team [5.15-0.rc4.33] - Fix ordering in genspec args (Justin M. Forbes) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- kernel.spec | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) (limited to 'kernel.spec') diff --git a/kernel.spec b/kernel.spec index 7e30ad14a..df6abe026 100755 --- a/kernel.spec +++ b/kernel.spec @@ -83,9 +83,9 @@ Summary: The Linux kernel # Set debugbuildsenabled to 0 to not build a separate debug kernel, but # to build the base kernel using the debug configuration. (Specifying # the --with-release option overrides this setting.) -%define debugbuildsenabled 0 +%define debugbuildsenabled 1 -%global distro_build 0.rc3.20211001git4de593fb965f.30 +%global distro_build 0.rc4.33 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -130,13 +130,13 @@ Summary: The Linux kernel %define rpmversion 5.15.0 %define patchversion 5.15 -%define pkgrelease 0.rc3.20211001git4de593fb965f.30 +%define pkgrelease 0.rc4.33 # This is needed to do merge window version magic %define patchlevel 15 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.20211001git4de593fb965f.30%{?buildid}%{?dist} +%define specrelease 0.rc4.33%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -677,7 +677,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.15-rc3-240-g4de593fb965f.tar.xz +Source0: linux-5.15-rc4.tar.xz Source1: Makefile.rhelver @@ -1368,8 +1368,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.15-rc3-240-g4de593fb965f -c -mv linux-5.15-rc3-240-g4de593fb965f linux-%{KVERREL} +%setup -q -n kernel-5.15-rc4 -c +mv linux-5.15-rc4 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2968,8 +2968,17 @@ fi # # %changelog -* Fri Oct 01 2021 Fedora Kernel Team [5.15-0.rc3.20211001git4de593fb965f.30] +* Mon Oct 04 2021 Fedora Kernel Team [5.15-0.rc4.33] +- Fix ordering in genspec args (Justin M. Forbes) + +* Sat Oct 02 2021 Fedora Kernel Team [5.15-0.rc3.20211002git53d5fc89d66a.30] +- redhat/configs: Enable Hyper-V guests on ARM64 (Vitaly Kuznetsov) [2007430] +- redhat: configs: Enable CONFIG_THINKPAD_LMI (Hans de Goede) +- redhat/docs: update Koji link to avoid redirect (Joel Savitz) +- redhat: add support for different profiles with dist*-brew (Herton R. Krzesinski) - Fix BPF selftests build on ppc64 (Justin M. Forbes) +- redhat: configs: Disable xtables and ipset (Phil Sutter) [1945179] +- redhat: Add mark_driver_deprecated() (Phil Sutter) [1945179] * Fri Oct 01 2021 Fedora Kernel Team [5.15-0.rc3.20211001git4de593fb965f.29] - Change s390x CONFIG_NODES_SHIFT from 4 to 1 (Justin M. Forbes) -- cgit From fdd71c313e1f2ad59cb7dd1996416a345a1668f0 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 5 Oct 2021 12:02:59 -0500 Subject: Try without FORCE_TARGETS Signed-off-by: Justin M. Forbes --- kernel.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kernel.spec') diff --git a/kernel.spec b/kernel.spec index df6abe026..474a0763a 100755 --- a/kernel.spec +++ b/kernel.spec @@ -2254,7 +2254,7 @@ export BPFTOOL=$(pwd)/tools/bpf/bpftool/bpftool pushd tools/testing/selftests # We need to install here because we need to call make with ARCH set which # doesn't seem possible to do in the install section. -%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf livepatch net net/forwarding net/mptcp netfilter tc-testing" SKIP_TARGETS="" FORCE_TARGETS=1 INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}" install +%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf livepatch net net/forwarding net/mptcp netfilter tc-testing" SKIP_TARGETS="" INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}" install # 'make install' for bpf is broken and upstream refuses to fix it. # Install the needed files manually. -- cgit From 3d94e393cbb905779cb00cb267691304a2f5b7d4 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 5 Oct 2021 13:24:56 -0500 Subject: Still broken, so let's just turn off selftests for ppc Signed-off-by: Justin M. Forbes --- kernel.spec | 1 + 1 file changed, 1 insertion(+) (limited to 'kernel.spec') diff --git a/kernel.spec b/kernel.spec index 474a0763a..1aebe3b9d 100755 --- a/kernel.spec +++ b/kernel.spec @@ -433,6 +433,7 @@ Summary: The Linux kernel %define kernel_image vmlinux %define kernel_image_elf 1 %define use_vdso 0 +%define with_selftests 0 %define all_arch_configs kernel-%{version}-ppc64le*.config %endif -- cgit From 6694d05e5fc1a4a41107a172a53f7d9b6373cadf Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 6 Oct 2021 11:06:21 -0500 Subject: kernel-5.15-0.rc4.20211006git60a9483534ed.34 * Wed Oct 06 2021 Justin M. Forbes [5.15-0.rc4.20211006git60a9483534ed.34] - Testing upstream bpf selftests (Justin M. Forbes) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- kernel.spec | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'kernel.spec') diff --git a/kernel.spec b/kernel.spec index 1aebe3b9d..173d7f3ef 100755 --- a/kernel.spec +++ b/kernel.spec @@ -83,9 +83,9 @@ Summary: The Linux kernel # Set debugbuildsenabled to 0 to not build a separate debug kernel, but # to build the base kernel using the debug configuration. (Specifying # the --with-release option overrides this setting.) -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 -%global distro_build 0.rc4.33 +%global distro_build 0.rc4.20211006git60a9483534ed.34 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -130,13 +130,13 @@ Summary: The Linux kernel %define rpmversion 5.15.0 %define patchversion 5.15 -%define pkgrelease 0.rc4.33 +%define pkgrelease 0.rc4.20211006git60a9483534ed.34 # This is needed to do merge window version magic %define patchlevel 15 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.33%{?buildid}%{?dist} +%define specrelease 0.rc4.20211006git60a9483534ed.34%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -433,7 +433,6 @@ Summary: The Linux kernel %define kernel_image vmlinux %define kernel_image_elf 1 %define use_vdso 0 -%define with_selftests 0 %define all_arch_configs kernel-%{version}-ppc64le*.config %endif @@ -678,7 +677,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.15-rc4.tar.xz +Source0: linux-5.15-rc4-15-g60a9483534ed.tar.xz Source1: Makefile.rhelver @@ -1369,8 +1368,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.15-rc4 -c -mv linux-5.15-rc4 linux-%{KVERREL} +%setup -q -n kernel-5.15-rc4-15-g60a9483534ed -c +mv linux-5.15-rc4-15-g60a9483534ed linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2969,7 +2968,13 @@ fi # # %changelog -* Mon Oct 04 2021 Fedora Kernel Team [5.15-0.rc4.33] +* Wed Oct 06 2021 Justin M. Forbes [5.15-0.rc4.20211006git60a9483534ed.34] +- Testing upstream bpf selftests (Justin M. Forbes) + +* Wed Oct 06 2021 Fedora Kernel Team [5.15-0.rc4.20211006git60a9483534ed.34] +- Revert "Merge branch 'ppcbpfselftest' into 'os-build'" (Justin M. Forbes) + +* Tue Oct 05 2021 Fedora Kernel Team [5.15-0.rc4.20211005gitf6274b06e326.33] - Fix ordering in genspec args (Justin M. Forbes) * Sat Oct 02 2021 Fedora Kernel Team [5.15-0.rc3.20211002git53d5fc89d66a.30] -- cgit