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

merge the control file and the .ipk file targets into one to prevent them from going out of sync

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17332 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2009-08-20 15:48:41 +00:00
parent d0f1eb07ec
commit 6a26e8186b
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/package-ipkg.mk
View File

@ -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))