From 617b8f2ae26a6b4ac57795fead39ef20b1f92ecc 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 Signed-off-by: Richard Purdie --- meta/conf/distro/poky.conf | 7 ------- meta/conf/machine/include/qemu.inc | 1 + meta/conf/machine/qemux86-64.conf | 2 +- meta/conf/machine/qemux86.conf | 2 +- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index f13a67f39..3a66a76e7 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf @@ -32,13 +32,6 @@ LOCALE_UTF8_ONLY = "0" DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci" POKY_EXTRA_RDEPENDS = "task-core-boot" -POKY_EXTRA_RDEPENDS_qemuarm = "qemu-config" -POKY_EXTRA_RDEPENDS_qemuarmv6 = "qemu-config" -POKY_EXTRA_RDEPENDS_qemuarmv7 = "qemu-config" -POKY_EXTRA_RDEPENDS_qemumips = "qemu-config" -POKY_EXTRA_RDEPENDS_qemuppc = "qemu-config" -POKY_EXTRA_RDEPENDS_qemux86 = "qemu-config" -POKY_EXTRA_RDEPENDS_qemux86-64 = "qemu-config" DISTRO_EXTRA_RDEPENDS += "${POKY_EXTRA_RDEPENDS}" DISTRO_EXTRA_RRECOMMENDS += "kernel-module-af-packet" diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc index 4122a882d..40723ebf7 100644 --- a/meta/conf/machine/include/qemu.inc +++ b/meta/conf/machine/include/qemu.inc @@ -17,3 +17,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 182759adf..ca9138897 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 f1a0939eb..8b1473143 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 v1.2.3