package wlc, jffs2root, mtd as "openwrt-utils"

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@493 3c298f89-4303-0410-b956-a3cf2f4a3e73

4 files changed, 43 insertions, 49 deletions

diff --git a/openwrt/package/openwrt/Makefile b/openwrt/package/openwrt/Makefile
index 1b6de828a..4c129fd4c 100644
--- a/openwrt/package/openwrt/Makefile
+++ b/openwrt/package/openwrt/Makefile
@@ -2,6 +2,12 @@
 
 include $(TOPDIR)/rules.mk
 
+PKG_NAME := openwrt-utils
+PKG_RELEASE := 1
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_RELEASE)_$(ARCH).ipk
+PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg
+
 SHARED_INCLUDE:=${shell pwd}/include
 
 libshared-compile libnvram-compile wlc-compile:
@@ -13,13 +19,17 @@ libshared-install libnvram-install wlc-install:
 libshared-clean libnvram-clean wlc-clean:
 	@$(MAKE) -C $(patsubst %-clean,%,$@) clean
 
-$(TARGET_DIR)/sbin/mtd: mtd.c
+$(PKG_IPK_DIR)/sbin/mtd: mtd.c
+	mkdir -p $(PKG_IPK_DIR)/sbin
 	$(TARGET_CC) -o $@ $<
-	$(STRIP) $@
 
-$(TARGET_DIR)/sbin/jffs2root: jffs2root.c
+$(PKG_IPK_DIR)/sbin/jffs2root: jffs2root.c
+	mkdir -p $(PKG_IPK_DIR)/sbin
 	$(TARGET_CC) -o $@ $<
-	$(STRIP) $@
+
+$(PKG_IPK_DIR)/usr/sbin/wlc: wlc.c libshared-compile
+	mkdir -p $(PKG_IPK_DIR)/usr/sbin
+	$(TARGET_CC) -o $@ $< -lshared -L./libshared -I$(SHARED_INCLUDE)
 
 # wlconf tool extracted from linksys firmware GPL.unpackedtree
 # WRT54GS_3_37_2_1109_US
@@ -44,13 +54,23 @@ $(TARGET_DIR)/usr/sbin/wlconf: $(LINKSYS_WLCONF_DIR)/.unpacked
 			install
 	$(STRIP) $@
 
-source:
-prepare: 
-compile: libnvram-compile libshared-compile wlc-compile
-install: libnvram-install libshared-install wlc-install \
-	$(TARGET_DIR)/sbin/mtd $(TARGET_DIR)/sbin/jffs2root $(TARGET_DIR)/usr/sbin/wlconf
+$(PKG_IPK): $(PKG_IPK_DIR)/sbin/mtd $(PKG_IPK_DIR)/sbin/jffs2root $(PKG_IPK_DIR)/usr/sbin/wlc
+	$(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_RELEASE) $(ARCH)
+	$(STRIP) $(PKG_IPK_DIR)/usr/sbin/*
+	$(STRIP) $(PKG_IPK_DIR)/sbin/*
+	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)/$(LINKSYS_WLCONF_TGZ)
+prepare: $(LINKSYS_WLCONF_DIR)/.unpacked
+compile: prepare libnvram-compile libshared-compile $(PKG_IPK)
+install: libnvram-install libshared-install \
+	 $(TARGET_DIR)/usr/sbin/wlconf \
+	 $(IPKG_STATE_DIR)/info/$(PKG_NAME).list
 
-clean: libnvram-clean libshared-clean wlc-clean
-	rm -rf $(LINKSYS_WLCONF_DIR)
-	rm -f $(TARGET_DIR)/sbin/mtd
-	rm -f $(TARGET_DIR)/sbin/jffs2root
+clean: libshared-clean libnvram-clean
+	rm -rf $(PKG_BUILD_DIR)
+	rm -f $(PKG_IPK)
diff --git a/openwrt/package/openwrt/openwrt-utils.control b/openwrt/package/openwrt/openwrt-utils.control
new file mode 100644
index 000000000..b42669b96
--- /dev/null
+++ b/openwrt/package/openwrt/openwrt-utils.control
@@ -0,0 +1,10 @@
+Package: openwrt-utils
+Priority: optional
+Section: sys
+Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Source: buildroot internal
+Description: Basic OpenWrt utilities
+ This package contains:
+   mtd: Tool for modifying the flash chip
+   jffs2root: Expands the jffs2 root partition
+   wlc: Tool for setting various broadcom driver options
diff --git a/openwrt/package/openwrt/wlc/wlc.c b/openwrt/package/openwrt/wlc.c
index 8cb6dd375..8cb6dd375 100644
--- a/openwrt/package/openwrt/wlc/wlc.c
+++ b/openwrt/package/openwrt/wlc.c
diff --git a/openwrt/package/openwrt/wlc/Makefile b/openwrt/package/openwrt/wlc/Makefile
deleted file mode 100644
index 8a1e970d9..000000000
--- a/openwrt/package/openwrt/wlc/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id$
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=wlc
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
-
-EXTRA_CFLAGS := -c -I. -I../include
-
-all: compile
-
-WLC_OBJS:=
-define OBJ_template
-$(PKG_BUILD_DIR)/$(1): $(PKG_BUILD_DIR)
-	$(TARGET_CC) $(TARGET_CFLAGS) $(EXTRA_CFLAGS) -o $$@ $$(patsubst %.o,%.c,$(1))
-WLC_OBJS += $(PKG_BUILD_DIR)/$(1)
-endef
-
-OBJS := wlc.o
-$(foreach obj,$(OBJS),$(eval $(call OBJ_template,$(obj))))
-
-$(PKG_BUILD_DIR):
-	mkdir -p $(PKG_BUILD_DIR)
-
-$(PKG_BUILD_DIR)/wlc: $(WLC_OBJS)
-	$(TARGET_CC) -o $@ $^ -L$(BUILD_DIR)/libshared -lshared
-
-$(TARGET_DIR)/usr/sbin/wlc: $(PKG_BUILD_DIR)/wlc
-	install -m 755 $^ $@
-	$(STRIP) $@
-
-compile: $(PKG_BUILD_DIR)/wlc
-install: $(TARGET_DIR)/usr/sbin/wlc
-
-clean:
-	rm -rf $(PKG_BUILD_DIR)