From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 10 Aug 2009 19:42:18 +0000 (-0700)
Subject: bitbake.conf: Initialize empty PACKAGE_EXTRA_ARCHS conditionally.
X-Git-Tag: Release-2010-05/1~2746
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4a6504890b98d415948dfd2e13dd37c5c600dca;p=openembedded.git

bitbake.conf: Initialize empty PACKAGE_EXTRA_ARCHS conditionally.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
---

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 8b6956453b..37b17d6ccf 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -107,6 +107,7 @@ EXEEXT = "${HOST_EXEEXT}"
 
 BASE_PACKAGE_ARCH = "${HOST_ARCH}"
 PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}"
+PACKAGE_EXTRA_ARCHS ?= ""
 MACHINE_ARCH = "${@[bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}"
 PACKAGE_ARCHS = "all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}"
 
@@ -120,7 +121,7 @@ BASEPKG_TARGET_SYS = "${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
 QEMU_OPTIONS = ""
 QEMU_OPTIONS_iwmmxt  = "-cpu pxa270-c5"
 QEMU_OPTIONS_armv6   = "-cpu arm1136"
-QEMU_OPTIONS_armv6-novfp = ""-cpu arm1136"
+QEMU_OPTIONS_armv6-novfp = "-cpu arm1136"
 QEMU_OPTIONS_armv7a   = "-cpu cortex-a8"
 
 ##################################################################