qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 00:30:16 +02:00
Code

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

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17313 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2009-08-19 15:12:54 +00:00
parent 38b0a09fbc
commit a5ee1ea114
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/package-ipkg.mk
View File

@ -57,8 +57,9 @@ ifeq ($(DUMP),)
$(eval $(call BuildIPKGVariable,$(1),postinst)) $(eval $(call BuildIPKGVariable,$(1),postinst))
$(eval $(call BuildIPKGVariable,$(1),prerm)) $(eval $(call BuildIPKGVariable,$(1),prerm))
$(eval $(call BuildIPKGVariable,$(1),postrm)) $(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 -f $(PACKAGE_DIR)/$(1)_*
rm -rf $$(IDIR_$(1))
mkdir -p $$(IDIR_$(1))/CONTROL mkdir -p $$(IDIR_$(1))/CONTROL
echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control
echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control
@ -107,9 +108,6 @@ ifeq ($(DUMP),)
clean: $(1)-clean clean: $(1)-clean
$(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH): $(STAMP_PREPARED)
-@rm -f $(PKG_BUILD_DIR)/.version-$(1)_* 2>/dev/null
@touch $$@
endef endef
$(STAGING_DIR)/etc/ipkg.conf: $(STAGING_DIR)/etc/ipkg.conf: