From 367a1394e2504b129bfe9ef6d0c9aebf2ffde0aa Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 10 May 2011 14:33:58 +0100 Subject: 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 --- meta/conf/machine/include/qemu.inc | 1 + meta/conf/machine/qemux86-64.conf | 2 +- meta/conf/machine/qemux86.conf | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'meta/conf/machine') 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" -- cgit 1.2.3-korg