[OE-core] [PATCH 08/11] busybox: move common do_install_ptest() into busybox.inc
Andre McCurdy
armccurdy at gmail.com
Thu Oct 15 01:43:20 UTC 2015
Current do_install_ptest() is common to all supported versions of
busybox (1.23.2 and git), so move from version specific recipes into
busybox.inc.
Signed-off-by: Andre McCurdy <armccurdy at gmail.com>
---
meta/recipes-core/busybox/busybox.inc | 6 ++++++
meta/recipes-core/busybox/busybox_1.23.2.bb | 6 ------
meta/recipes-core/busybox/busybox_git.bb | 6 ------
3 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 878e2bb..e0e4591 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -304,6 +304,12 @@ do_install () {
fi
}
+do_install_ptest () {
+ cp -r ${B}/testsuite ${D}${PTEST_PATH}/
+ cp ${B}/.config ${D}${PTEST_PATH}/
+ ln -s /bin/busybox ${D}${PTEST_PATH}/busybox
+}
+
inherit update-alternatives
ALTERNATIVE_PRIORITY = "50"
diff --git a/meta/recipes-core/busybox/busybox_1.23.2.bb b/meta/recipes-core/busybox/busybox_1.23.2.bb
index 554c816..e9f7eb6 100644
--- a/meta/recipes-core/busybox/busybox_1.23.2.bb
+++ b/meta/recipes-core/busybox/busybox_1.23.2.bb
@@ -43,9 +43,3 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
SRC_URI[tarball.md5sum] = "7925683d7dd105aabe9b6b618d48cc73"
SRC_URI[tarball.sha256sum] = "05a6f9e21aad8c098e388ae77de7b2361941afa7157ef74216703395b14e319a"
-
-do_install_ptest () {
- cp -r ${B}/testsuite ${D}${PTEST_PATH}/
- cp ${B}/.config ${D}${PTEST_PATH}/
- ln -s /bin/busybox ${D}${PTEST_PATH}/busybox
-}
diff --git a/meta/recipes-core/busybox/busybox_git.bb b/meta/recipes-core/busybox/busybox_git.bb
index 17de8ac..e9ff0bc 100644
--- a/meta/recipes-core/busybox/busybox_git.bb
+++ b/meta/recipes-core/busybox/busybox_git.bb
@@ -44,10 +44,4 @@ SRC_URI = "git://busybox.net/busybox.git \
file://getopts.cfg \
"
-do_install_ptest () {
- cp -r ${B}/testsuite ${D}${PTEST_PATH}/
- cp ${B}/.config ${D}${PTEST_PATH}/
- ln -s /bin/busybox ${D}${PTEST_PATH}/busybox
-}
-
DEFAULT_PREFERENCE = "-1"
--
1.9.1
More information about the Openembedded-core
mailing list