aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-08-19 15:12:54 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-08-19 15:12:54 +0000
commit2bb863f337025c138dc92f6c7cc4e3a378d27e36 (patch)
treea13dc6170734536f3f09aadbbdf02aa1eaadccb6
parent7c746b122fa8225305116d1f806c9ab7238335ab (diff)
downloadupstream-2bb863f337025c138dc92f6c7cc4e3a378d27e36.tar.gz
upstream-2bb863f337025c138dc92f6c7cc4e3a378d27e36.tar.bz2
upstream-2bb863f337025c138dc92f6c7cc4e3a378d27e36.zip
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
-rw-r--r--include/package-ipkg.mk6
1 files changed, 2 insertions, 4 deletions
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: