From: Steve Sakoman <steve@sakoman.com>
To: openembedded-core@lists.openembedded.org
Subject: [OE-core][kirkstone 18/34] busybox: Use base_bindir instead of hardcoding /bin path
Date: Fri, 29 Apr 2022 06:00:37 -1000 [thread overview]
Message-ID: <592464cb64a8eedf2ee1537934ba714059c2e0ce.1651246310.git.steve@sakoman.com> (raw)
In-Reply-To: <cover.1651246310.git.steve@sakoman.com>
From: Khem Raj <raj.khem@gmail.com>
This symlink is not valid when using usrmerge and ptest packaging would fail
Exception: FileExistsError: [Errno 17] File exists: '/usr/bin/busybox.suid' -> '/mnt/b/yoe/master/build/tmp/work/ppc64p9le-yoe-linux-musl/busybox/1.35.0-r0/package/usr/lib/busybox/ptest/bin/login'
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 238fd30689054c7b44176dce7180fb6dac4e1b6f)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-core/busybox/busybox.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 69fa499737..5f1c473d5e 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -347,7 +347,7 @@ do_install_ptest () {
# These access the internet which is not guaranteed to work on machines running the tests
rm -rf ${D}${PTEST_PATH}/testsuite/wget
sort ${B}/.config > ${D}${PTEST_PATH}/.config
- ln -s /bin/busybox ${D}${PTEST_PATH}/busybox
+ ln -s ${base_bindir}/busybox ${D}${PTEST_PATH}/busybox
}
inherit update-alternatives
--
2.25.1
next prev parent reply other threads:[~2022-04-29 16:02 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-29 16:00 [OE-core][kirkstone 00/34] Patch review Steve Sakoman
2022-04-29 16:00 ` [OE-core][kirkstone 01/34] e2fsprogs: fix CVE-2022-1304 Steve Sakoman
2022-04-29 16:00 ` [OE-core][kirkstone 02/34] python3: ignore CVE-2015-20107 Steve Sakoman
2022-04-29 16:00 ` [OE-core][kirkstone 03/34] cve_check: skip remote patches that haven't been fetched when searching for CVE tags Steve Sakoman
2022-04-29 16:00 ` [OE-core][kirkstone 04/34] apt: upgrade 2.4.4 -> 2.4.5 Steve Sakoman
2022-04-29 16:00 ` [OE-core][kirkstone 05/34] subversion: upgrade to 1.14.2 Steve Sakoman
2022-04-29 16:00 ` [OE-core][kirkstone 06/34] glib: upgrade 2.72.0 -> 2.72.1 Steve Sakoman
2022-04-29 16:00 ` [OE-core][kirkstone 07/34] glibc: ptest: Fix glibc-tests package issue Steve Sakoman
2022-04-29 16:00 ` [OE-core][kirkstone 08/34] seatd: Disable overflow warning as error on ppc64/musl Steve Sakoman
2022-04-29 16:00 ` [OE-core][kirkstone 09/34] package.bbclass: Prevent perform_packagecopy from removing /sysroot-only Steve Sakoman
2022-04-29 16:00 ` [OE-core][kirkstone 10/34] kernel-yocto.bbclass: Fixup do_kernel_configcheck usage of KMETA Steve Sakoman
2022-04-29 16:00 ` [OE-core][kirkstone 11/34] linux-firmware: correct license for ar3k firmware Steve Sakoman
2022-04-29 16:00 ` [OE-core][kirkstone 12/34] arch-armv8-2a.inc: fix a typo in TUNEVALID variable Steve Sakoman
2022-04-29 16:00 ` [OE-core][kirkstone 13/34] musl: Fix build when usrmerge distro feature is enabled Steve Sakoman
2022-04-29 16:00 ` [OE-core][kirkstone 14/34] gcompat: " Steve Sakoman
2022-04-29 16:00 ` [OE-core][kirkstone 15/34] wic: do not use PARTLABEL for msdos partition tables Steve Sakoman
2022-04-29 16:00 ` [OE-core][kirkstone 16/34] libc-glibc: Use libxcrypt to provide virtual/crypt Steve Sakoman
2022-04-29 16:00 ` [OE-core][kirkstone 17/34] qemu.bbclass: Extend ppc/ppc64 extra options Steve Sakoman
2022-04-29 16:00 ` Steve Sakoman [this message]
2022-04-29 16:00 ` [OE-core][kirkstone 19/34] gstreamer1.0-plugins-good: Fix libsoup dependency Steve Sakoman
2022-04-29 16:00 ` [OE-core][kirkstone 20/34] gstreamer1.0: Minor documentation addition Steve Sakoman
2022-04-29 16:00 ` [OE-core][kirkstone 21/34] gstreamer1.0-plugins-bad: drop patch Steve Sakoman
2022-04-29 16:00 ` [OE-core][kirkstone 22/34] terminal.py: Restore error output from Terminal Steve Sakoman
2022-04-29 16:00 ` [OE-core][kirkstone 23/34] devshell.bbclass: Allow devshell & pydevshell to use the network Steve Sakoman
2022-04-29 16:00 ` [OE-core][kirkstone 24/34] cases/buildepoxy.py: fix typo Steve Sakoman
2022-04-29 16:00 ` [OE-core][kirkstone 25/34] create-spdx: delete virtual/kernel dependency to fix FreeRTOS build Steve Sakoman
2022-04-29 16:00 ` [OE-core][kirkstone 26/34] go.bbclass: disable the use of the default configuration file Steve Sakoman
2022-04-29 16:00 ` [OE-core][kirkstone 27/34] install/devshell: Introduce git intercept script due to fakeroot issues Steve Sakoman
2022-04-29 16:00 ` [OE-core][kirkstone 28/34] base: Drop git intercept Steve Sakoman
2022-04-29 16:00 ` [OE-core][kirkstone 29/34] bitbake.conf: mark all directories as safe for git to read Steve Sakoman
2022-04-29 16:00 ` [OE-core][kirkstone 30/34] neard: Switch SRC_URI to git repo Steve Sakoman
2022-04-29 16:00 ` [OE-core][kirkstone 31/34] sanity: skip make 4.2.1 warning for debian Steve Sakoman
2022-04-29 16:00 ` [OE-core][kirkstone 32/34] util-linux: Create u-a symlink for findfs utility Steve Sakoman
2022-04-29 16:00 ` [OE-core][kirkstone 33/34] staging: Ensure we filter out ourselves Steve Sakoman
2022-04-29 16:00 ` [OE-core][kirkstone 34/34] libxml2: update patch status Steve Sakoman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=592464cb64a8eedf2ee1537934ba714059c2e0ce.1651246310.git.steve@sakoman.com \
--to=steve@sakoman.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox