Commit Graph

89 Commits

Author SHA1 Message Date
Nathan Rossi 548ab15d6d qemu: Update PACKAGECONFIG[xen] and add xen to defaults
* Add build and runtime dependencies for PACKAGECONFIG[xen]
* Add xen as a default PACKAGECONFIG option when it is part of
  DISTRO_FEATURES

(From OE-Core rev: d3c82cd6019ad43af489fdc518a3f8a9f31f6777)

Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-02-14 08:40:57 +00:00
Robert Yang 3a0c5de055 qemu: fix B != S
And bump PR to avoid:
Makefile:16: *** This is an out of tree build but your source tree
(/path/to/qemu-2.2.0) seems to have been used for an in-tree build. You
can fix this by running "make distclean && rm -rf *-linux-user
*-softmmu" in your source tree.  Stop.

(From OE-Core rev: 0ba65934fa1c2a4f4bd3ed404ab9a9163bde5309)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-01-16 23:08:26 +00:00
Richard Tollerton 48a03945c3 qemu: disable vte if gtk is also disabled
vte will pull in the gtk libs itself. This can cause build failures if
the native gtk was build with glib>=2.41 while the sysroot native glib
is <=2.40.

Fix for [YOCTO #7077].

(From OE-Core rev: 6cea10dd8f041731269ad16b94d8e172ab1f7257)

Signed-off-by: Richard Tollerton <rich.tollerton@ni.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-12-19 18:07:59 +00:00
Richard Purdie ef7ea3869c qemu: Add missing wacom HID descriptor
The wacom driver we use is missing a HID descriptor causing it not to work
with 3.17 kernels and later. This patch adds in a descriptor to make the
driver work again.

(From OE-Core rev: 51200e0151f0a3b0ed06649ffe77ef20bb296499)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-11-28 14:02:56 +00:00
Robert Yang b2a93ca8e8 qemu-native: only depends on libxext-native when x11
Fixed when build without x11 in DISTRO_FEATURES:
ERROR: libxext-native was skipped: missing required distro feature 'x11' (not in DISTRO_FEATURES)

(From OE-Core rev: 012c7fbe0a21e469db5112873e778ff7c3b17237)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-09-03 11:09:04 +01:00
Robert Yang 1ea36c8cd3 qemu-native: depends on libxext-native when enable sdl
Fixed do_configure error:

ERROR: User requested feature sdl
       configure was not able to find it.
       Install SDL devel

The error message from log.do_configure, and if we check config.log, the
error is:

sysroots/x86_64-linux/usr/lib/libXext.so.6: undefined reference to `_XEatDataWords'

The _XEatDataWords is provided by libX11.so, the dependencies are:

qemu-native -> sdl(from the host) -> libXext.so(maybe host or native) -> libX11.so (maybe host or native)

For example on Ubuntu 12.04 x86_64, the link route is:

qemu-native's do_configure sdl checking:
/usr/lib/x86_64-linux-gnu/libSDL.so --> <sysroots>/x86_64-linux/usr/lib/libXext.so.6 --> /usr/lib/x86_64-linux-gnu/libX11.so

So it is:
host sdl -> sysroot libXext.so.6 -> host X11.so

qemu-native doesn't depend on libxext-native, so the error would happen
if the libx11-native is being rebuilding and the host's libX11.so
doesn't have _XEatDataWords.

Manually reproduce it on Ubuntu 12.04 x86_64:

$ bitbake qemu-native libx11-native libxext-native
$ bitbake qemu-native libx11-native -ccleansstate && bitbake qemu-native

Note, only qemu-native has this problem since libxext depends on libX11,
and SDL would depend on libxext when x11 is enabled.

(From OE-Core rev: fbf6995306d85ad868fa5d33da9b493e7e0de414)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-08-29 23:44:37 +01:00
Jackie Huang c16795477e qemu: add PACKAGECONFIG for numa
Add PACKAGECONFIG for numa to avoid build error:
backends/hostmem.c:21:20: fatal error: numaif.h: No such file or directory

Package numctl is from meta-oe.

(From OE-Core rev: 9661ce6ed5e01dd21360946c561b3c8a1ce9fc2c)

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-08-27 12:13:38 +01:00
Jonathan Liu f9619af318 qemu: Explicitly disable libiscsi, its not in DEPENDS
(From OE-Core rev: 71fd367f6a460257b6a5866b4932762b041e9563)

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-08-23 09:26:12 +01:00
Richard Purdie ea06e645a5 qemu.inc: Drop unneeded nativesdk-libsdl RDEPENDS
Now sdl is completely handled by PACKAGECONFIG, we can drop this RDEPENDS.

(From OE-Core rev: df764706c221a0da77af993dad23b1b97507ec8b)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-08-17 10:01:35 +01:00
Kai Kang 8247293cf5 qemu: add PACKAGECONF lzo
Add PACKAGECONF 'lzo' for qemu to fix QA warning:

WARNING: QA Issue: qemu rdepends on lzo, but it isn't a build dependency? [build-deps]

(From OE-Core rev: b05cf36a1fcb0fc2d3795ab43481f6de01de2af2)

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-08-15 18:21:48 +01:00
Kai Kang d5b7327492 qemu: enable aarch64 support
qemu 2.1.0 support aarch64 targets, so add aarch64 to QEMU_TARGETS to
enable qemu aarch64 support.

[YOCTO #6487]

(From OE-Core rev: 2ff11438b763ddebfd798ccfe93d0d981d596202)

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-08-15 18:21:48 +01:00
Richard Purdie 3939d66849 qemu: Overwrite KVM explicitly for darwin/mingw
Force KVM to disabled on mingw/darwin systems since this makes no
sense there.

(From OE-Core rev: 0bbafc1e0250bc4df6c6fcc749ab9bbbd7de4a89)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-08-15 18:21:47 +01:00
Richard Purdie 06d6608a89 qemu: Simplify DEPENDS
These DEPENDS are now identical and the native/nativesdk variants can
be dropped in favour of letting PACKAGECONFIG sort it out.

(From OE-Core rev: 67c8f70e84ac25adb5ea54dbde83d2377a994f97)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-08-15 18:21:47 +01:00
Richard Purdie 42f0ffe6f8 qemu: Add PACKAGECONFIG for glx
With the configuration for sdl and glx, the virtual/libx11 in DEPENDS
no longer makes any sense at all, the dependency comes through the
various graphics backends. Therefore drop it. The glx PACKAGECONFIG
is added for completeness. We avoid a floating dependency on mesa.

(From OE-Core rev: ddb88df0eca85b0b2afca68a23c018d39a4c3d78)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-08-15 18:21:47 +01:00
Richard Purdie 153773e62b qemu: Add alsa PACKAGECONFIG and cleanup native/nativesdk DEPENDS
Converting this dependency to become a PACKAGECONFIG makes sense. Since
there is a "," in the configuration option, its not quite as straightforward
as normal.

Also clean up the native and nativesdk DEPENDS and set the PACKAGECONFIG
entries to match the old behaviour by default.

(From OE-Core rev: f724085b4947ec8437d48f77acd2e9e9d19e39ef)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-08-15 18:21:47 +01:00
Richard Purdie 1c1ce088c6 qemu: Fixup target sdl configuration to use PACKAGECONFIG
SDL is now controlled by PACKAGECONFIG, remove the DEPENDS remnant
set PACKAGECONFIG accordingly.

(From OE-Core rev: 5bb25628e408f8738b38baba1f8609ab22cd5c51)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-08-15 18:21:47 +01:00
Richard Purdie f4ff3d3f8a qemu: Move dtc(fdt) configuration to PACKAGECONFIG
Converting this dependency to become a PACKAGECONFIG makes sense.

(From OE-Core rev: 15d7dc8df4b508acfeac43a8d0f9e15889ec3e7d)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-08-15 18:21:47 +01:00
Cristian Iorga 963604605c qemu: upgrade to 2.1
QEMU 2.1 comes with fixes and improvements.
See http://wiki.qemu.org/ChangeLog/2.1 for details.
- Added config for quorum support, depending on gnutls.
- pcie_better_hotplug_support.patch removed,
integrated upstream.
- Qemu-Arm-versatilepb-Add-memory-size-checking.patch updated
to 2.1 source code.
- no-strip.patch removed, no longer necessary due to code changes.

(From OE-Core rev: 3ae32d0d6c7cf8294300f32d346da36748e05f3d)

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-08-11 10:53:08 +01:00
Richard Purdie 81d7adf605 qemu.inc: Allow optional use of pkg-config from the HOST
Currently, if pkg-config isn't installed on the build system, this code
can cause an error. We don't need to require this, only use it if its
present so allow the test to fail gracefully.

(From OE-Core rev: c39a1172afd783cedf4cb11f00e8f16d7a7ec22c)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-08-02 09:26:15 +01:00
Richard Purdie 63df03dc7b qemu: Use PACKAGECONFIG for libusb to avoid floating dependency
(From OE-Core rev: 24cc1af031244ad7c152b98312012b6344e57d48)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-07-25 15:33:58 +01:00
Roy.Li 58e3c4d56b qemu: exclude some ARM EABI obsolete syscalls
some syscalls are obsolete and no longer available for EABI, exclude them to
fix the below error:
        In file included from qemu-seccomp.c:16:0:
        qemu-seccomp.c:28:7: error: '__NR_select' undeclared here (not in a function)
              { SCMP_SYS(select), 252 },
                ^
        qemu-seccomp.c:36:7: error: '__NR_mmap' undeclared here (not in a function)
              { SCMP_SYS(mmap), 247 },
                ^
        qemu-seccomp.c:57:7: error: '__NR_getrlimit' undeclared here (not in a function)
              { SCMP_SYS(getrlimit), 245 },
                ^
        qemu-seccomp.c:96:7: error: '__NR_time' undeclared here (not in a function)
              { SCMP_SYS(time), 245 },
                ^
        qemu-seccomp.c:185:7: error: '__NR_alarm' undeclared here (not in a function)
              { SCMP_SYS(alarm), 241 },

please refer source files:
        arch/arm/include/uapi/asm/unistd.h
or kernel header:
        /usr/include/asm/unistd.h

(From OE-Core rev: 49257247fdc57e9296520bbd598fd8cbf425d44a)

Signed-off-by: Roy.Li <rongqing.li@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-07-17 12:28:51 +01:00
Cristian Iorga fbe129100b qemu: fix qemu-native pkg-config paths
For qemu-native, the pkg-config paths do not
include build host paths.
This is an issue for libsdl for example, where SDL is
used by qemu, but for qemu-native libsdl-native is not
built, but assumed to be provided by the build host.
Because pkg-config do not search for libsdl config files
on the build host sysroot, the configure stage of qemu-native
will fail because it will not find SDL as being installed.
Usually, the isssue is masked by a functional sdl-config that
will be interogated instead of pkg-config. However, on Build
Appliance, sdl-config is deliberately made non-functional,
so the issue manifests itself.

The fix will create an extended PKG_CONFIG_PATH, which does
include the build host sysroot paths for pkg-config.

Fix for [YOCTO #6495].

(From OE-Core rev: 68a5ed337f8f7ee8e5bf55542ec82d786eb754db)

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-07-03 17:41:16 +01:00
Joe Slater 939fce4d98 qemu: define PACKAGECONFIG[] for ssh2
qemu configure will search for libssh2 if we do not enable or
disable it's use, resulting in non-deterministic builds.  We
define PACKAGECONFIG[] to avoid this.

(From OE-Core rev: ecb819b12a89e4e944974068d2e20ed226979317)

Signed-off-by: Joe Slater <jslater@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-05-13 19:32:06 +01:00
Richard Purdie 4055185967 qemu/local.conf.sample: Add sdl PACKAGECONFIG
Currently the SDL configuration option for qemu floats. This is confusing to new users
and makes the build non-determinstic. This patch adds a PACKAGECONFIG option, defaulting
to off and adds documentation to local.conf.sample leaving it on by default since this
is the configuration our quick start assumes.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-05-13 08:02:04 +01:00
Otavio Salvador 4c14b09498 Globally replace 'base_contains' calls with 'bb.utils.contains'
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>
2014-04-25 17:19:19 +01:00
Richard Purdie 069de520ec autotools-brokensep: Mark recipes with broken separate build dir support
This patch goes through the OE-Core recipes and marks those which use autotools
but don't support a separate build directory (${S} != ${B}). A new class,
autotools-brokensep is used for this purpose.

This doesn't introduce any change in behaviour in its own right.

(From OE-Core rev: 006b8a7808a58713af16c326dc37d07765334b12)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-02-28 14:01:16 +00:00
Jonas Eriksson 245ee1643f qemu: Allow building without X11 support
To enable the construction of minimal hypervisors based on OE, it is
important to be able to build qemu without it requiring X support. By
checking that the distro is built with the x11 feature before adding
virtual/x11 to the dependencies, this is made possible.

(From OE-Core rev: e88b85406f2a6722a507b5db3485358a88d950f7)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-01-29 17:38:48 +00:00
Cristian Iorga 37a0775984 qemu: upgrade to 1.7.0
linux-user-Handle-SOCK_CLOEXEC-NONBLOCK-if-unavailab.patch
file no longer needed, included in upstream.
qemu-native tested on all architectures,
host machine is Ubuntu Linux 13.10 x86-64.
Basic X11 and networking tests performed.

(From OE-Core rev: 0f81a4b17ab9ea1b3cc69629aec3f3d2176f8153)

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-01-10 15:16:48 +00:00
Paul Eggleton cec8b230cf Replace one-line DESCRIPTION with SUMMARY
A lot of our recipes had short one-line DESCRIPTION values and no
SUMMARY value set. In this case it's much better to just set SUMMARY
since DESCRIPTION is defaulted from SUMMARY anyway and then the SUMMARY
is at least useful. I also took the opportunity to fix up a lot of the
new SUMMARY values, making them concisely explain the function of the
recipe / package where possible.

(From OE-Core rev: b8feee3cf21f70ba4ec3b822d2f596d4fc02a292)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-01-02 12:50:18 +00:00
Hongxu Jia 1fd93bd1a3 qemu: add bash and python to qemu's RDEPENDS
| Note: adding Smart RPM DB channel
|
| Note: to be installed:  qemu@x86_64 run-postinsts@x86_64 kernel-modules@qemux86_64 packagegroup-core-boot@qemux86_64
| Loading cache...
| Updating cache...               ######################################## [100%]
|
| Computing transaction...error: Can't install qemu-1.5.0-r0.0@x86_64: no package provides /usr/bin/python
|
| Saving cache...
|
| WARNING: exit code 1 from a shell command.
| ERROR: Function failed: do_rootfs (log file is located at tmp/work/qemux86_64-wrs-linux/wrlinux-image-glibc-small/1.0-r1/temp/do_rootfs/log.do_rootfs.21373)

(From OE-Core rev: 44806d40a8061a3dbab4cc19d1200c032781e0b4)

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-12-09 18:01:43 +00:00
Christopher Larson 44b2cf59e2 qemu: handle CLOEXEC/NONBLOCK if unavailable on host
(From OE-Core rev: d60cf44deb297119f97d7e792eae5ab01977e2fc)

Signed-off-by: Christopher Larson <kergoth@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-12-03 17:45:53 +00:00
Hongxu Jia 1e084f9d75 qemu: add PACKAGECONFIG for vnc, libcurl, nss, uuid, curses, gtk+, libcap-ng
Use PACKAGECONFIG to explicitly address vnc, libcurl, nss, uuid, curses, gtk+,
libcap-ng dependencies rather than tested by configure.

It avoided potential errors while multiple builds shared a common state_cache.

(From OE-Core rev: 4482af07df26644885bae49b98f5d765a5caa68c)

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-11-26 12:10:35 +00:00
Ming Liu f61e62c87d qemu: explicitly disable xen support
We don't make use of xen and when building on Ubuntu 13.04 when
libxen-dev is installed on the build host you will get errors like the
following:

| /usr/include/x86_64-linux-gnu/bits/string3.h:81: warning: memset used with constant zero length parameter; this could be due to transposed parameters
| /usr/lib/gcc/x86_64-linux-gnu/4.7/../../../../lib/libxenguest.so: undefined reference to `lzma_alone_decoder@XZ_5.0'
| /usr/lib/gcc/x86_64-linux-gnu/4.7/../../../../lib/libxenguest.so: undefined reference to `lzma_code@XZ_5.0'
| /usr/lib/gcc/x86_64-linux-gnu/4.7/../../../../lib/libxenguest.so: undefined reference to `lzma_stream_decoder@XZ_5.0'
| /usr/lib/gcc/x86_64-linux-gnu/4.7/../../../../lib/libxenguest.so: undefined reference to `lzma_end@XZ_5.0'

This change disables xen for both -native and target packages but
since it is a PACKAGECONFIG a user could tune this to have xen support
in the target package.

(From OE-Core rev: fd638b975aac826d7137fd11db94b64ba82de592)

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Ming Liu <ming.liu@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-11-20 14:03:28 +00:00
Ming Liu 9f56718722 qemu: use PACKAGECONFIG to address xfsprogs dependency
To avoid a implicit build result.

(From OE-Core rev: 3e302e94ba5bcbba2736f37c0f67cfaf7fa45c0c)

Signed-off-by: Ming Liu <ming.liu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-11-12 16:00:28 +00:00
Chris Patterson 6a3e200e28 qemu: upgrade to 1.6.1
This update also drops the following patches which appear to have
been resolved upstream:
- ftd_header.patch
- target-i386-Fix-aflag-logic-for-CODE64-and-the-0x67-.patch
- target-ppc_fix_bit_extraction.patch

Qemu no longer uses the i386.ld and x86_64.ld linker scripts
and the .interp section should now have a 0x1000 size with the
proper path.  Therefore, for nativesdk-qemu, the following
patch should no longer be required and is also dropped:
- relocatable_sdk.patch

(From OE-Core rev: 8e22b08de2745e08421b38f8ba215bcc1de4b423)

Signed-off-by: Chris Patterson <cjp256@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-11-05 22:04:29 +00:00
Ross Burton dd2b2f93a9 qemu: add option to disable X grabs
When the mouse pointer enters the qemu window it takes a pointer grab. This
doesn't sound too dangerous at first but it turns out that SDL will infinitely
busy-loop if it can't get the grab (e.g. if the screen is locked) and the
average autobuilder setup's X server will have locked the screen a few minutes
after boot.

The result is that on many autobuilders apparently random qemu instances (the
top-most one under the pointer) will hang during boot.

To resolve this add an option (via an environment variable) to never attempt a
grab.  The default behaviour remains to grab so that everyone else doesn't see
any change.

(From OE-Core rev: a60b1ebbb8f81245f3ccf25b3f9d63677de75b85)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-09-18 17:52:04 +01:00
Khem Raj 352701f88d qemu: Skip it for mips64 target
We should not skip it always since same recipes provide
qemu-native too so user class-target override to make it
only skip for target recipes

(From OE-Core rev: 23d633cc65cf31486263f120c71df82186cfdd22)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-08-13 23:06:04 +01:00
Riku Voipio 290a5aef1f qemu: pass CFLAGS via ./configure instead of a patch
OE carries a patch to pass CFLAGS to qemu. However, we can avoid
patching by passing CFLAGS with qemu's --extra-cflags option.

Tested that building qemu-native still works without zlib-dev
on host, and that qemu builds.

(From OE-Core rev: 67b6d8d9f987a59090a9a8af61cf740207703dff)

Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-08-12 13:09:52 +01:00
Ross Burton f890c73027 qemu: remove unused SDL variable
(From OE-Core rev: 414f1b54f93115bc52130f342ffe3a95be47b18e)

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>
2013-08-03 10:33:04 +01:00
Mark Hatle 5c9281e87b qemu: QEMU fix libtool usage
QEMU uses the environment variable LIBTOOL by default.  We want to ensure
we set it to the proper libtool version, instead of letting it default to
the host system version.

This corrects target building, and ensures we're linking properly for
native and nativesdk versions.

(From OE-Core rev: b91d65fc78c18948ed4ec96f34b85c431dbc3d95)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-07-13 18:23:38 +01:00
Ting Liu 6e08d01e54 qemu: use PACKAGECONFIG to address libaio/attr/libcap dependencies
Move to using the PACKAGECONFIG mechanism to select configure options
and dependencies. Without this the system will attempt to discover
various dependencies, and sometimes does so incorrectly.

(From OE-Core rev: 8438bbe210de6f565f842d745ccede131fa385db)

Signed-off-by: Ting Liu <b28495@freescale.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-07-10 09:42:00 +01:00
Riku Voipio b85b6118d5 qemu: update to 1.5.0
Patches removed:

0001-doc-Fix-texinfo-table-markup-in-qemu-options.hx.patch
 - applied
0002-docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch
 - fixed different upstream
Revert-vmware_vga-Add-back-some-info-in-local-state-.patch
 - fixed different upstream
arm-bgr.patch
 - this should be also fixed upstream, if still issue please resend.
fallback-to-safe-mmap_min_addr.patch
 - this should be also fixed upstream, if still issue please resend.
linker-flags.patch
 - unneeded with makefile changes

from configure the obsolete --audio-cards-list option has been removed.

(From OE-Core rev: 408f933f3b5523fc26ee818a16bb4162c4343192)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-06-13 17:38:08 +01:00
Ionut Radu 8f5abd2812 qemu: Updated from 1.4.0 to 1.4.1
0001-doc-Fix-texinfo-table-markup-in-qemu-options.hx.patch and 3f08ffb4a4741d147634761dc053ed386243a0de.patch were backported in 1.4.1

(From OE-Core rev: d3fd92010a0b965fe1b7696f7c4e6c02d07f85dc)

Signed-off-by: Ionut Radu <ionutx.radu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-24 14:14:46 +01:00
Martin Jansa dabf7a4b75 qemu: Add 2 patches to fix build with texinfo-5
(From OE-Core rev: af65260dbf17fcd47b6630db473d95f2f3225d68)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-04-04 14:04:43 +01:00
Mihai Prica 6ad0467ac8 qemu: Enabled SDL when compiling for target architecture
Enables qemu to run images with video output without the need for vncviewer.

(From OE-Core rev: 30d5c1d5bc9a3931a09425962d980a3571dc56f3)

Signed-off-by: Mihai Prica <mihai.prica@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-04-04 14:04:42 +01:00
Richard Purdie 7b5f838137 qemu: Add missing DEPENDS on dtc
This fixes failures in builds where qemu fails with:

i586-poky-linux/qemu/1.4.0-r0/qemu-1.4.0/hw/arm/../../device_tree.c:28:20: fatal error: libfdt.h: No such file or directory
x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.7.2/ld: cannot find -lfdt

(From OE-Core rev: 1bf194f392bf14154e9cc2c33e117a52ef07f9e1)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-27 11:56:31 +00:00
Hongxu Jia e609afe4d7 qemu-native:fix do_compile failed on SLED 11.2
1, When build qemu-native on SLED 11.2, there is an error:
...
| In file included from /usr/include/bits/sigcontext.h:28,
|    from /usr/include/signal.h:339,
|    from /buildarea2/tmp/work/i686-linux/qemu-native/1.4.0-r0/
qemu-1.4.0/include/qemu-common.h:42,
|    from fsdev/virtfs-proxy-helper.c:23:
| /usr/include/asm/sigcontext.h:28: error: expected specifier-
qualifier-list before '__u64'
| /usr/include/asm/sigcontext.h:191: error: expected specifier-
qualifier-list before '__u64'
...

2, The virtfs-proxy-helper.c includes <sys/capability.h> and
qemu-common.h in sequence. The header include map is:
(`-->' presents `include')
...
"virtfs-proxy-helper.c" --> <sys/capability.h>
...
"virtfs-proxy-helper.c" --> "qemu-common.h" --> <signal.h> -->
<bits/sigcontext.h> --> <asm/sigcontext.h> --> <linux/types.h> -->
<asm/types.h> --> <asm-generic/types.h> --> <asm-generic/int-ll64.h>
...

3, The bug is found on SLED 11.2 x86. In libcap header file
/usr/include/sys/capability.h, it does evil stuff like this:
...
  25 /*
  26  * Make sure we can be included from userland by preventing
  27  * capability.h from including other kernel headers
  28  */
  29 #define _LINUX_TYPES_H
  30 #define _LINUX_FS_H
  31 #define __LINUX_COMPILER_H
  32 #define __user
  33
  34 typedef unsigned int __u32;
  35 typedef __u32 __le32;
...
This completely prevents including /usr/include/linux/types.h.
The above `<asm/sigcontext.h> --> <linux/types.h>' is prevented,
and '__u64' is defined in <asm-generic/int-ll64.h>.

4, Modify virtfs-proxy-helper.c to include <sys/capability.h>
last to workaround the issue.

http://www.linuxtv.org/pipermail/vdr/2009-August/021194.html
http://patchwork.linuxtv.org/patch/12748/

[YOCTO #4001]

(From OE-Core rev: 1267bb2fd91f205d35e805aa019d25ab7a921b14)

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-15 01:53:04 +00:00
Khem Raj 3cbd4beced qemu: Upgrade to 1.4.0 release
Tested qemu on x86-64 target and qemu-native
no obvious problems seen in testing

(From OE-Core rev: f479201fffda617e3530967a75ab350739574b4b)

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>
2013-03-05 13:14:55 +00:00
Jason Wessel 40f8412442 qemu.inc: Non deterministic compile of qemu
When you using a qemuppc target and sstate you might end up with
the problem:

qemu-system-ppc: error while loading shared libraries:
   libfdt.so.1: cannot open shared object file: No such file or directory

The way you can force this to happen assuming you are using sstate is
as follows:

bitbake dtc-native
bitbake -c cleansstate qemu-native
bitbake qemu-native
bitbake -c clean dtc-native

Now go start qemu and it will fail.  The solution is to always build
the dtc libraries since they are used and needed by the qemuppc
simulator.

(From OE-Core rev: 79c620016b0be4dacc9fcfbd4baab5ea6c66a440)

Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-02 12:56:55 +00:00
Martin Jansa 9ea8828fe4 qemu: disable smartcard support
* sometimes it's autodetected and fails to build:
  | /usr/bin/ld: libcacard/.libs/cac.o: Relocations in generic ELF (EM:40)
  | libcacard/.libs/cac.o: could not read symbols: File in wrong format
  | collect2: ld returned 1 exit status
  | make[1]: *** [libcacard.la] Error 1

(From OE-Core rev: acb0e56d79cfaa606ccd0a075a7c78ede172da86)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-02-08 14:50:36 +00:00