From 0b45504ab25164c26928f94cbdcc02a75c1c7fbd Mon Sep 17 00:00:00 2001 From: Gyorgy Sarvari Date: Tue, 9 Sep 2025 14:28:43 +0200 Subject: diffoscope: upgrade 301 -> 306 Changelog: 302: * Mask stderr from the extract-vmlinux script. * Make it much more explicit that we return 'success' from the extract-vmlinux script instead of just falling through to the bottom of the script. * Use Difference.from_operation in an attempt to pipeline the output of extract-vmlinux, potentially avoiding it all residing in memory. This is an attempt to prevent out of memory issues on try.diffoscope.org. * Use --print-armap long option with nm in the "ar" comparator for wider compatibility. 303: * Don't check for PyPDF version 3 specifically, check for >= 3. Thanks, Vagrant, for the patch. * Ensure that Java class files are named .class on the filesystem before passing them to javap(1). * Update copyright years. 304: * Do not run jsondiff on files over 100KiB as the algorithm runs in O(n^2) time. * Fix test after the upload of systemd-ukify 258~rc3 (vs. 258~rc2). * Move from a mono-utils dependency to versioned "mono-devel | mono-utils" dependency, taking care to maintain the riscv64 architecture restriction. * Use sed -ne over awk -F= to to avoid mangling dependency lines containing equals signs (=), for example version restrictions. * Use sed backreferences when generating debian/tests/control to avoid DRY violations. * Update copyright years. * Avoid a crash in the HTML presenter when page limit is None. 305: Upload to unstable/sid after the release of trixie. 306: * Fix compatibility with RPM 6. * Use regular 'open' calls instead of the deprecated 'codecs.open'. * Accept additional 'v' when calling 'fdtump --version'. (From OE-Core rev: 4901bf71978136df0446d88ca71fb6712297e4ce) Signed-off-by: Gyorgy Sarvari Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- meta/recipes-support/diffoscope/diffoscope_301.bb | 40 ----------------------- meta/recipes-support/diffoscope/diffoscope_306.bb | 40 +++++++++++++++++++++++ 2 files changed, 40 insertions(+), 40 deletions(-) delete mode 100644 meta/recipes-support/diffoscope/diffoscope_301.bb create mode 100644 meta/recipes-support/diffoscope/diffoscope_306.bb diff --git a/meta/recipes-support/diffoscope/diffoscope_301.bb b/meta/recipes-support/diffoscope/diffoscope_301.bb deleted file mode 100644 index c93ff4f588..0000000000 --- a/meta/recipes-support/diffoscope/diffoscope_301.bb +++ /dev/null @@ -1,40 +0,0 @@ -SUMMARY = "in-depth comparison of files, archives, and directories" -DESCRIPTION = "Tries to get to the bottom of what makes files or directories \ -different. It will recursively unpack archives of many kinds and transform \ -various binary formats into more human-readable form to compare them. \ -It can compare two tarballs, ISO images, or PDF just as easily." -HOMEPAGE = "https://diffoscope.org/" -BUGTRACKER = "https://salsa.debian.org/reproducible-builds/diffoscope/-/issues" -LICENSE = "GPL-3.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -PYPI_PACKAGE = "diffoscope" - -inherit pypi setuptools3 - -SRC_URI[sha256sum] = "2b46b60afe3fbb9ba79946e5196157b272ddad27692ccf5e4839def1ef3019c6" - -RDEPENDS:${PN} += "\ - binutils \ - python3-curses \ - python3-difflib \ - python3-fcntl \ - python3-json \ - python3-libarchive-c \ - python3-magic \ - python3-multiprocessing \ - python3-pprint \ - python3-rpm \ - squashfs-tools \ - vim \ - " - -do_install:append:class-native() { - create_wrapper ${D}${bindir}/diffoscope \ - MAGIC=${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc \ - RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \ - LD_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE} \ - RPM_ETCCONFIGDIR=${STAGING_DIR_NATIVE} -} - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-support/diffoscope/diffoscope_306.bb b/meta/recipes-support/diffoscope/diffoscope_306.bb new file mode 100644 index 0000000000..624e1ee3f1 --- /dev/null +++ b/meta/recipes-support/diffoscope/diffoscope_306.bb @@ -0,0 +1,40 @@ +SUMMARY = "in-depth comparison of files, archives, and directories" +DESCRIPTION = "Tries to get to the bottom of what makes files or directories \ +different. It will recursively unpack archives of many kinds and transform \ +various binary formats into more human-readable form to compare them. \ +It can compare two tarballs, ISO images, or PDF just as easily." +HOMEPAGE = "https://diffoscope.org/" +BUGTRACKER = "https://salsa.debian.org/reproducible-builds/diffoscope/-/issues" +LICENSE = "GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +PYPI_PACKAGE = "diffoscope" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "2c489aba7334ab0d4a9946ac51fe1b17085621a5476b89950e9c4f1e612cbab3" + +RDEPENDS:${PN} += "\ + binutils \ + python3-curses \ + python3-difflib \ + python3-fcntl \ + python3-json \ + python3-libarchive-c \ + python3-magic \ + python3-multiprocessing \ + python3-pprint \ + python3-rpm \ + squashfs-tools \ + vim \ + " + +do_install:append:class-native() { + create_wrapper ${D}${bindir}/diffoscope \ + MAGIC=${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc \ + RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \ + LD_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE} \ + RPM_ETCCONFIGDIR=${STAGING_DIR_NATIVE} +} + +BBCLASSEXTEND = "native" -- cgit v1.2.3-54-g00ecf