summaryrefslogtreecommitdiffstats
path: root/recipes/busybox
diff options
context:
space:
mode:
authorMichael Smith <msmith@cbnco.com>2009-06-07 16:43:26 -0400
committerPhil Blundell <philb@gnu.org>2009-06-08 10:14:05 +0100
commit654cb590ae11f3ada8ed877a6f81f14cabe7b506 (patch)
tree12ac94e4c9c5ae53a73b7f10f6624cf7762168ff /recipes/busybox
parent86f777c46c59a3344790ffdc6e4da20c51504d58 (diff)
downloadopenembedded-654cb590ae11f3ada8ed877a6f81f14cabe7b506.tar.gz
busybox: fix udhcpc default script location when prefix is not "/usr"
Signed-off-by: Michael Smith <msmith@cbnco.com>
Diffstat (limited to 'recipes/busybox')
-rw-r--r--recipes/busybox/busybox-1.13.2/defconfig2
-rw-r--r--recipes/busybox/busybox.inc8
-rw-r--r--recipes/busybox/busybox_1.11.3.bb5
-rw-r--r--recipes/busybox/busybox_1.13.2.bb6
4 files changed, 10 insertions, 11 deletions
diff --git a/recipes/busybox/busybox-1.13.2/defconfig b/recipes/busybox/busybox-1.13.2/defconfig
index 0db650fcf1..ddbaa0839d 100644
--- a/recipes/busybox/busybox-1.13.2/defconfig
+++ b/recipes/busybox/busybox-1.13.2/defconfig
@@ -720,7 +720,7 @@ CONFIG_FEATURE_UDHCPC_ARPING=y
# CONFIG_FEATURE_UDHCP_PORT is not set
# CONFIG_UDHCP_DEBUG is not set
# CONFIG_FEATURE_UDHCP_RFC3397 is not set
-CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
+CONFIG_UDHCPC_DEFAULT_SCRIPT="@DATADIR@/udhcpc/default.script"
CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
# CONFIG_VCONFIG is not set
CONFIG_WGET=y
diff --git a/recipes/busybox/busybox.inc b/recipes/busybox/busybox.inc
index 106938e01b..e056ad1141 100644
--- a/recipes/busybox/busybox.inc
+++ b/recipes/busybox/busybox.inc
@@ -11,7 +11,7 @@ LICENSE = "GPL"
SECTION = "base"
PRIORITY = "required"
-INC_PR = "r20"
+INC_PR = "r21"
SRC_URI = "\
http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
@@ -59,6 +59,12 @@ LD = "${CC} -nostdlib"
inherit cml1 update-rc.d
+do_configure () {
+ sed -e 's#@DATADIR@#${datadir}#g' \
+ < ${WORKDIR}/defconfig > ${S}/.config
+ cml1_do_configure
+}
+
do_compile() {
unset CFLAGS CPPFLAGS CXXFLAGS
base_do_compile
diff --git a/recipes/busybox/busybox_1.11.3.bb b/recipes/busybox/busybox_1.11.3.bb
index 673fe15ba7..551826438b 100644
--- a/recipes/busybox/busybox_1.11.3.bb
+++ b/recipes/busybox/busybox_1.11.3.bb
@@ -25,11 +25,6 @@ SRC_URI = "\
EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"
-do_configure () {
- install -m 0644 ${WORKDIR}/defconfig ${S}/.config
- cml1_do_configure
-}
-
do_install_append() {
install -m 0644 ${WORKDIR}/mdev.conf ${D}${sysconfdir}/
install -d ${D}${sysconfdir}/init.d/
diff --git a/recipes/busybox/busybox_1.13.2.bb b/recipes/busybox/busybox_1.13.2.bb
index c1cc51baf1..03a7208229 100644
--- a/recipes/busybox/busybox_1.13.2.bb
+++ b/recipes/busybox/busybox_1.13.2.bb
@@ -39,12 +39,10 @@ SRC_URI = "\
EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"
-do_configure () {
- install -m 0644 ${WORKDIR}/defconfig ${S}/.config
+do_configure_prepend () {
if [ "${TARGET_ARCH}" = "avr32" ] ; then
- sed -i s:CONFIG_FEATURE_OSF_LABEL=y:CONFIG_FEATURE_OSF_LABEL=n: ${S}/.config
+ sed -i s:CONFIG_FEATURE_OSF_LABEL=y:CONFIG_FEATURE_OSF_LABEL=n: ${WORKDIR}/defconfig
fi
- cml1_do_configure
}
do_install_append() {