From f987dac6a269f88351d112297b48b446ba98734a Mon Sep 17 00:00:00 2001 From: Trevor Gamblin Date: Tue, 18 Jul 2023 11:43:31 -0400 Subject: diffoscope: upgrade 243 -> 244 Changelog: https://diffoscope.org/news/diffoscope-244-released/ * Address compatibility with python-libarchive-c version 5. (Closes: reproducible-builds/diffoscope#344) * Testsuite changes: - Mark that test_dex::test_javap_14_differences requires procyon. - Fix "test skipped" textual reason generation in the case of a required version being outside of the required range. - Temporarily mark some Android-related as XFAIL due to Debian bugs #1040941 and #1040916. (From OE-Core rev: e7ab92360cb9515c28197b809bdc8b112e23bb57) Signed-off-by: Trevor Gamblin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-support/diffoscope/diffoscope_243.bb | 43 ----------------------- meta/recipes-support/diffoscope/diffoscope_244.bb | 43 +++++++++++++++++++++++ 2 files changed, 43 insertions(+), 43 deletions(-) delete mode 100644 meta/recipes-support/diffoscope/diffoscope_243.bb create mode 100644 meta/recipes-support/diffoscope/diffoscope_244.bb (limited to 'meta/recipes-support/diffoscope') diff --git a/meta/recipes-support/diffoscope/diffoscope_243.bb b/meta/recipes-support/diffoscope/diffoscope_243.bb deleted file mode 100644 index 5cdc2caf10..0000000000 --- a/meta/recipes-support/diffoscope/diffoscope_243.bb +++ /dev/null @@ -1,43 +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] = "3ce7ff00d72ffd9c904d1d93a4a147208878f56e8f0286073533615689d840b1" - -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 \ - " - -# Dependencies don't build for musl -COMPATIBLE_HOST:libc-musl = 'null' - -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_244.bb b/meta/recipes-support/diffoscope/diffoscope_244.bb new file mode 100644 index 0000000000..c17bd81f5b --- /dev/null +++ b/meta/recipes-support/diffoscope/diffoscope_244.bb @@ -0,0 +1,43 @@ +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] = "8bee8bbb144cdb7ddfa21886d5ce1822220139241c9a53def09b4adc3340db93" + +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 \ + " + +# Dependencies don't build for musl +COMPATIBLE_HOST:libc-musl = 'null' + +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