From 4de4827ddc9d64a055bcfdb6a65f0e427d36e85e Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 24 Oct 2014 09:24:51 +0000 Subject: include: unbreak conffiles, postinst & prerm exports 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 SVN-Revision: 43041 --- include/package-ipkg.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index 13bb7c7d42..77eaeb824f 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -13,10 +13,14 @@ IPKG_BUILD:= \ IPKG_STATE_DIR:=$(TARGET_DIR)/usr/lib/opkg +# 1: package name +# 2: variable name +# 3: variable suffix define BuildIPKGVariable ifdef 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 endef -- cgit v1.2.3