crans/openwrt-chaoscalmer-uappro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

include: unbreak conffiles, postinst & prerm exports

Browse source 
Changeset r43017 reworked the ipkg control metadata generation but broke
the export of conffiles, postinst and prerm defines.

Change the code back to rely on shvar and shexport, this is required to
properly output multiline contents.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43041 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2014-10-24 09:24:51 +00:00
parent 8881888aea
commit 59ddc77ccd
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/package-ipkg.mk
View file

@ -13,10 +13,14 @@ IPKG_BUILD:= \
IPKG_STATE_DIR:=$(TARGET_DIR)/usr/lib/opkg IPKG_STATE_DIR:=$(TARGET_DIR)/usr/lib/opkg
# 1: package name
# 2: variable name
# 3: variable suffix
define BuildIPKGVariable define BuildIPKGVariable
ifdef Package/$(1)/$(2) ifdef Package/$(1)/$(2)
$$(IPKG_$(1)) : VAR_$(2)$(3)=$$(Package/$(1)/$(2)) $$(IPKG_$(1)) : VAR_$(2)$(3)=$$(Package/$(1)/$(2))
$(1)_COMMANDS += echo "$$$$$(2)$(3)" > $(2)$(3); $(call shexport,Package/$(1)/$(2))
$(1)_COMMANDS += echo "$$$$$$$$$(call shvar,Package/$(1)/$(2))" > $(2)$(3);
endif endif
endef endef