From bb3fedb067c0acc5bdeefcf48956eb53688ebeeb Mon Sep 17 00:00:00 2001 From: Gyorgy Sarvari Date: Thu, 17 Jul 2025 20:32:57 +0200 Subject: diffoscope: upgrade 298 -> 301 Changelog 301: - Avoid spurious differences in h5dump output caused by exposure of absolute internal extraction paths. - Use our_check_output in the ODT comparator. - Memoize a number of calls to --version. Changelog 300: - Fix a regression and add a test so that diffoscope picks up differences in metadata for identical files again. Changelog 299: - Add python3-defusedxml to the Build-Depends in order to include it in the Docker image. (From OE-Core rev: b740601fd6b523e09c2d22e83aed1c0589a8203d) Signed-off-by: Gyorgy Sarvari Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- meta/recipes-support/diffoscope/diffoscope_298.bb | 40 ----------------------- meta/recipes-support/diffoscope/diffoscope_301.bb | 40 +++++++++++++++++++++++ 2 files changed, 40 insertions(+), 40 deletions(-) delete mode 100644 meta/recipes-support/diffoscope/diffoscope_298.bb create mode 100644 meta/recipes-support/diffoscope/diffoscope_301.bb (limited to 'meta') diff --git a/meta/recipes-support/diffoscope/diffoscope_298.bb b/meta/recipes-support/diffoscope/diffoscope_298.bb deleted file mode 100644 index 4a50059c99..0000000000 --- a/meta/recipes-support/diffoscope/diffoscope_298.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] = "9644b7e711df71f13c5f50f3d1353c1e6d09f462d342d9771576e75f3dd8c3e1" - -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_301.bb b/meta/recipes-support/diffoscope/diffoscope_301.bb new file mode 100644 index 0000000000..c93ff4f588 --- /dev/null +++ b/meta/recipes-support/diffoscope/diffoscope_301.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] = "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" -- cgit v1.2.3-54-g00ecf