* 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>
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>
Upgrade qemu from version 2.1.2 to 2.2.0.
Update Qemu-Arm-versatilepb-Add-memory-size-checking.patch for new
version qemu.
(From OE-Core rev: a693ccb1603be1125bea3b254bf4b6c4188890ac)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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>
The 'overrides' here are PACKAGE_ARCH based and hence not overrides
as such and the _append wasn't working in many cases. This adjusts the
code to use PACKAGE_ARCH as the accessor and ensures the variables
work as expected. This fixes various segfaults and ensures postinsts
run at build time rather than on the target system.
The bug was introduced in http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=7efad8a1b56df6ee07c12ad360c0493d7b1d6d23.
(From OE-Core rev: 219e793907406eabf632e784e3a11ab9acb77cfb)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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>
There is no dtc/.git and pixman/.git files any longer. So remove task
sanitize_sources which is used to remove these files.
(From OE-Core rev: 8d280849b00b1e8ec0de906f6d2ad0b4dc31864a)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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>
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>
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>
(From OE-Core rev: 71fd367f6a460257b6a5866b4932762b041e9563)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Darwin target will not be detected correctly
if qemu is cross-compiled under a Linux host.
(From OE-Core rev: 47d1fc9f5c38f3d092937c47bd4c2f45adaa7fe6)
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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>
For non-linux targets, don't return linux-user qemu targets. This change
also improves readability of the functions through better variable names.
(From OE-Core rev: 3ad8107fa0244b8d0f03400bcd82349f97f347f4)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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>
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>
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>
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>
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>
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>
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>
Converting this dependency to become a PACKAGECONFIG makes sense.
(From OE-Core rev: 15d7dc8df4b508acfeac43a8d0f9e15889ec3e7d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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>
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>
Qemu PCIe bus support is vulnerable to a use-after-free flaw. It could
occur via guest, when it tries to hotplug/hotunplug devices on the
guest.
A user able to add & delete Virtio block devices on a guest could use
this flaw to crash the Qemu instance resulting in DoS.
Originated-by: Marcel Apfelbaum <address@hidden>
Updated the qemu recipe to include the security patch.
Upstream-Status: Submitted
(From OE-Core rev: a84e1749b489cee5ea219799c35e29b6edead30f)
Signed-off-by: Daniel BORNAZ <daniel.bornaz@enea.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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>
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>
The correct cpu options are needed in order to correctly run some CPU
types. This information is available in QEMU_OPTIONS, use it. This
avoids architectures like qemuppc failing postinstalls.
(From OE-Core rev: 3d9c0cbf1f9b9802d7374c4fa1672c26fc5db5cb)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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>
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
However in nativesdk-qemu-helper no FILESPATH additions are currently needed so
instead it should be removed.
(From OE-Core rev: cd35938fa4fac4451da3ef32626988c51ed8c021)
Signed-off-by: Petter Mabäcker <petter@technux.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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>
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>
The machine can not work with memory over 256M, so add a checking
at startup. If the memory size exceed 256M, just stop emulation then
throw out warning about memory limitation.
(From OE-Core rev: 48ff812a4b649fa7b1c73740ef65e4855640dc39)
Signed-off-by: Jiang Lu <lu.jiang@windriver.com>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Jeff Polk <jeff.polk@windriver.com>
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The qemu mips malta base board boot loader uses environment strings
with a max length of 256 bytes which is not long enough to accommodate
a long NFS path in addition to the normal kernel boot command line
arguments.
The solution is to expand the environment string length to 1024 bytes.
(From OE-Core rev: 1e9e26304b77dd11b30ec983b7fa058378b29c47)
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Jeff Polk <jeff.polk@windriver.com>
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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>
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>
The qemu tarball ships some extraneous .git metadata in the dtc/ and pixman/
subfolders, containing a reference to the path "../.git/modules" which
doesn't exist. The presence of these files will confuse git if it happens
to recurse into the qemu source folder during an operation on some parent
directory, for example "git clean" at a higher level. Avoid that problem
(mostly) by removing them immediately after the sources are unpacked.
(From OE-Core rev: cd962b790d5d15985a5a436169d6b2e3b0db0b2d)
Signed-off-by: Phil Blundell <pb@pbcl.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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>
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>
Setting DESCRIPTION to the same value as SUMMARY doesn't do anything,
since the value of DESCRIPTION will be derived from SUMMARY if not
specified.
(From OE-Core rev: e1e888585c84175580ad822d4a6c93f62e5ce16c)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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>
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>
Nathan Rossi
Robert Yang
Kai Kang
Richard Tollerton
Richard Purdie
Cristian Iorga
Sona Sarmadi
Jackie Huang
Jonathan Liu
Daniel BORNAZ
Roy.Li
Joe Slater
Petter Mabäcker
Otavio Salvador
Jiang Lu
Jeff Polk
Jonas Eriksson
Phil Blundell
Paul Eggleton
Chong Lu
Hongxu Jia
Christopher Larson
Ming Liu
Saul Wold