diff options
-rw-r--r-- | meta/recipes-core/busybox/busybox.inc | 8 | ||||
-rw-r--r-- | meta/recipes-core/busybox/busybox_1.23.2.bb | 8 | ||||
-rw-r--r-- | meta/recipes-core/busybox/busybox_git.bb | 8 |
3 files changed, 7 insertions, 17 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 9e1a207e6d..ac534a4acb 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc | |||
@@ -18,7 +18,7 @@ BUSYBOX_SPLIT_SUID ?= "1" | |||
18 | export EXTRA_CFLAGS = "${CFLAGS}" | 18 | export EXTRA_CFLAGS = "${CFLAGS}" |
19 | export EXTRA_LDFLAGS = "${LDFLAGS}" | 19 | export EXTRA_LDFLAGS = "${LDFLAGS}" |
20 | 20 | ||
21 | EXTRA_OEMAKE += "LD='${CCLD}'" | 21 | EXTRA_OEMAKE += "LD='${CCLD}' V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y" |
22 | 22 | ||
23 | PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev ${PN}-hwclock" | 23 | PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev ${PN}-hwclock" |
24 | 24 | ||
@@ -301,6 +301,12 @@ do_install () { | |||
301 | fi | 301 | fi |
302 | } | 302 | } |
303 | 303 | ||
304 | do_install_ptest () { | ||
305 | cp -r ${B}/testsuite ${D}${PTEST_PATH}/ | ||
306 | cp ${B}/.config ${D}${PTEST_PATH}/ | ||
307 | ln -s /bin/busybox ${D}${PTEST_PATH}/busybox | ||
308 | } | ||
309 | |||
304 | inherit update-alternatives | 310 | inherit update-alternatives |
305 | 311 | ||
306 | ALTERNATIVE_PRIORITY = "50" | 312 | 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 25598232ae..e9f7eb60b5 100644 --- a/meta/recipes-core/busybox/busybox_1.23.2.bb +++ b/meta/recipes-core/busybox/busybox_1.23.2.bb | |||
@@ -43,11 +43,3 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ | |||
43 | 43 | ||
44 | SRC_URI[tarball.md5sum] = "7925683d7dd105aabe9b6b618d48cc73" | 44 | SRC_URI[tarball.md5sum] = "7925683d7dd105aabe9b6b618d48cc73" |
45 | SRC_URI[tarball.sha256sum] = "05a6f9e21aad8c098e388ae77de7b2361941afa7157ef74216703395b14e319a" | 45 | SRC_URI[tarball.sha256sum] = "05a6f9e21aad8c098e388ae77de7b2361941afa7157ef74216703395b14e319a" |
46 | |||
47 | EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y" | ||
48 | |||
49 | do_install_ptest () { | ||
50 | cp -r ${B}/testsuite ${D}${PTEST_PATH}/ | ||
51 | cp ${B}/.config ${D}${PTEST_PATH}/ | ||
52 | ln -s /bin/busybox ${D}${PTEST_PATH}/busybox | ||
53 | } | ||
diff --git a/meta/recipes-core/busybox/busybox_git.bb b/meta/recipes-core/busybox/busybox_git.bb index ed1c0a84bd..e9ff0bc41e 100644 --- a/meta/recipes-core/busybox/busybox_git.bb +++ b/meta/recipes-core/busybox/busybox_git.bb | |||
@@ -44,12 +44,4 @@ SRC_URI = "git://busybox.net/busybox.git \ | |||
44 | file://getopts.cfg \ | 44 | file://getopts.cfg \ |
45 | " | 45 | " |
46 | 46 | ||
47 | EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y" | ||
48 | |||
49 | do_install_ptest () { | ||
50 | cp -r ${B}/testsuite ${D}${PTEST_PATH}/ | ||
51 | cp ${B}/.config ${D}${PTEST_PATH}/ | ||
52 | ln -s /bin/busybox ${D}${PTEST_PATH}/busybox | ||
53 | } | ||
54 | |||
55 | DEFAULT_PREFERENCE = "-1" | 47 | DEFAULT_PREFERENCE = "-1" |