aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-11-01 15:04:53 +1300
committerPaul Eggleton <paul.eggleton@linux.intel.com>2016-11-01 16:22:33 +1300
commitea8c34f8572f12b3fdf6f7bb9512b838a294d986 (patch)
tree175b389bd9845e4cf01ee8a83b255dff0dff7cd1
parentb18fa5f2f2f46afc6fdc58f4d29679dea9c36c43 (diff)
downloadopenembedded-core-contrib-ea8c34f8572f12b3fdf6f7bb9512b838a294d986.tar.gz
openembedded-core-contrib-ea8c34f8572f12b3fdf6f7bb9512b838a294d986.tar.bz2
openembedded-core-contrib-ea8c34f8572f12b3fdf6f7bb9512b838a294d986.zip
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 <paul.eggleton@linux.intel.com>
-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 4462b52cb20..a7626553475 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' \