summaryrefslogtreecommitdiffstats
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
parente27f339a048c70a01642357ffb8bb79ed697eb00 (diff)
downloadpoky-367a1394e2504b129bfe9ef6d0c9aebf2ffde0aa.tar.gz
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>
-rw-r--r--meta-yocto/conf/distro/poky.conf7
-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
4 files changed, 3 insertions, 9 deletions
diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf
index f13a67f393..3a66a76e77 100644
--- a/meta-yocto/conf/distro/poky.conf
+++ b/meta-yocto/conf/distro/poky.conf
@@ -32,13 +32,6 @@ LOCALE_UTF8_ONLY = "0"
32DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci" 32DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci"
33 33
34POKY_EXTRA_RDEPENDS = "task-core-boot" 34POKY_EXTRA_RDEPENDS = "task-core-boot"
35POKY_EXTRA_RDEPENDS_qemuarm = "qemu-config"
36POKY_EXTRA_RDEPENDS_qemuarmv6 = "qemu-config"
37POKY_EXTRA_RDEPENDS_qemuarmv7 = "qemu-config"
38POKY_EXTRA_RDEPENDS_qemumips = "qemu-config"
39POKY_EXTRA_RDEPENDS_qemuppc = "qemu-config"
40POKY_EXTRA_RDEPENDS_qemux86 = "qemu-config"
41POKY_EXTRA_RDEPENDS_qemux86-64 = "qemu-config"
42 35
43DISTRO_EXTRA_RDEPENDS += "${POKY_EXTRA_RDEPENDS}" 36DISTRO_EXTRA_RDEPENDS += "${POKY_EXTRA_RDEPENDS}"
44DISTRO_EXTRA_RRECOMMENDS += "kernel-module-af-packet" 37DISTRO_EXTRA_RRECOMMENDS += "kernel-module-af-packet"
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"
19#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" 19#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
20 20
21EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native" 21EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"
22MACHINE_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 \
30GLIBC_ADDONS = "nptl" 30GLIBC_ADDONS = "nptl"
31GLIBC_EXTRA_OECONF = "--with-tls" 31GLIBC_EXTRA_OECONF = "--with-tls"
32 32
33MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "v86d" 33MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
34 34
35TARGET_CC_ARCH = "-m64" 35TARGET_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 \
29GLIBC_ADDONS = "nptl" 29GLIBC_ADDONS = "nptl"
30GLIBC_EXTRA_OECONF = "--with-tls" 30GLIBC_EXTRA_OECONF = "--with-tls"
31 31
32MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "v86d" 32MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
33 33
34TARGET_CC_ARCH = "-march=i586" 34TARGET_CC_ARCH = "-march=i586"