diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2009-08-20 15:48:41 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2009-08-20 15:48:41 +0000 |
| commit | 822615cb6b189377f8cdbe326f6a32dc8b3bd386 (patch) | |
| tree | b8541146be30e763dc6f3df13ee5c45270f54e01 | |
| parent | f08684ffc0415425c29e4a4ddc51ddd882bbf5fc (diff) | |
| download | upstream-822615cb6b189377f8cdbe326f6a32dc8b3bd386.tar.gz upstream-822615cb6b189377f8cdbe326f6a32dc8b3bd386.tar.bz2 upstream-822615cb6b189377f8cdbe326f6a32dc8b3bd386.zip | |
merge the control file and the .ipk file targets into one to prevent them from going out of sync
SVN-Revision: 17332
| -rw-r--r-- | include/package-ipkg.mk | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index 245e29fa5d..904bbd75af 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -57,7 +57,14 @@ ifeq ($(DUMP),) $(eval $(call BuildIPKGVariable,$(1),postinst)) $(eval $(call BuildIPKGVariable,$(1),prerm)) $(eval $(call BuildIPKGVariable,$(1),postrm)) - $$(IDIR_$(1))/CONTROL/control: $(STAMP_BUILT) + + $(STAGING_DIR_ROOT)/stamp/.$(1)_installed: $(STAMP_BUILT) + mkdir -p $(STAGING_DIR_ROOT)/stamp + $(call Package/$(1)/install,$(STAGING_DIR_ROOT)) + $(call Package/$(1)/install_lib,$(STAGING_DIR_ROOT)) + touch $$@ + + $$(IPKG_$(1)): $(STAGING_DIR)/etc/ipkg.conf $(STAMP_BUILT) @rm -f $(PACKAGE_DIR)/$(1)_* rm -rf $$(IDIR_$(1)) mkdir -p $$(IDIR_$(1))/CONTROL @@ -82,16 +89,7 @@ ifeq ($(DUMP),) (cd $$(IDIR_$(1))/CONTROL; \ $($(1)_COMMANDS) \ ) - - $(STAGING_DIR_ROOT)/stamp/.$(1)_installed: $(STAMP_BUILT) - mkdir -p $(STAGING_DIR_ROOT)/stamp - $(call Package/$(1)/install,$(STAGING_DIR_ROOT)) - $(call Package/$(1)/install_lib,$(STAGING_DIR_ROOT)) - touch $$@ - - $$(IPKG_$(1)): $(STAGING_DIR)/etc/ipkg.conf $(STAMP_BUILT) $$(IDIR_$(1))/CONTROL/control $(call Package/$(1)/install,$$(IDIR_$(1))) - mkdir -p $$(IDIR_$(1))/CONTROL mkdir -p $(PACKAGE_DIR) -find $$(IDIR_$(1)) -name 'CVS' -o -name '.svn' -o -name '.#*' | $(XARGS) rm -rf $(RSTRIP) $$(IDIR_$(1)) |