X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/34dbf787c3fa13541abc9aadcf53c23016895382..912f0d3ea02874cf2c8d133d83d6afd77935f7de:/package/busybox/Makefile

diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index f56d2462d..38740fdbf 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -9,31 +9,40 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=busybox
-PKG_VERSION:=1.2.1
+PKG_VERSION:=1.4.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.busybox.net/downloads
-PKG_MD5SUM:=362b3dc0f2023ddfda901dc1f1a74391
-PKG_CAT:=bzcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_URL:=http://www.busybox.net/downloads \
+		http://distfiles.gentoo.org/distfiles/
+PKG_MD5SUM:=b4c61fb15642be9dde20e8493788c585
 
 include $(INCLUDE_DIR)/package.mk
 
+ifeq ($(DUMP),)
+  STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell grep '^CONFIG_BUSYBOX_' $(TOPDIR)/.config | md5s)
+endif
+
+init-y :=
+init-$(CONFIG_BUSYBOX_CONFIG_HTTPD) += httpd
+init-$(CONFIG_BUSYBOX_CONFIG_CROND) += cron
+init-$(CONFIG_BUSYBOX_CONFIG_TELNETD) += telnet
+
 define Package/busybox
   SECTION:=base
   CATEGORY:=Base system
-  DEFAULT:=y
   TITLE:=Core utilities for embedded Linux
-  DESCRIPTION:=\
-	The Swiss Army Knife of embedded Linux. \\\
-	It slices, it dices, it makes Julian Fries.
   URL:=http://busybox.net/
   MENU:=1
 endef
 
+define Package/busybox/description
+The Swiss Army Knife of embedded Linux.
+	It slices, it dices, it makes Julian Fries.
+endef
+
 define Package/busybox/config
+	source "$(SOURCE)/target-config.in"
 	menu "Configuration"
 		depends on PACKAGE_busybox
 		source "$(SOURCE)/config/Config.in"
@@ -41,30 +50,39 @@ define Package/busybox/config
 endef
 
 define Build/Configure
-	$(SCRIPT_DIR)/gen_busybox_config.pl $(TOPDIR)/.config > $(PKG_BUILD_DIR)/.config
+	rm -f $(PKG_BUILD_DIR)/.configured*
+	grep 'CONFIG_BUSYBOX_' $(TOPDIR)/.config | sed -e "s,\\(# \)\\?CONFIG_BUSYBOX_\\(.*\\),\\1\\2,g" > $(PKG_BUILD_DIR)/.config
 	yes '' | $(MAKE) -C $(PKG_BUILD_DIR) \
 		CC="$(TARGET_CC)" \
-		CROSS="$(TARGET_CROSS)" \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
+		ARCH="$(ARCH)" \
 		oldconfig
 endef
 
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		CC="$(TARGET_CC)" \
-		CROSS="$(TARGET_CROSS)" \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
 		EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
+		ARCH="$(ARCH)" \
 		IPKG_ARCH="$(ARCH)" \
 		all
 endef
 
 define Package/busybox/install
+	find $(PKG_BUILD_DIR) -lname busybox -exec rm \{\} \;
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		CC="$(TARGET_CC)" \
-		CROSS="$(TARGET_CROSS)" \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
 		EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
+		ARCH="$(ARCH)" \
 		IPKG_ARCH="$(ARCH)" \
-		PREFIX="$(1)" \
+		CONFIG_PREFIX="$(1)" \
 		install
+	$(INSTALL_DIR) $(1)/etc/init.d
+	for tmp in $(init-y); do \
+		$(INSTALL_BIN) ./files/$$$$tmp $(1)/etc/init.d/$$$$tmp; \
+	done
 	-rm -rf $(1)/lib64
 endef