diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/iw | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/iw')
| -rw-r--r-- | package/iw/Makefile | 10 | ||||
| -rw-r--r-- | package/iw/ipkg/iw.control | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/package/iw/Makefile b/package/iw/Makefile index f651112fc..8e153b5cc 100644 --- a/package/iw/Makefile +++ b/package/iw/Makefile @@ -9,13 +9,17 @@ PKG_NAME:= iw PKG_VERSION:= 0.9.14 PKG_RELEASE:= 1 PKG_MD5SUM:= b5059cfe86bc7664511b79c159635a8f -MASTER_SITES:= http://wireless.kernel.org/download/iw/ -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +PKG_DESCR:= Tools for setting up WiFi cards via netlink (nl80211) +PKG_SECTION:= net +PKG_DEPENDS:= libnl +PKG_URL:= http://wireless.kernel.org/en/users/Documentation/iw +PKG_SITES:= http://wireless.kernel.org/download/iw/ +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,IW,iw,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,IW,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) XAKE_FLAGS:= V=1 BUILD_STYLE:= auto diff --git a/package/iw/ipkg/iw.control b/package/iw/ipkg/iw.control deleted file mode 100644 index b6246b4df..000000000 --- a/package/iw/ipkg/iw.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: iw -Priority: optional -Section: net -Description: Tools for setting up WiFi cards via netlink (nl80211) |