From f965880f7f03f32a2752f541d5faa20aab9bc785 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sun, 25 Jun 2023 23:22:30 +0200 Subject: diffutils: update 3.9 -> 3.10 Remove the comment addition from the patch body, as it increases likelyhood of rebase conflicts, and repeats what the commit says. (From OE-Core rev: 925155acc6922f7e9df2afa45e79ad1b2c57ba24) Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- .../0001-Skip-strip-trailing-cr-test-case.patch | 19 ++++------ meta/recipes-extended/diffutils/diffutils_3.10.bb | 43 ++++++++++++++++++++++ meta/recipes-extended/diffutils/diffutils_3.9.bb | 43 ---------------------- 3 files changed, 50 insertions(+), 55 deletions(-) create mode 100644 meta/recipes-extended/diffutils/diffutils_3.10.bb delete mode 100644 meta/recipes-extended/diffutils/diffutils_3.9.bb diff --git a/meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch b/meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch index 8b88c308f2..32793233f9 100644 --- a/meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch +++ b/meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch @@ -1,4 +1,4 @@ -From 027229d25392b22d7280c0abbc3efde4f467d167 Mon Sep 17 00:00:00 2001 +From f31395c931bc633206eccfcfaaaa5d15021a3e86 Mon Sep 17 00:00:00 2001 From: Peiran Hong Date: Thu, 5 Sep 2019 15:42:22 -0400 Subject: [PATCH] Skip strip-trailing-cr test case @@ -12,23 +12,18 @@ Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Peiran Hong --- - tests/Makefile.am | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) + tests/Makefile.am | 1 - + 1 file changed, 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am -index d98df82..757ea52 100644 +index 79bacfb..4adb4d7 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -21,9 +21,11 @@ TESTS = \ +@@ -22,7 +22,6 @@ TESTS = \ stdin \ strcoll-0-names \ filename-quoting \ - strip-trailing-cr \ timezone \ - colors -+# Skipping this test since it requires valgrind -+# and thus is too heavy for diffutils package -+# strip-trailing-cr - - XFAIL_TESTS = large-subopt - + colors \ + y2038-vs-32bit diff --git a/meta/recipes-extended/diffutils/diffutils_3.10.bb b/meta/recipes-extended/diffutils/diffutils_3.10.bb new file mode 100644 index 0000000000..08e8305612 --- /dev/null +++ b/meta/recipes-extended/diffutils/diffutils_3.10.bb @@ -0,0 +1,43 @@ +LICENSE = "GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +require diffutils.inc + +SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz \ + file://run-ptest \ + file://0001-Skip-strip-trailing-cr-test-case.patch \ + " + +SRC_URI[sha256sum] = "90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e" + +EXTRA_OECONF += "ac_cv_path_PR_PROGRAM=${bindir}/pr --without-libsigsegv-prefix" + +# latest gnulib is no longer able to handle this - I dare not try to fix that maze of abstractions and generators +CFLAGS:mingw32 = " -DSA_RESTART=0" + +# Fix "Argument list too long" error when len(TMPDIR) = 410 +acpaths = "-I ./m4" + +EXTRA_OEMAKE:append:mingw32 = " LIBS='-lbcrypt'" +inherit ptest + +RDEPENDS:${PN}-ptest += "make perl" + +do_install_ptest() { + t=${D}${PTEST_PATH} + install -D ${S}/build-aux/test-driver $t/build-aux/test-driver + cp -r ${S}/tests $t/ + install ${B}/tests/Makefile $t/tests/ + sed -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ + -e 's|${DEBUG_PREFIX_MAP}||g' \ + -e 's:${HOSTTOOLS_DIR}/::g' \ + -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ + -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ + -e 's|^Makefile:|_Makefile:|' \ + -e 's|bash|sh|' \ + -e 's|^top_srcdir = \(.*\)|top_srcdir = ..\/|' \ + -e 's|^srcdir = \(.*\)|srcdir = .|' \ + -e 's|"`$(built_programs)`"|diff|' \ + -e 's|gawk|awk|g' \ + -i $t/tests/Makefile +} diff --git a/meta/recipes-extended/diffutils/diffutils_3.9.bb b/meta/recipes-extended/diffutils/diffutils_3.9.bb deleted file mode 100644 index 2bb9e6f32d..0000000000 --- a/meta/recipes-extended/diffutils/diffutils_3.9.bb +++ /dev/null @@ -1,43 +0,0 @@ -LICENSE = "GPL-3.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -require diffutils.inc - -SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz \ - file://run-ptest \ - file://0001-Skip-strip-trailing-cr-test-case.patch \ - " - -SRC_URI[sha256sum] = "d80d3be90a201868de83d78dad3413ad88160cc53bcc36eb9eaf7c20dbf023f1" - -EXTRA_OECONF += "ac_cv_path_PR_PROGRAM=${bindir}/pr --without-libsigsegv-prefix" - -# latest gnulib is no longer able to handle this - I dare not try to fix that maze of abstractions and generators -CFLAGS:mingw32 = " -DSA_RESTART=0" - -# Fix "Argument list too long" error when len(TMPDIR) = 410 -acpaths = "-I ./m4" - -EXTRA_OEMAKE:append:mingw32 = " LIBS='-lbcrypt'" -inherit ptest - -RDEPENDS:${PN}-ptest += "make perl" - -do_install_ptest() { - t=${D}${PTEST_PATH} - install -D ${S}/build-aux/test-driver $t/build-aux/test-driver - cp -r ${S}/tests $t/ - install ${B}/tests/Makefile $t/tests/ - sed -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ - -e 's|${DEBUG_PREFIX_MAP}||g' \ - -e 's:${HOSTTOOLS_DIR}/::g' \ - -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ - -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ - -e 's|^Makefile:|_Makefile:|' \ - -e 's|bash|sh|' \ - -e 's|^top_srcdir = \(.*\)|top_srcdir = ..\/|' \ - -e 's|^srcdir = \(.*\)|srcdir = .|' \ - -e 's|"`$(built_programs)`"|diff|' \ - -e 's|gawk|awk|g' \ - -i $t/tests/Makefile -} -- cgit v1.2.3-54-g00ecf