[oe-commits] [openembedded-core] 27/55: ovmf: Fix build failure for PARALLEL_MAKE with no space

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch rocko-next
in repository openembedded-core.

commit 058641f1ea9b5cac633803a0d913cb1ec005b164
Author: Jason Wessel <jason.wessel at windriver.com>
AuthorDate: Tue Dec 5 09:51:16 2017 -0800

    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.
    
    Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    (cherry picked from commit cf7f4705e65a877cb4b3ac8872369c1b2e81a7be)
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta/recipes-core/ovmf/ovmf_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/ovmf/ovmf_git.bb b/meta/recipes-core/ovmf/ovmf_git.bb
index a988262..fa0d662 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() {
 
 do_compile_class-target() {
     export LFLAGS="${LDFLAGS}"
-    PARALLEL_JOBS="${@ '${PARALLEL_MAKE}'.replace('-j', '-n')}"
+    PARALLEL_JOBS="${@ '${PARALLEL_MAKE}'.replace('-j', '-n ')}"
     OVMF_ARCH="X64"
     if [ "${TARGET_ARCH}" != "x86_64" ] ; then
         OVMF_ARCH="IA32"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.