From 06bedd759df2bd3800b04b807e257476b67dc9da Mon Sep 17 00:00:00 2001 From: wangmy Date: Mon, 10 Jan 2022 22:07:00 +0800 Subject: diffoscope: upgrade 196 -> 199 Changelog: ========= * Support both variants of "odt2txt", including the one provided by unoconv. (Closes: reproducible-builds/diffoscope#298) * Add external tool reference on Arch Linux for xb-tool. (From OE-Core rev: 763c44e30c20ebcd4199d41fa76dae3d3b4ec5c3) Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-support/diffoscope/diffoscope_196.bb | 30 ----------------------- meta/recipes-support/diffoscope/diffoscope_199.bb | 30 +++++++++++++++++++++++ 2 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 meta/recipes-support/diffoscope/diffoscope_196.bb create mode 100644 meta/recipes-support/diffoscope/diffoscope_199.bb (limited to 'meta/recipes-support/diffoscope') diff --git a/meta/recipes-support/diffoscope/diffoscope_196.bb b/meta/recipes-support/diffoscope/diffoscope_196.bb deleted file mode 100644 index 62a1561a0d..0000000000 --- a/meta/recipes-support/diffoscope/diffoscope_196.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] = "d31fd0d8ac58d41cc111ef6a3bb0007f5f52543b932bf93584bdd0dfe029e626" - -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_199.bb b/meta/recipes-support/diffoscope/diffoscope_199.bb new file mode 100644 index 0000000000..3645ff1e6e --- /dev/null +++ b/meta/recipes-support/diffoscope/diffoscope_199.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] = "7b07b8ff34e5fe0e57acc8b02bcb9303ae254c40f357fb7ed805e9f9f7c7686f" + +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