From dd1e47489e0696f224db0471b88e8fd45c731970 Mon Sep 17 00:00:00 2001 From: Liu Yiding Date: Sun, 27 Apr 2025 15:59:36 +0800 Subject: gzip: upgrade 1.13 -> 1.14 1. Add coreutils to RDEPENDS:gzip-ptest to fix ptest error: | od: invalid option -- 'A' | BusyBox v1.37.0 () multi-call binary. 2. Delete BUILD_LDFLAGS to fix issue: |ERROR: gzip-1.14-r0 do_package_qa: QA Issue: File /usr/lib/gzip/ptest/src/tests/Makefile in package gzip-ptest contains reference to TMPDIR ildpaths] |ERROR: gzip-1.14-r0 do_package_qa: Fatal QA errors were found, failing task. error point in /usr/lib/gzip/ptest/src/tests/Makefile of gzip-ptest: |BUILD_LDFLAGS = -L/gzip/1.14/recipe-sysroot-native/usr/lib -L/gzip/1.14/recipe-sysroot-native/lib | -Wl,--enable-new-dtags -Wl,-rpath-link,/gzip/1.14/recipe-sysroot-native/usr/lib -Wl,-r |path-link,/gzip/1.14/recipe-sysroot-native/lib -Wl,-rpath,/gzip/1.14/recipe-sysroot-native/usr/lib | -Wl,-rpath,/gzip/1.14/recipe-sysroot-native/lib -Wl,-O1 -Wl,--allow-shlib-undefined -Wl,--dynamic-linker=/mnt |/test/build_auh/tmp/sysroots-uninative/x86_64-linux/lib/ld-linux-x86-64.so.2 -pthread ptest pass after delete BUILD_LDFLAGS in Makefile ptest result: |============================================================================ |Testsuite summary for gzip 1.14 |============================================================================ |# TOTAL: 30 |# PASS: 28 |# SKIP: 2 |# XFAIL: 0 |# FAIL: 0 |# XPASS: 0 |# ERROR: 0 License-Update: copyright years update and simplifies compliance by replacing physical contact instructions with a permanent web reference (From OE-Core rev: 198ae02439fb3c4146bfa05edbea30dfe3bad445) Signed-off-by: Liu Yiding Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- .../gzip/gzip-1.13/wrong-path-fix.patch | 36 ------------------ .../gzip/gzip-1.14/wrong-path-fix.patch | 35 ++++++++++++++++++ meta/recipes-extended/gzip/gzip_1.13.bb | 41 --------------------- meta/recipes-extended/gzip/gzip_1.14.bb | 43 ++++++++++++++++++++++ 4 files changed, 78 insertions(+), 77 deletions(-) delete mode 100644 meta/recipes-extended/gzip/gzip-1.13/wrong-path-fix.patch create mode 100644 meta/recipes-extended/gzip/gzip-1.14/wrong-path-fix.patch delete mode 100644 meta/recipes-extended/gzip/gzip_1.13.bb create mode 100644 meta/recipes-extended/gzip/gzip_1.14.bb diff --git a/meta/recipes-extended/gzip/gzip-1.13/wrong-path-fix.patch b/meta/recipes-extended/gzip/gzip-1.13/wrong-path-fix.patch deleted file mode 100644 index 7f9e249de8..0000000000 --- a/meta/recipes-extended/gzip/gzip-1.13/wrong-path-fix.patch +++ /dev/null @@ -1,36 +0,0 @@ -fix MakeMaker issues with using wrong SHELL/GREP - -A set of substitution is being processed to all target scripts with sed by -replacing some key words with the detected values at configure time, this -is exactly not compliant with cross compling, and will cause missing path -errors at run time like: -"/usr/bin/zgrep: line 230: /usr/bin/grep: No such file or directory" - -Fixed by removing unneeded substitution and using real runtime paths -instead. - -Signed-off-by: Ming Liu - -Upstream-Status: Pending - ---- - Makefile.am | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 4f51b61..80a5ddf 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -93,8 +93,7 @@ SUFFIXES = .in - .in: - $(AM_V_GEN)rm -f $@-t $@ \ - && sed \ -- -e 's|/bin/sh|$(SHELL)|g' \ -- -e 's|[@]GREP@|$(GREP)|g' \ -+ -e 's|[@]GREP@|$(base_bindir)/grep|g' \ - -e "s|'gzip'|$(GZIP_TRANSFORMED)|g" \ - -e "s|'zdiff'|$(ZDIFF_TRANSFORMED)|g" \ - -e "s|'zgrep'|$(ZGREP_TRANSFORMED)|g" \ --- -2.7.4 - diff --git a/meta/recipes-extended/gzip/gzip-1.14/wrong-path-fix.patch b/meta/recipes-extended/gzip/gzip-1.14/wrong-path-fix.patch new file mode 100644 index 0000000000..4d5e7a8e02 --- /dev/null +++ b/meta/recipes-extended/gzip/gzip-1.14/wrong-path-fix.patch @@ -0,0 +1,35 @@ +From eda9b1d08c517acbdc5b26c24c94a3985f29c749 Mon Sep 17 00:00:00 2001 +From: Ming Liu +Date: Fri, 21 Nov 2014 04:50:57 -0500 +Subject: [PATCH] fix MakeMaker issues with using wrong SHELL/GREP + +A set of substitution is being processed to all target scripts with sed by +replacing some key words with the detected values at configure time, this +is exactly not compliant with cross compling, and will cause missing path +errors at run time like: +"/usr/bin/zgrep: line 230: /usr/bin/grep: No such file or directory" + +Fixed by removing unneeded substitution and using real runtime paths +instead. + +Signed-off-by: Ming Liu + +Upstream-Status: Pending +--- + Makefile.am | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 23e0d3e..3455878 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -95,8 +95,7 @@ SUFFIXES = .in + .in: + $(AM_V_GEN)rm -f $@-t $@ \ + && sed \ +- -e 's|/bin/sh|$(SHELL)|g' \ +- -e 's|[@]GREP@|$(GREP)|g' \ ++ -e 's|[@]GREP@|$(base_bindir)/grep|g' \ + -e "s|'gzip'|$(GZIP_TRANSFORMED)|g" \ + -e "s|'zdiff'|$(ZDIFF_TRANSFORMED)|g" \ + -e "s|'zgrep'|$(ZGREP_TRANSFORMED)|g" \ diff --git a/meta/recipes-extended/gzip/gzip_1.13.bb b/meta/recipes-extended/gzip/gzip_1.13.bb deleted file mode 100644 index fd846b30a5..0000000000 --- a/meta/recipes-extended/gzip/gzip_1.13.bb +++ /dev/null @@ -1,41 +0,0 @@ -require gzip.inc - -# change to GPL-3.0-or-later in 2007/07. Previous GPL-2.0-or-later version is -# 1.3.12 -LICENSE = "GPL-3.0-or-later" - -SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz \ - file://run-ptest \ - " -SRC_URI:append:class-target = " file://wrong-path-fix.patch" - -LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ - file://gzip.h;beginline=8;endline=20;md5=6e47caaa630e0c8bf9f1bc8d94a8ed0e" - -PROVIDES:append:class-native = " gzip-replacement-native" - -RDEPENDS:${PN}-ptest += "make perl grep diffutils" - -BBCLASSEXTEND = "native nativesdk" - -inherit ptest - -do_install_ptest() { - mkdir -p ${D}${PTEST_PATH}/src/build-aux - cp ${S}/build-aux/test-driver ${D}${PTEST_PATH}/src/build-aux/ - mkdir -p ${D}${PTEST_PATH}/src/tests - cp -r ${S}/tests/* ${D}${PTEST_PATH}/src/tests - sed -e 's/^abs_srcdir = ..*/abs_srcdir = \.\./' \ - -e 's/^top_srcdir = ..*/top_srcdir = \.\./' \ - -e 's/^GREP = ..*/GREP = grep/' \ - -e 's/^AWK = ..*/AWK = awk/' \ - -e 's/^srcdir = ..*/srcdir = \./' \ - -e 's/^Makefile: ..*/Makefile: /' \ - -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ - -e 's|${DEBUG_PREFIX_MAP}||g' \ - -e 's:${HOSTTOOLS_DIR}/::g' \ - -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ - ${B}/tests/Makefile > ${D}${PTEST_PATH}/src/tests/Makefile -} - -SRC_URI[sha256sum] = "20fc818aeebae87cdbf209d35141ad9d3cf312b35a5e6be61bfcfbf9eddd212a" diff --git a/meta/recipes-extended/gzip/gzip_1.14.bb b/meta/recipes-extended/gzip/gzip_1.14.bb new file mode 100644 index 0000000000..c7837cdae0 --- /dev/null +++ b/meta/recipes-extended/gzip/gzip_1.14.bb @@ -0,0 +1,43 @@ +require gzip.inc + +# change to GPL-3.0-or-later in 2007/07. Previous GPL-2.0-or-later version is +# 1.3.12 +LICENSE = "GPL-3.0-or-later" + +SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz \ + file://run-ptest \ + " +SRC_URI:append:class-target = " file://wrong-path-fix.patch" + +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ + file://gzip.h;beginline=8;endline=20;md5=a22158dc3dd3f5cf6e5a556940a49212 \ + " + +PROVIDES:append:class-native = " gzip-replacement-native" + +RDEPENDS:${PN}-ptest += "make perl grep diffutils coreutils" + +BBCLASSEXTEND = "native nativesdk" + +inherit ptest + +do_install_ptest() { + mkdir -p ${D}${PTEST_PATH}/src/build-aux + cp ${S}/build-aux/test-driver ${D}${PTEST_PATH}/src/build-aux/ + mkdir -p ${D}${PTEST_PATH}/src/tests + cp -r ${S}/tests/* ${D}${PTEST_PATH}/src/tests + sed -e 's/^abs_srcdir = ..*/abs_srcdir = \.\./' \ + -e 's/^top_srcdir = ..*/top_srcdir = \.\./' \ + -e 's/^GREP = ..*/GREP = grep/' \ + -e 's/^AWK = ..*/AWK = awk/' \ + -e 's/^srcdir = ..*/srcdir = \./' \ + -e 's/^Makefile: ..*/Makefile: /' \ + -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ + -e 's|${DEBUG_PREFIX_MAP}||g' \ + -e 's|${BUILD_LDFLAGS}||g' \ + -e 's:${HOSTTOOLS_DIR}/::g' \ + -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ + ${B}/tests/Makefile > ${D}${PTEST_PATH}/src/tests/Makefile +} + +SRC_URI[sha256sum] = "613d6ea44f1248d7370c7ccdeee0dd0017a09e6c39de894b3c6f03f981191c6b" -- cgit v1.2.3-54-g00ecf