[oe-commits] [openembedded-core] 40/42: populate_sdk_base: handle empty SDK_PACKAGING_FUNC

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit b15f89eb84f8f92bf2554c7d085c1466a10a2d09
Author: Christopher Larson <chris_larson at mentor.com>
AuthorDate: Mon Feb 29 13:47:46 2016 -0700

    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 <chris_larson at mentor.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/populate_sdk_base.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index de23f14..008bb57 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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.