X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2Fbusybox%2FMakefile;h=2f977942618c93b10c18a47c2945a6a9fa7e701b;hb=875000f68adc598093312913ade3e2a68210b384;hp=5ccbe225144c63de4c8e76987ed28946c50376b7;hpb=096afa4e695916a8068c82af6807f9b6de587c38;p=openwrt.git

diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 5ccbe22514..2f97794261 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -1,48 +1,91 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 # $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=busybox
-PKG_VERSION:=1.1.2
+PKG_VERSION:=1.11.3
 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:=0b5d78072302fe687407956537bdb9e3
-PKG_CAT:=bzcat
+PKG_SOURCE_URL:=http://www.busybox.net/downloads \
+		http://distfiles.gentoo.org/distfiles/
+PKG_MD5SUM:=4355ad8bb57ce3b39ad827566c1a6da3
 
-include $(TOPDIR)/package/rules.mk
+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
-CONFIGFILE:=config/Config.in
-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/
+  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)/target-config.in"
+		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
+	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_COMPILE="$(TARGET_CROSS)" \
+		KBUILD_HAVE_NLS=no \
+		ARCH="$(ARCH)" \
+		oldconfig
 endef
 
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC=$(TARGET_CC) \
-		CROSS="$(TARGET_CROSS)" \
-		PREFIX="$(IDIR_BUSYBOX)" \
+		CC="$(TARGET_CC)" \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
+		KBUILD_HAVE_NLS=no \
 		EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
-		ARCH="$(ARCH)" 
+		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
-	$(STRIP) $(1)/bin/busybox
+	$(FIND) $(PKG_BUILD_DIR) -lname "*busybox" -exec rm \{\} \;
+	$(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
+	$(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
 
 $(eval $(call BuildPackage,busybox))