summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine/qemux86.conf
Commit message (Collapse)AuthorAgeFilesLines
* qemux86: support X11 when QEMU is emulating a different GPU than vmwareMax Eliaser2014-08-271-0/+2
| | | | | | | | | | | | | | | | | QEMU is capable of emulating four different VGA adapters: cirrus, std, vmware, and QXL. By adding the cirrus and fbdev X.Org drivers to the qemux86 image, the image can be made to launch an X server on when cirrus and std are chosen, in addition to just vmware. (The build of QEMU in OE-Core appears to have QXL disabled, meaning a driver for it is unnecessary.) The runqemu script now allows the choice of emulated VGA adapter to be specified manually, so it's important that qemux86 supports any configuration the user might choose without requiring the image to be rebuilt. (From OE-Core rev: 9e4ca6739d65716fcb0a1b7d635749083da98c52) Signed-off-by: Max Eliaser <max.eliaser@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Globally replace 'base_contains' calls with 'bb.utils.contains'Otavio Salvador2014-04-251-1/+1
| | | | | | | | | | | The base_contains is kept as a compatibility method and we ought to not use it in OE-Core so we can remove it from base metadata in future. (From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qemu: only depend on mesa-driver-swrast if opengl is enabledRoss Burton2013-09-111-1/+1
| | | | | | | | | | As Mesa refuses to compile if the "opengl" DISTRO_FEATURE isn't enabled, mesa-driver-swrast has to be conditional in the QEMU machine defintions too. (From OE-Core rev: 9951e1da6a755f9a46d3a595aa4c2f975aee8f46) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qemux86*.conf: replace XSERVER weak assignment with a hard oneLaurentiu Palcu2013-03-271-1/+1
| | | | | | | | | | | | | Because the qemu.inc is now included before the XSERVER assignment, the xf86-video-vmware and xf86-video-vmmouse are not built and the X for qemux86 and qemux86-64 does not start. [YOCTO #4124] (From OE-Core rev: f9c12a42f9777bc66b2ce63a244e655d167025ed) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* conf/machine: Clean up MACHINEOVERRIDES handlingRichard Purdie2013-03-251-2/+1
| | | | | | | | | | | | | | | | OVERRIDES reads from left to right, least to most specific. We were appending to MACHINEOVERRIDES when we should have been prepending so the ordering of qemuall verses qemuxxx was incorrect, as was the x86 override and several of the arm overrides. This patch is a batch cleanup of the various issues to correct the order from least to most specific. The include order does matter and we needed to tweak some of that in this patch too. [YOCTO #4090] (From OE-Core rev: bdc1b214431c9c93a929b547b9a61e7b87fbd366) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* mesa: rename mesa-dri recipe to just mesaLaurentiu Palcu2013-03-221-4/+4
| | | | | | | | | | | | | | | | | Rename mesa-dri recipes to just mesa. Also, replace all references to mesa-dri in all recipes/configs. The reason for this renaming (quote from bugzilla): "mesa-dri is a artefact of mesa-xlib existing, which doesn't anymore. mesa-dri should be renamed to mesa." [YOCTO #3385] (From OE-Core rev: c8bbb9983bcc7cfc5332e89c3e8148505b4ca83f) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qemugl: Remove since support for it was removed from qemuRichard Purdie2012-10-241-3/+1
| | | | | | (From OE-Core rev: 0195a08f77fe0e01b2d7548ccffeaf89d2d780e1) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* machines/x86: Drop redundant glibc configure knobsKhem Raj2012-09-101-4/+0
| | | | | | | | | | nptl and thereby tls are not optional anymore (From OE-Core rev: 1a4b277e47a8d624cde4c73713d036e230f3a523) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* core: Prefer mesa-dri as virtual/libopengles1/2 providerDamien Lespiau2012-08-191-0/+2
| | | | | | | | | | | Wihtout it, you have both mesa-dri and mesa-xlib as providers. Let's prefer the accelerated version. (From OE-Core rev: 9f83d93c65942f9ed1b25a24976f92ae06c425c8) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qemumachines: make MACHINE_FEATURES append follow qemu.inc includeTom Zanussi2012-07-041-2/+2
| | | | | | | | | | | | | | | | | | | qemu.inc does a straight assign to MACHINE_FEATURES so overwriting the preceding append to MACHINE_FEATURES, so the MACHINE_FEATURES append needs to be moved after the include. This situation came about as a result of commit 71a4bf386: qemumachines: Enable xserver-xorg as default xserver For qemux86 and qemux86-64 include qemu.inc after defining XSERVER which missed this side-effect (and maybe others). (From OE-Core rev: 4f336e5f416df382fdd2b405314741164d537b22) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qemumachines: Enable xserver-xorg as default xserverKhem Raj2012-05-241-1/+2
| | | | | | | | | | | | | | | | | | | | | For qemux86 and qemux86-64 include qemu.inc after defining XSERVER XSERVER variable is also weakly defined in task-core-x11.bb which means we can not use ??= otherwise when building any qemu image that uses task-core-x11.bb will get the wrong definition So we define the XSERVER common set for qemu in qemu.inc and as we know x86 and x86-64 qemu overrides the default we include qemu.inc after that definition which means that qemux86 and qemux86-64 get their own definitions and other qemus get the definitions from qemu.inc. other non-qemu machine will get their defintion from task which points to kdrive as of now. (From OE-Core rev: 62dba36166bc5faa32ba3e0664ae98b168cde6b1) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* virtual/libgl: use mesa-xlib for qemuarm/qemumips/qemuppcZhai Edwin2012-03-301-0/+1
| | | | | | | | | | | | Still need mesa-xlib for emulation of GLX interface on qemuarm/mips/ppc, where mesa-dri doesn't work for pure qemu emulator. [YOCTO #2066] fixed. (From OE-Core rev: 22775b5f1d9c6d9860a579245bf7a48a982ab62f) Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* conf/machine: Don't poke around providers which aren't machine specific/safeRichard Purdie2011-12-061-3/+0
| | | | | | | | | | | | Machines shouldn't be poking around PREFERRED_PROVIDERS which aren't machine specific or at least machine safe. Kernels are machine specific and the xserver is selectable. libx11 and mesa are now really a distro choice and machine configurations shouldn't be poking around them as it just leads to corruption, conflicts and confusion. (From OE-Core rev: 97a57aca12437c24b628071bb189c9f3b94e27ca) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-liteMartin Jansa2011-10-111-3/+3
| | | | | | | | | | | | * xserver-xorg is closer to upstream naming and that's how it's named in OE-classic and meta-oe? It would make meta-oe transition easier and better to do it now then convert meta-oe to xserver-xf86 and then rename it back later. (From OE-Core rev: 0b31c7200a368533df970f0efeb81e2e20c73593) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* conf/machine/tune: Overhaul tune include file variablesRichard Purdie2011-07-251-3/+1
| | | | | | | | | | | | | | | | | | | | | | There is currently consideradble confusion over how the tune files operate and how these interact with the rest of the build system. This update/overhaul changes things so the tune files are primarily resonsible for setting: TUNE_ARCH - What was formerly set as TARGET_ARCH and is the value that represents the architecture we're targetting. TUNE_PKGARCH - The value that represents the tune confuration that this set of tune parameters results in. This allows the significant improvement that the core can now always determine the target architecture value, even when TARGET_ARCH needs to be reset to something different and likewise, there is one package architecture variable the core can reference allowing simplification of the BASE_PACKAGE_ARCH, PACKAGE_ARCH and FEED_ARCH variables. (From OE-Core rev: a10de4cf8b424ee95c8e283e75d486be5b3b8eac) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* machine/qemu: Add qemu-config as an essential machine speicfic dependency ↵Richard Purdie2011-05-111-1/+1
| | | | | | | | and drop specific distro config (From OE-Core rev: 617b8f2ae26a6b4ac57795fead39ef20b1f92ecc) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* machines: move PACKAGE_EXTRA_ARCHS to tune filesKoen Kooi2011-01-101-1/+0
| | | | | | | | This gets us closer to making including tune-<arch>.inc "just work". Moving the TARGET_ARCH definitions is something for a follup patch. Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qemu machines: Switch to use linux-wrsBruce Ashfield2010-07-191-3/+2
| | | | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
* Move all QEMU machines to use a common kernel recipe set and versionJoshua Lock2010-05-181-1/+0
| | | | | | | | | | | The different kernel recipes encapsulate functionality groups for machines, therefore it makes sense to have all the QEMU machines using the same kernel recipe. Switch the QEMU machines to default to the "linux" recipes for their kernel and bump the latest recipe from linux-2.6.32 to 2.6.33. Signed-off-by: Joshua Lock <josh@linux.intel.com>
* qemux86: fix setting of preferred provider for virtual/xserverJoshua Lock2010-02-101-6/+7
| | | | | | | Change the virtual/xserver preferred provider in qemu.inc to a soft assign and set preferred provider in qemux86 before the require so that the value is retained. Signed-off-by: Joshua Lock <josh@linux.intel.com>
* qemux86: Add xf86-input-vmmouse, swrast dri fallback, switch back to ↵Richard Purdie2009-06-091-3/+4
| | | | | | mesa-dri as the GL provider and drop synaptics input driver Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
* qemux86: Convert to se xserver-xf86-dri-liteRichard Purdie2009-01-211-0/+12
|
* qemux86: use march=i586 when compiling - should unbreak glibcMarcin Juszkiewicz2008-03-051-0/+2
| | | | git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3916 311d38ba-8fff-0310-9ca6-ca027cbcb966
* qemux86: added 'x86' to MACHINE_FEATURESMarcin Juszkiewicz2008-01-181-0/+2
| | | | git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3530 311d38ba-8fff-0310-9ca6-ca027cbcb966
* qemux86.conf: Add essential dependency on v86dRichard Purdie2008-01-101-0/+2
| | | | git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3458 311d38ba-8fff-0310-9ca6-ca027cbcb966
* conf/machine: Set KERNEL_IMAGE_TYPE and kernel-base RDEPENDS for various ↵Richard Purdie2007-08-291-0/+2
| | | | | | machines git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2599 311d38ba-8fff-0310-9ca6-ca027cbcb966
* conf/machine/include: Rename to .conf to .inc filesRichard Purdie2007-08-081-1/+1
| | | | git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2388 311d38ba-8fff-0310-9ca6-ca027cbcb966
* machine configs: drop MACHINE_TASK_PROVIDER which is set in bitbake.confMarcin Juszkiewicz2007-06-111-2/+0
| | | | git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1903 311d38ba-8fff-0310-9ca6-ca027cbcb966
* machine/qemu: Set image size in common fileRichard Purdie2007-01-081-2/+0
| | | | git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1132 311d38ba-8fff-0310-9ca6-ca027cbcb966
* qemu*.conf: Increase image size to 200MB to fit sdkRichard Purdie2006-12-221-1/+3
| | | | git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1080 311d38ba-8fff-0310-9ca6-ca027cbcb966
* qemux86: machine config files should not set TARGET_VENDOR, its a distro optionRichard Purdie2006-11-291-2/+0
| | | | git-svn-id: https://svn.o-hand.com/repos/poky/trunk@979 311d38ba-8fff-0310-9ca6-ca027cbcb966
* Rename linux-openzaurus to linux-rpRichard Purdie2006-11-291-1/+1
| | | | git-svn-id: https://svn.o-hand.com/repos/poky/trunk@977 311d38ba-8fff-0310-9ca6-ca027cbcb966
* conf/machine: Merge task-base updatesRichard Purdie2006-11-161-0/+2
| | | | git-svn-id: https://svn.o-hand.com/repos/poky/trunk@856 311d38ba-8fff-0310-9ca6-ca027cbcb966
* Sync up.. all the deb/dpkg changes which I have locally are now in svn.Chris Larson2006-09-191-1/+1
| | | | git-svn-id: https://svn.o-hand.com/repos/poky/trunk@728 311d38ba-8fff-0310-9ca6-ca027cbcb966
* qemux86: Switch to use linux-openzaurus as the kernel providerRichard Purdie2006-08-241-1/+1
| | | | git-svn-id: https://svn.o-hand.com/repos/poky/trunk@634 311d38ba-8fff-0310-9ca6-ca027cbcb966
* x86:Chris Larson2006-08-181-0/+17
* 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
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 09:40:59 +0000