Commit Graph

34 Commits

Author SHA1 Message Date
Richard Purdie ad23395cd1 nativesdk: Switch to using nativesdk as a prefix, not a suffix
As discussed on the mailing lists, using a suffix to package names is
hard and has lead to many recipes having to do PKGSUFFIX games. Its
looking extremely hard to scale nativesdk much further without hacking
many recipes.

By comparison, using a prefix like multilib does works much better and
doesn't involve "hacking" as many recipes. This change converts nativesdk
to use a prefix using the existing multilib infrastructure.

(From OE-Core rev: 81813c0e322dc04ce4b069117188d8a54dfddb8c)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-02 05:52:06 -07:00
Richard Purdie 0b0db813a5 qemu-0.15: Drop GL passthrough support
These patches are a maintenance nightmare and impacting our abaility to
keep up to date with qemu. They are also a source of various bugs.

Remove them until someone is willing to step up and maintain them,
or upstream gains GL support.

(From OE-Core rev: e9a6df98458d9147227659d3888eff01589f2f76)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-20 16:53:15 +01:00
Robert Yang 047db04923 qemu.inc: disable curl for qemu-nativesdk
We had added the --disable-curl to EXTRA_OECONF, but there is an
EXTRA_OECONF_virtclass-nativesdk += "foo", the
"EXTRA_OECONF_virtclass-nativesdk +=" equals to
"EXTRA_OECONF_virtclass-nativesdk =" (the "+" has no effect here), so we
should add the "--disable-curl" to EXTRA_OECONF_virtclass-nativesdk.

And change the "+=" to "=" to not confuse people.

[YOCTO #2305]

(From OE-Core rev: a69df1807af3e099685b766dac4d6c6919b01852)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-13 20:10:30 +01:00
Yao Zhao 63f545b850 qemu-nativesdk: fix the build failure that linux/kvm.h not found
qemu.inc: on older kernel build hosts that have < 2.6.20 which
doesn't support kvm yet, build will fail. Add a check in do_configure
to make sure whether linux/kvm.h exists for nativesdk build.

(From OE-Core rev: 7d49af3a811472a2a47453bef0813b89c6331ae7)

Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-18 17:46:53 +01:00
Khem Raj ccaef5c9a1 qemu: Explicitly add --disable-gl-accel when gl is not enabled
Default seems to be to enable GL accelaration so when
gl is not specified in PACKAGECONFIG then add the
--disable-gl-accel to really disable it.

(From OE-Core rev: 039a2f63712cbe87eb68a8c8c0cc365b74651f5a)

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>
2012-07-17 10:54:02 +01:00
Khem Raj 06fe8a9a4e qemu.inc: Fix packageconfig options
--{en|dis}able-gl-accel is spcefic to gl
patches in 0.15.1 which may not be available
for other qemu's so if someone chooses to remove
gl from PACKAGECONFIG then we dont explicitly
use the --disable-gl-accel option since this
wont be recognised by configure.

(From OE-Core rev: 68a170c9b69fc70b22167f344e6f72f028938066)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-06-25 16:35:53 +01:00
Zhai Edwin d63298e566 qemu: Add an option to remove host sdl/gl checking
Add an PACKAGECONFIG in qemu to disable GL acceleration:
* By default configure try best to enable GL acceleration and fail when missing
  host dependency(libSDL and libGL).
* End user can also choose to turn off GL capability, thus remove the host
  dependence in building.

[YOCTO #2407] got fixed.

(From OE-Core rev: cfa93553e17057a1ea9d81e3a415fc8260c54067)

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-30 12:04:48 +01:00
Saul Wold 6558abda67 qemu: disable vnc-jpeg compression
This is disabled by default to ensure a deterministic build, qemu
configure would sometimes detect the libjpeg and then enable this.
Since mostly qemu is used locally disable by default.

(From OE-Core rev: 0f795f81fe5ad3ef78c21a177eca90fbc8810f81)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-24 08:53:57 +01:00
Richard Purdie ad229f81f4 qemu: Disable curl explicitly, its not in DEPENDS
There is an error when build meta-toolchain-sdk on Ubuntu 10.10:

| Installing NATIVESDK packages
| Processing task-sdk-host-nativesdk...
| Processing task-cross-canadian-mips...
| error: Failed dependencies:
|       libcurl.so.4 is needed by qemu-nativesdk-0.15.1-r5.i686
NOTE: package meta-toolchain-gmae-1.0-r7: task do_populate_sdk: Failed
ERROR: Task 21 (/buildarea2/lyang1/poky/meta/recipes-core/meta/meta-toolchain-gmae.bb, do_populate_sdk) failed with exit code '1'

This is because qemu would depend on curl if it happened to be
available at build time and could confuse the -native and -nativesdk
librbaries.

[YOCTO #2305]

(From OE-Core rev: 566ad643efd03db34b59a427f48ca55ce613cf89)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-17 14:08:40 +01:00
Robert Yang aff0f018d2 qemu: add fedora pkg names when build failed
When qemu build failed, we can see such messages:

You need libGL.so and libGLU.so to exist in your library path and the
development headers for SDL installed to build qemu-native.

Ubuntu package names are: libgl1-mesa-dev, libglu1-mesa-dev and
libsdl1.2-dev

These pkgs have different names on Fedora distributions, and Fedora is
one the
main linux distributions, so add Fedora package names.

The following Fedora versions have these pkgs:
	Fedora 9 64bit
	Fedora 13 32bit
	Fedora 13 64bit
	Fedora 16 64bit

[YOCTO #2174]

(From OE-Core rev: 246438582f8a23ce1847bae230bce07fbb3c6d15)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-26 12:13:04 +01:00
Saul Wold ef461c4a2a qemu: Add glib-2.0 as depends
(From OE-Core rev: 37a8655bd4b781985eb6b4e33f1847e997609f7b)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-02-28 12:27:46 +00:00
Paul Eggleton 189a854e8d qemu: enable building qemu-nativesdk without x11
Allow building for nativesdk with x11 removed from DISTRO_FEATURES
by conditionally disabling qemugl (which requires X).

Fixes [YOCTO #2020]

(From OE-Core rev: 136b13eb6a682222e2af887d3247a61310476c70)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-02-24 17:01:44 +00:00
Paul Eggleton 1090bc49da qemu: explicitly disable kvm support for native without kvm header
Addendum to previous fix - instead of just not specifying --enable-kvm,
explicitly specify --disable-kvm when building native version and
kvm header is unavailable. Fixes reported do_configure failure on
earlier CentOS 5.x versions (e.g. 5.4).

(From OE-Core rev: a922112e197925db47cf02682c08f3af2bc760b4)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-12-24 10:05:43 +00:00
Paul Eggleton bc13ebece2 qemu: for native, do not fail if kvm is unavailable
When building qemu-native, if the linux kvm header is unavailable (as
it is on CentOS 5.x 32-bit) then do not pass the --enable-kvm switch to
the configure script, thus avoiding failed do_configure.

(From OE-Core rev: 8c21c71f005b601f58925e9912f2cf44127e291d)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-12-15 14:36:21 +00:00
Saul Wold c471b1c905 qemu.inc: qemu-native also needs glib-2.0 native
(From OE-Core rev: 5cef819b71733b15066a0624c3d6404e9093890f)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-14 13:18:19 +01:00
Khem Raj 22d8978422 qemu.inc: Add glib-2.0-nativesdk to qemu-nativesdk DEPENDS
QEMU starting version 0.15 needs glibc-2.0

(From OE-Core rev: 65f7ff79c5e1e98403a5968c5dbee405c316d55c)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-14 13:18:14 +01:00
Anders Darander 85a6d0c260 qemu: modify search paths for libgl
On e.g. Debian libql is found under /usr/lib/x86_64-linux-gnu/libGL.so.
Use a wildcard to match different locations, as uname -i only return unknown on Debian.

(From OE-Core rev: 32f74152dfe583f005c8654910b15cd7d0e3d421)

Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-19 09:29:19 -07:00
Zhai Edwin 5440cb560d qemu: Make qemu buildable inside qemux86/qemuppc target
It requires libx11 and libGL(if enabled GL) for building, which introduce extra
dependence in qemuppc target. Futhermore, qemu's GL code is x86-oriented, thus
some hacks needed for building in qemupcc. For simplicity, just make qemu GL's
code for native only, so that qemu building is okay in world build.

[YOCTO #1011] got fixed.

(From OE-Core rev: e744d4e2d33d914b2ca31be2d4eadab9fbcc3251)

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-17 15:14:55 +01:00
Khem Raj e154e51011 qemu: Poke more paths for presence of libgl
On ubuntu 11.10 libGL is not in
/usr/lib/`uname -i`-linux-gnu/ directory
so we search this dir too.

(From OE-Core rev: ced947e989dfbca8055fe57e14207cb6f1357430)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-10 13:33:05 +01:00
Richard Purdie fa62058503 qemu: Clean up various QA warnings, add approproate INSANE_SKIP for firmware files, ensure files aren't stripped
(From OE-Core rev: 1c43b7ea6152aaad42159ce8071a4014b00f75fc)

Signed-off-by: Richard  Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-05 11:39:10 +01:00
Saul Wold 04e3654834 qemu: Fix Dependency and compatible machines
add DEFAULT_PREFERENCE = "-1" to disable git recipe
Added libx11 for GL support to DEPENDS
Use BROKEN to disable qemuarm and qemumips world build of qemu target

(From OE-Core rev: 1bedd7f3d73c2f9f179f4de4bfaea944a18e49b5)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-18 14:32:47 +01:00
Saul Wold 5f37ef4681 qemu: Fix non-sdl/opengl build
(From OE-Core rev: 4b3e39a9dd491a8a6996fce8ed0d05074ea920f5)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-28 10:45:50 +01:00
Saul Wold eb0deaeef8 qemu: disable sdl for target build
This allows qemu  to build for the target in the world build.
Not sure this would make sense to run on the target.

(From OE-Core rev: 09a55b1d4354531afe692f2618bd4fa5bf2dec74)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-24 22:50:21 +01:00
Ilya Yanok a0933f0a92 qemu-nativesdk: fix do_configure
qemu 0.14 does not need --cross-prefix switch as it uses CC environment
variables (and friends) which contains the cross prefix already.

(From OE-Core rev: c9ead26abae18397fcf0e07ff278bb9052d5b8f3)

Signed-off-by: Ilya Yanok <yanok@emcraft.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-04 17:28:08 +01:00
Khem Raj a9441d4382 qemu.inc: Add sh4,sh4eb,mips64,mips64el targets
In order to leavarage more emulations in oe-core
these targets needs to be built as well

Introduce new variable QEMU_TARGETS which
can be set by user to decide what all machine support
should be build into qemu-native

This one works adding same to qemu.inc does not
parse presumably a bitbake problem.

(From OE-Core rev: 62ced6b84bf650ce4cf101491614613ec8fc17af)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-31 22:02:51 +01:00
Koen Kooi 38a5f61233 qemu: enabling the alsa driver needs alsa in DEPENDS, add it
This fixes:

| + /OE/tentacle/build/tmp-angstrom_2010_x/work/x86_64-linux/qemu-native-0.13.0-r1/qemu-0.13.0/configure --prefix=/OE/tentacle/build/tmp-angstrom_2010_x/sysroots/x86_64-linux/usr --target-list=arm-linux-user,arm-softmmu,i386-linux-user,i386-softmmu,x86_64-linux-user,x86_64-softmmu,mips-linux-user,mips-softmmu,ppc-linux-user,ppc-softmmu,mipsel-linux-user --disable-werror --disable-vnc-tls --enable-kvm --audio-drv-list=oss,alsa --audio-card-list=ac97,es1370
|
| Error: alsa check failed
| Make sure to have the alsa libs and headers installed.

(From OE-Core rev: 6d186d7144c781ee1985654e808f39ce2f6b1be7)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-23 15:43:44 +00:00
Zhai Edwin d26cbff22a qemu: enable audio support
On qemux86, export ac97 & es1370 emulated device to guest, and enable host oss&alsa
driver. So end user can get sound from qemux86 guest if the sound card
driver installed.

[BUGID #488] got fixed.

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
2011-02-22 11:04:07 -08:00
Zhai Edwin a1175b8906 qemu: Enable KVM support on x86/x86-64 host
User need build kvm module for native kernel and install them by "modprobe
kvm_intel". Then add "kvm" option to poky-qemu to enable it.

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
2010-12-09 08:18:18 -08:00
Zhai Edwin 429a526e35 qemu: Add license checksum
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
2010-12-02 05:24:54 -08:00
Bruce Ashfield 1ea9ad4df2 qemu: add qemu-mipsel to the list of simulators
Add qemu-mipsel to the list of generated simulators. Obviously
this is needed to build a MIPS little endian system.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
2010-09-10 11:55:37 +01:00
Joshua Lock a6c83e0620 qemu: build qemu-x86-64 binary for use in locale generation
Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-09-02 14:07:11 +01:00
Zhai Edwin 431c97533b Add qemu-ppc in qemu-native, required by eglibc
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
2010-09-02 09:53:49 +01:00
Zhai Edwin 09bffb70de Add qemu-i386 in qemu-native, required by eglibc
Adding i386-linux-user in target-list is enough in theory, but our gl stuff is
not friendly to linux-user code. So disable it when compiling linux-user.

[BUGID #218] fixed by this.

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
2010-08-31 16:48:53 +01:00
Richard Purdie 29d6678fd5 Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things
and is generally overwhelming. This commit splits it into several
logical sections roughly based on function, recipes.txt gives more
information about the classifications used.

The opportunity is also used to switch from "packages" to "recipes"
as used in OpenEmbedded as the term "packages" can be confusing to
people and has many different meanings.

Not all recipes have been classified yet, this is just a first pass
at separating things out. Some packages are moved to meta-extras as
they're no longer actively used or maintained.

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-08-27 15:29:45 +01:00