aboutsummaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-10 14:33:58 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-11 15:26:16 +0100
commit367a1394e2504b129bfe9ef6d0c9aebf2ffde0aa (patch)
tree07c8e04cdf9c454be031b780e0d9bcd114d6995c /meta/conf
parente27f339a048c70a01642357ffb8bb79ed697eb00 (diff)
downloadopenembedded-core-contrib-367a1394e2504b129bfe9ef6d0c9aebf2ffde0aa.tar.gz
openembedded-core-contrib-367a1394e2504b129bfe9ef6d0c9aebf2ffde0aa.tar.bz2
openembedded-core-contrib-367a1394e2504b129bfe9ef6d0c9aebf2ffde0aa.zip
machine/qemu: Add qemu-config as an essential machine speicfic dependency and drop specific distro config
(From OE-Core rev: 617b8f2ae26a6b4ac57795fead39ef20b1f92ecc) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/machine/include/qemu.inc1
-rw-r--r--meta/conf/machine/qemux86-64.conf2
-rw-r--r--meta/conf/machine/qemux86.conf2
3 files changed, 3 insertions, 2 deletions
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc
index 61281bf516..bd409830e8 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -19,3 +19,4 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "qemu-config"
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 182759adfe..ca91388978 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -30,6 +30,6 @@ XSERVER ?= "xserver-xf86-dri-lite \
GLIBC_ADDONS = "nptl"
GLIBC_EXTRA_OECONF = "--with-tls"
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "v86d"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
TARGET_CC_ARCH = "-m64"
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index f1a0939ebc..8b14731436 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -29,6 +29,6 @@ XSERVER ?= "xserver-xf86-dri-lite \
GLIBC_ADDONS = "nptl"
GLIBC_EXTRA_OECONF = "--with-tls"
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "v86d"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
TARGET_CC_ARCH = "-march=i586"