From 2bea0da1a1f8012ee8a9be0c0e6e6bfad7708b79 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 13 Dec 2005 20:08:53 +0000
Subject: [PATCH] split wireless-tools and iwlib to produce smaller micro
 images

SVN-Revision: 2664
---
 openwrt/package/Makefile                          |  2 +-
 openwrt/package/wireless-tools/Config.in          | 15 +++++++++++++++
 openwrt/package/wireless-tools/Makefile           |  9 +++++++--
 openwrt/package/wireless-tools/ipkg/iwlib.control |  4 ++++
 .../wireless-tools/ipkg/wireless-tools.control    |  1 +
 .../linux/imagebuilder/lists/default.brcm-2.4     |  1 +
 .../linux/imagebuilder/lists/micro.brcm-2.4       |  2 +-
 .../target/linux/imagebuilder/lists/pptp.brcm-2.4 |  1 +
 8 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 openwrt/package/wireless-tools/ipkg/iwlib.control

diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile
index 9756129aaf..80048683d2 100644
--- a/openwrt/package/Makefile
+++ b/openwrt/package/Makefile
@@ -115,7 +115,7 @@ package-$(BR2_PACKAGE_VTUN) += vtun
 package-$(BR2_PACKAGE_VSFTPD) += vsftpd
 package-$(BR2_PACKAGE_WEBIF) += webif
 package-$(BR2_PACKAGE_WIFICONF) += wificonf
-package-$(BR2_PACKAGE_WIRELESS_TOOLS) += wireless-tools
+package-$(BR2_COMPILE_WIRELESS_TOOLS) += wireless-tools
 package-$(BR2_PACKAGE_WOL) += wol
 package-$(BR2_PACKAGE_WPA_SUPPLICANT) += wpa_supplicant
 package-$(BR2_PACKAGE_WPUT) += wput
diff --git a/openwrt/package/wireless-tools/Config.in b/openwrt/package/wireless-tools/Config.in
index 1c155bb776..c957d40dd9 100644
--- a/openwrt/package/wireless-tools/Config.in
+++ b/openwrt/package/wireless-tools/Config.in
@@ -1,5 +1,20 @@
+config BR2_COMPILE_WIRELESS_TOOLS
+	tristate
+	default n
+	depends BR2_PACKAGE_IWLIB
+
 config BR2_PACKAGE_WIRELESS_TOOLS
 	tristate "wireless-tools - Tools for manipulating Linux Wireless Extensions"
 	default y
+	select BR2_PACKAGE_IWLIB
 	help
 	  Tools for configuring Wireless Adapters implementing the "Wireless Extension"
+
+config BR2_PACKAGE_IWLIB
+	tristate "iwlib - Library for manipulating Linux Wireless Extensions"
+	default y
+	select BR2_COMPILE_WIRELESS_TOOLS
+	help
+	  Library configuring Wireless Adapters implementing the "Wireless Extension"
+
+
diff --git a/openwrt/package/wireless-tools/Makefile b/openwrt/package/wireless-tools/Makefile
index 4d132b99dd..fb9cca0fee 100644
--- a/openwrt/package/wireless-tools/Makefile
+++ b/openwrt/package/wireless-tools/Makefile
@@ -16,6 +16,7 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
 
+$(eval $(call PKG_template,IWLIB,iwlib,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,WIRELESS_TOOLS,wireless-tools,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
@@ -33,9 +34,13 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
 		install install-iwmulticall
 	touch $@
 
+$(IPKG_IWLIB):
+	mkdir -p $(IDIR_IWLIB)/usr/lib
+	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libiw.so.28 $(IDIR_IWLIB)/usr/lib/
+	$(RSTRIP) $(IDIR_IWLIB)
+	$(IPKG_BUILD) $(IDIR_IWLIB) $(PACKAGE_DIR)
+	
 $(IPKG_WIRELESS_TOOLS):
-	mkdir -p $(IDIR_WIRELESS_TOOLS)/usr/lib
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libiw.so.28 $(IDIR_WIRELESS_TOOLS)/usr/lib/
 	mkdir -p $(IDIR_WIRELESS_TOOLS)/usr/sbin
 	cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/iw{config,getid,list,priv,spy} $(IDIR_WIRELESS_TOOLS)/usr/sbin/
 	$(RSTRIP) $(IDIR_WIRELESS_TOOLS)
diff --git a/openwrt/package/wireless-tools/ipkg/iwlib.control b/openwrt/package/wireless-tools/ipkg/iwlib.control
new file mode 100644
index 0000000000..ca866bcb8c
--- /dev/null
+++ b/openwrt/package/wireless-tools/ipkg/iwlib.control
@@ -0,0 +1,4 @@
+Package: iwlib
+Priority: optional
+Section: net
+Description: Library for setting up WiFi cards using the Wireless Extension
diff --git a/openwrt/package/wireless-tools/ipkg/wireless-tools.control b/openwrt/package/wireless-tools/ipkg/wireless-tools.control
index 5f472d958d..9ff7801149 100644
--- a/openwrt/package/wireless-tools/ipkg/wireless-tools.control
+++ b/openwrt/package/wireless-tools/ipkg/wireless-tools.control
@@ -1,4 +1,5 @@
 Package: wireless-tools
 Priority: optional
 Section: net
+Depends: iwlib
 Description: Tools for setting up WiFi cards using the Wireless Extension
diff --git a/openwrt/target/linux/imagebuilder/lists/default.brcm-2.4 b/openwrt/target/linux/imagebuilder/lists/default.brcm-2.4
index 132ff48222..3de5c09819 100644
--- a/openwrt/target/linux/imagebuilder/lists/default.brcm-2.4
+++ b/openwrt/target/linux/imagebuilder/lists/default.brcm-2.4
@@ -7,6 +7,7 @@ dropbear
 haserl
 ipkg
 iptables
+iwlib
 kmod-brcm-et
 kmod-brcm-wl
 kmod-diag
diff --git a/openwrt/target/linux/imagebuilder/lists/micro.brcm-2.4 b/openwrt/target/linux/imagebuilder/lists/micro.brcm-2.4
index 3541bfa482..f10696f54d 100644
--- a/openwrt/target/linux/imagebuilder/lists/micro.brcm-2.4
+++ b/openwrt/target/linux/imagebuilder/lists/micro.brcm-2.4
@@ -6,6 +6,7 @@ dnsmasq
 dropbear
 ipkg-sh
 iptables
+iwlib
 kmod-brcm-et
 kmod-brcm-wl
 kmod-diag
@@ -14,6 +15,5 @@ libgcc
 mtd
 nvram
 uclibc
-wireless-tools
 wificonf
 zlib
diff --git a/openwrt/target/linux/imagebuilder/lists/pptp.brcm-2.4 b/openwrt/target/linux/imagebuilder/lists/pptp.brcm-2.4
index cfad67b1c1..f54b06d980 100644
--- a/openwrt/target/linux/imagebuilder/lists/pptp.brcm-2.4
+++ b/openwrt/target/linux/imagebuilder/lists/pptp.brcm-2.4
@@ -7,6 +7,7 @@ dropbear
 haserl
 ipkg
 iptables
+iwlib
 kmod-brcm-et
 kmod-brcm-wl
 kmod-diag
-- 
2.30.2