diff options
29 files changed, 73 insertions, 29 deletions
diff --git a/gcc-12-subcmd-util.patch b/gcc-12-subcmd-util.patch new file mode 100644 index 000000000..ac063292e --- /dev/null +++ b/gcc-12-subcmd-util.patch @@ -0,0 +1,35 @@ +From b3d2907a37c53f7379be8742bfbfe47aa2877bfc Mon Sep 17 00:00:00 2001 +From: "Justin M. Forbes" <jforbes@fedoraproject.org> +Date: Thu, 27 Jan 2022 15:33:37 -0600 +Subject: [PATCH] Fix subcmd-util for gcc 12 + +Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org> +--- + tools/lib/subcmd/subcmd-util.h | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/tools/lib/subcmd/subcmd-util.h b/tools/lib/subcmd/subcmd-util.h +index 794a375dad36..7009fc176636 100644 +--- a/tools/lib/subcmd/subcmd-util.h ++++ b/tools/lib/subcmd/subcmd-util.h +@@ -49,13 +49,12 @@ static NORETURN inline void die(const char *err, ...) + + static inline void *xrealloc(void *ptr, size_t size) + { +- void *ret = realloc(ptr, size); +- if (!ret && !size) +- ret = realloc(ptr, 1); ++ void *ret; ++ if (!size) ++ size = 1; ++ ret = realloc(ptr, size); + if (!ret) { + ret = realloc(ptr, size); +- if (!ret && !size) +- ret = realloc(ptr, 1); + if (!ret) + die("Out of memory, realloc failed"); + } +-- +2.34.1 + diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 68691285b..51960f808 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -6365,7 +6365,7 @@ CONFIG_RTLWIFI=m CONFIG_RTW88_8723DE=m # CONFIG_RTW88_8723DU is not set CONFIG_RTW88_8821CE=m -# CONFIG_RTW88_8821CU is not set +CONFIG_RTW88_8821CU=m CONFIG_RTW88_8822BE=m # CONFIG_RTW88_8822BU is not set CONFIG_RTW88_8822CE=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index a3a51e89d..f3b42aceb 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -4952,7 +4952,7 @@ CONFIG_RTLWIFI=m CONFIG_RTW88_8723DE=m # CONFIG_RTW88_8723DU is not set CONFIG_RTW88_8821CE=m -# CONFIG_RTW88_8821CU is not set +CONFIG_RTW88_8821CU=m CONFIG_RTW88_8822BE=m # CONFIG_RTW88_8822BU is not set CONFIG_RTW88_8822CE=m diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index c9b91753a..ddc013932 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -6344,7 +6344,7 @@ CONFIG_RTLWIFI=m CONFIG_RTW88_8723DE=m # CONFIG_RTW88_8723DU is not set CONFIG_RTW88_8821CE=m -# CONFIG_RTW88_8821CU is not set +CONFIG_RTW88_8821CU=m CONFIG_RTW88_8822BE=m # CONFIG_RTW88_8822BU is not set CONFIG_RTW88_8822CE=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 5a6bcf7ba..9be99094c 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -4929,7 +4929,7 @@ CONFIG_RTLWIFI=m CONFIG_RTW88_8723DE=m # CONFIG_RTW88_8723DU is not set CONFIG_RTW88_8821CE=m -# CONFIG_RTW88_8821CU is not set +CONFIG_RTW88_8821CU=m CONFIG_RTW88_8822BE=m # CONFIG_RTW88_8822BU is not set CONFIG_RTW88_8822CE=m diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 4e7651497..f8fe95cbb 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -6380,7 +6380,7 @@ CONFIG_RTLWIFI=m CONFIG_RTW88_8723DE=m # CONFIG_RTW88_8723DU is not set CONFIG_RTW88_8821CE=m -# CONFIG_RTW88_8821CU is not set +CONFIG_RTW88_8821CU=m CONFIG_RTW88_8822BE=m # CONFIG_RTW88_8822BU is not set CONFIG_RTW88_8822CE=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 8a6d2a544..6f79dc340 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -6361,7 +6361,7 @@ CONFIG_RTLWIFI=m CONFIG_RTW88_8723DE=m # CONFIG_RTW88_8723DU is not set CONFIG_RTW88_8821CE=m -# CONFIG_RTW88_8821CU is not set +CONFIG_RTW88_8821CU=m CONFIG_RTW88_8822BE=m # CONFIG_RTW88_8822BU is not set CONFIG_RTW88_8822CE=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 18c27e0d5..008f484a3 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -6203,7 +6203,7 @@ CONFIG_RTLWIFI=m CONFIG_RTW88_8723DE=m # CONFIG_RTW88_8723DU is not set CONFIG_RTW88_8821CE=m -# CONFIG_RTW88_8821CU is not set +CONFIG_RTW88_8821CU=m CONFIG_RTW88_8822BE=m # CONFIG_RTW88_8822BU is not set CONFIG_RTW88_8822CE=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 5c4094391..0fd04422f 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -6184,7 +6184,7 @@ CONFIG_RTLWIFI=m CONFIG_RTW88_8723DE=m # CONFIG_RTW88_8723DU is not set CONFIG_RTW88_8821CE=m -# CONFIG_RTW88_8821CU is not set +CONFIG_RTW88_8821CU=m CONFIG_RTW88_8822BE=m # CONFIG_RTW88_8822BU is not set CONFIG_RTW88_8822CE=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 5cc621f28..48582487e 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -5283,7 +5283,7 @@ CONFIG_RTLWIFI=m CONFIG_RTW88_8723DE=m # CONFIG_RTW88_8723DU is not set CONFIG_RTW88_8821CE=m -# CONFIG_RTW88_8821CU is not set +CONFIG_RTW88_8821CU=m CONFIG_RTW88_8822BE=m # CONFIG_RTW88_8822BU is not set CONFIG_RTW88_8822CE=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 6123a5f5e..0e9128363 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -4706,7 +4706,7 @@ CONFIG_RTLWIFI=m CONFIG_RTW88_8723DE=m # CONFIG_RTW88_8723DU is not set CONFIG_RTW88_8821CE=m -# CONFIG_RTW88_8821CU is not set +CONFIG_RTW88_8821CU=m CONFIG_RTW88_8822BE=m # CONFIG_RTW88_8822BU is not set CONFIG_RTW88_8822CE=m diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index da0d86a84..070f2eeb9 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -5262,7 +5262,7 @@ CONFIG_RTLWIFI=m CONFIG_RTW88_8723DE=m # CONFIG_RTW88_8723DU is not set CONFIG_RTW88_8821CE=m -# CONFIG_RTW88_8821CU is not set +CONFIG_RTW88_8821CU=m CONFIG_RTW88_8822BE=m # CONFIG_RTW88_8822BU is not set CONFIG_RTW88_8822CE=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 4f239b5a8..7a34c6494 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -4685,7 +4685,7 @@ CONFIG_RTLWIFI=m CONFIG_RTW88_8723DE=m # CONFIG_RTW88_8723DU is not set CONFIG_RTW88_8821CE=m -# CONFIG_RTW88_8821CU is not set +CONFIG_RTW88_8821CU=m CONFIG_RTW88_8822BE=m # CONFIG_RTW88_8822BU is not set CONFIG_RTW88_8822CE=m diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 1173539cb..5b84e8fd3 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -5214,7 +5214,7 @@ CONFIG_RTLWIFI=m CONFIG_RTW88_8723DE=m # CONFIG_RTW88_8723DU is not set CONFIG_RTW88_8821CE=m -# CONFIG_RTW88_8821CU is not set +CONFIG_RTW88_8821CU=m CONFIG_RTW88_8822BE=m # CONFIG_RTW88_8822BU is not set CONFIG_RTW88_8822CE=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 7014def98..35218843e 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -4644,7 +4644,7 @@ CONFIG_RTLWIFI=m CONFIG_RTW88_8723DE=m # CONFIG_RTW88_8723DU is not set CONFIG_RTW88_8821CE=m -# CONFIG_RTW88_8821CU is not set +CONFIG_RTW88_8821CU=m CONFIG_RTW88_8822BE=m # CONFIG_RTW88_8822BU is not set CONFIG_RTW88_8822CE=m diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index b91174ef4..5d2befc95 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -5193,7 +5193,7 @@ CONFIG_RTLWIFI=m CONFIG_RTW88_8723DE=m # CONFIG_RTW88_8723DU is not set CONFIG_RTW88_8821CE=m -# CONFIG_RTW88_8821CU is not set +CONFIG_RTW88_8821CU=m CONFIG_RTW88_8822BE=m # CONFIG_RTW88_8822BU is not set CONFIG_RTW88_8822CE=m diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index bb25abbd7..95ad4e9ce 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -4623,7 +4623,7 @@ CONFIG_RTLWIFI=m CONFIG_RTW88_8723DE=m # CONFIG_RTW88_8723DU is not set CONFIG_RTW88_8821CE=m -# CONFIG_RTW88_8821CU is not set +CONFIG_RTW88_8821CU=m CONFIG_RTW88_8822BE=m # CONFIG_RTW88_8822BU is not set CONFIG_RTW88_8822CE=m diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index d4beb3019..77583dd6b 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -4639,7 +4639,7 @@ CONFIG_RT_MUTEXES=y CONFIG_RTW88_8723DE=m # CONFIG_RTW88_8723DU is not set CONFIG_RTW88_8821CE=m -# CONFIG_RTW88_8821CU is not set +CONFIG_RTW88_8821CU=m CONFIG_RTW88_8822BE=m # CONFIG_RTW88_8822BU is not set CONFIG_RTW88_8822CE=m diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index bec5eaa44..e130bafe9 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -5624,7 +5624,7 @@ CONFIG_RTLWIFI=m CONFIG_RTW88_8723DE=m # CONFIG_RTW88_8723DU is not set CONFIG_RTW88_8821CE=m -# CONFIG_RTW88_8821CU is not set +CONFIG_RTW88_8821CU=m CONFIG_RTW88_8822BE=m # CONFIG_RTW88_8822BU is not set CONFIG_RTW88_8822CE=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 54e9026cf..aea7aab3b 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -4876,7 +4876,7 @@ CONFIG_RTLWIFI=m CONFIG_RTW88_8723DE=m # CONFIG_RTW88_8723DU is not set CONFIG_RTW88_8821CE=m -# CONFIG_RTW88_8821CU is not set +CONFIG_RTW88_8821CU=m CONFIG_RTW88_8822BE=m # CONFIG_RTW88_8822BU is not set CONFIG_RTW88_8822CE=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 26ab2dddd..f8ce220a1 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -1309,7 +1309,7 @@ CONFIG_DEBUG_FS=y # CONFIG_DEBUG_GPIO is not set # CONFIG_DEBUG_HIGHMEM is not set # CONFIG_DEBUG_HOTPLUG_CPU0 is not set -CONFIG_DEBUG_INFO_BTF=y +# CONFIG_DEBUG_INFO_BTF is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set CONFIG_DEBUG_INFO_COMPRESSED_NONE=y # CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set @@ -5604,7 +5604,7 @@ CONFIG_RTLWIFI=m CONFIG_RTW88_8723DE=m # CONFIG_RTW88_8723DU is not set CONFIG_RTW88_8821CE=m -# CONFIG_RTW88_8821CU is not set +CONFIG_RTW88_8821CU=m CONFIG_RTW88_8822BE=m # CONFIG_RTW88_8822BU is not set CONFIG_RTW88_8822CE=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 173fff7e3..f07eb9aed 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -4854,7 +4854,7 @@ CONFIG_RTLWIFI=m CONFIG_RTW88_8723DE=m # CONFIG_RTW88_8723DU is not set CONFIG_RTW88_8821CE=m -# CONFIG_RTW88_8821CU is not set +CONFIG_RTW88_8821CU=m CONFIG_RTW88_8822BE=m # CONFIG_RTW88_8822BU is not set CONFIG_RTW88_8822CE=m diff --git a/kernel.spec b/kernel.spec index 20bf6c2c5..ae309c19f 100755 --- a/kernel.spec +++ b/kernel.spec @@ -95,6 +95,10 @@ Summary: The Linux kernel %global zipsed -e 's/\.ko$/\.ko.xz/' %endif +# define buildid .local +%define packager Thorsten Leemhuis https://fedoraproject.org/wiki/Kernel_Vanilla_Repositories +%define buildid .vanilla.1 + %if 0%{?fedora} %define primary_target fedora %else @@ -122,7 +126,7 @@ 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 # define buildid .local %define specversion 6.2.0 %define patchversion 6.2 @@ -159,7 +163,7 @@ Summary: The Linux kernel # kernel PAE (only valid for ARM (lpae)) %define with_pae %{?_without_pae: 0} %{?!_without_pae: 1} # kernel-debug -%define with_debug %{?_without_debug: 0} %{?!_without_debug: 1} +%define with_debug %{?_with_debug: 1} %{?!_with_debug: 0} # kernel-zfcpdump (s390 specific kernel for zfcpdump) %define with_zfcpdump %{?_without_zfcpdump: 0} %{?!_without_zfcpdump: 1} # kernel-doc @@ -210,7 +214,7 @@ Summary: The Linux kernel %define with_cross %{?_with_cross: 1} %{?!_with_cross: 0} # # build a release kernel on rawhide -%define with_release %{?_with_release: 1} %{?!_with_release: 0} +%define with_release %{?_without_release: 0} %{?!_without_release: 1} # verbose build, i.e. no silent rules and V=1 %define with_verbose %{?_with_verbose: 1} %{?!_with_verbose: 0} @@ -228,7 +232,7 @@ Summary: The Linux kernel %define with_ipaclones %{?_without_ipaclones: 0} %{?!_without_ipaclones: 1} # Want to build a vanilla kernel build without any non-upstream patches? -%define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0} +%define with_vanilla %{?_without_vanilla: 0} %{?!_without_vanilla: 1} %if 0%{?fedora} # Kernel headers are being split out into a separate package @@ -654,7 +658,7 @@ BuildConflicts: dwarves < 1.13 %undefine _debugsource_packages %undefine _debuginfo_subpackages %global _find_debuginfo_opts -r -%global _missing_build_ids_terminate_build 1 +%global _missing_build_ids_terminate_build 0 %global _no_recompute_build_ids 1 %endif %if %{with_kabidwchk} || %{with_kabidw_base} @@ -1432,7 +1436,7 @@ ApplyOptionalPatch() mv linux-%{tarfile_release} linux-%{KVERREL} cd linux-%{KVERREL} -cp -a %{SOURCE1} . +# cp -a %{SOURCE1} . %if !%{nopatches} @@ -2211,7 +2215,12 @@ BuildKernel() { # Generate vmlinux.h and put it to kernel-devel path # zfcpdump build does not have btf anymore if [ "$Variant" != "zfcpdump" ]; then - bpftool btf dump file vmlinux format c > $RPM_BUILD_ROOT/$DevelDir/vmlinux.h + # disabled for vanilla builds, to avoid a build problem: + # + # + bpftool btf dump file vmlinux format c + # Error: failed to load BTF from vmlinux: Unknown error -2 + # bpftool btf dump file vmlinux format c > $RPM_BUILD_ROOT/$DevelDir/vmlinux.h + : fi %endif diff --git a/redhatsecureboot301.cer b/redhatsecureboot301.cer Binary files differnew file mode 100644 index 000000000..20e660479 --- /dev/null +++ b/redhatsecureboot301.cer diff --git a/redhatsecureboot501.cer b/redhatsecureboot501.cer Binary files differnew file mode 100644 index 000000000..dfa7afb46 --- /dev/null +++ b/redhatsecureboot501.cer diff --git a/redhatsecurebootca1.cer b/redhatsecurebootca1.cer Binary files differnew file mode 100644 index 000000000..b2354007b --- /dev/null +++ b/redhatsecurebootca1.cer diff --git a/redhatsecurebootca5.cer b/redhatsecurebootca5.cer Binary files differnew file mode 100644 index 000000000..dfb028495 --- /dev/null +++ b/redhatsecurebootca5.cer diff --git a/secureboot_ppc.cer b/secureboot_ppc.cer Binary files differnew file mode 100644 index 000000000..2c0087dbc --- /dev/null +++ b/secureboot_ppc.cer diff --git a/secureboot_s390.cer b/secureboot_s390.cer Binary files differnew file mode 100644 index 000000000..137d3858f --- /dev/null +++ b/secureboot_s390.cer |