diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-11-01 16:24:22 +1300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-06 23:35:33 +0000 |
commit | 8381bb0b5f250bc9808349a7eb748686214bc738 (patch) | |
tree | 0057226f0f822b797d7ce63d61746a7a18e635c7 /meta/classes | |
parent | 6d776f5c0be86f53c769b2ce48b1651e6b93e53f (diff) | |
download | poky-8381bb0b5f250bc9808349a7eb748686214bc738.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)
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>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/populate_sdk_base.bbclass | 2 |
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' \ |