From ac34f24442f60a947b4039b0d9824ff4bac833e1 Mon Sep 17 00:00:00 2001 From: wangmy Date: Tue, 9 Nov 2021 20:09:04 +0800 Subject: diffoscope: upgrade 189 -> 190 Changelog: [Chris Lamb] Don't raise a traceback if we cannot de-marshal Python bytecode to support Python 3.7 loading newer .pyc files. (Closes: reproducible-builds/diffoscope#284) Fix Python tests under Python 3.7 with file 5.39+. [Vagrant Cascadian] Skip Python bytecode testing when "file" is older than 5.39. [Roland Clobus] Detect whether the GNU_BUILD_ID field has been modified. (From OE-Core rev: b9c59b5d2ac29544c1877f50ec10d2126339d814) Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-support/diffoscope/diffoscope_189.bb | 30 ----------------------- meta/recipes-support/diffoscope/diffoscope_190.bb | 30 +++++++++++++++++++++++ 2 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 meta/recipes-support/diffoscope/diffoscope_189.bb create mode 100644 meta/recipes-support/diffoscope/diffoscope_190.bb diff --git a/meta/recipes-support/diffoscope/diffoscope_189.bb b/meta/recipes-support/diffoscope/diffoscope_189.bb deleted file mode 100644 index d3c70b47c5..0000000000 --- a/meta/recipes-support/diffoscope/diffoscope_189.bb +++ /dev/null @@ -1,30 +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+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -PYPI_PACKAGE = "diffoscope" - -inherit pypi setuptools3 - -SRC_URI[sha256sum] = "2ec8d94af13e905ec1a905ebfb2654971cf977b149d296f8bf2aeff6bcab3d8a" - -RDEPENDS:${PN} += "binutils vim squashfs-tools python3-libarchive-c python3-magic python3-rpm" - -# 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_190.bb b/meta/recipes-support/diffoscope/diffoscope_190.bb new file mode 100644 index 0000000000..8303ee4693 --- /dev/null +++ b/meta/recipes-support/diffoscope/diffoscope_190.bb @@ -0,0 +1,30 @@ +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+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +PYPI_PACKAGE = "diffoscope" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "29e3c5ce764b494771876aef3f587ed4867374a0f4e28afe39d4f0640ddb7744" + +RDEPENDS:${PN} += "binutils vim squashfs-tools python3-libarchive-c python3-magic python3-rpm" + +# 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