diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-11-23 17:12:54 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-11-23 17:12:54 +0000 |
| commit | 1a0728cfcf9e98da7a3184710a33c62e519e1844 (patch) | |
| tree | c11874448ab64db1a60e9cdb89a9d94f1de11233 | |
| parent | 26df34e35ffe671aa1b5d62f22f7f0edccea7f68 (diff) | |
hostapd: fix rebuild checks (#6210)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18497 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/package.mk | 2 | ||||
| -rw-r--r-- | package/hostapd/Makefile | 12 |
2 files changed, 12 insertions, 2 deletions
diff --git a/include/package.mk b/include/package.mk index 4ee9d71291..90aa51c595 100644 --- a/include/package.mk +++ b/include/package.mk @@ -17,7 +17,7 @@ include $(INCLUDE_DIR)/unpack.mk include $(INCLUDE_DIR)/depends.mk STAMP_PREPARED=$(PKG_BUILD_DIR)/.prepared$(if $(QUILT)$(DUMP),,_$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPENDS),))) -STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured$(if $(QUILT)$(DUMP),,_$(call confvar,$(PKG_CONFIG_DEPENDS))) +STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured$(if $(DUMP),,_$(call confvar,$(PKG_CONFIG_DEPENDS))) STAMP_BUILT:=$(PKG_BUILD_DIR)/.built STAMP_INSTALLED:=$(STAGING_DIR)/stamp/.$(PKG_NAME)_installed diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile index bb497fec3b..b1dde1c453 100644 --- a/package/hostapd/Makefile +++ b/package/hostapd/Makefile @@ -80,9 +80,19 @@ define Package/hostapd-utils/description 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/*.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 |