From: Christopher Larson Date: Mon, 29 Feb 2016 20:47:46 +0000 (-0700) Subject: populate_sdk_base: handle empty SDK_PACKAGING_FUNC X-Git-Tag: 2016-4~608 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=f836f4bfd83862a1a0da7d4cc20ae9eaf62118da;p=openembedded-core.git 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. Signed-off-by: Christopher Larson Signed-off-by: Richard Purdie --- 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 () { POPULATE_SDK_POST_TARGET_COMMAND_append = " write_target_sdk_manifest ; " POPULATE_SDK_POST_HOST_COMMAND_append = " write_host_sdk_manifest; " -SDK_POSTPROCESS_COMMAND = " create_sdk_files; check_sdk_sysroots; tar_sdk; ${SDK_PACKAGING_FUNC}; " +SDK_PACKAGING_COMMAND = "${@'${SDK_PACKAGING_FUNC};' if '${SDK_PACKAGING_FUNC}' else ''}" +SDK_POSTPROCESS_COMMAND = " create_sdk_files; check_sdk_sysroots; tar_sdk; ${SDK_PACKAGING_COMMAND} " # Some archs override this, we need the nativesdk version # turns out this is hard to get from the datastore due to TRANSLATED_TARGET_ARCH