X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/0d3fffa91dee49ba80032ce5c67f1cb47aee8f4d..e1da0cb9a573dba1ca6fce313420bc99e6024ae0:/package/busybox/Makefile?ds=sidebyside

diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 6e9cf4194..2927d7043 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -9,42 +9,76 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=busybox
-PKG_VERSION:=1.2.1
+PKG_VERSION:=1.3.1
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.busybox.net/downloads
-PKG_MD5SUM:=362b3dc0f2023ddfda901dc1f1a74391
+PKG_SOURCE_URL:=http://www.busybox.net/downloads \
+		http://distfiles.gentoo.org/distfiles/
+PKG_MD5SUM:=571531cfa83726947ccb566de017ad4f
 PKG_CAT:=bzcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
 include $(INCLUDE_DIR)/package.mk
 
+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
-MENU:=1
-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/
-CONFIG:=\\\
-	menu "Configuration" \\\
-		depends on PACKAGE_busybox \\\
-		source "$(SOURCE)/config/Config.in" \\\
+  SECTION:=base
+  CATEGORY:=Base system
+  TITLE:=Core utilities for embedded Linux
+  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
+	menu "Configuration"
+		depends on PACKAGE_busybox
+		source "$(SOURCE)/config/Config.in"
 	endmenu
 endef
 
 define Build/Configure
 	$(SCRIPT_DIR)/gen_busybox_config.pl $(TOPDIR)/.config > $(PKG_BUILD_DIR)/.config
-	yes '' | $(MAKE) CC="$(TARGET_CC)" CROSS="$(TARGET_CROSS)" \
-	-C $(PKG_BUILD_DIR) oldconfig
+	yes '' | $(MAKE) -C $(PKG_BUILD_DIR) \
+		CC="$(TARGET_CC)" \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
+		ARCH="$(ARCH)" \
+		oldconfig
+endef
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CC="$(TARGET_CC)" \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
+		EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
+		ARCH="$(ARCH)" \
+		IPKG_ARCH="$(ARCH)" \
+		all
 endef
 
 define Package/busybox/install
-	$(MAKE) CC="$(TARGET_CC)" CROSS="$(TARGET_CROSS)" \
-	PREFIX="$(1)" EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(PKG_BUILD_DIR) install
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CC="$(TARGET_CC)" \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
+		EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
+		ARCH="$(ARCH)" \
+		IPKG_ARCH="$(ARCH)" \
+		CONFIG_PREFIX="$(1)" \
+		install
+	mkdir -p $(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