add changes to nvram from #254/#266, resolves problems on older wap54g, thx for report

[openwrt.git] / package / busybox / Makefile

diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 8877c37..50faa27 100644 (file)
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -1,9 +1,42 @@
+# $Id$
+
 include $(TOPDIR)/rules.mk
 
-include ./busybox.mk
+PKG_NAME:=busybox
+PKG_RELEASE:=1
+
+ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y)
+# Be aware that this changes daily....
+PKG_VERSION:=0.${shell date +"%G%m%d"}
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+PKG_SOURCE:=$(PKG_NAME)-snapshot.tar.bz2
+PKG_SOURCE_URL:=http://www.busybox.net/downloads/snapshots
+PKG_MD5SUM:=x
+else
+PKG_VERSION:=1.1.0
+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:=855e12c7c9dc90e16b014a788925e4cb
+endif
+PKG_CAT:=bzcat
+
+include $(TOPDIR)/package/rules.mk
+
+$(eval $(call PKG_template,BUSYBOX,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+
+$(PKG_BUILD_DIR)/.configured:
+       $(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
+       touch $@
+
+$(PKG_BUILD_DIR)/.built:
+       $(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" PREFIX="$(IDIR_BUSYBOX)" \
+               EXTRA_CFLAGS="$(TARGET_CFLAGS)" ARCH="$(ARCH)" -C $(PKG_BUILD_DIR)
+       touch $@
 
-source: busybox-source
-prepare: $(BUSYBOX_DIR)/.unpacked
-compile: $(BUSYBOX_DIR)/busybox
-install: busybox
-clean: busybox-dirclean
+$(IPKG_BUSYBOX):
+       $(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" PREFIX="$(IDIR_BUSYBOX)" \
+               EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(PKG_BUILD_DIR) install
+       $(STRIP) $(IDIR_BUSYBOX)/bin/busybox
+       $(IPKG_BUILD) $(IDIR_BUSYBOX) $(PACKAGE_DIR)