KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
SVN-Revision: 17332
This commit is contained in:
Felix Fietkau 2009-08-20 15:48:41 +00:00
parent f08684ffc0
commit 822615cb6b
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))