[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3228/8267] classes/populate_sdk_base: fix usage of & character in SDK_TITLE



commit 8381bb0b5f250bc9808349a7eb748686214bc738
Author: Paul Eggleton <paul eggleton linux intel com>
Date:   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.
    
    (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>

 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 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' \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]