wireless_tools: Migrate to gentargets and fixes

Rename it from wireless-tools to wireless_tools to match upstream.
Make it install manpages.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/CHANGES b/CHANGES
index 64a60b363543967e9fbac05fc0373fa49cfc9054..aeaef6f4c79bfbf50f0d6512e3fbe5092c1675de 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -25,7 +25,8 @@
        mplayer, mysql_client, nbd, ncurses, neon, netcat, netperf,
        ntfsprogs, openssl, php, qt, quagga, sqlite, sdl, sdl_mixer,
        sdl_sound, sdl_ttf, squashfs, swfdec, thttpd, tn5250, tremor,
-       usbutils, webif, xkeyboard-config, xserver_xorg-server, xvkbd
+       usbutils, webif, wireless_tools, xkeyboard-config,
+       xserver_xorg-server, xvkbd
 
        Removed packages: modutils, portage, rxvt
 

diff --git a/package/Config.in b/package/Config.in
index fe96939332f51ee5b168db9453868787c44a606c..6b3616ab44451a2c79a20e5141e4d873ba08a593 100644 (file)
--- a/package/Config.in
+++ b/package/Config.in
@@ -435,7 +435,7 @@ source "package/webif/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/wget/Config.in"
 endif
-source "package/wireless-tools/Config.in"
+source "package/wireless_tools/Config.in"
 source "package/wpa_supplicant/Config.in"
 
 endmenu

diff --git a/package/wireless-tools/Config.in b/package/wireless-tools/Config.in
deleted file mode 100644 (file)
index efe28d2..0000000
--- a/package/wireless-tools/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config BR2_PACKAGE_WIRELESS_TOOLS
-       bool "wireless tools"
-       help
-         A collection of tools to configure wireless lan cards.
-
-         http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html

diff --git a/package/wireless-tools/wireless-tools.mk b/package/wireless-tools/wireless-tools.mk
deleted file mode 100644 (file)
index 9c16ff8..0000000
--- a/package/wireless-tools/wireless-tools.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-#############################################################
-#
-# wireless-tools - Wireless Tools
-#
-#############################################################
-
-# This Makefile only work with the multicall version of Wireless Tools,
-# which is available in 28-pre3 and later...
-# Jean II
-# v28.pre3 -> earliest possible
-WIRELESS_TOOLS_VERSION:=29
-WIRELESS_TOOLS_SUBVER:=
-
-WIRELESS_TOOLS_SOURCE_URL:=http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/
-WIRELESS_TOOLS_SOURCE:=wireless_tools.$(WIRELESS_TOOLS_VERSION)$(WIRELESS_TOOLS_SUBVER).tar.gz
-WIRELESS_TOOLS_BUILD_DIR=$(BUILD_DIR)/wireless_tools.$(WIRELESS_TOOLS_VERSION)
-
-$(DL_DIR)/$(WIRELESS_TOOLS_SOURCE):
-        $(call DOWNLOAD,$(WIRELESS_TOOLS_SOURCE_URL),$(WIRELESS_TOOLS_SOURCE))
-
-$(WIRELESS_TOOLS_BUILD_DIR)/.unpacked: $(DL_DIR)/$(WIRELESS_TOOLS_SOURCE)
-       $(ZCAT) $(DL_DIR)/$(WIRELESS_TOOLS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-       toolchain/patch-kernel.sh $(WIRELESS_TOOLS_BUILD_DIR) package/wireless-tools/ \*.patch
-       sed -i -e s:'strip':'$(STRIPCMD)':g $(WIRELESS_TOOLS_BUILD_DIR)/Makefile
-       touch $(WIRELESS_TOOLS_BUILD_DIR)/.unpacked
-
-$(WIRELESS_TOOLS_BUILD_DIR)/.configured: $(WIRELESS_TOOLS_BUILD_DIR)/.unpacked
-       touch $(WIRELESS_TOOLS_BUILD_DIR)/.configured
-
-$(WIRELESS_TOOLS_BUILD_DIR)/iwmulticall: $(WIRELESS_TOOLS_BUILD_DIR)/.configured
-       $(MAKE) -C $(WIRELESS_TOOLS_BUILD_DIR) \
-               CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
-               iwmulticall
-
-$(TARGET_DIR)/sbin/iwconfig: $(WIRELESS_TOOLS_BUILD_DIR)/iwmulticall
-       $(MAKE) -C $(WIRELESS_TOOLS_BUILD_DIR) \
-               PREFIX="$(TARGET_DIR)" \
-               CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
-               install-iwmulticall
-
-wireless-tools: $(TARGET_DIR)/sbin/iwconfig
-
-wireless-tools-source: $(DL_DIR)/$(WIRELESS_TOOLS_SOURCE)
-
-wireless-tools-clean:
-       $(MAKE) DESTDIR=$(TARGET_DIR) CC="$(TARGET_CC)" -C $(WIRELESS_TOOLS_BUILD_DIR) uninstall
-       -$(MAKE) -C $(WIRELESS_TOOLS_BUILD_DIR) clean
-
-wireless-tools-dirclean:
-       rm -rf $(WIRELESS_TOOLS_BUILD_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_WIRELESS_TOOLS),y)
-TARGETS+=wireless-tools
-endif

diff --git a/package/wireless-tools/wireless_tools.29-remove-bzero.patch b/package/wireless-tools/wireless_tools.29-remove-bzero.patch
deleted file mode 100644 (file)
index 4714b31..0000000
--- a/package/wireless-tools/wireless_tools.29-remove-bzero.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/iwlib.c  2007-06-29 19:43:31.000000000 -0400
-+++ b/iwlib.c  2008-03-12 14:18:48.000000000 -0400
-@@ -475,7 +475,7 @@ iw_get_range_info(int              skfd,
-   union iw_range_raw *        range_raw;
- 
-   /* Cleanup */
--  bzero(buffer, sizeof(buffer));
-+  memset(buffer, 0, sizeof(buffer));
- 
-   wrq.u.data.pointer = (caddr_t) buffer;
-   wrq.u.data.length = sizeof(buffer);
-@@ -504,7 +504,7 @@ iw_get_range_info(int              skfd,
-   else
-     {
-       /* Zero unknown fields */
--      bzero((char *) range, sizeof(struct iw_range));
-+      memset((char *) range, 0, sizeof(struct iw_range));
- 
-       /* Initial part unmoved */
-       memcpy((char *) range,
-@@ -2960,7 +2960,7 @@ iw_process_scanning_token(struct iw_even
-       oldwscan->next = wscan;
- 
-       /* Reset it */
--      bzero(wscan, sizeof(struct wireless_scan));
-+      memset(wscan, 0, sizeof(struct wireless_scan));
- 
-       /* Save cell identifier */
-       wscan->has_ap_addr = 1;

diff --git a/package/wireless_tools/Config.in b/package/wireless_tools/Config.in
new file mode 100644 (file)
index 0000000..efe28d2
--- /dev/null
+++ b/package/wireless_tools/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_WIRELESS_TOOLS
+       bool "wireless tools"
+       help
+         A collection of tools to configure wireless lan cards.
+
+         http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html

diff --git a/package/wireless_tools/wireless_tools-29-remove-bzero.patch b/package/wireless_tools/wireless_tools-29-remove-bzero.patch
new file mode 100644 (file)
index 0000000..4714b31
--- /dev/null
+++ b/package/wireless_tools/wireless_tools-29-remove-bzero.patch
@@ -0,0 +1,29 @@
+--- a/iwlib.c  2007-06-29 19:43:31.000000000 -0400
++++ b/iwlib.c  2008-03-12 14:18:48.000000000 -0400
+@@ -475,7 +475,7 @@ iw_get_range_info(int              skfd,
+   union iw_range_raw *        range_raw;
+ 
+   /* Cleanup */
+-  bzero(buffer, sizeof(buffer));
++  memset(buffer, 0, sizeof(buffer));
+ 
+   wrq.u.data.pointer = (caddr_t) buffer;
+   wrq.u.data.length = sizeof(buffer);
+@@ -504,7 +504,7 @@ iw_get_range_info(int              skfd,
+   else
+     {
+       /* Zero unknown fields */
+-      bzero((char *) range, sizeof(struct iw_range));
++      memset((char *) range, 0, sizeof(struct iw_range));
+ 
+       /* Initial part unmoved */
+       memcpy((char *) range,
+@@ -2960,7 +2960,7 @@ iw_process_scanning_token(struct iw_even
+       oldwscan->next = wscan;
+ 
+       /* Reset it */
+-      bzero(wscan, sizeof(struct wireless_scan));
++      memset(wscan, 0, sizeof(struct wireless_scan));
+ 
+       /* Save cell identifier */
+       wscan->has_ap_addr = 1;

diff --git a/package/wireless_tools/wireless_tools.mk b/package/wireless_tools/wireless_tools.mk
new file mode 100644 (file)
index 0000000..0707808
--- /dev/null
+++ b/package/wireless_tools/wireless_tools.mk
@@ -0,0 +1,30 @@
+#############################################################
+#
+# wireless_tools
+#
+#############################################################
+
+WIRELESS_TOOLS_VERSION = 29
+WIRELESS_TOOLS_SITE = http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux
+WIRELESS_TOOLS_SOURCE = wireless_tools.$(WIRELESS_TOOLS_VERSION).tar.gz
+
+define WIRELESS_TOOLS_BUILD_CMDS
+       $(MAKE) -C $(@D) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
+               iwmulticall
+endef
+
+define WIRELESS_TOOLS_CLEAN_CMDS
+       $(MAKE) -C $(@D) clean
+       rm -f $(@D)/iwmulticall
+endef
+
+define WIRELESS_TOOLS_INSTALL_TARGET_CMDS
+       $(MAKE) -C $(@D) PREFIX="$(TARGET_DIR)" install-iwmulticall
+       $(MAKE) -C $(@D) INSTALL_MAN="$(TARGET_DIR)/usr/share/man" install-man
+endef
+
+define WIRELESS_TOOLS_UNINSTALL_TARGET_CMDS
+       $(MAKE) -C $(@D) PREFIX="$(TARGET_DIR)" uninstall
+endef
+
+$(eval $(call GENTARGETS,package,wireless_tools))