From 45b048283ce2157d6c17d30a7c21d785bd1c6540 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Fri, 18 Aug 2006 09:31:38 +0000 Subject: x86: * Add qemux86 machine. * Glibc 2.4 updates from upstream OE. * Add linux-x86 kernel to satisfy the deps. git-svn-id: https://svn.o-hand.com/repos/poky/trunk@616 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/conf/machine/qemuarm.conf | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'meta/conf/machine/qemuarm.conf') diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf index cc4daa491f..a64a58e9a2 100644 --- a/meta/conf/machine/qemuarm.conf +++ b/meta/conf/machine/qemuarm.conf @@ -5,19 +5,9 @@ TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "armv4 armv5te" -PCMCIA_MANAGER = "pcmciautils" -PREFERRED_PROVIDER_xserver = "xserver-kdrive" -GUI_MACHINE_CLASS = "bigscreen" -GPE_EXTRA_INSTALL += "gaim sylpheed" - -include conf/machine/include/tune-arm926ejs.conf +require conf/machine/include/qemu.conf +require conf/machine/include/tune-arm926ejs.conf SERIAL_CONSOLE = "115200 ttyAMA0" PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" - -MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget" - -IMAGE_FSTYPES ?= "tar.bz2" - -ROOT_FLASH_SIZE = "100" -- cgit 1.2.3-korg