python 3.8 will be stricter about python quoting. Fix up several misquoted
expressions and fix Deprecation warnings like:
Var :1: DeprecationWarning: invalid escape sequence \$
Signed-off-by: Richard Purdie
---
meta/classes/cml1.bbclass | 2 +-
meta/classes/gtk-doc.bbclass| 2 +-
meta/classes/populate_sdk_base.bbclass | 2 +-
.../gobject-introspection/gobject-introspection_1.58.2.bb | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/classes/cml1.bbclass b/meta/classes/cml1.bbclass
index 926747f2ba6..7f6df4011bc 100644
--- a/meta/classes/cml1.bbclass
+++ b/meta/classes/cml1.bbclass
@@ -26,7 +26,7 @@ python do_menuconfig() {
except OSError:
mtime = 0
-oe_terminal("${SHELL} -c \"make %s; if [ \$? -ne 0 ]; then echo 'Command
failed.'; printf 'Press any key to continue... '; read r; fi\"" %
d.getVar('KCONFIG_CONFIG_COMMAND'),
+oe_terminal("${SHELL} -c \"make %s; if [ \\$? -ne 0 ]; then echo 'Command
failed.'; printf 'Press any key to continue... '; read r; fi\"" %
d.getVar('KCONFIG_CONFIG_COMMAND'),
d.getVar('PN') + ' Configuration', d)
# FIXME this check can be removed when the minimum bitbake version has
been bumped
diff --git a/meta/classes/gtk-doc.bbclass b/meta/classes/gtk-doc.bbclass
index b4f6754906a..bedb36ec8b7 100644
--- a/meta/classes/gtk-doc.bbclass
+++ b/meta/classes/gtk-doc.bbclass
@@ -41,7 +41,7 @@ do_compile_prepend_class-target () {
if [ ${GTKDOC_ENABLED} = True ]; then
# Write out a qemu wrapper that will be given to gtkdoc-scangobj so
that it
# can run target helper binaries through that.
-qemu_binary="${@qemu_wrapper_cmdline(d, '$STAGING_DIR_HOST',
['\$GIR_EXTRA_LIBS_PATH','$STAGING_DIR_HOST/${libdir}','$STAGING_DIR_HOST/${base_libdir}'])}"
+qemu_binary="${@qemu_wrapper_cmdline(d, '$STAGING_DIR_HOST',
['\\$GIR_EXTRA_LIBS_PATH','$STAGING_DIR_HOST/${libdir}','$STAGING_DIR_HOST/${base_libdir}'])}"
cat > ${B}/gtkdoc-qemuwrapper << EOF
#!/bin/sh
# Use a modules directory which doesn't exist so we don't load random things
diff --git a/meta/classes/populate_sdk_base.bbclass
b/meta/classes/populate_sdk_base.bbclass
index 677ba3cf12f..a4afc61c465 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -257,7 +257,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@#${@d.getVar("SDK_TITLE").replace('&',
'\&')}#g' \
+ -e 's#@SDK_TITLE@#${@d.getVar("SDK_TITLE").replace('&',
'\\&')}#g' \
-e 's#@SDK_VERSION@#${SDK_VERSION}#g' \
-e '/@SDK_PRE_INSTALL_COMMAND@/d' \
-e '/@SDK_POST_INSTALL_COMMAND@/d' \
diff --git
a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.2.bb
b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.2.bb
index 242899accc4..d00f3bd3441 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.2.bb
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.2.bb
@@ -76,7 +76,7 @@ do_configure_prepend_class-native() {
do_configure_prepend_class-target() {
# Write out a qemu wrapper that will be given to gi-scanner so that it
# can run target helper binaries through that.
-qemu_binary="${@qemu_wrapper_cmdline(d, '$STAGING_DIR_HOST',
['\$GIR_EXTRA_LIBS_PATH','.libs','$STAGING_DIR_HOST/${libdir}','$STAGING_DIR_HOST/${base_libdir}'])}"
+qemu_binary="${@qemu_wrapper_cmdline(d, '$STAGING_DIR_HOST',
['\\$GIR_EXTRA_LIBS_PATH','.libs','$STAGING_DIR_HOST/${libdir}','$STAGING_DIR_HOST/${base_libdir}'])}"
cat > ${B}/g-ir-scanner-qemuwrapper << EOF
#!/bin/sh
# Use a modules directory which doesn't exist so we don't load random things
--
2.19.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
