[oe-commits] [openembedded-core] 04/67: busybox: Use PTEST binary directory
git at git.openembedded.org
git at git.openembedded.org
Thu Apr 11 14:27:18 UTC 2019
This is an automated email from the git hooks/post-receive script.
rpurdie pushed a commit to branch master-next
in repository openembedded-core.
commit a3923085d1cad7de7e644ff57d05c4a8955b5b00
Author: Mariano Lopez <just.another.mariano at gmail.com>
AuthorDate: Tue Apr 9 00:44:15 2019 -0500
busybox: Use PTEST binary directory
This will generate the symlinks in the ptest binary directory using the
ptest class functionality instead of generating them manually. Because
the ptest class uses update-alternatives to get the metadata for the
symlinks it will respect the use of BUSYBOX_SPLIT_SUID automatically.
[YOCTO #12597]
Signed-off-by: Mariano Lopez <just.another.mariano at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-core/busybox/busybox.inc | 16 ++--------------
1 file changed, 2 insertions(+), 14 deletions(-)
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index c9d25ff..174ce5a 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -347,24 +347,12 @@ do_install () {
fi
}
+PTEST_BINDIR = "1"
+
do_install_ptest () {
cp -r ${B}/testsuite ${D}${PTEST_PATH}/
cp ${B}/.config ${D}${PTEST_PATH}/
ln -s /bin/busybox ${D}${PTEST_PATH}/busybox
-
- mkdir ${D}${PTEST_PATH}/bin
- if [ "${BUSYBOX_SPLIT_SUID}" = "1" ]; then
- while read link; do
- ln -s ${base_bindir}/busybox.suid ${D}${PTEST_PATH}/bin/$(basename $link)
- done <${D}${sysconfdir}/busybox.links.suid
- while read link; do
- ln -s ${base_bindir}/busybox.nosuid ${D}${PTEST_PATH}/bin/$(basename $link)
- done <${D}${sysconfdir}/busybox.links.nosuid
- else
- while read link; do
- ln -s ${base_bindir}/busybox ${D}${PTEST_PATH}/bin/$(basename $link)
- done <${D}${sysconfdir}/busybox.links
- fi
}
inherit update-alternatives
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list