diff options
Diffstat (limited to 'package/iw')
| -rw-r--r-- | package/iw/Config.in | 7 | ||||
| -rw-r--r-- | package/iw/Makefile | 11 | ||||
| -rw-r--r-- | package/iw/patches/patch-Makefile | 12 | ||||
| -rw-r--r-- | package/iw/patches/patch-version_sh | 17 |
4 files changed, 17 insertions, 30 deletions
diff --git a/package/iw/Config.in b/package/iw/Config.in deleted file mode 100644 index 16b88454d..000000000 --- a/package/iw/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config ADK_PACKAGE_IW - prompt "iw................................ Tools for manipulating Linux Wireless cards" - tristate - select ADK_PACKAGE_LIBNL - default n - help - Tools for configuring Wireless Adapters. diff --git a/package/iw/Makefile b/package/iw/Makefile index 2f63420c0..4d55ffd28 100644 --- a/package/iw/Makefile +++ b/package/iw/Makefile @@ -4,12 +4,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= iw -PKG_VERSION:= 0.9.14 +PKG_VERSION:= 0.9.19 PKG_RELEASE:= 1 -PKG_MD5SUM:= b5059cfe86bc7664511b79c159635a8f +PKG_MD5SUM:= 3b88743f9c6ce8a7e2f5fd7d18fdea42 PKG_DESCR:= Tools for setting up WiFi cards via netlink (nl80211) PKG_SECTION:= net PKG_DEPENDS:= libnl +PKG_BUILDDEP+= libnl PKG_URL:= http://wireless.kernel.org/en/users/Documentation/iw PKG_SITES:= http://wireless.kernel.org/download/iw/ @@ -19,12 +20,10 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,IW,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -XAKE_FLAGS:= V=1 -BUILD_STYLE:= auto -INSTALL_STYLE:= auto +CONFIG_STYLE:= manual post-install: ${INSTALL_DIR} ${IDIR_IW}/usr/sbin - ${INSTALL_BIN} ${WRKINST}/usr/bin/iw ${IDIR_IW}/usr/sbin + ${INSTALL_BIN} ${WRKINST}/usr/sbin/iw ${IDIR_IW}/usr/sbin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/iw/patches/patch-Makefile b/package/iw/patches/patch-Makefile index 32ef25f93..4c95aee80 100644 --- a/package/iw/patches/patch-Makefile +++ b/package/iw/patches/patch-Makefile @@ -1,11 +1,11 @@ ---- iw-0.9.14.orig/Makefile 2009-05-13 00:10:08.000000000 +0200 -+++ iw-0.9.14/Makefile 2009-06-13 09:45:08.000000000 +0200 -@@ -81,10 +81,10 @@ check: +--- iw-0.9.18.orig/Makefile 2009-11-20 17:35:56.000000000 +0100 ++++ iw-0.9.18/Makefile 2010-01-04 23:00:34.031210816 +0100 +@@ -86,10 +86,10 @@ check: install: iw iw.8.gz @$(NQ) ' INST iw' - $(Q)$(MKDIR) $(DESTDIR)$(BINDIR) -- $(Q)$(INSTALL) -m 755 -t $(DESTDIR)$(BINDIR) iw -+ $(Q)$(INSTALL) -m 755 iw $(DESTDIR)$(BINDIR) + $(Q)$(MKDIR) $(DESTDIR)$(SBINDIR) +- $(Q)$(INSTALL) -m 755 -t $(DESTDIR)$(SBINDIR) iw ++ $(Q)$(INSTALL) -m 755 iw $(DESTDIR)$(SBINDIR) @$(NQ) ' INST iw.8' $(Q)$(MKDIR) $(DESTDIR)$(MANDIR)/man8/ - $(Q)$(INSTALL) -m 644 -t $(DESTDIR)$(MANDIR)/man8/ iw.8.gz diff --git a/package/iw/patches/patch-version_sh b/package/iw/patches/patch-version_sh index b4f0fc044..dfc939354 100644 --- a/package/iw/patches/patch-version_sh +++ b/package/iw/patches/patch-version_sh @@ -1,13 +1,9 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- iw-0.9.14.orig/version.sh 2009-05-13 00:10:08.000000000 +0200 -+++ iw-0.9.14/version.sh 2009-05-21 23:14:24.000000000 +0200 -@@ -1,23 +1,7 @@ --#!/bin/sh -+#!/usr/bin/env bash +--- iw-0.9.17.orig/version.sh 2009-08-26 11:41:41.000000000 +0200 ++++ iw-0.9.17/version.sh 2009-11-20 23:11:10.000000000 +0100 +@@ -5,20 +5,6 @@ OUT="$1" + + echo '#include "iw.h"' > "$OUT" - VERSION="0.9.14" - OUT="$1" -- -if head=`git rev-parse --verify HEAD 2>/dev/null`; then - git update-index --refresh --unmerged > /dev/null - descr=$(git describe) @@ -16,7 +12,6 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ - # is correct... - [ "${descr%%-*}" = "v$VERSION" ] || exit 2 - -- echo -n 'const char iw_version[] = "' > "$OUT" - v="${descr#v}" - if git diff-index --name-only HEAD | read dummy ; then - v="$v"-dirty @@ -26,4 +21,4 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ -fi +v="$VERSION" - echo "const char iw_version[] = \"$v\";" > "$OUT" + echo "const char iw_version[] = \"$v\";" >> "$OUT" |