From: Prarit Bhargava <prarit(a)redhat.com>
kernel.spec.template: Only use gzip with aarch64
gzip is only needed for aarch64.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100755
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -579,7 +579,7 @@ Requires: kernel-modules-core-uname-r = %{KVERREL}
# List the packages used during the kernel build
#
BuildRequires: kmod, bash, coreutils, tar, git-core, which
-BuildRequires: bzip2, xz, findutils, gzip, m4, perl-interpreter, perl-Carp, perl-devel,
perl-generators, make, diffutils, gawk
+BuildRequires: bzip2, xz, findutils, m4, perl-interpreter, perl-Carp, perl-devel,
perl-generators, make, diffutils, gawk
BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc, bison, flex, gcc-c++
BuildRequires: net-tools, hostname, bc, elfutils-devel
BuildRequires: dwarves
@@ -613,6 +613,7 @@ BuildRequires: numactl-devel
%endif
%ifarch aarch64
BuildRequires: opencsd-devel >= 1.0.0
+BuildRequires: gzip
%endif
%endif
%if %{with_tools}
@@ -1745,14 +1746,11 @@ BuildKernel() {
CopyKernel=cp
fi
- # Sign the image if we're using EFI
- # aarch64 kernels are gziped EFI images
- KernelExtension=${KernelImage##*.}
- if [ "$KernelExtension" == "gz" ]; then
+ SignImage=$KernelImage
+ %ifarch aarch64
+ # aarch64 kernels are gziped EFI images
SignImage=${KernelImage%.*}
- else
- SignImage=$KernelImage
- fi
+ %endif
%ifarch x86_64 aarch64
%pesign -s -i $SignImage -o vmlinuz.tmp -a %{secureboot_ca_0} -c %{secureboot_key_0}
-n %{pesign_name_0}
@@ -1775,9 +1773,9 @@ BuildKernel() {
exit 1
fi
mv vmlinuz.signed $SignImage
- if [ "$KernelExtension" == "gz" ]; then
+ %ifarch aarch64
gzip -f9 $SignImage
- fi
+ %endif
# signkernel
%endif
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2173