X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/c3b88d8b5e47898e1941074d62ad7e979b42bad9..a7d37003016b53ca8612384353754052545f257e:/package/hostapd/Makefile

diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index ac45e7f7b..b7a7d5e11 100644
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -1,77 +1,132 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 # $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hostapd
-PKG_VERSION:=0.5.2
+PKG_VERSION:=0.5.7
 PKG_RELEASE:=1
-PKG_MD5SUM:=b7f4739ca4758798f8dc3b1ea9fd00d0
 
-PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
+PKG_MD5SUM:=d5113247dc6ee17106e6bc7cb89aa507
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-include $(TOPDIR)/package/rules.mk
+PKG_BUILD_DEPENDS:=madwifi
 
-define PKG_build
+include $(INCLUDE_DIR)/package.mk
 
-ifneq ($(BR2_PACKAGE_$(1)),)
-BUILD_TARGETS += $(PKG_INSTALL_DIR)/$(2)/hostapd
-endif
+define Package/hostapd/Default
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=IEEE 802.1x Authenticator
+  URL:=http://hostap.epitest.fi/
+endef
 
-$(PKG_INSTALL_DIR)/$(2)/hostapd: $(PKG_BUILD_DIR)/.prepared
-	-$(MAKE) -C $(PKG_BUILD_DIR) clean
-	$(CP) ./files/$(2).config $(PKG_BUILD_DIR)/.config
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		OPTFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include/madwifi" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-		hostapd
-	mkdir -p $(PKG_INSTALL_DIR)/$(2)
-	$(CP) $(PKG_BUILD_DIR)/hostapd $(PKG_INSTALL_DIR)/$(2)/
-	touch $$@
-
-$$(IPKG_$(1)): $(PKG_INSTALL_DIR)/$(2)/hostapd
-	install -m0755 -d $$(IDIR_$(1))/etc
-	install -m0600 $(PKG_BUILD_DIR)/madwifi.conf $$(IDIR_$(1))/etc/hostapd.conf
-	install -m0755 -d $$(IDIR_$(1))/usr/sbin
-	install -m0755 $(PKG_INSTALL_DIR)/$(2)/hostapd $$(IDIR_$(1))/usr/sbin/
-	$(RSTRIP) $$(IDIR_$(1))
-	$(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
+define Package/hostapd
+  $(call Package/hostapd/Default)
+  DEPENDS:=+libopenssl
+  TITLE+= (full)
+  DESCRIPTION:=\
+	This package contains a full featured IEEE 802.1x/WPA/EAP/RADIUS \\\
+	Authenticator.
+endef
+
+define Package/hostapd/conffiles
+/etc/hostapd.conf
+endef
 
+define Package/hostapd-mini
+  $(call Package/hostapd/Default)
+  TITLE+= (WPA-PSK only)
+  DESCRIPTION:=\
+	This package contains a minimal IEEE 802.1x/WPA/EAP/RADIUS Authenticator \\\
+	(WPA-PSK only).
 endef
 
-$(eval $(call PKG_template,HOSTAPD,hostapd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,HOSTAPD_MINI,hostapd-mini,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,HOSTAPD_UTILS,hostapd-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+define Package/hostapd-mini/conffiles
+/etc/hostapd.conf
+endef
 
-$(eval $(call PKG_build,HOSTAPD,hostapd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_build,HOSTAPD_MINI,hostapd-mini,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+define Package/hostapd-utils
+  $(call Package/hostapd/Default)
+  DEPENDS:=@PACKAGE_hostapd||PACKAGE_hostapd-mini
+  TITLE+= (utils)
+  DESCRIPTION:=\
+	This package contains a command line utility to control the \\\
+	IEEE 802.1x/WPA/EAP/RADIUS Authenticator.
+endef
 
-$(PKG_BUILD_DIR)/.configured:
-	$(CP) ./files/hostapd.config $(PKG_BUILD_DIR)/.config
-	touch $@
+define Build/ConfigureTarget
+	$(CP) $(PKG_BUILD_DIR) $(PKG_BUILD_DIR)_$(1)
+	$(CP) ./files/$(1).config $(PKG_BUILD_DIR)_$(1)/.config
+endef
 
-$(PKG_BUILD_DIR)/.built: $(BUILD_TARGETS)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
+define Build/CompileTarget
+	$(MAKE) -C $(PKG_BUILD_DIR)_$(1) \
 		$(TARGET_CONFIGURE_OPTS) \
 		OPTFLAGS="$(TARGET_CFLAGS)" \
 		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include/madwifi" \
 		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-		hostapd_cli
-	touch $@
+		hostapd hostapd_cli
+	$(CP) $(PKG_BUILD_DIR)_$(1)/hostapd_cli $(PKG_BUILD_DIR)/
+endef
+
+define Package/InstallTemplate
+	if [ \! -f "$(PKG_BUILD_DIR)_$(2)/hostapd" ]; then \
+		rm -f $(PKG_BUILD_DIR)/.built; \
+		$(MAKE) $(PKG_BUILD_DIR)/.built; \
+	fi
+	$(INSTALL_DIR) $$(1)/etc
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)_$(2)/madwifi.conf $$(1)/etc/hostapd.conf
+	$(INSTALL_DIR) $$(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)_$(2)/hostapd $$(1)/usr/sbin/
+endef
+
+define Package/Template
+ ifneq ($(CONFIG_PACKAGE_$(1)),)
+  define Build/Configure/$(2)
+	$(call Build/ConfigureTarget,$(2))
+  endef
+  define Build/Compile/$(2)
+	$(call Build/CompileTarget,$(2))
+  endef
+  define Package/$(1)/install
+	$(call Package/InstallTemplate,$(1),$(2))
+  endef
+ endif
+endef
+
+define Build/Configure
+	$(call Build/Configure/default)
+	$(call Build/Configure/mini)
+endef
+
+define Build/Compile
+	$(call Build/Compile/default)
+	$(call Build/Compile/mini)
+endef
 
-$(IPKG_HOSTAPD_UTILS): $(PKG_BUILD_DIR)/.built
-	install -m0755 -d $(IDIR_HOSTAPD_UTILS)/usr/sbin
-	install -m0755 $(PKG_BUILD_DIR)/hostapd_cli $(IDIR_HOSTAPD_UTILS)/usr/sbin/
-	$(RSTRIP) $(IDIR_HOSTAPD_UTILS)
-	$(IPKG_BUILD) $(IDIR_HOSTAPD_UTILS) $(PACKAGE_DIR)
+define Build/Clean
+	rm -rf $(PKG_BUILD_DIR)_default
+	rm -rf $(PKG_BUILD_DIR)_mini
+endef
+
+define Package/hostapd-utils/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/hostapd_cli $(1)/usr/sbin/
+endef
 
-mostlyclean:
-	-$(MAKE) -C $(PKG_BUILD_DIR) clean
-	rm -f $(PKG_BUILD_DIR)/.built
+$(eval $(call Package/Template,hostapd,default))
+$(eval $(call Package/Template,hostapd-mini,mini))
 
+$(eval $(call BuildPackage,hostapd))
+$(eval $(call BuildPackage,hostapd-mini))
+$(eval $(call BuildPackage,hostapd-utils))