Author: jow Date: 2014-10-24 11:24:51 +0200 (Fri, 24 Oct 2014) New Revision: 43041
Modified: trunk/include/package-ipkg.mk Log: 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]> Modified: trunk/include/package-ipkg.mk =================================================================== --- trunk/include/package-ipkg.mk 2014-10-24 09:24:45 UTC (rev 43040) +++ trunk/include/package-ipkg.mk 2014-10-24 09:24:51 UTC (rev 43041) @@ -13,10 +13,14 @@ 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 _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
