summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gcc-12-subcmd-util.patch35
-rw-r--r--kernel-aarch64-debug-rhel.config2
-rw-r--r--kernel-aarch64-rhel.config2
-rw-r--r--kernel-ppc64le-debug-rhel.config2
-rw-r--r--kernel-ppc64le-rhel.config2
-rw-r--r--kernel-s390x-debug-rhel.config2
-rw-r--r--kernel-s390x-rhel.config2
-rw-r--r--kernel-s390x-zfcpdump-rhel.config2
-rw-r--r--kernel-x86_64-debug-rhel.config2
-rw-r--r--kernel-x86_64-fedora.config2
-rw-r--r--kernel-x86_64-rhel.config2
-rwxr-xr-xkernel.spec21
-rw-r--r--redhatsecureboot301.cerbin0 -> 899 bytes
-rw-r--r--redhatsecureboot501.cerbin0 -> 964 bytes
-rw-r--r--redhatsecurebootca1.cerbin0 -> 977 bytes
-rw-r--r--redhatsecurebootca5.cerbin0 -> 920 bytes
-rw-r--r--secureboot_ppc.cerbin0 -> 899 bytes
-rw-r--r--secureboot_s390.cerbin0 -> 899 bytes
18 files changed, 60 insertions, 16 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-rhel.config b/kernel-aarch64-debug-rhel.config
index a837e96ae..8c004e6d3 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -4946,7 +4946,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 c2decfdfe..08b970e00 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -4923,7 +4923,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 7a6697282..c1b00e823 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -4705,7 +4705,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 73311cd2a..8752a0fda 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -4684,7 +4684,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 e97ea1d31..7add6a2f1 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -4643,7 +4643,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 8ba959f83..d9b3960c0 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -4622,7 +4622,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 ab2fc8557..c5272ef73 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -4638,7 +4638,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-rhel.config b/kernel-x86_64-debug-rhel.config
index 2e687d820..4b4f058c9 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -4875,7 +4875,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 77470409c..b04d3151d 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -1304,7 +1304,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
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index b3384e856..8d1cf0e40 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -4853,7 +4853,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 09c698b1d..094704e52 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
@@ -655,7 +659,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}
@@ -1463,7 +1467,7 @@ ApplyOptionalPatch()
mv linux-%{tarfile_release} linux-%{KVERREL}
cd linux-%{KVERREL}
-cp -a %{SOURCE1} .
+# cp -a %{SOURCE1} .
%if !%{nopatches}
@@ -2239,7 +2243,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
new file mode 100644
index 000000000..20e660479
--- /dev/null
+++ b/redhatsecureboot301.cer
Binary files differ
diff --git a/redhatsecureboot501.cer b/redhatsecureboot501.cer
new file mode 100644
index 000000000..dfa7afb46
--- /dev/null
+++ b/redhatsecureboot501.cer
Binary files differ
diff --git a/redhatsecurebootca1.cer b/redhatsecurebootca1.cer
new file mode 100644
index 000000000..b2354007b
--- /dev/null
+++ b/redhatsecurebootca1.cer
Binary files differ
diff --git a/redhatsecurebootca5.cer b/redhatsecurebootca5.cer
new file mode 100644
index 000000000..dfb028495
--- /dev/null
+++ b/redhatsecurebootca5.cer
Binary files differ
diff --git a/secureboot_ppc.cer b/secureboot_ppc.cer
new file mode 100644
index 000000000..2c0087dbc
--- /dev/null
+++ b/secureboot_ppc.cer
Binary files differ
diff --git a/secureboot_s390.cer b/secureboot_s390.cer
new file mode 100644
index 000000000..137d3858f
--- /dev/null
+++ b/secureboot_s390.cer
Binary files differ
generated by cgit (git 2.34.1) at 2024-05-08 10:07:29 +0000