summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2016-02-29 13:47:46 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-02 22:39:44 +0000
commita005d251857b05e37f81abb19cbe02e860eaea24 (patch)
tree93951d1d3f3e5c547b1c0bbb0170d76efa037ea1 /meta
parentec3be9f7c7830a2a0968af582ee465db7398716f (diff)
downloadpoky-a005d251857b05e37f81abb19cbe02e860eaea24.tar.gz
populate_sdk_base: handle empty SDK_PACKAGING_FUNC
Currently, the pre/post process command variables are parsed as shell, even though they're not shell anymore. As a result, an empty SDK_PACKAGING_FUNC results in a parsing error. Rather than manually adding their vardeps, only append its ; when the var is set. (From OE-Core rev: f836f4bfd83862a1a0da7d4cc20ae9eaf62118da) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/populate_sdk_base.bbclass3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index de23f141f9..008bb577c4 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -84,7 +84,8 @@ python write_host_sdk_manifest () {
84 84
85POPULATE_SDK_POST_TARGET_COMMAND_append = " write_target_sdk_manifest ; " 85POPULATE_SDK_POST_TARGET_COMMAND_append = " write_target_sdk_manifest ; "
86POPULATE_SDK_POST_HOST_COMMAND_append = " write_host_sdk_manifest; " 86POPULATE_SDK_POST_HOST_COMMAND_append = " write_host_sdk_manifest; "
87SDK_POSTPROCESS_COMMAND = " create_sdk_files; check_sdk_sysroots; tar_sdk; ${SDK_PACKAGING_FUNC}; " 87SDK_PACKAGING_COMMAND = "${@'${SDK_PACKAGING_FUNC};' if '${SDK_PACKAGING_FUNC}' else ''}"
88SDK_POSTPROCESS_COMMAND = " create_sdk_files; check_sdk_sysroots; tar_sdk; ${SDK_PACKAGING_COMMAND} "
88 89
89# Some archs override this, we need the nativesdk version 90# Some archs override this, we need the nativesdk version
90# turns out this is hard to get from the datastore due to TRANSLATED_TARGET_ARCH 91# turns out this is hard to get from the datastore due to TRANSLATED_TARGET_ARCH