From: Prarit Bhargava <pra...@redhat.com>
kernel.spec.template: Add global compression variables
Add global compression variables. 'compression' is the compression
utility, and 'compext' is the compression extension. In the case of xz,
these variables have the same value but that may not always be the
case.
Signed-off-by: Prarit Bhargava <pra...@redhat.com>
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -106,8 +106,11 @@ Summary: The Linux kernel
%global zipmodules 1
%endif
+# Default compression algorithm
+%global compression xz
+%global compext xz
%if %{zipmodules}
-%global zipsed -e 's/\.ko$/\.ko.xz/'
+%global zipsed -e 's/\.ko$/\.ko.%compext/'
%endif
%if 0%{?fedora}
@@ -1910,8 +1913,8 @@ BuildKernel() {
# NOTENOTE: checksums to the rpm metadata provides list.
# NOTENOTE: if you change the symvers name, update the backend too
echo "**** GENERATING kernel ABI metadata ****"
- xz -c9 < Module.symvers > $RPM_BUILD_ROOT/boot/symvers-$KernelVer.xz
- cp $RPM_BUILD_ROOT/boot/symvers-$KernelVer.xz
$RPM_BUILD_ROOT/lib/modules/$KernelVer/symvers.xz
+ %compression -c9 < Module.symvers >
$RPM_BUILD_ROOT/boot/symvers-$KernelVer.%compext
+ cp $RPM_BUILD_ROOT/boot/symvers-$KernelVer.%compext
$RPM_BUILD_ROOT/lib/modules/$KernelVer/symvers.%compext
%if %{with_kabichk}
echo "**** kABI checking is enabled in kernel SPEC file. ****"
@@ -2560,7 +2563,7 @@ find Documentation -type d | xargs chmod u+w
fi \
if [ "%{zipmodules}" -eq "1" ]; then \
echo "Compressing kernel modules ..." \
- find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -n 16
-P${RPM_BUILD_NCPUS} -r xz; \
+ find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -n 16
-P${RPM_BUILD_NCPUS} -r %compression; \
fi \
%{nil}
@@ -2988,9 +2991,9 @@ fi\
%endif\
rm -f
%{_localstatedir}/lib/rpm-state/%{name}/installing_core_%{KVERREL}%{?1:+%{1}}\
/bin/kernel-install add %{KVERREL}%{?1:+%{1}}
/lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz || exit $?\
-if [[ ! -e "/boot/symvers-%{KVERREL}%{?1:+%{1}}.xz" ]]; then\
- ln -s "/lib/modules/%{KVERREL}%{?1:+%{1}}/symvers.xz"
"/boot/symvers-%{KVERREL}%{?1:+%{1}}.xz"\
- command -v restorecon &>/dev/null && restorecon
"/boot/symvers-%{KVERREL}%{?1:+%{1}}.xz" \
+if [[ ! -e "/boot/symvers-%{KVERREL}%{?1:+%{1}}.%compext" ]]; then\
+ ln -s "/lib/modules/%{KVERREL}%{?1:+%{1}}/symvers.%compext"
"/boot/symvers-%{KVERREL}%{?1:+%{1}}.%compext"\
+ command -v restorecon &>/dev/null && restorecon
"/boot/symvers-%{KVERREL}%{?1:+%{1}}.%compext" \
fi\
%{nil}
@@ -3269,10 +3272,10 @@ fi
%endif\
%attr(0600, root, root) /lib/modules/%{KVERREL}%{?3:+%{3}}/System.map\
%ghost %attr(0600, root, root) /boot/System.map-%{KVERREL}%{?3:+%{3}}\
-/lib/modules/%{KVERREL}%{?3:+%{3}}/symvers.xz\
+/lib/modules/%{KVERREL}%{?3:+%{3}}/symvers.%compext\
/lib/modules/%{KVERREL}%{?3:+%{3}}/config\
/lib/modules/%{KVERREL}%{?3:+%{3}}/modules.builtin*\
-%ghost %attr(0600, root, root) /boot/symvers-%{KVERREL}%{?3:+%{3}}.xz\
+%ghost %attr(0600, root, root) /boot/symvers-%{KVERREL}%{?3:+%{3}}.%compext\
%ghost %attr(0600, root, root) /boot/initramfs-%{KVERREL}%{?3:+%{3}}.img\
%ghost %attr(0644, root, root) /boot/config-%{KVERREL}%{?3:+%{3}}\
%{expand:%%files -f kernel-%{?3:%{3}-}modules-core.list
%{?3:%{3}-}modules-core}\
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2173
_______________________________________________
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
Fedora Code of Conduct:
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives:
https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Do not reply to spam, report it:
https://pagure.io/fedora-infrastructure/new_issue
