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

build: move the SH_FUNC eval to the beginning of the opkg control file build command chain, not in front of every single command

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26432 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2011-04-03 02:10:32 +00:00
parent 0ae05aca57
commit 748cabc8d4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/package-ipkg.mk
View File

@ -30,7 +30,7 @@ IPKG_STATE_DIR:=$(TARGET_DIR)/usr/lib/opkg
define BuildIPKGVariable define BuildIPKGVariable
ifdef Package/$(1)/$(2) ifdef Package/$(1)/$(2)
$(call shexport,Package/$(1)/$(2)) $(call shexport,Package/$(1)/$(2))
$(1)_COMMANDS += $(SH_FUNC) var2file "$(call shvar,Package/$(1)/$(2))" $(2); $(1)_COMMANDS += var2file "$(call shvar,Package/$(1)/$(2))" $(2);
endif endif
endef endef
@ -113,7 +113,7 @@ ifeq ($(DUMP),)
echo -n "Description: "; $(SH_FUNC) getvar $(call shvar,Package/$(1)/description) | sed -e 's,^[[:space:]]*, ,g'; \ echo -n "Description: "; $(SH_FUNC) getvar $(call shvar,Package/$(1)/description) | sed -e 's,^[[:space:]]*, ,g'; \
) > $$(IDIR_$(1))/CONTROL/control ) > $$(IDIR_$(1))/CONTROL/control
chmod 644 $$(IDIR_$(1))/CONTROL/control chmod 644 $$(IDIR_$(1))/CONTROL/control
(cd $$(IDIR_$(1))/CONTROL; \ $(SH_FUNC) (cd $$(IDIR_$(1))/CONTROL; \
$($(1)_COMMANDS) \ $($(1)_COMMANDS) \
) )