From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 19 Aug 2009 15:12:54 +0000 (+0000)
Subject: when regenerating an ipkg package, make sure the entire ipkg build dir is cleaned... 
X-Git-Tag: reboot~22635
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=2bb863f337025c138dc92f6c7cc4e3a378d27e36

when regenerating an ipkg package, make sure the entire ipkg build dir is cleaned as well to prevent stale files from making it into the package after configuration changes

SVN-Revision: 17313
---

diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index 72d6d596b7..5d5c826842 100644
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -57,8 +57,9 @@ ifeq ($(DUMP),)
     $(eval $(call BuildIPKGVariable,$(1),postinst))
     $(eval $(call BuildIPKGVariable,$(1),prerm))
     $(eval $(call BuildIPKGVariable,$(1),postrm))
-    $$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH)
+    $$(IDIR_$(1))/CONTROL/control: $(STAMP_BUILT)
 	@rm -f $(PACKAGE_DIR)/$(1)_*
+	rm -rf $$(IDIR_$(1))
 	mkdir -p $$(IDIR_$(1))/CONTROL
 	echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control
 	echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control
@@ -107,9 +108,6 @@ ifeq ($(DUMP),)
 
     clean: $(1)-clean
 
-    $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH): $(STAMP_PREPARED)
-	-@rm -f $(PKG_BUILD_DIR)/.version-$(1)_* 2>/dev/null
-	@touch $$@
   endef
 
   $(STAGING_DIR)/etc/ipkg.conf: