From c14fe345d5e4776784860e2ff61ef0caa7dd9ae2 Mon Sep 17 00:00:00 2001 From: Dodji Seketeli Date: Wed, 17 Apr 2024 16:44:06 +0200 Subject: [PATCH 1/8] Update to upstream 2.5 tarball - Update to upstream 2.5 tarball - Drop patches 0001-Bug-31045-Don-t-try-setting-translation-unit-for-uni.patch 0002-suppression-Add-has_strict_flexible_array_data_membe.patch 0003-Replace-deprecated-mock-with-unittest.mock.patch - Package libabigail.so.4 rather than the previous libabigail.so.3. - Add abidb to the package Signed-off-by: Dodji Seketeli --- .gitignore | 1 + libabigail.spec | 27 +++++++++++++++++++-------- sources | 4 +--- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 92f96ae..0935c8c 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ /libabigail-2.4.tar.xz /0001-Bug-31045-Don-t-try-setting-translation-unit-for-uni.patch /0002-suppression-Add-has_strict_flexible_array_data_membe.patch +/libabigail-2.5.tar.xz diff --git a/libabigail.spec b/libabigail.spec index d884749..aac692a 100644 --- a/libabigail.spec +++ b/libabigail.spec @@ -2,16 +2,13 @@ %global tarball_name %{name}-%{version} Name: libabigail -Version: 2.4 -Release: 7%{?dist} +Version: 2.5 +Release: 1%{?dist} Summary: Set of ABI analysis tools License: Apache-2.0 WITH LLVM-exception URL: https://sourceware.org/libabigail/ Source0: http://mirrors.kernel.org/sourceware/libabigail/%{tarball_name}.tar.xz -Patch1: 0001-Bug-31045-Don-t-try-setting-translation-unit-for-uni.patch -Patch2: 0002-suppression-Add-has_strict_flexible_array_data_membe.patch -Patch3: 0003-Replace-deprecated-mock-with-unittest.mock.patch BuildRequires: git BuildRequires: libbpf-devel @@ -23,6 +20,8 @@ BuildRequires: libxml2-devel BuildRequires: doxygen BuildRequires: python3-sphinx BuildRequires: texinfo +BuildRequires: python3-GitPython +BuildRequires: python3-libarchive-c %if 0%{?fedora} BuildRequires: dpkg BuildRequires: koji @@ -97,7 +96,7 @@ them manually. %autosetup -v -S git %build -%configure --enable-ctf --enable-btf --disable-silent-rules --disable-zip-archive --disable-static +%configure --enable-abidb --enable-ctf --enable-btf --disable-silent-rules --disable-zip-archive --disable-static make %{?_smp_mflags} pushd doc make html-doc @@ -137,8 +136,9 @@ fi %{_bindir}/abilint %{_bindir}/abipkgdiff %{_bindir}/kmidiff -%{_libdir}/libabigail.so.3 -%{_libdir}/libabigail.so.3.0.0 +%{_bindir}/abidb +%{_libdir}/libabigail.so.4 +%{_libdir}/libabigail.so.4.0.0 %{_libdir}/libabigail/default.abignore %doc README AUTHORS ChangeLog %license LICENSE.txt license-change-2020.txt @@ -162,6 +162,17 @@ fi %endif %changelog +* Thu Apr 18 2024 Dodji Seketeli - 2.5-1 +- Update to upstream 2.5 tarball +- Drop patches + 0001-Bug-31045-Don-t-try-setting-translation-unit-for-uni.patch + 0002-suppression-Add-has_strict_flexible_array_data_membe.patch + 0003-Replace-deprecated-mock-with-unittest.mock.patch +- Package libabigail.so.4 rather than the previous libabigail.so.3. +- Add abidb to the package + Added BuildRequires: python3-GitPython, python3-libarchive-c +- Better handle error handling when tests fails. + * Fri Jan 26 2024 Maxwell G - 2.4-7 - Remove python3-mock dependency - Apply patch 0003-Replace-deprecated-mock-with-unittest.mock.patch diff --git a/sources b/sources index 32bfac4..d84e053 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -SHA512 (libabigail-2.4.tar.xz) = f9b51f8710c75b911da10c1e93e0b6b6fa575f99e8f37a5f51e93a8e6b79c9ad1541e531730b410385053d6565f807300f7910dca48cbd3e991d111198781d95 -SHA512 (0001-Bug-31045-Don-t-try-setting-translation-unit-for-uni.patch) = f2145d6f9552dcd818228c08a68b6d54f7d79c53d79c2fff18f2664ac3684d2da09670247e482a18ee8f3b44fafbac425ca8d357ea4c621212b84b8180bd989e -SHA512 (0002-suppression-Add-has_strict_flexible_array_data_membe.patch) = 28b8eecba059e2e08e907ecc8ee9e03d57acdc94ce4e1aea4b8c51cf78c7711812215539149e5d24e77fb4c7a6b62c2e5062e7ff87b69d4ee2a85d2205e8b00b +SHA512 (libabigail-2.5.tar.xz) = 4084ebdd723a8ce1632f70943e29d71328bb695b1b0012ebd3d6ec7edccde872b54e76dfb1bc1c261805919c5e636198cd5bf23baf113474a082db21f2cfdd0d From 63c5c552f42b6cb6031b3b7e6249895c838d522f Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 14 May 2024 08:59:35 -0700 Subject: [PATCH 2/8] Change 'how' in plans/ci.fmf to try and fix CI tests I think `how: beakerlib` is no longer allowed, see e.g. https://artifacts.dev.testing-farm.io/ac6e6d82-985b-478a-adfc-bb402bf0b46e/pipeline.log (from https://osci-jenkins-1.ci.fedoraproject.org/job/fedora-ci/job/dist-git-pipeline/job/master/376078/ , from https://bodhi.fedoraproject.org/updates/FEDORA-2024-6da0169ae7 ) which says "Unsupported execute method 'beakerlib' in the '/plans/ci' plan." I think it should now be `how: tmt`. Signed-off-by: Adam Williamson --- plans/ci.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/ci.fmf b/plans/ci.fmf index 1ad2c12..85710d6 100644 --- a/plans/ci.fmf +++ b/plans/ci.fmf @@ -3,4 +3,4 @@ discover: how: fmf directory: tests execute: - how: beakerlib + how: tmt From 75654ba97bb74e9d805537c4da4ca39728826e27 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 16 May 2024 07:55:57 -0700 Subject: [PATCH 3/8] CI: remove SPECPARTS directory to fix finding build dir cd $TmpDir/BUILD/libabigail-* is failing currently: /usr/share/beakerlib/testing.sh: line 896: cd: too many arguments this is likely because of the SPECPARTS directory which now shows up alongside the build directory. Let's try removing that before we cd. Signed-off-by: Adam Williamson --- tests/libabigail-testsuite/runtest.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/libabigail-testsuite/runtest.sh b/tests/libabigail-testsuite/runtest.sh index 4b69b8b..f387b16 100755 --- a/tests/libabigail-testsuite/runtest.sh +++ b/tests/libabigail-testsuite/runtest.sh @@ -55,6 +55,7 @@ rlJournalStart rlRun "yum-builddep -y $TmpDir/SPECS/*.spec" rlRun "su -c 'rpmbuild -D \"_topdir $TmpDir\" -bc $TmpDir/SPECS/*.spec &>$TmpDir/rpmbuild.log' $BUILD_USER" rlRun "rlFileSubmit $TmpDir/rpmbuild.log" + rlRun "rm -rf $TmpDir/BUILD/libabigail-*-SPECPARTS" rlRun "cd $TmpDir/BUILD/libabigail-*" rlPhaseEnd From 03c6d7cf5aad5387cf729f2bc5128f5f007f417a Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 16 May 2024 10:47:50 -0700 Subject: [PATCH 4/8] CI: drop 'directory' from discover config This isn't valid, according to current upstream docs, and seems to produce a warning: warn: /plans/ci:discover - {'how': 'fmf', 'directory': 'tests'} is not valid under any of the given schemas it looks like we just want 'how': 'fmf', and it finds the files on its own. Signed-off-by: Adam Williamson --- plans/ci.fmf | 1 - 1 file changed, 1 deletion(-) diff --git a/plans/ci.fmf b/plans/ci.fmf index 85710d6..3fd3ab7 100644 --- a/plans/ci.fmf +++ b/plans/ci.fmf @@ -1,6 +1,5 @@ summary: CI Gating Plan discover: how: fmf - directory: tests execute: how: tmt From 3501acb62b3db0fc75c935ef32ead2d08be7ccb9 Mon Sep 17 00:00:00 2001 From: Dodji Seketeli Date: Fri, 1 Nov 2024 18:39:06 +0100 Subject: [PATCH 5/8] Update to upstream 2.6 tarball - Update to upstream 2.6 tarball - Add xxhash-devel as BuildRequire Signed-off-by: Dodji Seketeli --- libabigail.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libabigail.spec b/libabigail.spec index aac692a..543628a 100644 --- a/libabigail.spec +++ b/libabigail.spec @@ -2,7 +2,7 @@ %global tarball_name %{name}-%{version} Name: libabigail -Version: 2.5 +Version: 2.6 Release: 1%{?dist} Summary: Set of ABI analysis tools @@ -17,6 +17,7 @@ BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: elfutils-devel BuildRequires: libxml2-devel +BuildRequires: xxhash-devel BuildRequires: doxygen BuildRequires: python3-sphinx BuildRequires: texinfo @@ -162,6 +163,10 @@ fi %endif %changelog +* Fri Nov 1 2024 Dodji Seketeli - 2.6-1 +- Update to upstream 2.6 tarball +- Add xxhash-devel as BuildRequires + * Thu Apr 18 2024 Dodji Seketeli - 2.5-1 - Update to upstream 2.5 tarball - Drop patches From c2859398bf95b25516d03ed042501d6eeaf1d8b7 Mon Sep 17 00:00:00 2001 From: Dodji Seketeli Date: Fri, 1 Nov 2024 18:56:41 +0100 Subject: [PATCH 6/8] Update to upstream 2.6 tarball Signed-off-by: Dodji Seketeli --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 0935c8c..f4adf89 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ /0001-Bug-31045-Don-t-try-setting-translation-unit-for-uni.patch /0002-suppression-Add-has_strict_flexible_array_data_membe.patch /libabigail-2.5.tar.xz +/libabigail-2.6.tar.xz diff --git a/sources b/sources index d84e053..3146d43 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libabigail-2.5.tar.xz) = 4084ebdd723a8ce1632f70943e29d71328bb695b1b0012ebd3d6ec7edccde872b54e76dfb1bc1c261805919c5e636198cd5bf23baf113474a082db21f2cfdd0d +SHA512 (libabigail-2.6.tar.xz) = 77983586c9fa99ab5593e41e33ddfc175aef7a2ddfabb7eac79a9adfd776e7dbbb317f6d4c26044c420f2eac1f9d25e0c04887a54bb3136cc91e61219a1343e4 From 974f669695a15bed6401d4d84415c12d55de784a Mon Sep 17 00:00:00 2001 From: Dodji Seketeli Date: Fri, 1 Nov 2024 19:33:06 +0100 Subject: [PATCH 7/8] Update for libabigail SONAME bump to 5 Signed-off-by: Dodji Seketeli --- libabigail.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libabigail.spec b/libabigail.spec index 543628a..f629b10 100644 --- a/libabigail.spec +++ b/libabigail.spec @@ -138,8 +138,8 @@ fi %{_bindir}/abipkgdiff %{_bindir}/kmidiff %{_bindir}/abidb -%{_libdir}/libabigail.so.4 -%{_libdir}/libabigail.so.4.0.0 +%{_libdir}/libabigail.so.5 +%{_libdir}/libabigail.so.5.0.0 %{_libdir}/libabigail/default.abignore %doc README AUTHORS ChangeLog %license LICENSE.txt license-change-2020.txt @@ -166,6 +166,7 @@ fi * Fri Nov 1 2024 Dodji Seketeli - 2.6-1 - Update to upstream 2.6 tarball - Add xxhash-devel as BuildRequires +- Update library to libabigail.so.5.0.0 * Thu Apr 18 2024 Dodji Seketeli - 2.5-1 - Update to upstream 2.5 tarball From ca55862f1dfc7fefbd61b37593fb27625e420cf4 Mon Sep 17 00:00:00 2001 From: Dodji Seketeli Date: Fri, 11 Apr 2025 17:01:27 +0200 Subject: [PATCH 8/8] Update to upstream 2.7 tarball - Do not build with by default XXH_INLINE_ALL anymore - Drop xxhash-static dependency - Add xz-devel >= 5.2.0 dependency to support reading xz-compressed binaries - Support new libabigail.so.6.0.0 SONAME Signed-off-by: Dodji Seketeli --- .gitignore | 1 + libabigail.spec | 14 +++++++++++--- sources | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f4adf89..9a443fc 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ /0002-suppression-Add-has_strict_flexible_array_data_membe.patch /libabigail-2.5.tar.xz /libabigail-2.6.tar.xz +/libabigail-2.7.tar.xz diff --git a/libabigail.spec b/libabigail.spec index f629b10..7a4e71c 100644 --- a/libabigail.spec +++ b/libabigail.spec @@ -2,7 +2,7 @@ %global tarball_name %{name}-%{version} Name: libabigail -Version: 2.6 +Version: 2.7 Release: 1%{?dist} Summary: Set of ABI analysis tools @@ -18,6 +18,7 @@ BuildRequires: libtool BuildRequires: elfutils-devel BuildRequires: libxml2-devel BuildRequires: xxhash-devel +BuildRequires: xz-devel >= 5.2.0 BuildRequires: doxygen BuildRequires: python3-sphinx BuildRequires: texinfo @@ -138,8 +139,8 @@ fi %{_bindir}/abipkgdiff %{_bindir}/kmidiff %{_bindir}/abidb -%{_libdir}/libabigail.so.5 -%{_libdir}/libabigail.so.5.0.0 +%{_libdir}/libabigail.so.6 +%{_libdir}/libabigail.so.6.0.0 %{_libdir}/libabigail/default.abignore %doc README AUTHORS ChangeLog %license LICENSE.txt license-change-2020.txt @@ -163,6 +164,13 @@ fi %endif %changelog +* Fri Apr 11 2025 Dodji Seketeli - 2.7-1 +- Update to upstream 2.7 tarball +- Do not build with by default XXH_INLINE_ALL anymore +- Drop xxhash-static dependency +- Add xz-devel >= 5.2.0 dependency to support reading xz-compressed binaries +- Support new libabigail.so.6.0.0 SONAME + * Fri Nov 1 2024 Dodji Seketeli - 2.6-1 - Update to upstream 2.6 tarball - Add xxhash-devel as BuildRequires diff --git a/sources b/sources index 3146d43..67f786a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libabigail-2.6.tar.xz) = 77983586c9fa99ab5593e41e33ddfc175aef7a2ddfabb7eac79a9adfd776e7dbbb317f6d4c26044c420f2eac1f9d25e0c04887a54bb3136cc91e61219a1343e4 +SHA512 (libabigail-2.7.tar.xz) = 6c31df739b94b83a5bac4b560eb1c16919495280ed3f5a37a84144e18a2362038337d3843948e3022b97ba73f7a41b32b33ca5f8b86a51ea57574dc3de98b9d5