]> code.ossystems Code Review - openembedded-core.git/commitdiff
classes/populate_sdk_base: fix usage of & character in SDK_TITLE
authorPaul Eggleton <paul.eggleton@linux.intel.com>
Tue, 1 Nov 2016 03:24:22 +0000 (16:24 +1300)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 6 Nov 2016 23:35:17 +0000 (23:35 +0000)
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 <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/classes/populate_sdk_base.bbclass

index 4462b52cb2033f9d1dfad5a1a51d8a7960ba3bd0..a7626553475ecac417997c90d4863ea38fcfb6ec 100644 (file)
@@ -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' \