mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-03 14:54:11 +08:00
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
This commit is contained in:
parent
7c746b122f
commit
2bb863f337
@ -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:
|
||||||
|
Loading…
Reference in New Issue
Block a user