summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMariano Lopez <just.another.mariano@gmail.com>2019-04-09 00:44:15 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-04-11 15:22:44 +0100
commita3923085d1cad7de7e644ff57d05c4a8955b5b00 (patch)
tree37e6633527aebfe3d328a5bb24e030a17c44d53c
parent1a8fd875f0b171e25a5ac8a32cc81ff3887935bd (diff)
downloadopenembedded-core-a3923085d1cad7de7e644ff57d05c4a8955b5b00.tar.gz
openembedded-core-a3923085d1cad7de7e644ff57d05c4a8955b5b00.tar.bz2
openembedded-core-a3923085d1cad7de7e644ff57d05c4a8955b5b00.zip
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@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/busybox/busybox.inc16
1 files 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