diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2025-05-13 07:10:14 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-05-15 10:55:26 +0100 |
| commit | d74ff59aa8050b9b477b006c60976992dabbd97d (patch) | |
| tree | d8251b11bbc2b4294ab5174a0f485cb006aa2bf2 | |
| parent | e1d0f2e46cce39e8419b5666d7ec9a3fff59828c (diff) | |
| download | poky-d74ff59aa8050b9b477b006c60976992dabbd97d.tar.gz | |
coreutils: Drop 0001-local.mk-fix-cross-compiling-problem.patch
The patch is used for fixing:
| Makefile:3418: *** Recursive variable 'INSTALL' references itself (eventually). Stop.
Now the code and check and set that correctly:
if CROSS_COMPILING
cu_install_program = @INSTALL@
else
cu_install_program = src/ginstall
endif
So just drop the patch.
And also remove the ginstall hack to fix ptest case failure when single-binary
is enabled, I can't find the reason on why it was needed from git log.
Fixed:
install: missing file operand
Try 'install --help' for more information.
* Reproducer:
DISTRO_FEATURES:append = " ptest"
EXTRA_IMAGE_FEATURES:append = " ptest-pkgs"
IMAGE_INSTALL:append = " coreutils"
PACKAGECONFIG:append:pn-coreutils = " single-binary"
$ bitbake core-image-sato
$ runqemu tmp/deploy/images/qemux86-64/ nographic kvm
On target:
$ cd /usr/lib/coreutils/ptest
$ ./run-ptest
============================================================================
Testsuite summary for GNU coreutils 9.6
============================================================================
TOTAL: 655
PASS: 529
SKIP: 126
XFAIL: 0
FAIL: 0
XPASS: 0
ERROR: 0
============================================================================
make[1]: Leaving directory '/usr/lib/coreutils/ptest'
(From OE-Core rev: 8728815f74f73723e86ba25b56a66b3fb46d6596)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/coreutils/coreutils/0001-local.mk-fix-cross-compiling-problem.patch | 26 | ||||
| -rw-r--r-- | meta/recipes-core/coreutils/coreutils_9.6.bb | 3 |
2 files changed, 0 insertions, 29 deletions
diff --git a/meta/recipes-core/coreutils/coreutils/0001-local.mk-fix-cross-compiling-problem.patch b/meta/recipes-core/coreutils/coreutils/0001-local.mk-fix-cross-compiling-problem.patch deleted file mode 100644 index 97a6357ab9..0000000000 --- a/meta/recipes-core/coreutils/coreutils/0001-local.mk-fix-cross-compiling-problem.patch +++ /dev/null | |||
| @@ -1,26 +0,0 @@ | |||
| 1 | From 7cb2d20cfa2a27191255031d231cd41917dcffe8 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Chen Qi <Qi.Chen@windriver.com> | ||
| 3 | Date: Mon, 26 Dec 2016 16:10:35 +0800 | ||
| 4 | Subject: [PATCH] local.mk: fix cross compiling problem | ||
| 5 | |||
| 6 | We meet the following error when cross compiling. | ||
| 7 | | Makefile:3418: *** Recursive variable 'INSTALL' references itself (eventually). Stop. | ||
| 8 | This patch fixes this problem. | ||
| 9 | |||
| 10 | Upstream-Status: Pending | ||
| 11 | |||
| 12 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
| 13 | --- | ||
| 14 | src/local.mk | 2 +- | ||
| 15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 16 | |||
| 17 | diff --git a/src/local.mk b/src/local.mk | ||
| 18 | index 96ee941..cdd47d6 100644 | ||
| 19 | --- a/src/local.mk | ||
| 20 | +++ b/src/local.mk | ||
| 21 | @@ -704,4 +704,4 @@ cu_install_program = @INSTALL@ | ||
| 22 | else | ||
| 23 | cu_install_program = src/ginstall | ||
| 24 | endif | ||
| 25 | -INSTALL = $(cu_install_program) -c | ||
| 26 | +INSTALL_PROGRAM = $(cu_install_program) | ||
diff --git a/meta/recipes-core/coreutils/coreutils_9.6.bb b/meta/recipes-core/coreutils/coreutils_9.6.bb index 3eb0c6fd1b..a966c4b448 100644 --- a/meta/recipes-core/coreutils/coreutils_9.6.bb +++ b/meta/recipes-core/coreutils/coreutils_9.6.bb | |||
| @@ -15,7 +15,6 @@ inherit autotools gettext texinfo | |||
| 15 | 15 | ||
| 16 | SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ | 16 | SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ |
| 17 | file://remove-usr-local-lib-from-m4.patch \ | 17 | file://remove-usr-local-lib-from-m4.patch \ |
| 18 | file://0001-local.mk-fix-cross-compiling-problem.patch \ | ||
| 19 | file://intermittent-testfailure.patch \ | 18 | file://intermittent-testfailure.patch \ |
| 20 | file://0001-ls-fix-crash-with-context.patch \ | 19 | file://0001-ls-fix-crash-with-context.patch \ |
| 21 | file://0001-cksum-port-to-32-bit-uint_fast32_t.patch \ | 20 | file://0001-cksum-port-to-32-bit-uint_fast32_t.patch \ |
| @@ -184,7 +183,6 @@ RRECOMMENDS:${PN}-dev += "${DEVDEPS}" | |||
| 184 | do_install_ptest () { | 183 | do_install_ptest () { |
| 185 | install -d ${D}${PTEST_PATH}/tests | 184 | install -d ${D}${PTEST_PATH}/tests |
| 186 | cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests | 185 | cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests |
| 187 | sed -i 's/ginstall/install/g' `grep -R ginstall ${D}${PTEST_PATH}/tests | awk -F: '{print $1}' | uniq` | ||
| 188 | install -d ${D}${PTEST_PATH}/build-aux | 186 | install -d ${D}${PTEST_PATH}/build-aux |
| 189 | install ${S}/build-aux/test-driver ${D}${PTEST_PATH}/build-aux/ | 187 | install ${S}/build-aux/test-driver ${D}${PTEST_PATH}/build-aux/ |
| 190 | install -Dm 0644 ${B}/lib/config.h ${D}${PTEST_PATH}/lib/config.h | 188 | install -Dm 0644 ${B}/lib/config.h ${D}${PTEST_PATH}/lib/config.h |
| @@ -198,7 +196,6 @@ do_install_ptest () { | |||
| 198 | sed -i '/^abs_srcdir/s/= .*$/= \$\{PWD\}/g' ${D}${PTEST_PATH}/Makefile | 196 | sed -i '/^abs_srcdir/s/= .*$/= \$\{PWD\}/g' ${D}${PTEST_PATH}/Makefile |
| 199 | sed -i '/^abs_top_builddir/s/= .*$/= \$\{PWD\}/g' ${D}${PTEST_PATH}/Makefile | 197 | sed -i '/^abs_top_builddir/s/= .*$/= \$\{PWD\}/g' ${D}${PTEST_PATH}/Makefile |
| 200 | sed -i '/^abs_top_srcdir/s/= .*$/= \$\{PWD\}/g' ${D}${PTEST_PATH}/Makefile | 198 | sed -i '/^abs_top_srcdir/s/= .*$/= \$\{PWD\}/g' ${D}${PTEST_PATH}/Makefile |
| 201 | sed -i '/^built_programs/s/ginstall/install/g' ${D}${PTEST_PATH}/Makefile | ||
| 202 | sed -i '/^CC =/s/ --sysroot=.*recipe-sysroot/ /g' ${D}${PTEST_PATH}/Makefile | 199 | sed -i '/^CC =/s/ --sysroot=.*recipe-sysroot/ /g' ${D}${PTEST_PATH}/Makefile |
| 203 | sed -i '/^BUILD_LDFLAGS =/d' ${D}${PTEST_PATH}/Makefile | 200 | sed -i '/^BUILD_LDFLAGS =/d' ${D}${PTEST_PATH}/Makefile |
| 204 | chmod -R 777 ${D}${PTEST_PATH} | 201 | chmod -R 777 ${D}${PTEST_PATH} |
