From: Prarit Bhargava
redhat/kernel.spec.template: Switch KABI compression to xz
Switch KABI compression to xz. There's no reason it has to be bz2.
Signed-off-by: Prarit Bhargava
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -332,9 +332,9 @@ endif
TARFILE:=linux-$(SPECTARFILE_RELEASE).tar.xz
TARBALL:=$(REDHAT)/$(TARFILE)
-KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(SPECKABIVERSION).tar.bz2
+KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(SPECKABIVERSION).tar.xz
KABIDW := $(REDHAT)/kabi-dwarf
-KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(SPECKABIVERSION).tar.bz2
+KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(SPECKABIVERSION).tar.xz
# Taken from tools/lib/bpf/Makefile
SPECBPFTOOLVERSION:=$(shell \
@@ -603,14 +603,14 @@ $(TARBALL):
.PHONY: $(KABI_TARBALL)
$(KABI_TARBALL):
- @(cd kabi && tar cjf $(KABI_TARBALL) kabi-rhel$(RHEL_MAJOR)*
kabi-current)
+ @(cd kabi && tar -cJf $(KABIDW_TARBALL) kabi-rhel9* kabi-current)
.PHONY: $(KABIDW_TARBALL)
$(KABIDW_TARBALL):
@if [ ! -d $(KABIDW)/base ]; then \
mkdir -p $(KABIDW)/base; \
fi
- @(cd kabi-dwarf && tar cjf $(KABIDW_TARBALL) base run_kabi-dw.sh)
+ @(cd kabi-dwarf && tar -cJf $(KABIDW_TARBALL) base run_kabi-dw.sh)
dist-git-version-check:
@# genspec.sh uses pathspec magic that wasn't introduced until version
2.13
@@ -716,11 +716,11 @@ sources-rh: $(TARBALL) generate-testpatch-tmp
setup-source dist-configs-check
cp kabi/Module.kabi_$$KABIARCH $(SOURCES)/; \
cp kabi/Module.kabi_dup_$$KABIARCH $(SOURCES)/; \
done
- @(cd kabi && tar cjf $(KABI_TARBALL) kabi-rhel$(RHEL_MAJOR)*
kabi-current)
+ @(cd kabi && tar -cJf $(KABI_TARBALL) kabi-rhel9* kabi-current)
@if [ ! -d $(KABIDW)/base ]; then \
mkdir -p $(KABIDW)/base; \
fi
- @(cd kabi-dwarf && tar cjf $(KABIDW_TARBALL) base run_kabi-dw.sh)
+ @(cd kabi-dwarf && tar -cJf $(KABIDW_TARBALL) base run_kabi-dw.sh)
dist-sources: dist-kabi dist-kabi-dup sources-rh
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
@@ -943,8 +943,8 @@ Source211: Module.kabi_dup_ppc64le
Source212: Module.kabi_dup_s390x
Source213: Module.kabi_dup_x86_64
-Source300: kernel-abi-stablelists-%{kabiversion}.tar.bz2
-Source301: kernel-kabi-dw-%{kabiversion}.tar.bz2
+Source300: kernel-abi-stablelists-%{kabiversion}.tar.xz
+Source301: kernel-kabi-dw-%{kabiversion}.tar.xz
# RT specific virt module
Source400: mod-kvm.list
@@ -2172,10 +2172,10 @@ BuildKernel() {
# Don't build kabi base for debug kernels
if [ "$Variant" != "zfcpdump" -a "$Variant" != "debug" ]; then
mkdir -p $RPM_BUILD_ROOT/kabi-dwarf
-tar xjvf %{SOURCE301} -C $RPM_BUILD_ROOT/kabi-dwarf
+tar -xvf %{SOURCE301} -C $RPM_BUILD_ROOT/kabi-dwarf
mkdir -p $RPM_BUILD_ROOT/kabi-dwarf/stablelists
-tar xjvf %{SOURCE300} -C $RPM_BUILD_ROOT/kabi-dwarf/stablelists
+tar -xvf %{SOURCE300} -C $RPM_BUILD_ROOT/kabi-dwarf/stablelists
echo " GENERATING DWARF-based kABI baseline dataset "
chmod 0755 $RPM_BUILD_ROOT/kabi-dwarf/run_kabi-dw.sh
@@ -2191,10 +2191,10 @@ BuildKernel() {
%if %{with_kabidwchk}
if [ "$Variant" != "zfcpdump" ]; then
mkdir -p $RPM_BUILD_ROOT/kabi-dwarf
-tar xjvf %{SOURCE301} -C $RPM_BUILD_ROOT/kabi-dwarf
+tar -xvf %{SOURCE301} -C $RPM_BUILD_ROOT/kabi-dwarf
if [ -d
"$RPM_BUILD_ROOT/kabi-dwarf/base/%{_target_cpu}${Variant:+.${Variant}}" ]; then
mkdir -p $RPM_BUILD_ROOT/kabi-dwarf/stablelists
-tar xjvf %{SOURCE300} -C $RPM_BUILD_ROOT/kabi-dwarf/stablelists
+tar -xvf %{SOURCE300} -C $RPM_BUILD_ROOT/kabi-dwarf/stablelists
echo " GENERATING DWARF-based kABI dataset "
chmod 0755 $RPM_BUILD_ROOT/kabi-dwarf/run_kabi-dw.sh
@@ -2939,7 +2939,7 @@ INSTALL_KABI_PATH=$RPM_BUILD_ROOT/lib/modules/
mkdir -p $INSTALL_KABI_PATH
# install kabi releases directories
-tar xjvf %{SOURCE300} -C $INSTALL_KABI_PATH
+tar -xvf %{SOURCE300} -C $INSTALL_KABI_PATH
# with_kernel_abi_stablelists
%endif
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2760
___
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