✅ PASS: Test report for 6.5.9-100.fc37 (kernel-fedora)
Hi, we tested your kernel and here are the results: Overall result: PASSED Merge: OK Compile: OK Test: OK Tested-by: CKI Project Kernel information: Brew / Koji Task ID: 108100817 You can find all the details about the test run at https://datawarehouse.cki-project.org/kcidb/checkouts/111376 One or more kernel tests failed: We also see the following known issues which are not related to your changes: Issue: NFS Connectathon: SELinux prevents rpcbind URL: https://bugzilla.redhat.com/1758147 Affected tests: ppc64le - Filesystem - NFS Connectathon x86_64 - Filesystem - NFS Connectathon If you find a failure unrelated to your changes, please ask the test maintainer to review it. This will prevent the failures from being incorrectly reported in the future. Please reply to this email if you have any questions about the tests that we ran or if you have any suggestions on how to make future tests more effective. ,-. ,-. ( C ) ( K ) Continuous `-',-.`-' Kernel ( I ) Integration `-' __ ___ 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
Re: [OS-BUILD PATCH] Fix binutils breakage
From: Carlos O'Donell (Red Hat) on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2749#note_1619241995 @dzickusrh We are definitely triggering some odd issues with the flags we're passing down at this point. You've managed to get clang's bpf backend to emit `R_BPF_64_NODYLD32` (type 0x4) which binutils does not support. The relocation itself does nothing at runtime, but it's a marker for section merging support in lld (I don't know why they need it). Either earlier binutils ignored it, and now doesn't, which could be seen as a regression (since it doesn't have to do anything AFAICT). ___ 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
Re: [OS-BUILD PATCH] Fix binutils breakage
From: Don Zickus on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2749#note_1619009596 @codonell-rh - throwing the ball back into your court for above issue ^^ ___ 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
Re: [OS-BUILD PATCH] Fix binutils breakage
From: Viktor Malik on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2749#note_1618369263 So the `strip` problem is really a bug which @tohojo also noticed. He opened a bugzilla for that: https://bugzilla.redhat.com/show_bug.cgi?id=2245296 ___ 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
Re: [OS-BUILD PATCHv3 1/3] redhat/kernel.spec.template: Switch KABI compression to xz
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2760#note_1618227797 Thanks. Both fixed. ___ 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
[OS-BUILD PATCHv5 2/3] redhat/scripts: Switch KABI tarballs to xz
From: Prarit Bhargava
redhat/scripts: Switch KABI tarballs to xz
Switch the KABI tarballs to xz.
Signed-off-by: Prarit Bhargava
diff --git a/redhat/scripts/rh-dist-git.sh b/redhat/scripts/rh-dist-git.sh
index blahblah..blahblah 100755
--- a/redhat/scripts/rh-dist-git.sh
+++ b/redhat/scripts/rh-dist-git.sh
@@ -41,8 +41,8 @@ echo "Unpacking from SRPM"
# upload tarballs
sed -i "/linux-.*.tar.xz/d" "$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore};
-sed -i "/kernel-abi-stablelists.*.tar.bz2/d"
"$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore};
-sed -i "/kernel-kabi-dw-.*.tar.bz2/d"
"$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore};
+sed -i "/kernel-abi-stablelists.*.tar.xz/d"
"$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore};
+sed -i "/kernel-kabi-dw-.*.tar.xz/d"
"$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore};
upload_list="$TARBALL $KABI_TARBALL $KABIDW_TARBALL"
echo "Uploading new tarballs: $upload_list"
--
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
[OS-BUILD PATCHv5 0/3] redhat: Switch KABI file compression to xz
From: Prarit Bhargava on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2760 Switch the KABI compression from bz2 to xz to match other compression targets. Signed-off-by: Prarit Bhargava --- redhat/scripts/rh-dist-git.sh | 4 ++-- redhat/self-test/data/centos-2585cf9dfaad.el7 | 4 ++-- redhat/self-test/data/centos-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/centos-78e36f3b0dae.el7 | 4 ++-- redhat/self-test/data/centos-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/centos-df0cc57e057f.el7 | 4 ++-- redhat/self-test/data/centos-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/centos-fce15c45d3fb.el7 | 4 ++-- redhat/self-test/data/centos-fce15c45d3fb.fc25 | 4 ++-- redhat/self-test/data/fedora-2585cf9dfaad.el7 | 4 ++-- redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/fedora-78e36f3b0dae.el7 | 4 ++-- redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/fedora-df0cc57e057f.el7 | 4 ++-- redhat/self-test/data/fedora-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/fedora-fce15c45d3fb.el7 | 4 ++-- redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 4 ++-- redhat/self-test/data/rhel-2585cf9dfaad.el7| 4 ++-- redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/rhel-78e36f3b0dae.el7| 4 ++-- redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/rhel-df0cc57e057f.el7| 4 ++-- redhat/self-test/data/rhel-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/rhel-fce15c45d3fb.el7| 4 ++-- redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 4 ++-- redhat/Makefile| 12 ++-- redhat/kernel.spec.template| 14 +++--- 27 files changed, 63 insertions(+), 63 deletions(-) ___ 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
[OS-BUILD PATCHv5 3/3] redhat/self-test: Update data for KABI xz change
From: Prarit Bhargava redhat/self-test: Update data for KABI xz change The extension on the KABI files has changed from bz2 to xz. Signed-off-by: Prarit Bhargava diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7 b/redhat/self-test/data/centos-2585cf9dfaad.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.el7 +++ b/redhat/self-test/data/centos-2585cf9dfaad.el7 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.el7.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.el7.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.el7.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.el7.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25 b/redhat/self-test/data/centos-2585cf9dfaad.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.fc25 +++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.fc25.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.fc25.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.fc25.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.fc25.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7 b/redhat/self-test/data/centos-78e36f3b0dae.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.el7 +++ b/redhat/self-test/data/centos-78e36f3b0dae.el7 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25 b/redhat/self-test/data/centos-78e36f3b0dae.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.fc25 +++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7 b/redhat/self-test/data/centos-df0cc57e057f.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-df0cc57e057f.el7 +++ b/redhat/self-test/data/centos-df0cc57e057f.el7 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.el7.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.el7.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
[OS-BUILD PATCHv5 1/3] redhat/kernel.spec.template: Switch KABI compression to xz
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 $(KABI_TARBALL) kabi-rhel$(RHEL_MAJOR)*
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-rhel$(RHEL_MAJOR)*
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
[OS-BUILD PATCHv4 0/3] redhat: Switch KABI file compression to xz
From: Prarit Bhargava on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2760 Switch the KABI compression from bz2 to xz to match other compression targets. Signed-off-by: Prarit Bhargava --- redhat/scripts/rh-dist-git.sh | 4 ++-- redhat/self-test/data/centos-2585cf9dfaad.el7 | 4 ++-- redhat/self-test/data/centos-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/centos-78e36f3b0dae.el7 | 4 ++-- redhat/self-test/data/centos-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/centos-df0cc57e057f.el7 | 4 ++-- redhat/self-test/data/centos-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/centos-fce15c45d3fb.el7 | 4 ++-- redhat/self-test/data/centos-fce15c45d3fb.fc25 | 4 ++-- redhat/self-test/data/fedora-2585cf9dfaad.el7 | 4 ++-- redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/fedora-78e36f3b0dae.el7 | 4 ++-- redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/fedora-df0cc57e057f.el7 | 4 ++-- redhat/self-test/data/fedora-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/fedora-fce15c45d3fb.el7 | 4 ++-- redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 4 ++-- redhat/self-test/data/rhel-2585cf9dfaad.el7| 4 ++-- redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/rhel-78e36f3b0dae.el7| 4 ++-- redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/rhel-df0cc57e057f.el7| 4 ++-- redhat/self-test/data/rhel-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/rhel-fce15c45d3fb.el7| 4 ++-- redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 4 ++-- redhat/Makefile| 12 ++-- redhat/kernel.spec.template| 14 +++--- 27 files changed, 63 insertions(+), 63 deletions(-) ___ 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
[OS-BUILD PATCHv4 3/3] redhat/self-test: Update data for KABI xz change
From: Prarit Bhargava redhat/self-test: Update data for KABI xz change The extension on the KABI files has changed from bz2 to xz. Signed-off-by: Prarit Bhargava diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7 b/redhat/self-test/data/centos-2585cf9dfaad.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.el7 +++ b/redhat/self-test/data/centos-2585cf9dfaad.el7 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.el7.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.el7.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.el7.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.el7.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25 b/redhat/self-test/data/centos-2585cf9dfaad.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.fc25 +++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.fc25.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.fc25.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.fc25.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.fc25.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7 b/redhat/self-test/data/centos-78e36f3b0dae.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.el7 +++ b/redhat/self-test/data/centos-78e36f3b0dae.el7 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25 b/redhat/self-test/data/centos-78e36f3b0dae.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.fc25 +++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7 b/redhat/self-test/data/centos-df0cc57e057f.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-df0cc57e057f.el7 +++ b/redhat/self-test/data/centos-df0cc57e057f.el7 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.el7.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.el7.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
[OS-BUILD PATCHv4 2/3] redhat/scripts: Switch KABI tarballs to xz
From: Prarit Bhargava
redhat/scripts: Switch KABI tarballs to xz
Switch the KABI tarballs to xz.
Signed-off-by: Prarit Bhargava
diff --git a/redhat/scripts/rh-dist-git.sh b/redhat/scripts/rh-dist-git.sh
index blahblah..blahblah 100755
--- a/redhat/scripts/rh-dist-git.sh
+++ b/redhat/scripts/rh-dist-git.sh
@@ -41,8 +41,8 @@ echo "Unpacking from SRPM"
# upload tarballs
sed -i "/linux-.*.tar.xz/d" "$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore};
-sed -i "/kernel-abi-stablelists.*.tar.bz2/d"
"$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore};
-sed -i "/kernel-kabi-dw-.*.tar.bz2/d"
"$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore};
+sed -i "/kernel-abi-stablelists.*.tar.xz/d"
"$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore};
+sed -i "/kernel-kabi-dw-.*.tar.xz/d"
"$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore};
upload_list="$TARBALL $KABI_TARBALL $KABIDW_TARBALL"
echo "Uploading new tarballs: $upload_list"
--
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
[OS-BUILD PATCHv4 1/3] redhat/kernel.spec.template: Switch KABI compression to xz
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
Re: [OS-BUILD PATCHv3 1/3] redhat/kernel.spec.template: Switch KABI compression to xz
From: Čestmír Kalina on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2760#note_1618202343 Why is there $(KABIDW_TARBALL) under $(KABI_TARBALL) target? ___ 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
Re: [OS-BUILD PATCHv3 1/3] redhat/kernel.spec.template: Switch KABI compression to xz
From: Čestmír Kalina on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2760#note_1618200039 Why do we need to hardcode `rhel9` here? ___ 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
[OS-BUILD PATCHv3 0/3] redhat: Switch KABI file compression to xz
From: Prarit Bhargava on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2760 Switch the KABI compression from bz2 to xz to match other compression targets. Signed-off-by: Prarit Bhargava --- redhat/scripts/rh-dist-git.sh | 4 ++-- redhat/self-test/data/centos-2585cf9dfaad.el7 | 4 ++-- redhat/self-test/data/centos-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/centos-78e36f3b0dae.el7 | 4 ++-- redhat/self-test/data/centos-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/centos-df0cc57e057f.el7 | 4 ++-- redhat/self-test/data/centos-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/centos-fce15c45d3fb.el7 | 4 ++-- redhat/self-test/data/centos-fce15c45d3fb.fc25 | 4 ++-- redhat/self-test/data/fedora-2585cf9dfaad.el7 | 4 ++-- redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/fedora-78e36f3b0dae.el7 | 4 ++-- redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/fedora-df0cc57e057f.el7 | 4 ++-- redhat/self-test/data/fedora-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/fedora-fce15c45d3fb.el7 | 4 ++-- redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 4 ++-- redhat/self-test/data/rhel-2585cf9dfaad.el7| 4 ++-- redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/rhel-78e36f3b0dae.el7| 4 ++-- redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/rhel-df0cc57e057f.el7| 4 ++-- redhat/self-test/data/rhel-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/rhel-fce15c45d3fb.el7| 4 ++-- redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 4 ++-- redhat/Makefile| 12 ++-- redhat/kernel.spec.template| 14 +++--- 27 files changed, 63 insertions(+), 63 deletions(-) ___ 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
[OS-BUILD PATCHv3 2/3] redhat/scripts: Switch KABI tarballs to xz
From: Prarit Bhargava
redhat/scripts: Switch KABI tarballs to xz
Switch the KABI tarballs to xz.
Signed-off-by: Prarit Bhargava
diff --git a/redhat/scripts/rh-dist-git.sh b/redhat/scripts/rh-dist-git.sh
index blahblah..blahblah 100755
--- a/redhat/scripts/rh-dist-git.sh
+++ b/redhat/scripts/rh-dist-git.sh
@@ -41,8 +41,8 @@ echo "Unpacking from SRPM"
# upload tarballs
sed -i "/linux-.*.tar.xz/d" "$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore};
-sed -i "/kernel-abi-stablelists.*.tar.bz2/d"
"$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore};
-sed -i "/kernel-kabi-dw-.*.tar.bz2/d"
"$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore};
+sed -i "/kernel-abi-stablelists.*.tar.xz/d"
"$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore};
+sed -i "/kernel-kabi-dw-.*.tar.xz/d"
"$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore};
upload_list="$TARBALL $KABI_TARBALL $KABIDW_TARBALL"
echo "Uploading new tarballs: $upload_list"
--
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
[OS-BUILD PATCHv3 1/3] redhat/kernel.spec.template: Switch KABI compression to xz
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
[OS-BUILD PATCHv3 3/3] redhat/self-test: Update data for KABI xz change
From: Prarit Bhargava redhat/self-test: Update data for KABI xz change The extension on the KABI files has changed from bz2 to xz. Signed-off-by: Prarit Bhargava diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7 b/redhat/self-test/data/centos-2585cf9dfaad.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.el7 +++ b/redhat/self-test/data/centos-2585cf9dfaad.el7 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.el7.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.el7.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.el7.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.el7.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25 b/redhat/self-test/data/centos-2585cf9dfaad.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.fc25 +++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.fc25.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.fc25.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.fc25.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.fc25.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7 b/redhat/self-test/data/centos-78e36f3b0dae.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.el7 +++ b/redhat/self-test/data/centos-78e36f3b0dae.el7 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25 b/redhat/self-test/data/centos-78e36f3b0dae.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.fc25 +++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7 b/redhat/self-test/data/centos-df0cc57e057f.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-df0cc57e057f.el7 +++ b/redhat/self-test/data/centos-df0cc57e057f.el7 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.el7.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.el7.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
Re: [OS-BUILD PATCHv2 0/2] redhat: Switch KABI file compression to xz
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2760#note_1618114473 Oh, interesting. I've removed this commit and pushed a new version without it. ___ 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
[OS-BUILD PATCHv2 2/2] redhat/self-test: Update data for KABI xz change
From: Prarit Bhargava redhat/self-test: Update data for KABI xz change The extension on the KABI files has changed from bz2 to xz. Signed-off-by: Prarit Bhargava diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7 b/redhat/self-test/data/centos-2585cf9dfaad.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.el7 +++ b/redhat/self-test/data/centos-2585cf9dfaad.el7 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.el7.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.el7.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.el7.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.el7.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25 b/redhat/self-test/data/centos-2585cf9dfaad.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.fc25 +++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.fc25.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.fc25.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.fc25.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.fc25.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7 b/redhat/self-test/data/centos-78e36f3b0dae.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.el7 +++ b/redhat/self-test/data/centos-78e36f3b0dae.el7 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25 b/redhat/self-test/data/centos-78e36f3b0dae.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.fc25 +++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7 b/redhat/self-test/data/centos-df0cc57e057f.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-df0cc57e057f.el7 +++ b/redhat/self-test/data/centos-df0cc57e057f.el7 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.el7.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.el7.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
[OS-BUILD PATCHv2 1/2] redhat/kernel.spec.template: Switch KABI compression to xz
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
[OS-BUILD PATCHv2 0/2] redhat: Switch KABI file compression to xz
From: Prarit Bhargava on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2760 Switch the KABI compression from bz2 to xz to match other compression targets. Signed-off-by: Prarit Bhargava --- redhat/self-test/data/centos-2585cf9dfaad.el7 | 4 ++-- redhat/self-test/data/centos-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/centos-78e36f3b0dae.el7 | 4 ++-- redhat/self-test/data/centos-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/centos-df0cc57e057f.el7 | 4 ++-- redhat/self-test/data/centos-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/centos-fce15c45d3fb.el7 | 4 ++-- redhat/self-test/data/centos-fce15c45d3fb.fc25 | 4 ++-- redhat/self-test/data/fedora-2585cf9dfaad.el7 | 4 ++-- redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/fedora-78e36f3b0dae.el7 | 4 ++-- redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/fedora-df0cc57e057f.el7 | 4 ++-- redhat/self-test/data/fedora-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/fedora-fce15c45d3fb.el7 | 4 ++-- redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 4 ++-- redhat/self-test/data/rhel-2585cf9dfaad.el7| 4 ++-- redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/rhel-78e36f3b0dae.el7| 4 ++-- redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/rhel-df0cc57e057f.el7| 4 ++-- redhat/self-test/data/rhel-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/rhel-fce15c45d3fb.el7| 4 ++-- redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 4 ++-- redhat/Makefile| 12 ++-- redhat/kernel.spec.template| 14 +++--- 26 files changed, 61 insertions(+), 61 deletions(-) ___ 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
Re: [OS-BUILD PATCH] Fix binutils breakage
From: Viktor Malik on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2749#note_1617635466 Patches sent, added you to cc. I'd still wait a couple of days, if possible, to see if upstream doesn't propose a different approach, to avoid carrying non-upstream patches in ARK. But that's up to you. ___ 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
