summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJason Wessel <jason.wessel@windriver.com>2017-12-05 09:51:16 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-18 18:03:57 +0000
commitb0beb3c912a643f90719ce1fe2b020fc5eadb75f (patch)
tree835b888470e22dd25ef806259d79daa2a292cbfb /meta
parentf302bf14bb408743a6702b01c216721910214f2a (diff)
downloadpoky-b0beb3c912a643f90719ce1fe2b020fc5eadb75f.tar.gz
ovmf: Fix build failure for PARALLEL_MAKE with no space
The ovmf package fails to build if you use a PARALLEL_MAKE flag without a space in it. If you put the following in local.conf for example: PARALLEL_MAKE = "-j4" The build will fail with as follows: | build.exe: error: Option -n only allows one instance in command line! | WARNING: /opt/build/ovmf/git-r0/temp/run.do_compile.26080:1 exit 2 from '/opt/build/ovmf/git-r0/git/OvmfPkg/build.sh $PARALLEL_JOBS -a $OVMF_ARCH -b RELEASE -t ${FIXED_GCCVER}' | ERROR: Function failed: do_compile (log file is located at /opt/build/ovmf/git-r0/temp/log.do_compile.26080) The failure is because the build.sh expects a space. The simple work around is to fix the recipe to add some white space. The build.sh only cares that it gets at least one space between the arguments, the extra space if someone uses "-j 4" does not cause problems. (From OE-Core rev: cf7f4705e65a877cb4b3ac8872369c1b2e81a7be) Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/ovmf/ovmf_git.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/ovmf/ovmf_git.bb b/meta/recipes-core/ovmf/ovmf_git.bb
index a98826210e..fa0d66291d 100644
--- a/meta/recipes-core/ovmf/ovmf_git.bb
+++ b/meta/recipes-core/ovmf/ovmf_git.bb
@@ -151,7 +151,7 @@ do_compile_class-native() {
151 151
152do_compile_class-target() { 152do_compile_class-target() {
153 export LFLAGS="${LDFLAGS}" 153 export LFLAGS="${LDFLAGS}"
154 PARALLEL_JOBS="${@ '${PARALLEL_MAKE}'.replace('-j', '-n')}" 154 PARALLEL_JOBS="${@ '${PARALLEL_MAKE}'.replace('-j', '-n ')}"
155 OVMF_ARCH="X64" 155 OVMF_ARCH="X64"
156 if [ "${TARGET_ARCH}" != "x86_64" ] ; then 156 if [ "${TARGET_ARCH}" != "x86_64" ] ; then
157 OVMF_ARCH="IA32" 157 OVMF_ARCH="IA32"