3 files changed, 66 insertions, 66 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 8877c373c..09b67277a 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -1,9 +1,63 @@
+# $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)-.tar.bz2
+PKG_SOURCE_URL:=http://www.busybox.net/downloads/snapshots
+PKG_MD5SUM:=5c7ea9b5d3b3677dfcdcec38b281a756
+else
+PKG_VERSION:=1.00
+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:=5c7ea9b5d3b3677dfcdcec38b281a756
+endif
+
+PKG_CAT:=bzcat
+PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
+PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg
+
+$(DL_DIR)/$(PKG_SOURCE):
+	$(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
+
+$(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE)
+	$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	$(PATCH) $(PKG_BUILD_DIR) ./patches
+	touch $(PKG_BUILD_DIR)/.patched
+
+$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.patched
+	$(SCRIPT_DIR)/gen_busybox_config.pl $(TOPDIR)/.config > $(PKG_BUILD_DIR)/.config
+	$(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" -C $(PKG_BUILD_DIR) oldconfig
+	touch $(PKG_BUILD_DIR)/.configured
+
+$(PKG_BUILD_DIR)/$(PKG_NAME): $(PKG_BUILD_DIR)/.configured
+	$(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" PREFIX="$(PKG_IPK_DIR)" \
+		EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(PKG_BUILD_DIR)
+
+$(PKG_IPK): $(PKG_BUILD_DIR)/$(PKG_NAME)
+	$(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
+	$(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" PREFIX="$(PKG_IPK_DIR)" \
+		EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(PKG_BUILD_DIR) install
+	$(STRIP) $(PKG_IPK_DIR)/bin/busybox
+	-chmod a+x $(PKG_IPK_DIR)/usr/share/udhcpc/default.script
+	mkdir -p $(PACKAGE_DIR)
+	$(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
+
+$(IPKG_STATE_DIR)/info/$(PKG_NAME).list: $(PKG_IPK)
+	$(IPKG) install $(PKG_IPK)
+
+source: $(DL_DIR)/$(PKG_SOURCE)
+prepare: $(PKG_BUILD_DIR)/.patched
+compile: $(PKG_IPK)
+install: $(IPKG_STATE_DIR)/info/$(PKG_NAME).list
 
-source: busybox-source
-prepare: $(BUSYBOX_DIR)/.unpacked
-compile: $(BUSYBOX_DIR)/busybox
-install: busybox
-clean: busybox-dirclean
+clean:
+	rm -rf $(PKG_BUILD_DIR)
+	rm -f $(PKG_IPK)
diff --git a/package/busybox/busybox.control b/package/busybox/busybox.control
new file mode 100644
index 000000000..37dfbf609
--- /dev/null
+++ b/package/busybox/busybox.control
@@ -0,0 +1,6 @@
+Package: busybox
+Priority: optional
+Section: net
+Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Source: buildroot internal
+Description: Core utilities for embedded Linux systems
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
deleted file mode 100644
index 98e8c5da9..000000000
--- a/package/busybox/busybox.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-# $Id$
-
-ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y)
-# Be aware that this changes daily....
-BUSYBOX_DIR:=$(BUILD_DIR)/busybox
-BUSYBOX_SOURCE:=busybox-snapshot.tar.bz2
-BUSYBOX_SITE:=http://www.busybox.net/downloads/snapshots
-else
-BUSYBOX_VER:=1.00
-BUSYBOX_MD5:=5c7ea9b5d3b3677dfcdcec38b281a756
-BUSYBOX_DIR:=$(BUILD_DIR)/busybox-$(BUSYBOX_VER)
-BUSYBOX_SOURCE:=busybox-$(BUSYBOX_VER).tar.bz2
-BUSYBOX_SITE:=http://www.busybox.net/downloads
-endif
-BUSYBOX_UNZIP=bzcat
-
-$(DL_DIR)/$(BUSYBOX_SOURCE):
-	 $(SCRIPT_DIR)/download.pl $(DL_DIR) $(BUSYBOX_SOURCE) $(BUSYBOX_MD5) $(BUSYBOX_SITE)
-
-busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_CONFIG)
-
-$(BUSYBOX_DIR)/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE)
-	$(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	# Allow busybox patches.
-	$(PATCH) $(BUSYBOX_DIR) ./patches
-	touch $(BUSYBOX_DIR)/.unpacked
-
-$(BUSYBOX_DIR)/.configured: $(BUSYBOX_DIR)/.unpacked
-	$(SCRIPT_DIR)/gen_busybox_config.pl $(TOPDIR)/.config > $(BUSYBOX_DIR)/.config
-#	cp $(BUSYBOX_CONFIG) $(BUSYBOX_DIR)/.config
-#	$(SED) "s,^CROSS.*,CROSS=$(TARGET_CROSS)\n\
-#		PREFIX=$(TARGET_DIR),;" $(BUSYBOX_DIR)/Rules.mak
-#ifeq ($(BR2_LARGEFILE),y)
-#	$(SED) "s/^.*CONFIG_LFS.*/CONFIG_LFS=y/;" $(BUSYBOX_DIR)/.config
-#else
-#	$(SED) "s/^.*CONFIG_LFS.*/CONFIG_LFS=n/;" $(BUSYBOX_DIR)/.config
-#	$(SED) "s/^.*FDISK_SUPPORT_LARGE_DISKS.*/FDISK_SUPPORT_LARGE_DISKS=n/;" $(BUSYBOX_DIR)/.config
-#endif
-	$(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" -C $(BUSYBOX_DIR) oldconfig
-	touch $(BUSYBOX_DIR)/.configured
-
-$(BUSYBOX_DIR)/busybox: $(BUSYBOX_DIR)/.configured
-	$(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
-		EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_DIR)
-
-$(TARGET_DIR)/bin/busybox: $(BUSYBOX_DIR)/busybox
-	$(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
-		EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_DIR) install
-	$(STRIP) $(TARGET_DIR)/bin/busybox
-	# Just in case
-	-chmod a+x $(TARGET_DIR)/usr/share/udhcpc/default.script
-
-busybox: $(TARGET_DIR)/bin/busybox
-
-busybox-clean:
-	rm -f $(TARGET_DIR)/bin/busybox
-	-$(MAKE) -C $(BUSYBOX_DIR) clean
-
-busybox-dirclean:
-	rm -rf $(BUSYBOX_DIR)