diff options
| author |   Chris Larson <kergoth@openedhand.com> | 2006-08-18 09:31:38 +0000 |
|---|---|---|
| committer | Chris Larson <kergoth@openedhand.com> | 2006-08-18 09:31:38 +0000 |
| commit | 45b048283ce2157d6c17d30a7c21d785bd1c6540 (patch) | |
| tree | de94c49fec3a5e3cbeb8f509086575dd28dcf7d1 /meta/conf | |
| parent | 10984ecd54feed390029271f4a82708e431bcfcb (diff) | |
| download | openembedded-core-contrib-45b048283ce2157d6c17d30a7c21d785bd1c6540.tar.gz | |
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
Diffstat (limited to 'meta/conf')
| -rw-r--r-- | meta/conf/distro/poky.conf | 3 | ||||
| -rw-r--r-- | meta/conf/machine/include/qemu.conf | 10 | ||||
| -rw-r--r-- | meta/conf/machine/qemuarm.conf | 14 | ||||
| -rw-r--r-- | meta/conf/machine/qemux86.conf | 17 |
4 files changed, 31 insertions, 13 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index 992858f9d6..33b9cf841a 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf @@ -13,7 +13,8 @@ INHERIT += " package_ipk debian multimachine poky " # For some reason, this doesn't work # TARGET_OS ?= "linux" TARGET_OS = "linux" -TARGET_FPU ?= "soft" +TARGET_FPU_arm ?= "soft" +TARGET_FPU_armeb ?= "soft" IMAGE_ROOTFS_SIZE_ext2 = 131072 PARALLEL_INSTALL_MODULES = "1" diff --git a/meta/conf/machine/include/qemu.conf b/meta/conf/machine/include/qemu.conf new file mode 100644 index 0000000000..8587c2ab2f --- /dev/null +++ b/meta/conf/machine/include/qemu.conf @@ -0,0 +1,10 @@ +PCMCIA_MANAGER = "pcmciautils" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" +GUI_MACHINE_CLASS = "bigscreen" +GPE_EXTRA_INSTALL += "gaim sylpheed" + +MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget" + +IMAGE_FSTYPES ?= "tar.bz2" + +ROOT_FLASH_SIZE = "100" 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" diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf new file mode 100644 index 0000000000..340ad812c7 --- /dev/null +++ b/meta/conf/machine/qemux86.conf @@ -0,0 +1,17 @@ +#@TYPE: Machine +#@NAME: qemu x86 Emulator setup +#@DESCRIPTION: Machine configuration for running an x86 system under qemu emulation + +TARGET_ARCH = "i586" +TARGET_VENDOR = "-oe" +IPKG_EXTRA_ARCHS = "x86" + +require conf/machine/include/qemu.conf +# require conf/machine/include/tune-arm926ejs.conf + +SERIAL_CONSOLE = "115200 ttyS0" + +PREFERRED_PROVIDER_virtual/kernel = "linux-x86" + +GLIBC_ADDONS = "nptl" +GLIBC_EXTRA_OECONF = "--with-tls" |