diff options
author | Koen Kooi <koen.kooi@linaro.org> | 2015-04-28 10:34:49 +0200 |
---|---|---|
committer | Koen Kooi <koen.kooi@linaro.org> | 2015-04-28 10:36:07 +0200 |
commit | a59aa0b60d6adc5d8ee2d603d72e3e7ac1fe4b12 (patch) | |
tree | 3daa4d4fece55ff4059d321a8141b52768dbaa1b | |
parent | 3c91afd54aa45daa5aa7db06a267ce72d8554dc3 (diff) |
functions.sh: fix variable expansion error
Straight quotes prevent variable expansion, leading to:
08:08:17 WARNING: Can't get the filesystem id of: ${base_dir}/workspace/tmp
08:08:17 Parsing recipes...NOTE: Error during finalise of /home/buildslave/workspace/openembedded-armv7a-rootfs-external-toolchain/label/build/rootfs/minimal/meta-linaro/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-4.8.bb
08:08:18 NOTE: Error during finalise of /home/buildslave/workspace/openembedded-armv7a-rootfs-external-toolchain/label/build/rootfs/minimal/meta-linaro/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-4.9.bb
08:08:18 ERROR: ExpansionError during parsing /home/buildslave/workspace/openembedded-armv7a-rootfs-external-toolchain/label/build/rootfs/minimal/meta-linaro/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-4.9.bb: Failure expanding variable oe_runconf: ExpansionError: Failure expanding variable EXTRA_OECONF, expression was --with-newlib --without-headers --disable-shared --disable-threads --disable-multilib --disable-__cxa_atexit --enable-languages=c --enable-target-optspace --program-prefix=x86_64-oesdk-linux- --with-sysroot=/not/exist --with-build-sysroot=${base_dir}/workspace/tmp/work/x86_64-oesdk-linux/gcc-crosssdk-initial-x86_64/linaro-4.9-r2015.03/gcc-linaro-4.9-2015.03/build.x86_64-linux.x86_64-oesdk-linux/tmpsysroot --disable-libmudflap --disable-libgomp --disable-libssp --disable-libquadmath --with-system-zlib --disable-lto --disable-plugin --enable-decimal-float=no ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--with-ld=${base_dir}/workspace/tmp/sysroots/x86_64-linux/usr/bin/x86_64-oesdk-linux/x86_64-oesdk-linux-ld.bfd', '', d)} --with-native-system-header-dir=/usr/local/oecore-x86_64/sysroots/x86_64-oesdk-linux/usr/include --with-native-system-header-dir=/usr/local/oecore-x86_64/sysroots/x86_64-oesdk-linux/usr/include ${@gettext_oeconf(d)} --enable-__cxa_atexit which triggered exception SyntaxError: EOL while scanning string literal (EXTRA_OECONF, line 1)
Change-Id: I9a6ca8dc7fb7336ba23badd9082b9d3cded10aa0
Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
-rwxr-xr-x | functions.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/functions.sh b/functions.sh index aa41759..278fe1f 100755 --- a/functions.sh +++ b/functions.sh @@ -252,7 +252,7 @@ conf_jenkins() # As noted during jdk8 integration, toolchain has subtle ties to the build location. Thus in # jenkins use same tmpdir for all builds. # XXX: make this tmpfs, 10G of ram should be enough - echo 'TMPDIR = "${base_dir}/workspace/tmp"' >>conf/site.conf + echo "TMPDIR = \"${base_dir}/workspace/tmp\"" >>conf/site.conf echo 'TCLIBCAPPEND = ""' >>conf/site.conf fi } |