X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/0988e52bb412c814fb9d277887f7ed0a3d249353..495ea3c8471821855f1fc06ef5f66ffa05fabe62:/package/wpa_supplicant/Makefile?ds=sidebyside diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile index 1f798d27f..ed6e45588 100644 --- a/package/wpa_supplicant/Makefile +++ b/package/wpa_supplicant/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006 OpenWrt.org +# +# Copyright (C) 2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,20 +9,23 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wpa_supplicant -PKG_VERSION:=0.5.7 +PKG_VERSION:=0.6.3 PKG_RELEASE:=1 -PKG_MD5SUM:=bd2436392ad3c6d2513da701a12f2d27 +PKG_MD5SUM:=b51b2975f21006f85f7297f3fb1acde1 PKG_SOURCE_URL:=http://hostap.epitest.fi/releases PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_BUILD_DEPENDS:=madwifi + include $(INCLUDE_DIR)/package.mk +STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_kmod-madwifi CONFIG_WPA_SUPPLICANT_NO_TIMESTAMP_CHECK) define Package/wpa-supplicant SECTION:=net CATEGORY:=Network - DEPENDS:=+libopenssl TITLE:=WPA Supplicant + DEPENDS:=$(if $(CONFIG_WPA_SUPPLICANT_OPENSSL),+libopenssl) URL:=http://hostap.epitest.fi/wpa_supplicant/ endef @@ -30,6 +33,10 @@ define Package/wpa-supplicant/Description WPA Supplicant endef +define Package/wpa-supplicant/config + source "$(SOURCE)/Config.in" +endef + define Package/wpa-cli SECTION:=net CATEGORY:=Network @@ -38,53 +45,44 @@ define Package/wpa-cli endef define Package/wpa-cli/Description - + WPA Supplicant control utility endef -define Package/wpa-passphrase - SECTION:=net - CATEGORY:=Network - DEPENDS:=wpa-supplicant - TITLE:=Set WPA passphrase for a SSID -endef - -define Package/wpa-passphrase/Description - -endef +CONFIG=$(firstword $(wildcard ./files/config.$(BOARD) ./files/config.$(ARCH) ./config)) +TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/madwifi $(if $(CONFIG_WPA_SUPPLICANT_NO_TIMESTAMP_CHECK),-DNO_TIMESTAMP_CHECK) define Build/Configure - cp ./files/config.$(ARCH) $(PKG_BUILD_DIR)/.config + cp $(CONFIG) $(PKG_BUILD_DIR)/wpa_supplicant/.config + $(if $(CONFIG_PACKAGE_kmod-madwifi),,$(SED) 's,^CONFIG_DRIVER_MADWIFI,#CONFIG_DRIVER_MADWIFI,g' $(PKG_BUILD_DIR)/wpa_supplicant/.config) + $(if $(CONFIG_WPA_SUPPLICANT_OPENSSL),$(SED) 's|^CONFIG_TLS.*|CONFIG_TLS=openssl|g' $(PKG_BUILD_DIR)/wpa_supplicant/.config) endef define Build/Compile rm -rf $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR) - $(MAKE) -C $(PKG_BUILD_DIR) \ + CFLAGS="$(TARGET_CFLAGS)" \ + $(MAKE) -C $(PKG_BUILD_DIR)/wpa_supplicant \ CC="$(TARGET_CC)" \ KERNEL=$(LINUX_DIR) \ CPPFLAGS="$(TARGET_CPPFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" \ all - $(STRIP) $(PKG_BUILD_DIR)/wpa_supplicant - $(STRIP) $(PKG_BUILD_DIR)/wpa_cli - endef define Package/wpa-supplicant/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_BUILD_DIR)/wpa_supplicant $(1)/usr/sbin/ + $(CP) \ + $(PKG_BUILD_DIR)/wpa_supplicant/wpa_supplicant \ + $(PKG_BUILD_DIR)/wpa_supplicant/wpa_passphrase \ + $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/lib/wifi + $(INSTALL_DATA) ./files/wpa_supplicant.sh $(1)/lib/wifi/wpa_supplicant.sh endef define Package/wpa-cli/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_BUILD_DIR)/wpa_cli $(1)/usr/sbin/ -endef - -define Package/wpa-passphrase/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/wpa_passphrase $(1)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/wpa_supplicant/wpa_cli $(1)/usr/sbin/ endef $(eval $(call BuildPackage,wpa-supplicant)) $(eval $(call BuildPackage,wpa-cli)) -$(eval $(call BuildPackage,wpa-passphrase))