From: Andre McCurdy <armccurdy@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 08/11] busybox: move common do_install_ptest() into busybox.inc
Date: Wed, 14 Oct 2015 18:43:20 -0700 [thread overview]
Message-ID: <1444873403-21093-9-git-send-email-armccurdy@gmail.com> (raw)
In-Reply-To: <1444873403-21093-1-git-send-email-armccurdy@gmail.com>
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@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
next prev parent reply other threads:[~2015-10-15 1:43 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-15 1:43 [PATCH 00/11] busybox fixes and cleanups + update to 1.24 Andre McCurdy
2015-10-15 1:43 ` [PATCH 01/11] busybox_git: Enable getopt applet Andre McCurdy
2015-10-15 1:43 ` [PATCH 02/11] busybox.inc: don't export EXTRA_OEMAKE Andre McCurdy
2015-10-15 1:43 ` [PATCH 03/11] busybox: move common EXTRA_OEMAKE options into busybox.inc Andre McCurdy
2015-10-15 1:43 ` [PATCH 04/11] busybox.inc: explicitly include CC=${CC} on make command line Andre McCurdy
2015-10-15 1:43 ` [PATCH 05/11] busybox.inc: don't set .config CROSS_COMPILER_PREFIX Andre McCurdy
2015-10-15 1:43 ` [PATCH 06/11] busybox.inc: fix CONFIG_EXTRA_CFLAGS configmangle Andre McCurdy
2015-10-15 1:43 ` [PATCH 07/11] busybox.inc: remove MAKEFLAGS over-ride from EXTRA_OEMAKE Andre McCurdy
2015-10-15 1:43 ` Andre McCurdy [this message]
2015-10-15 1:43 ` [PATCH 09/11] busybox: re-order defconfig to align with busybox 1.24.0 Andre McCurdy
2015-10-15 1:43 ` [PATCH 10/11] busybox: update 1.23.2 -> 1.24.0 (and git recipe to latest trunk) Andre McCurdy
2015-10-15 1:43 ` [PATCH 11/11] busybox: disable support for mounting NFS file systems on Linux < 2.6.23 Andre McCurdy
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=1444873403-21093-9-git-send-email-armccurdy@gmail.com \
--to=armccurdy@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.