summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-11-01 16:24:22 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-16 10:37:56 +0000
commit95a10d1dfc5283767a7c82c4b7e3683207425a80 (patch)
tree645becff862f5db665b10f89ed28eaae0a774788 /meta
parent914e89709c80536745fc030e14850b6fd7f27e29 (diff)
downloadpoky-95a10d1dfc5283767a7c82c4b7e3683207425a80.tar.gz
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. (From OE-Core rev: acb85689c13cfdac21435509001048af5c3a7e99) (From OE-Core rev: bbad3402d431ac178cabdc00fcaf37b3a1a6bfd6) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/populate_sdk_base.bbclass2
1 files changed, 1 insertions, 1 deletions
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
223 -e 's#@SDKEXTPATH@#${SDKEXTPATH}#g' \ 223 -e 's#@SDKEXTPATH@#${SDKEXTPATH}#g' \
224 -e 's#@OLDEST_KERNEL@#${SDK_OLDEST_KERNEL}#g' \ 224 -e 's#@OLDEST_KERNEL@#${SDK_OLDEST_KERNEL}#g' \
225 -e 's#@REAL_MULTIMACH_TARGET_SYS@#${REAL_MULTIMACH_TARGET_SYS}#g' \ 225 -e 's#@REAL_MULTIMACH_TARGET_SYS@#${REAL_MULTIMACH_TARGET_SYS}#g' \
226 -e 's#@SDK_TITLE@#${SDK_TITLE}#g' \ 226 -e 's#@SDK_TITLE@#${@d.getVar("SDK_TITLE", True).replace('&', '\&')}#g' \
227 -e 's#@SDK_VERSION@#${SDK_VERSION}#g' \ 227 -e 's#@SDK_VERSION@#${SDK_VERSION}#g' \
228 -e '/@SDK_PRE_INSTALL_COMMAND@/d' \ 228 -e '/@SDK_PRE_INSTALL_COMMAND@/d' \
229 -e '/@SDK_POST_INSTALL_COMMAND@/d' \ 229 -e '/@SDK_POST_INSTALL_COMMAND@/d' \