From 36e918b8a80a0175b5d04cfdd04ab6d19aeef594 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 26 Feb 2012 12:45:47 +0000 Subject: Quoting fixes We have various variables which are either not quoted at all or are half quoted. This patch fixes the bad exmaples so everything is consistent. (From OE-Core rev: 30253358f5e76fb7b25be27198b4c125e0dbdf2c) Signed-off-by: Richard Purdie --- meta/classes/staging.bbclass | 2 +- meta/conf/bitbake.conf | 2 +- meta/conf/layer.conf | 2 +- meta/recipes-devtools/gcc/gcc-4.6.inc | 2 +- meta/recipes-devtools/gcc/gcc-configure-common.inc | 2 +- meta/recipes-devtools/gcc/libgcc_4.6.bb | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'meta') diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index 66314a7ba8..a98f51deb5 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass @@ -58,7 +58,7 @@ sysroot_stage_all() { } do_populate_sysroot[dirs] = "${SYSROOT_DESTDIR}" -do_populate_sysroot[umask] = 022 +do_populate_sysroot[umask] = "022" addtask populate_sysroot after do_install diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index f2666cb79c..7d0e0d84a9 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -387,7 +387,7 @@ IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${MACHINE}" # This option allows for a percentage overage of the actual image size rather than a # fixed extra space, this is space needed for initial startup and basic operations. -IMAGE_OVERHEAD_FACTOR ?= 1.3 +IMAGE_OVERHEAD_FACTOR ?= "1.3" # This option allow for adding addition space in K above and beyond what the # IMAGE_OVERHEAD_FACTOR might add. This space is for additional packages, user data, ... # To set a fixed size then overrideing IMAGE_ROOTFS_SIZE with the max size one wants diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf index 93c087a047..76ae58ceb7 100644 --- a/meta/conf/layer.conf +++ b/meta/conf/layer.conf @@ -9,7 +9,7 @@ BBFILE_PATTERN_normal := "^${LAYERDIR}/" BBFILE_PRIORITY_normal = "5" # Set a variable to get to the top of the metadata location -COREBASE := ${@os.path.normpath("${LAYERDIR}/../")} +COREBASE := '${@os.path.normpath("${LAYERDIR}/../")}' # Add scripts to PATH PATH := "${PATH}:${COREBASE}/scripts" diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes-devtools/gcc/gcc-4.6.inc index ece378d372..edc2a58de1 100644 --- a/meta/recipes-devtools/gcc/gcc-4.6.inc +++ b/meta/recipes-devtools/gcc/gcc-4.6.inc @@ -18,7 +18,7 @@ PV = "4.6.2+svnr${SRCPV}" BINV = "4.6.3" -SRCREV = 181430 +SRCREV = "181430" BRANCH = "gcc-4_6-branch" FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.6' ], d)}" diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc index c4b6ac1111..8ab799f7f1 100644 --- a/meta/recipes-devtools/gcc/gcc-configure-common.inc +++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc @@ -18,7 +18,7 @@ LANGUAGES ?= "c,c++${FORTRAN}${JAVA}" # when linking shared libraries further in the build like (gnutls) SPECIAL_ARCH_LIST = "powerpc" -OPTSPACE = ${@base_contains("SPECIAL_ARCH_LIST", "${TARGET_ARCH}", "", "--enable-target-optspace",d)} +OPTSPACE = '${@base_contains("SPECIAL_ARCH_LIST", "${TARGET_ARCH}", "", "--enable-target-optspace",d)}' EXTRA_OECONF_BASE ?= "" EXTRA_OECONF_PATHS ?= "" diff --git a/meta/recipes-devtools/gcc/libgcc_4.6.bb b/meta/recipes-devtools/gcc/libgcc_4.6.bb index 01a3b57e1e..04e287748a 100644 --- a/meta/recipes-devtools/gcc/libgcc_4.6.bb +++ b/meta/recipes-devtools/gcc/libgcc_4.6.bb @@ -16,7 +16,7 @@ FILES_${PN}-dev = " \ ${libdir}/${TARGET_SYS}/${BINV}/crt* \ ${libdir}/${TARGET_SYS}/${BINV}/libgcc*" FILES_libgcov-dev = " \ - ${libdir}/${TARGET_SYS}/${BINV}/libgcov.a \ + ${libdir}/${TARGET_SYS}/${BINV}/libgcov.a" FILES_${PN}-dbg += "${base_libdir}/.debug/" -- cgit v1.2.3-54-g00ecf