projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a6933e8)
Busybox 1.4.0 support
authorPeter Korsgaard <jacmet@sunsite.dk>
Tue, 30 Jan 2007 13:36:10 +0000 (13:36 -0000)
committerPeter Korsgaard <jacmet@sunsite.dk>
Tue, 30 Jan 2007 13:36:10 +0000 (13:36 -0000)
package/busybox/Config.in patch | blob | history
package/busybox/busybox.mk patch | blob | history

diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index 00a3de5cf0862656dbbfca08231c427de52be7fb..df7f17a54f9989888357d5299a60925c2e879038 100644 (file)
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -24,6 +24,9 @@ choice
        config BR2_BUSYBOX_VERSION_1_2_2_1
                bool "BusyBox 1.2.2.1"
 
+       config BR2_BUSYBOX_VERSION_1_4_0
+               bool "BusyBox 1.4.0"
+
        config BR2_PACKAGE_BUSYBOX_SNAPSHOT
                bool "daily snapshot"
 
@@ -51,6 +54,7 @@ config BR2_PACKAGE_BUSYBOX_CONFIG
        default "package/busybox/busybox-1.0.1.config" if BR2_BUSYBOX_VERSION_1_0_1
        default "package/busybox/busybox-1.1.3.config" if BR2_BUSYBOX_VERSION_1_1_3
        default "package/busybox/busybox-1.2.2.1.config" if BR2_BUSYBOX_VERSION_1_2_2_1
+       default "package/busybox/busybox-1.4.0.config" if BR2_BUSYBOX_VERSION_1_4_0
        help
          Some people may wish to use their own modified BusyBox configuration
          file, and will specify their config file location with this option.
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index a997aa7187bdf6c6aec2fa98e1d8f81484cd0811..c963ada509868223e3f8cffbd5702fee4ea4b9f3 100644 (file)
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -25,6 +25,13 @@ BUSYBOX_SOURCE:=busybox-$(BUSYBOX_VER).tar.bz2
 BUSYBOX_SITE:=http://www.busybox.net/downloads
 endif
 
+ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_4_0)),y)
+BUSYBOX_VER:=1.4.0
+BUSYBOX_DIR:=$(BUILD_DIR)/busybox-$(BUSYBOX_VER)
+BUSYBOX_SOURCE:=busybox-$(BUSYBOX_VER).tar.bz2
+BUSYBOX_SITE:=http://www.busybox.net/downloads
+endif
+
 ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y)
 # Be aware that this changes daily....
 BUSYBOX_DIR:=$(BUILD_DIR)/busybox
@@ -51,7 +58,7 @@ ifeq ($(BR2_PACKAGE_SYSKLOGD),y)
        $(SED) "/#include.*busybox\.h/a#define CONFIG_SYSLOGD" $(BUSYBOX_DIR)/init/init.c
 endif
        # Allow busybox patches.
-       toolchain/patch-kernel.sh $(BUSYBOX_DIR) package/busybox busybox\*.patch
+       toolchain/patch-kernel.sh $(BUSYBOX_DIR) package/busybox busybox-$(BUSYBOX_VER)\*.patch
        touch $(BUSYBOX_DIR)/.unpacked
 
 $(BUSYBOX_DIR)/.configured: $(BUSYBOX_DIR)/.unpacked $(BUSYBOX_CONFIG_FILE)