summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Landwerlin <llandwerlin@gmail.com>2010-12-09 09:55:05 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2010-12-12 23:29:23 (GMT)
commit274e34af3b7ce1d8be8de52799d15e43456b30b5 (patch)
treecb739fb8e7c4e1511abf693cb31c83e360b34b2a
parentcd182cae65c0075c16910dc6b990fc3f8abbd776 (diff)
downloadbuildroot-274e34af3b7ce1d8be8de52799d15e43456b30b5.tar.gz
buildroot-274e34af3b7ce1d8be8de52799d15e43456b30b5.tar.bz2
busybox: move udhcp script from skeleton to package
Since udhcpc is part of busybox, it seems logical to move the udhcpc script from skeleton to busybox. [Peter: only install if not available in skeleton] Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/busybox/busybox.mk5
-rwxr-xr-xpackage/busybox/udhcpc.script (renamed from fs/skeleton/usr/share/udhcpc/default.script)0
2 files changed, 4 insertions, 1 deletions
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index b7f4740..1010df3 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -141,7 +141,10 @@ endif
define BUSYBOX_INSTALL_TARGET_CMDS
$(BUSYBOX_INSTALL_BINARY)
- -chmod a+rx $(TARGET_DIR)/usr/share/udhcpc/default.script
+ if [ ! -f $(TARGET_DIR)/usr/share/udhcpc/default.script ]; then \
+ $(INSTALL) -m 0755 -D package/busybox/udhcpc.script \
+ $(TARGET_DIR)/usr/share/udhcpc/default.script; \
+ fi
endef
define BUSYBOX_UNINSTALL_TARGET_CMDS
diff --git a/fs/skeleton/usr/share/udhcpc/default.script b/package/busybox/udhcpc.script
index a52a7f8..a52a7f8 100755
--- a/fs/skeleton/usr/share/udhcpc/default.script
+++ b/package/busybox/udhcpc.script