X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2Fbusybox%2FMakefile;h=6a359688a5621d2599a058d0f8ac4e55456f4d0e;hb=ef998d64e381ed0a92fc73edf4206f7be7335caf;hp=812e12a8935baccf553289c6d8147273c1296170;hpb=b762affd8ed7a8baf8c62b7fee2c3e1358187eaf;p=openwrt.git

diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 812e12a893..6a359688a5 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -1,48 +1,51 @@
+# 
+# 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.1.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_MD5SUM:=19a0b475169335f17e421cf644616fe7
 PKG_CAT:=bzcat
 
-include $(TOPDIR)/package/rules.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/busybox
-CONFIGFILE:=config/Config.in
 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" \\\
+	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
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC=$(TARGET_CC) \
-		CROSS="$(TARGET_CROSS)" \
-		PREFIX="$(IDIR_BUSYBOX)" \
-		EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
-		ARCH="$(ARCH)" 
+	yes '' | $(MAKE) CC="$(TARGET_CC)" CROSS="$(TARGET_CROSS)" \
+	-C $(PKG_BUILD_DIR) oldconfig
 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
+	$(MAKE) CC="$(TARGET_CC)" CROSS="$(TARGET_CROSS)" \
+	PREFIX="$(1)" EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(PKG_BUILD_DIR) install
+	-rm -rf $(1)/lib64
 endef
 
 $(eval $(call BuildPackage,busybox))