Browse Source

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 <[email protected]>

SVN-Revision: 43041
Jo-Philipp Wich 11 years ago
parent
commit
4de4827ddc
1 changed files with 5 additions and 1 deletions
  1. 5 1
      include/package-ipkg.mk

+ 5 - 1
include/package-ipkg.mk

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