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 master rev: 4482af07df26644885bae49b98f5d765a5caa68c)
(From OE-Core rev: ea9eda2fc54b9dec0f4bd039bcda039388f0a95d)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Robert Yang <liezhi.yang@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 master rev: fd638b975aac826d7137fd11db94b64ba82de592)
(From OE-Core rev: e0947757829b4e1f953bec7b42b28d2c452442c2)
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>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
To avoid a implicit build result.
(From OE-Core master rev: 3e302e94ba5bcbba2736f37c0f67cfaf7fa45c0c)
(From OE-Core rev: b94e55928a07e672610e264f934b90649282ed53)
Signed-off-by: Ming Liu <ming.liu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
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>
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 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>
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>
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>
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>
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.htmlhttp://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>
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>
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>
* 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>
Set the RDEPENDS on the specific package that has the dependency and stop it
being applied to for example ${PN}-doc (and others).
(From OE-Core rev: 3c57a755ff1aec3806770443b73dc899d981c678)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
remove-hardcoded-libexec.patch: removed
- included in the new version
qemu-vmware-vga-depth.patch: removed
- doesn't apply anymore
- the problem addressed by the patch is fixed by
reverting commit 1f202568e0553b416483e5993f1bde219c22cf72
Revert-vmware_vga-Add-back-some-info-in-local-state-.patch:
- VMware VGA requires that the depth presented to the guest
to be the same as the Display Surface depth in order to do not
corrupt the display
- do not cache the DS depth (the depth might change)
- revert commit 1f202568
- QEMU now uses pixman (DEPENDS += "pixman")
- rearrange the recipe in order to mimic the bitbake flow
- update both variants (.tar.bz2, git)
(From OE-Core rev: 7622c4f6c050f26f252066a0fcaacdbf340dcefa)
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The overrides virtclass-native and virtclass-nativesdk are deprecated,
which should be replaced by class-native and class-nativesdk.
[YOCTO #3297]
(From OE-Core rev: bb67ddeb2eed3e25c626a279ef53a7e8c7bfe6f2)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This address the following when libexecdir is not set to /usr/libexec
WARNING: QA Issue: qemu: Files/directories were installed but not shipped
/usr/libexec
/usr/libexec/qemu-bridge-helper
/usr/libexec/.debug
/usr/libexec/.debug/qemu-bridge-helper
(From OE-Core rev: e2fa821033785a44f80002eafac73b7e110023ce)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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>
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>
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>
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>
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>
--{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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Hongxu Jia
Ming Liu
Ross Burton
Khem Raj
Riku Voipio
Mark Hatle
Ting Liu
Ionut Radu
Martin Jansa
Mihai Prica
Richard Purdie
Jason Wessel
Constantin Musca
Robert Yang
Saul Wold
Yao Zhao
Zhai Edwin
Paul Eggleton
Anders Darander
Ilya Yanok
Koen Kooi