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/mac80211 | |
| 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/mac80211')
| -rw-r--r-- | package/mac80211/Makefile | 17 | ||||
| -rw-r--r-- | package/mac80211/ipkg/kmod-mac80211-ath5k.control | 4 | ||||
| -rw-r--r-- | package/mac80211/ipkg/kmod-mac80211-rt61.control | 4 | ||||
| -rw-r--r-- | package/mac80211/ipkg/kmod-mac80211.control | 4 |
4 files changed, 12 insertions, 17 deletions
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index df5ea86dc..48b418bfc 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -9,16 +9,23 @@ PKG_NAME:= mac80211 PKG_VERSION:= 2009-05-01 PKG_RELEASE:= 1 PKG_MD5SUM:= abc949ec3f7cc57302cca814d9b9c6cd -DISTFILES:= compat-wireless-${PKG_VERSION}.tar.bz2 -MASTER_SITES:= http://www.orbit-lab.org/kernel/compat-wireless-2.6/2009/05/ \ +PKG_DESCR:= Linux wireless framework (SoftMAC) +PKG_SECTION:= kernel +PKG_URL:= http://wireless.kernel.org +PKG_SITES:= http://www.orbit-lab.org/kernel/compat-wireless-2.6/2009/05/ \ http://wireless.kernel.org/download/compat-wireless-2.6/ + +PKG_DESCR_1:= ath5k driver +PKG_DESCR_2:= rt61/rt2x00 driver + +DISTFILES:= compat-wireless-${PKG_VERSION}.tar.bz2 WRKDIST= ${WRKDIR}/compat-wireless-${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,KMOD_MAC80211,kmod-mac80211,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel (${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE}))) -$(eval $(call PKG_template,KMOD_MAC80211_ATH5K,kmod-mac80211-ath5k,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel (${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE}))) -$(eval $(call PKG_template,KMOD_MAC80211_RT61,kmod-mac80211-rt61,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel (${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE}))) +$(eval $(call PKG_template,KMOD_MAC80211,kmod-mac80211,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel ${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE},${PKG_DESCR},{PKG_SECTION})) +$(eval $(call PKG_template,KMOD_MAC80211_ATH5K,kmod-mac80211-ath5k,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel ${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE},${PKG_DESCR},{PKG_SECTION})) +$(eval $(call PKG_template,KMOD_MAC80211_RT61,kmod-mac80211-rt61,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel ${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE},${PKG_DESCR},{PKG_SECTION})) BUILD_STYLE:= auto INSTALL_STYLE:= manual diff --git a/package/mac80211/ipkg/kmod-mac80211-ath5k.control b/package/mac80211/ipkg/kmod-mac80211-ath5k.control deleted file mode 100644 index a495868d2..000000000 --- a/package/mac80211/ipkg/kmod-mac80211-ath5k.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: kmod-mac80211-ath5k -Priority: optional -Section: net -Description: Linux wireless driver for ath5k diff --git a/package/mac80211/ipkg/kmod-mac80211-rt61.control b/package/mac80211/ipkg/kmod-mac80211-rt61.control deleted file mode 100644 index 5684dd8e8..000000000 --- a/package/mac80211/ipkg/kmod-mac80211-rt61.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: kmod-mac80211-rt61 -Priority: optional -Section: net -Description: Linux wireless driver for Ralink rt61/rt2501 diff --git a/package/mac80211/ipkg/kmod-mac80211.control b/package/mac80211/ipkg/kmod-mac80211.control deleted file mode 100644 index bf8ae1f4e..000000000 --- a/package/mac80211/ipkg/kmod-mac80211.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: kmod-mac80211 -Priority: optional -Section: net -Description: Linux wireless framwork |