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/hostapd | |
| 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/hostapd')
| -rw-r--r-- | package/hostapd/Makefile | 11 | ||||
| -rw-r--r-- | package/hostapd/files/hostapd.conffiles (renamed from package/hostapd/ipkg/hostapd.conffiles) | 0 | ||||
| -rw-r--r-- | package/hostapd/ipkg/hostapd-utils.control | 5 | ||||
| -rw-r--r-- | package/hostapd/ipkg/hostapd.control | 6 |
4 files changed, 7 insertions, 15 deletions
diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile index f33a61f4d..faf9fbdaa 100644 --- a/package/hostapd/Makefile +++ b/package/hostapd/Makefile @@ -9,17 +9,20 @@ PKG_NAME:= hostapd PKG_VERSION:= 0.6.9 PKG_RELEASE:= 1 PKG_MD5SUM:= 83630d11fa66ade9091f1b304fccd74c -MASTER_SITES:= http://hostap.epitest.fi/releases/ +PKG_DESCR:= an IEEE 802.11 AP, IEEE 802.1x/WPA/WPA2/EAP/RADIUS Authenticator +PKG_SECTION:= net +PKG_DEPENDS:= libopenssl +PKG_URL:= http://hostap.epitest.fi +PKG_SITES:= http://hostap.epitest.fi/releases/ WRKSRC= ${WRKDIST}/${PKG_NAME} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,HOSTAPD,hostapd,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,HOSTAPD_UTILS,hostapd-utils,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,HOSTAPD,hostapd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,HOSTAPD_UTILS,hostapd-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) BUILD_STYLE= auto -#MAKE_FLAGS+= OPTFLAGS="${TARGET_CFLAGS}" do-configure: ${CP} ./files/hostapd.config ${WRKBUILD}/.config diff --git a/package/hostapd/ipkg/hostapd.conffiles b/package/hostapd/files/hostapd.conffiles index f61980010..f61980010 100644 --- a/package/hostapd/ipkg/hostapd.conffiles +++ b/package/hostapd/files/hostapd.conffiles diff --git a/package/hostapd/ipkg/hostapd-utils.control b/package/hostapd/ipkg/hostapd-utils.control deleted file mode 100644 index 5f8d82d9c..000000000 --- a/package/hostapd/ipkg/hostapd-utils.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: hostapd-utils -Priority: optional -Section: net -Depends: hostapd -Description: an IEEE 802.11 AP, IEEE 802.1x/WPA/WPA2/EAP/RADIUS Authenticator (CLI utility) diff --git a/package/hostapd/ipkg/hostapd.control b/package/hostapd/ipkg/hostapd.control deleted file mode 100644 index cb2dac672..000000000 --- a/package/hostapd/ipkg/hostapd.control +++ /dev/null @@ -1,6 +0,0 @@ -Package: hostapd -Priority: optional -Section: net -Depends: kmod-madwifi, libopenssl -Provides: hostpad -Description: an IEEE 802.11 AP, IEEE 802.1x/WPA/WPA2/EAP/RADIUS Authenticator |