diff options
-rw-r--r-- | meta/classes/cml1.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/gtk-doc.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/populate_sdk_base.bbclass | 2 | ||||
-rw-r--r-- | meta/recipes-gnome/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 926747f2ba..7f6df4011b 100644 --- a/meta/classes/cml1.bbclass +++ b/meta/classes/cml1.bbclass | |||
@@ -26,7 +26,7 @@ python do_menuconfig() { | |||
26 | except OSError: | 26 | except OSError: |
27 | mtime = 0 | 27 | mtime = 0 |
28 | 28 | ||
29 | 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'), | 29 | 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'), |
30 | d.getVar('PN') + ' Configuration', d) | 30 | d.getVar('PN') + ' Configuration', d) |
31 | 31 | ||
32 | # FIXME this check can be removed when the minimum bitbake version has been bumped | 32 | # 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 b4f6754906..bedb36ec8b 100644 --- a/meta/classes/gtk-doc.bbclass +++ b/meta/classes/gtk-doc.bbclass | |||
@@ -41,7 +41,7 @@ do_compile_prepend_class-target () { | |||
41 | if [ ${GTKDOC_ENABLED} = True ]; then | 41 | if [ ${GTKDOC_ENABLED} = True ]; then |
42 | # Write out a qemu wrapper that will be given to gtkdoc-scangobj so that it | 42 | # Write out a qemu wrapper that will be given to gtkdoc-scangobj so that it |
43 | # can run target helper binaries through that. | 43 | # can run target helper binaries through that. |
44 | qemu_binary="${@qemu_wrapper_cmdline(d, '$STAGING_DIR_HOST', ['\$GIR_EXTRA_LIBS_PATH','$STAGING_DIR_HOST/${libdir}','$STAGING_DIR_HOST/${base_libdir}'])}" | 44 | qemu_binary="${@qemu_wrapper_cmdline(d, '$STAGING_DIR_HOST', ['\\$GIR_EXTRA_LIBS_PATH','$STAGING_DIR_HOST/${libdir}','$STAGING_DIR_HOST/${base_libdir}'])}" |
45 | cat > ${B}/gtkdoc-qemuwrapper << EOF | 45 | cat > ${B}/gtkdoc-qemuwrapper << EOF |
46 | #!/bin/sh | 46 | #!/bin/sh |
47 | # Use a modules directory which doesn't exist so we don't load random things | 47 | # 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 677ba3cf12..a4afc61c46 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass | |||
@@ -257,7 +257,7 @@ EOF | |||
257 | -e 's#@SDKEXTPATH@#${SDKEXTPATH}#g' \ | 257 | -e 's#@SDKEXTPATH@#${SDKEXTPATH}#g' \ |
258 | -e 's#@OLDEST_KERNEL@#${SDK_OLDEST_KERNEL}#g' \ | 258 | -e 's#@OLDEST_KERNEL@#${SDK_OLDEST_KERNEL}#g' \ |
259 | -e 's#@REAL_MULTIMACH_TARGET_SYS@#${REAL_MULTIMACH_TARGET_SYS}#g' \ | 259 | -e 's#@REAL_MULTIMACH_TARGET_SYS@#${REAL_MULTIMACH_TARGET_SYS}#g' \ |
260 | -e 's#@SDK_TITLE@#${@d.getVar("SDK_TITLE").replace('&', '\&')}#g' \ | 260 | -e 's#@SDK_TITLE@#${@d.getVar("SDK_TITLE").replace('&', '\\&')}#g' \ |
261 | -e 's#@SDK_VERSION@#${SDK_VERSION}#g' \ | 261 | -e 's#@SDK_VERSION@#${SDK_VERSION}#g' \ |
262 | -e '/@SDK_PRE_INSTALL_COMMAND@/d' \ | 262 | -e '/@SDK_PRE_INSTALL_COMMAND@/d' \ |
263 | -e '/@SDK_POST_INSTALL_COMMAND@/d' \ | 263 | -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 242899accc..d00f3bd344 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() { | |||
76 | do_configure_prepend_class-target() { | 76 | do_configure_prepend_class-target() { |
77 | # Write out a qemu wrapper that will be given to gi-scanner so that it | 77 | # Write out a qemu wrapper that will be given to gi-scanner so that it |
78 | # can run target helper binaries through that. | 78 | # can run target helper binaries through that. |
79 | qemu_binary="${@qemu_wrapper_cmdline(d, '$STAGING_DIR_HOST', ['\$GIR_EXTRA_LIBS_PATH','.libs','$STAGING_DIR_HOST/${libdir}','$STAGING_DIR_HOST/${base_libdir}'])}" | 79 | qemu_binary="${@qemu_wrapper_cmdline(d, '$STAGING_DIR_HOST', ['\\$GIR_EXTRA_LIBS_PATH','.libs','$STAGING_DIR_HOST/${libdir}','$STAGING_DIR_HOST/${base_libdir}'])}" |
80 | cat > ${B}/g-ir-scanner-qemuwrapper << EOF | 80 | cat > ${B}/g-ir-scanner-qemuwrapper << EOF |
81 | #!/bin/sh | 81 | #!/bin/sh |
82 | # Use a modules directory which doesn't exist so we don't load random things | 82 | # Use a modules directory which doesn't exist so we don't load random things |