MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

gzip: upgrade 1.13 -> 1.14

Browse Source 
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>
This commit is contained in:
Liu Yiding 2025-04-27 15:59:36 +08:00 committed by Richard Purdie
parent ca65114e5e
commit dd1e47489e
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
meta/recipes-extended/gzip/gzip-1.13/wrong-path-fix.patch → meta/recipes-extended/gzip/gzip-1.14/wrong-path-fix.patch
View File

@ -1,4 +1,7 @@
fix MakeMaker issues with using wrong SHELL/GREP From eda9b1d08c517acbdc5b26c24c94a3985f29c749 Mon Sep 17 00:00:00 2001
From: Ming Liu <ming.liu@windriver.com>
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 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 replacing some key words with the detected values at configure time, this
@ -12,16 +15,15 @@ instead.
Signed-off-by: Ming Liu <ming.liu@windriver.com> Signed-off-by: Ming Liu <ming.liu@windriver.com>
Upstream-Status: Pending Upstream-Status: Pending
--- ---
Makefile.am | 3 +-- Makefile.am | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-) 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am diff --git a/Makefile.am b/Makefile.am
index 4f51b61..80a5ddf 100644 index 23e0d3e..3455878 100644
--- a/Makefile.am --- a/Makefile.am
+++ b/Makefile.am +++ b/Makefile.am
@@ -93,8 +93,7 @@ SUFFIXES = .in @@ -95,8 +95,7 @@ SUFFIXES = .in
.in: .in:
$(AM_V_GEN)rm -f $@-t $@ \ $(AM_V_GEN)rm -f $@-t $@ \
&& sed \ && sed \
@ -31,6 +33,3 @@ index 4f51b61..80a5ddf 100644
-e "s|'gzip'|$(GZIP_TRANSFORMED)|g" \ -e "s|'gzip'|$(GZIP_TRANSFORMED)|g" \
-e "s|'zdiff'|$(ZDIFF_TRANSFORMED)|g" \ -e "s|'zdiff'|$(ZDIFF_TRANSFORMED)|g" \
-e "s|'zgrep'|$(ZGREP_TRANSFORMED)|g" \ -e "s|'zgrep'|$(ZGREP_TRANSFORMED)|g" \
--
2.7.4

8
meta/recipes-extended/gzip/gzip_1.13.bb → meta/recipes-extended/gzip/gzip_1.14.bb
View File

@ -10,11 +10,12 @@ SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz \
SRC_URI:append:class-target = " file://wrong-path-fix.patch" SRC_URI:append:class-target = " file://wrong-path-fix.patch"
LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \
file://gzip.h;beginline=8;endline=20;md5=6e47caaa630e0c8bf9f1bc8d94a8ed0e" file://gzip.h;beginline=8;endline=20;md5=a22158dc3dd3f5cf6e5a556940a49212 \
"
PROVIDES:append:class-native = " gzip-replacement-native" PROVIDES:append:class-native = " gzip-replacement-native"
RDEPENDS:${PN}-ptest += "make perl grep diffutils" RDEPENDS:${PN}-ptest += "make perl grep diffutils coreutils"
BBCLASSEXTEND = "native nativesdk" BBCLASSEXTEND = "native nativesdk"
@ -33,9 +34,10 @@ do_install_ptest() {
-e 's/^Makefile: ..*/Makefile: /' \ -e 's/^Makefile: ..*/Makefile: /' \
-e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \
-e 's|${DEBUG_PREFIX_MAP}||g' \ -e 's|${DEBUG_PREFIX_MAP}||g' \
-e 's|${BUILD_LDFLAGS}||g' \
-e 's:${HOSTTOOLS_DIR}/::g' \ -e 's:${HOSTTOOLS_DIR}/::g' \
-e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \
${B}/tests/Makefile > ${D}${PTEST_PATH}/src/tests/Makefile ${B}/tests/Makefile > ${D}${PTEST_PATH}/src/tests/Makefile
} }
SRC_URI[sha256sum] = "20fc818aeebae87cdbf209d35141ad9d3cf312b35a5e6be61bfcfbf9eddd212a" SRC_URI[sha256sum] = "613d6ea44f1248d7370c7ccdeee0dd0017a09e6c39de894b3c6f03f981191c6b"