diff options
30 files changed, 114 insertions, 28 deletions
diff --git a/arm64-remove-special-treatment-for-the-link-order-of.patch b/arm64-remove-special-treatment-for-the-link-order-of.patch new file mode 100644 index 000000000..5b350734d --- /dev/null +++ b/arm64-remove-special-treatment-for-the-link-order-of.patch @@ -0,0 +1,38 @@ +From 994b7ac1697b4581b7726d2ac64321e3c840229b Mon Sep 17 00:00:00 2001 +From: Masahiro Yamada <masahiroy@kernel.org> +Date: Thu, 13 Oct 2022 08:35:00 +0900 +Subject: [PATCH] arm64: remove special treatment for the link order of head.o + +In the previous discussion (see the Link tag), Ard pointed out that +arm/arm64/kernel/head.o does not need any special treatment - the only +piece that must appear right at the start of the binary image is the +image header which is emitted into .head.text. + +The linker script does the right thing to do. The build system does +not need to manipulate the link order of head.o. + +Link: https://lore.kernel.org/lkml/CAMj1kXH77Ja8bSsq2Qj8Ck9iSZKw=1F8Uy-uAWGVDm4-CG=EuA@mail.gmail.com/ +Suggested-by: Ard Biesheuvel <ardb@kernel.org> +Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> +Reviewed-by: Nicolas Schier <nicolas@fjasle.eu> +Link: https://lore.kernel.org/r/20221012233500.156764-1-masahiroy@kernel.org +Signed-off-by: Will Deacon <will@kernel.org> +--- + scripts/head-object-list.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/scripts/head-object-list.txt b/scripts/head-object-list.txt +index b16326a92c45..f226e45e3b7b 100644 +--- a/scripts/head-object-list.txt ++++ b/scripts/head-object-list.txt +@@ -15,7 +15,6 @@ arch/alpha/kernel/head.o + arch/arc/kernel/head.o + arch/arm/kernel/head-nommu.o + arch/arm/kernel/head.o +-arch/arm64/kernel/head.o + arch/csky/kernel/head.o + arch/hexagon/kernel/head.o + arch/ia64/kernel/head.o +-- +2.38.1 + 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 1f6a63655..d13f938b0 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -6366,7 +6366,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 6be9d4fc3..e399da2f6 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -4953,7 +4953,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 760b31b43..8de19b07b 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -6345,7 +6345,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 a6f333ca3..0ded9704c 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -4930,7 +4930,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 bc906b5f4..670365a64 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -6381,7 +6381,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 1d393f083..1f0b12ec4 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -6362,7 +6362,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 cc02d03ac..9d0c59854 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -6204,7 +6204,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 9f366c955..d6977e201 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -6185,7 +6185,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 8e4ed2e73..38b95f8c8 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -5284,7 +5284,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 039c8a5d1..8abc1da08 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -4708,7 +4708,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 9fd4f1c08..8f776436b 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -5263,7 +5263,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 365b1c215..d7b5d675f 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -4687,7 +4687,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 84da7fb59..0ae40fb0e 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -5215,7 +5215,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 1a2515cf7..73b91f775 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -4646,7 +4646,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 84ebfcc83..105a5203d 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -5194,7 +5194,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 4e587eab3..4ab62fe2a 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -4625,7 +4625,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 067cf1d18..5e3601ed9 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -4641,7 +4641,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 9c0bf4481..9d2fe7dee 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -5625,7 +5625,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 4428eab34..5b8ed4dd3 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -4878,7 +4878,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 75a199cdd..07419889f 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 @@ -5605,7 +5605,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 7e948e7ea..b83dfcc77 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -4856,7 +4856,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 26328965a..83bde0da8 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 @@ -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} @@ -861,6 +865,8 @@ Source4002: gating.yaml ## Patches needed for building this package +Patch100: arm64-remove-special-treatment-for-the-link-order-of.patch + %if !%{nopatches} Patch1: patch-%{patchversion}-redhat.patch @@ -1432,7 +1438,9 @@ ApplyOptionalPatch() mv linux-%{tarfile_release} linux-%{KVERREL} cd linux-%{KVERREL} -cp -a %{SOURCE1} . +# cp -a %{SOURCE1} . + +patch -R -p1 < "$RPM_SOURCE_DIR/"arm64-remove-special-treatment-for-the-link-order-of.patch %if !%{nopatches} @@ -2211,7 +2219,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 |