[oe-commits] [openembedded-core] 26/84: classes/populate_sdk_base: fix usage of & character in SDK_TITLE

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit eff2977ecfc29127997d51f4dac53ef8570be786
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
AuthorDate: Tue Nov 1 16:24:22 2016 +1300

    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 at linux.intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/classes/populate_sdk_base.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index 4462b52..a762655 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' \

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.