From: Paul Eggleton Date: Tue, 1 Nov 2016 03:24:22 +0000 (+1300) Subject: classes/populate_sdk_base: fix usage of & character in SDK_TITLE X-Git-Tag: uninative-1.5~1515 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=acb85689c13cfdac21435509001048af5c3a7e99;p=openembedded-core.git classes/populate_sdk_base: fix usage of & character in SDK_TITLE If you used an & character in SDK_TITLE (possibly indirectly from DISTRO_NAME) then sed interpreted this as a directive to paste in the replaced string (@SDK_TITLE@ in this case). Escape any & characters in SDK_TITLE to avoid that. Signed-off-by: Paul Eggleton Signed-off-by: Ross Burton --- diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index 4462b52cb2..a762655347 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass @@ -223,7 +223,7 @@ EOF -e 's#@SDKEXTPATH@#${SDKEXTPATH}#g' \ -e 's#@OLDEST_KERNEL@#${SDK_OLDEST_KERNEL}#g' \ -e 's#@REAL_MULTIMACH_TARGET_SYS@#${REAL_MULTIMACH_TARGET_SYS}#g' \ - -e 's#@SDK_TITLE@#${SDK_TITLE}#g' \ + -e 's#@SDK_TITLE@#${@d.getVar("SDK_TITLE", True).replace('&', '\&')}#g' \ -e 's#@SDK_VERSION@#${SDK_VERSION}#g' \ -e '/@SDK_PRE_INSTALL_COMMAND@/d' \ -e '/@SDK_POST_INSTALL_COMMAND@/d' \