[OE-core] [PATCH v4 4/4] busybox: Use PTEST binary directory
Mariano Lopez
just.another.mariano at gmail.com
Tue Apr 9 05:44:15 UTC 2019
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>
---
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 c9d25ff1ca..174ce5a8c0 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
--
2.19.2
More information about the Openembedded-core
mailing list