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>
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>
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>
Remove all PR = "r0" from all .bb files in oe-core. This was done
with the command sed -e '/^PR.*=.*r0\"/d' recipes*/*/*.bb -i
We've switching to the PR server, PR bumps are no longer needed and
this saves people either accidentally bumping them or forgetting to
remove the lines (r0 is the default anyway).
(From OE-Core rev: 58ae94f1b06d0e6234413dbf9869bde85f154c85)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
when x11 is not defined in DISTRO_FEATURES, there are no x11 headers
so True is not defined leading to :
| ui/sdl.c:62:8: warning: type defaults to 'int' in declaration of 'doing_grabs' [-Wimplicit-int]
| static doing_grabs = True;
| ^
| ui/sdl.c:62:22: error: 'True' undeclared here (not in a function)
| static doing_grabs = True;
| ^
(From OE-Core rev: d3d5ccd3275196fb9e4cb8f49d3c087b97c20ed6)
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There was a bug in handling of the mxcsr register since cpu flags
were not getting updated after fxrstor operations. This small tweak
fixes that.
[YOCTO #5248]
(From OE-Core rev: 5dc43cdc08e6698afa16ba79f3506a1555bb3710)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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>
It's not necessary to specify the protocol parameter when it's the
default protocol for the fetcher, e.g. the default protocol for
git fetcher it git, "protocol=git" isn't needed.
(From OE-Core rev: a2bab241c64428d5109c3c5ac5de4463fbad70c5)
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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>
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>
qemu packages can NOT be built for mips64, Set COMPATIBLE_HOST to null to
block build them for such platform.
(From OE-Core rev: 239d46d9060ee4f30da4f7633377639283f16453)
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>
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>
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>
This backported patch will fix this Xorg issue and, probably, many
others which didn't show up yet.
[YOCTO #4737]
(From OE-Core rev: c659903841da7aa44675d2970d1b92841b91d29e)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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>
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>
This wrapper script is called mainly from intercept hooks and allarch
packages postinstalls. When multilib is used, the qemuwrapper script
points to the binary that matches the MACHINE architecture.
For example: if MACHINE=qemux86_64 and we activate multilib, then the
postinstalls for lib32 packages would call qemu-x86_64 with 32 bit
binaries and they would certainly fail.
This patch adds just a fallback method if the exit code of the previous
qemu call corresponds to "Invalid ELF image for this architecture"
error. This will allow us to have all postinstalls run on host.
(From OE-Core rev: 0c6ddb84043f0f917543cdaf4814efc15cd0273f)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This wrapper script doesn't need a compile or any of the default system
dependencies so lets inhibit them. This also stops the script
being rebuild every time the toolchain changes.
(From OE-Core rev: 7f72562d274dd2c37ce9262bb7fb8a8a6a9a37df)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* fixes
In file included from /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/libfdt.h:55:0,
from /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/work/x86_64-linux/qemu-native/1.4.0-r0/qemu-1.4.0/hw/arm/../../device_tree.c:28:
/home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:58:2: error: unknown type name 'fdt32_t'
/home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:59:2: error: unknown type name 'fdt32_t'
/home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:60:2: error: unknown type name 'fdt32_t'
/home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:61:2: error: unknown type name 'fdt32_t'
/home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:62:2: error: unknown type name 'fdt32_t'
/home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:63:2: error: unknown type name 'fdt32_t'
/home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:64:2: error: unknown type name 'fdt32_t'
/home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:67:2: error: unknown type name 'fdt32_t'
/home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:70:2: error: unknown type name 'fdt32_t'
/home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:73:2: error: unknown type name 'fdt32_t'
/home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:77:2: error: unknown type name 'fdt64_t'
/home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:78:2: error: unknown type name 'fdt64_t'
/home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:82:2: error: unknown type name 'fdt32_t'
/home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:87:2: error: unknown type name 'fdt32_t'
/home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:88:2: error: unknown type name 'fdt32_t'
/home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:89:2: error: unknown type name 'fdt32_t'
(From OE-Core rev: dfb0c2cf9799d084a76aa92e243c743d7ff05db8)
Signed-off-by: Henning Heinold <heinold@inf.fu-berlin.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We've been seeing random sefgaults on a variety of architectures which appear
to be from an issue in qemu. The attached backport from upstream appears
to fix these.
[YOCTO #4216]
(From OE-Core rev: 55a22b7341571179d5e026d102953a6d9f2045bf)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
