summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiu Yiding <liuyd.fnst@fujitsu.com>2025-04-27 15:59:36 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-05-01 14:22:54 +0100
commitdd1e47489e0696f224db0471b88e8fd45c731970 (patch)
tree3dc236d9417180a7a4a7e2a9ce692bd3fc9521dd
parentca65114e5e6b543164c297048c73a51d606c817c (diff)
downloadpoky-dd1e47489e0696f224db0471b88e8fd45c731970.tar.gz
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 <liuyd.fnst@fujitsu.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/gzip/gzip-1.14/wrong-path-fix.patch (renamed from meta/recipes-extended/gzip/gzip-1.13/wrong-path-fix.patch)13
-rw-r--r--meta/recipes-extended/gzip/gzip_1.14.bb (renamed from meta/recipes-extended/gzip/gzip_1.13.bb)8
2 files changed, 11 insertions, 10 deletions
diff --git a/meta/recipes-extended/gzip/gzip-1.13/wrong-path-fix.patch b/meta/recipes-extended/gzip/gzip-1.14/wrong-path-fix.patch
index 7f9e249de8..4d5e7a8e02 100644
--- a/meta/recipes-extended/gzip/gzip-1.13/wrong-path-fix.patch
+++ b/meta/recipes-extended/gzip/gzip-1.14/wrong-path-fix.patch
@@ -1,4 +1,7 @@
1fix MakeMaker issues with using wrong SHELL/GREP 1From eda9b1d08c517acbdc5b26c24c94a3985f29c749 Mon Sep 17 00:00:00 2001
2From: Ming Liu <ming.liu@windriver.com>
3Date: Fri, 21 Nov 2014 04:50:57 -0500
4Subject: [PATCH] fix MakeMaker issues with using wrong SHELL/GREP
2 5
3A set of substitution is being processed to all target scripts with sed by 6A set of substitution is being processed to all target scripts with sed by
4replacing some key words with the detected values at configure time, this 7replacing some key words with the detected values at configure time, this
@@ -12,16 +15,15 @@ instead.
12Signed-off-by: Ming Liu <ming.liu@windriver.com> 15Signed-off-by: Ming Liu <ming.liu@windriver.com>
13 16
14Upstream-Status: Pending 17Upstream-Status: Pending
15
16--- 18---
17 Makefile.am | 3 +-- 19 Makefile.am | 3 +--
18 1 file changed, 1 insertion(+), 2 deletions(-) 20 1 file changed, 1 insertion(+), 2 deletions(-)
19 21
20diff --git a/Makefile.am b/Makefile.am 22diff --git a/Makefile.am b/Makefile.am
21index 4f51b61..80a5ddf 100644 23index 23e0d3e..3455878 100644
22--- a/Makefile.am 24--- a/Makefile.am
23+++ b/Makefile.am 25+++ b/Makefile.am
24@@ -93,8 +93,7 @@ SUFFIXES = .in 26@@ -95,8 +95,7 @@ SUFFIXES = .in
25 .in: 27 .in:
26 $(AM_V_GEN)rm -f $@-t $@ \ 28 $(AM_V_GEN)rm -f $@-t $@ \
27 && sed \ 29 && sed \
@@ -31,6 +33,3 @@ index 4f51b61..80a5ddf 100644
31 -e "s|'gzip'|$(GZIP_TRANSFORMED)|g" \ 33 -e "s|'gzip'|$(GZIP_TRANSFORMED)|g" \
32 -e "s|'zdiff'|$(ZDIFF_TRANSFORMED)|g" \ 34 -e "s|'zdiff'|$(ZDIFF_TRANSFORMED)|g" \
33 -e "s|'zgrep'|$(ZGREP_TRANSFORMED)|g" \ 35 -e "s|'zgrep'|$(ZGREP_TRANSFORMED)|g" \
34--
352.7.4
36
diff --git a/meta/recipes-extended/gzip/gzip_1.13.bb b/meta/recipes-extended/gzip/gzip_1.14.bb
index fd846b30a5..c7837cdae0 100644
--- a/meta/recipes-extended/gzip/gzip_1.13.bb
+++ b/meta/recipes-extended/gzip/gzip_1.14.bb
@@ -10,11 +10,12 @@ SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz \
10SRC_URI:append:class-target = " file://wrong-path-fix.patch" 10SRC_URI:append:class-target = " file://wrong-path-fix.patch"
11 11
12LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ 12LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \
13 file://gzip.h;beginline=8;endline=20;md5=6e47caaa630e0c8bf9f1bc8d94a8ed0e" 13 file://gzip.h;beginline=8;endline=20;md5=a22158dc3dd3f5cf6e5a556940a49212 \
14 "
14 15
15PROVIDES:append:class-native = " gzip-replacement-native" 16PROVIDES:append:class-native = " gzip-replacement-native"
16 17
17RDEPENDS:${PN}-ptest += "make perl grep diffutils" 18RDEPENDS:${PN}-ptest += "make perl grep diffutils coreutils"
18 19
19BBCLASSEXTEND = "native nativesdk" 20BBCLASSEXTEND = "native nativesdk"
20 21
@@ -33,9 +34,10 @@ do_install_ptest() {
33 -e 's/^Makefile: ..*/Makefile: /' \ 34 -e 's/^Makefile: ..*/Makefile: /' \
34 -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ 35 -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \
35 -e 's|${DEBUG_PREFIX_MAP}||g' \ 36 -e 's|${DEBUG_PREFIX_MAP}||g' \
37 -e 's|${BUILD_LDFLAGS}||g' \
36 -e 's:${HOSTTOOLS_DIR}/::g' \ 38 -e 's:${HOSTTOOLS_DIR}/::g' \
37 -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ 39 -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \
38 ${B}/tests/Makefile > ${D}${PTEST_PATH}/src/tests/Makefile 40 ${B}/tests/Makefile > ${D}${PTEST_PATH}/src/tests/Makefile
39} 41}
40 42
41SRC_URI[sha256sum] = "20fc818aeebae87cdbf209d35141ad9d3cf312b35a5e6be61bfcfbf9eddd212a" 43SRC_URI[sha256sum] = "613d6ea44f1248d7370c7ccdeee0dd0017a09e6c39de894b3c6f03f981191c6b"