projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refresh patch
[openwrt.git]
/
package
/
hostapd
/
Makefile
diff --git
a/package/hostapd/Makefile
b/package/hostapd/Makefile
index
606ec67
..
6b46796
100644
(file)
--- a/
package/hostapd/Makefile
+++ b/
package/hostapd/Makefile
@@
-8,9
+8,9
@@
include $(TOPDIR)/rules.mk
PKG_NAME:=hostapd
include $(TOPDIR)/rules.mk
PKG_NAME:=hostapd
-PKG_VERSION:=20
091111
+PKG_VERSION:=20
100108
PKG_RELEASE:=1
PKG_RELEASE:=1
-PKG_REV:=d
c6d9ac250f793a62b21ca828445967fb484305f
+PKG_REV:=d
97572a40fd7ec77094e2e4ef83424a4c0f7e24d
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=git://w1.fi/srv/git/hostap.git
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=git://w1.fi/srv/git/hostap.git
@@
-80,9
+80,19
@@
define Package/hostapd-utils/description
IEEE 802.1x/WPA/EAP/RADIUS Authenticator.
endef
IEEE 802.1x/WPA/EAP/RADIUS Authenticator.
endef
-define Build/Configure
+ifneq ($(wildcard $(PKG_BUILD_DIR)/.config_*),$(subst .configured_,.config_,$(STAMP_CONFIGURED)))
+ $(warning $(wildcard $(PKG_BUILD_DIR)/.config_*) != $(subst .configured_,.config_,$(STAMP_CONFIGURED)))
+ define Build/Configure/rebuild
rm -f $(PKG_BUILD_DIR)/hostapd/hostapd
rm -f $(PKG_BUILD_DIR)/hostapd/hostapd
+ rm -f $(PKG_BUILD_DIR)/hostapd/*.o
rm -f $(PKG_BUILD_DIR)/src/drivers/drivers.o
rm -f $(PKG_BUILD_DIR)/src/drivers/drivers.o
+ rm -f $(PKG_BUILD_DIR)/.config_*
+ touch $(subst .configured_,.config_,$(STAMP_CONFIGURED))
+ endef
+endif
+
+define Build/Configure
+ $(Build/Configure/rebuild)
$(CP) ./files/$(BUILD_VARIANT).config $(PKG_BUILD_DIR)/hostapd/.config
endef
$(CP) ./files/$(BUILD_VARIANT).config $(PKG_BUILD_DIR)/hostapd/.config
endef
@@
-108,22
+118,19
@@
define Build/Compile
hostapd hostapd_cli
endef
hostapd hostapd_cli
endef
-define Package/InstallTemplate
+define Package/hostapd/install
+ $(INSTALL_DIR) $(1)/etc/hotplug.d/net
+ $(INSTALL_DATA) ./files/hostapd.hotplug $(1)/etc/hotplug.d/net/
$(INSTALL_DIR) $(1)/lib/wifi
$(INSTALL_DATA) ./files/hostapd.sh $(1)/lib/wifi/hostapd.sh
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/hostapd/hostapd $(1)/usr/sbin/
endef
$(INSTALL_DIR) $(1)/lib/wifi
$(INSTALL_DATA) ./files/hostapd.sh $(1)/lib/wifi/hostapd.sh
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/hostapd/hostapd $(1)/usr/sbin/
endef
-
-ifeq ($(BUILD_VARIANT),full)
- Package/hostapd/install = $(Package/InstallTemplate)
-else
- Package/hostapd-mini/install = $(Package/InstallTemplate)
-endif
+Package/hostapd-mini/install = $(Package/hostapd/install)
define Package/hostapd-utils/install
$(INSTALL_DIR) $(1)/usr/sbin
define Package/hostapd-utils/install
$(INSTALL_DIR) $(1)/usr/sbin
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/hostapd_cli $(1)/usr/sbin/
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/hostapd
/hostapd
_cli $(1)/usr/sbin/
endef
$(eval $(call BuildPackage,hostapd))
endef
$(eval $(call BuildPackage,hostapd))
This page took
0.024551 seconds
and
4
git commands to generate.