Commit Graph

15713 Commits

Author SHA1 Message Date
Bruce Ashfield
6fc0bfdb0f linux-yocto: use src_patches for out of tree kernel feature support
To support larger out of tree kernel features and enhanced patching schemes,
this changeset modifies the linux-yocto patching routines to call the
recently factored out 'src_patches' routine. Using the returned list of local
URIs for all valid patches, the logic can then determine whether or not
patches can be used in place, or need to be migrated and have re-usable
kernel features created. The results are then fed to the existing
infrastructure to be applied and commited to the tree.

(From OE-Core rev: dca97bbdbfc88c91287e74eb6a3974277f1028b7)

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-06 12:11:32 +00:00
Bruce Ashfield
a27ebcab80 linux-yocto: bump kernel version to v3.0.14
Updating the 3.0 kernel recipe to contain v3.0.14 -stable.

(From OE-Core rev: 2f2c73ead531343c5b17e598637ddabd75d53a69)

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-06 12:11:32 +00:00
Bruce Ashfield
b3cc230429 kern-tools: import flexible branching support
The commit:

   kern-tools: update SRCREV to pickup git operation fixes

Brought in the ability to trap failed git operations on the working tree,
but what it missed were some branching changes that allow arbitrary
branch points and the ability to create a branch multiple times (if a feature
is included multiple times). The graphics driver branches used by some
BSPs need this part of the change to properly handle graphics driver
branches.

Updating the SRCREV to pickup the associated kern-tools changes for this
support.

(From OE-Core rev: 229036a961bae61847a05546a92dfc93a88c6f67)

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-06 12:11:31 +00:00
Paul Eggleton
9beabe35f8 classes/buildhistory: remove redundant package history checking stub
The code that would have gone here has been superseded by the
buildhistory analysis functionality implemented in
meta/lib/oe/buildhistory_analysis.py and scripts/buildhistory-diff, so
remove it.

(From OE-Core rev: 5c8d583a12c507788c746637d5b4ddea62b0a629)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-06 12:11:31 +00:00
Paul Eggleton
6542028f3f classes/buildhistory: make the package version backwards error non-fatal
Just make it a bb.error when a package version goes backwards, it
doesn't make sense to fail the build immediately; the error(s) will
still be reflected in bitbake's exit code.

(From OE-Core rev: d3e70e0ed1ece5c8eb7f9c1c8140d3bd7b4333cf)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-06 12:11:31 +00:00
Paul Eggleton
c8d4807bd7 classes/buildhistory: add hostname to commit message
If we're building on multiple hosts then it's useful to have the
hostname in the commit message.

(From OE-Core rev: abf3e7f7f56cc8bcdf104d8e27e7e366b0619ed6)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-06 12:11:31 +00:00
Paul Eggleton
fcc5f6883c buildhistory: add script to check for significant changes
Adds a buildhistory-diff script which can be used to analyse changes in
the buildhistory git repository (as produced by buildhistory.bbclass),
and report significant ones that may need manual checking to ensure they
aren't regressions (e.g. package size changed by more than a certain
percentage, files added/removed/changed in the image, etc.)

The implementation is actually split into a small script and a Python
module, in order to make the logic re-usable in a future web-based
interface.

Implements the first part of [YOCTO #1566].

(From OE-Core rev: 5e5cbb9bd8cdce402b979680288ac8c51799a24d)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-06 12:11:30 +00:00
Saul Wold
f22c292261 gnutls: remove gettext patch for non-GPLv3
GPLv2 version of gnutls does not need the gettext 0.18 patch
since it still uses the over version of gettext that is also
GPLv2.

(From OE-Core rev: 70dc38b1e127524f50f661c5dd4b3225ddb0b36b)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-06 12:11:30 +00:00
Saul Wold
815c7e8e83 util-linux: Update patch for non-GPLv3
Rebase the disable-lscpu patch for the updated source base,
we only need to modify Makefile.am, since automake will regenerate
the Makefile.in.

(From OE-Core rev: a299d91ba422ed2ee34c1c54cdfaff4c88c60754)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-06 12:11:30 +00:00
Darren Hart
1d2451a8c7 distro: Update poky-tiny distro definition
Rather than conditionally drop eglibc-utils based on wchar support, set
USE_NLS="no" in the distro config to avoid pulling in gettext.

Also addresses some confusion over the "All rights reserved." statement by
explicitly referencing the MIT license.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-06 11:32:17 +00:00
Nitin A Kamble
7402c8a175 autoconf: fix nativesdk rdepends
Fixes this build error:

| error: Failed dependencies:
| 	m4 is needed by autoconf-nativesdk-2.68-r4.x86_64
| 	gnu-config is needed by autoconf-nativesdk-2.68-r4.x86_64
NOTE: package meta-toolchain-1.0-r6: task do_populate_sdk: Failed
ERROR: Task 8 (.../meta/recipes-core/meta/meta-toolchain.bb,
do_populate_sdk) failed with exit code '1'

(From OE-Core rev: df8d88e864fb6bdecf5c82b25c0252c3d54157ad)

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-06 09:22:37 +00:00
Richard Purdie
5797feac5f image-mklibs/package_ipk: Remove bashisms
We now support using dash but these bashisms triggered build failures for me
when using it. This replaces the code with something which works on dash.

(From OE-Core rev: 4a85312568a6bb052cc511c15b4ae842ff7f8e59)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-05 22:26:25 +00:00
Darren Hart
a10af679ec distro: Add poky-tiny distro definition
Poky-tiny is intended for building very small OS images. The distro
definition sets the providers for the kernel and the runtime services.
It also reduces the eglibc component list and other DISTRO_FEATURE
elements.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-05 22:22:38 +00:00
Zhai Edwin
c226ccb906 matchbox-wm: Remove x-session-manager handling
Windows manager should be independent on session manager, especially when we
have multiple session manager like mini-x and matchbox session.

This commit remove session-manager stuff in matchbox-wm, as matchbox-session
already has duplicated code. Also adjust alternative priority for mini-X to
make it higher priority over matchbox-session.

(From OE-Core rev: c3400040fdce8c049b51a8acb06eb2e92f9426d1)

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-05 22:19:22 +00:00
Scott Garman
198f2ac06e libusb-compat: move libraries to base_libdir
udev links to libusb-compat, and so this library needs to be in
base_libdir (/lib) instead of libdir (/usr/lib).

(From OE-Core rev: ed937940f54d1a376b518fc276da78811c4ac50b)

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-05 22:19:21 +00:00
Scott Garman
05409821ea insane.bbclass: use bb.process.Popen instead of subprocess.check_output
subprocess.check_output was only introduced in Python v2.7, so we
cannot use it. This refactors the QA test to use bb.process.Popen
instead.

This fixes the error:

AttributeError: 'module' object has no attribute 'check_output'

It no longer checks the return status of prelink-rtld, as that
case was simply adding noise. This QA test is intended to only
warn about specific paths that binaries could be linking to, not
handle the case where there is a missing library.

(From OE-Core rev: 0443487fe0bc628db9b03306bdc9dcdb39a121dc)

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-05 22:17:33 +00:00
Richard Purdie
7f837eb05f bitbake/runqueue: Improve the setscene logging
When debugging setscene problems it was found that some extra debug messages were useful.
This patch adds them.

(Bitbake rev: cff2c258b77fde01d530a5923e553e6111b15eb5)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-05 13:04:19 +00:00
Richard Purdie
8e43f9a751 multilib: Abstract class extension code into classextend.py
(From OE-Core rev: 563828bad19a242bba9ce3db461bb5807037dfdf)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-05 12:36:29 +00:00
Richard Purdie
0fa52f7078 native.bbclass: Fix variable remapping coverage
When looking for RDEPENDS to process, bitbake iterates through PACKAGES
*and* PN. Since native.bbclass sets PACKAGES to be empty, its pointless
remapping the list of PACKAGES since this does nothing. There is a problem
since *_${PN} are used by bitbake but not remapped by the native.bbclass
class extension code.

This changes the code to remap _${PN} in both expanded and unexpanded
forms. As a result of this, various surprising dependencies are uncovered
and the patch rectifies those. These are real bugs since they're injecting
unneeded (unremapped) dependencies into the dependency chain.

(From OE-Core rev: 0f485bfd6fc82a109b9da629e464fca1e90faec3)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-05 12:36:28 +00:00
Xiaofeng Yan
5aabdbaff7 core-image-gtk-directfb: add a bb file to build an image for gtk over directfb
This file can make an image to run gtk over directfb.

[YOCTO #1674]

(From OE-Core rev: 0c97fd9d721cea9786e89a557418649ef4576cfd)

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-05 11:24:49 +00:00
Derek Buitenhuis
2f60d9a9f9 binutils-cross-canadian: Allow ld-is-gold
In order to actually generate a toolchain (with
bitbake meta-toolchain) that supports gold, binutils-
cross-canadian also needs to be built this way.

(From OE-Core rev: 0eb3a0f3ee857a17d80598ea2f0b1f3d14ac6d30)

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-05 11:24:48 +00:00
Saul Wold
7b15d99e6c Patch Upstream-Status Update
(From OE-Core rev: f58bb1692c5700091f960e0fb90e5c39ebf5ab96)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-05 11:24:48 +00:00
Otavio Salvador
fc53fa79a8 udev: remove commented code from init script (no code changes)
(From OE-Core rev: 54daad852fc3bf6fc03c3ef96046e77d3ca047f4)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-05 11:24:48 +00:00
Otavio Salvador
27b45f6252 udev: split utilities onto udev-utils
(From OE-Core rev: 350b0921f66eb283637354f5f13a05d4aace41e2)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-05 11:24:48 +00:00
Otavio Salvador
53efd43855 udev: use 'echo' instead of 'echo -n' in init script
Avoid using two stage progress output to avoid text garbage during
parallel boot.

(From OE-Core rev: 7b3912883acaf4539d5d9cb974330778b6c85340)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-05 11:24:48 +00:00
Gary Thomas
352b9120a6 xserver-kdrive: work around issues with -Werror=address
A number of calls to REGION_INIT() use a static box which is flagged
as an error with -Werror=address.  This patch works around the problem,
but should not be considered a final solution.

Upstream-Status: Inappropriate

(From OE-Core rev: 605f6b89b9948351601af1ef37510f7dee77895b)

Signed-off-by: Gary Thomas <gary@mlbassoc.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-05 11:24:47 +00:00
Christopher Larson
28b6f1f36e opkg-utils: use /usr/bin/env python
(From OE-Core rev: 118cb063b08fc1aeb99c248fde6ef2069496c347)

Signed-off-by: Christopher Larson <kergoth@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-05 11:24:47 +00:00
Phil Blundell
6126f96a1d python-native: correct prefix handling for oe-core sysroot layout
Don't try to guess a path based on ${HOST_SYS} since this is not where the
files in the sysroot are likely to be.  Instead, just use the "plat_specific"
approach of taking STAGING_INCDIR and knocking off the trailing "/include" for
all cases.  This is still evidently suboptimal but does at least seem to give
the correct results.

(From OE-Core rev: 3b01b884dac0b31af8f5f2ebd60e5939e0111873)

Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-05 11:24:47 +00:00
Scott Garman
29feb44e05 insane.bbclass: add QA tests for unsafe references to exec_prefix
Files under exec_prefix (commonly /usr) may not be available during
system recovery. exec_prefix may also be kept on a separate partition
that is mounted late in the boot process.

This QA test throws an warning if a binary in base_[bindir|sbindir|libdir]
is dynamically linked to a file under exec_prefix. The intention is to
turn this into an error in the near future.

It also checks executable non-binaries (e.g, shell scripts) in the above
base directories with a simple grep test to look for references to
exec_prefix. This test only produces a warning, since false positives
are likely.

This fixes [YOCTO #1008]

(From OE-Core rev: 3e9c368a8045044736fc7e348404060498c7491b)

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-05 11:24:46 +00:00
Scott Garman
d34292c0c2 libusb1: move libraries to base_libdir
udev links to libusb1, and so these libraries need to be in
base_libdir (/lib) instead of libdir (/usr/lib).

(From OE-Core rev: 4ec9c25b9390bbfc1ddb0d46296f9251e5fd1498)

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-05 11:24:46 +00:00
Scott Garman
67b66d5a29 e2fsprogs: move libraries to base_libdir
The e2fsprogs utilities are installed into base_sbindir (/sbin)
and should not link to libraries under exec_prefix (/usr). So move
these libraries from libdir (/usr/lib) to base_libdir (/lib).

(From OE-Core rev: 90a1590f324a05f6b35b62856335aca7ba1f66c0)

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-05 11:24:46 +00:00
Scott Garman
f5023f53ea util-linux: move libraries to base_libdir
Various util-linux programs in base_sbindir (/sbin) linked to libraries
located under exec_prefix (/usr). Since this is not safe, move these
libraries from libdir (/usr/lib) to base_libdir (/lib).

(From OE-Core rev: 91c0f9e35da826055cda6662732c069dc7c31f96)

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-05 11:24:46 +00:00
Scott Garman
d1536ee2b5 libcap: move library to base_libdir
ls from coreutils links to libcap, so move the libcap library
from libdir (/usr/lib) to base_libdir (/lib).

(From OE-Core rev: 3a52df9c057b25c25fc2013ac6c5bf602cc8b4a7)

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-05 11:24:46 +00:00
Scott Garman
f8f5c05406 ncurses: move libraries to base_libdir
Various utilities (including bash and the util-linux programs) located
in base_bindir (/bin) or base_sbindir (/sbin) dynamically link against
many of the ncurses libraries. So move these libraries from libdir
(/usr/lib) to base_libdir (/lib).

(From OE-Core rev: 796c3d038fb7892a5e5206fb10217623de18853f)

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-05 11:24:45 +00:00
Saul Wold
db0f4a97df glib-2.0: ensure dtrace is diabled for all distro options and fix packaging
The linuxstdbase configuration flags also need to disable dtrace as per the
sandard package configuration options.

(From OE-Core rev: 6f4268682c33df7537a32f6e52d3698ebfa14e4e)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-05 11:24:45 +00:00
Saul Wold
8b26d1187c libxp: fix cast error
(From OE-Core rev: 6de454e0a66e832571b23406fdc4b9c4e65073d0)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-05 11:24:45 +00:00
Saul Wold
4de7aafbed image_types: Fix rootfs size calcuation
The ROOTFS_SIZE calculation was not correctly taking into account
the IMAGE_ROOTFS_EXTRA_SPACE variable, it would only be applied if
the size as determined by the ((du * overhead) + extra space) was
greater than the IMAGE_ROOTFS_SIZE, so if the du * overhead was smaller

(From OE-Core rev: 73db21a65fbdaf0886a01bcd98ee66e73a7465b8)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-05 11:24:45 +00:00
Paul Eggleton
c5996fd172 qt4: add Upstream-Status to recently added qt-4.8.0 patch
Add Upstream-Status to qmake_cxx_eval.patch.

(From OE-Core rev: f4bed494ab3b3047aad45ff31efcfd59b90e3822)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-05 11:24:44 +00:00
Paul Eggleton
a6e61c02a7 conf/local.conf.sample: fix typos/grammar/formatting
(From OE-Core rev: 6f81b3695f6f1e19906e6173c6c7e3ee4f86a11b)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-05 11:24:34 +00:00
Paul Eggleton
22106230a8 README: add short description of OE-Core
(From OE-Core rev: 5ebaabe8ed518b92515ab74963a4849410be44aa)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-05 11:24:01 +00:00
Paul Eggleton
464f8478ba classes/update-alternatives: fix typos and grammar
(From OE-Core rev: b63fd2c71b9d5d3bcaa98fe08b2e65db8c2bf6d1)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-05 11:23:11 +00:00
Richard Purdie
021848be9e valgrind: Fix for automake update
(From OE-Core rev: f309769d10cb3d8b72b8c7c4f7f418dcb8422c61)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-04 16:04:08 +00:00
Juraj Hercek
51d64452f6 fetch2/git: change colon to dot in ud.host
Local cloning of git repositories from DL_DIR into WORKDIR fails when
using ssh URL with port specification e.g.
"ssh://user@host:port/path/to/repo.git". Git fetcher clones such remote
repository into "${DL_DIR}/git2/host:port.path.to.repo.git". However,
when clonging from ${DL_DIR}/git2/host:port.path.to.repo.git into
${WORKDIR}, git fetcher fails with "ssh: Could not resolve hostname
${DLDIR}/git2/host: Name or service not known".

A solution is to replace ":" by "." in host component, similarly as it
is done when replacing "/" with "." in path component, so that local
clone directory in DL_DIR looks like this: "host.port.path.to.repo.git".

(Bitbake rev: 1f2867b79f1cd2bfbdc849ba5677a39db6fa3396)

Signed-off-by: Juraj Hercek <juraj.hercek@jhksoftware.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-04 16:04:07 +00:00
Paul Eggleton
f540034864 bitbake-layers: fix Python error during parse
If "bitbake-layers show_layers" was run when the cache was dirty forcing
a parse, it failed with the following error:

ERROR: Failure expanding variable SRCPV, expression was
${@bb.fetch2.get_srcrev(d)} which triggered exception AttributeError:
'module' object has no attribute 'fetch2'

A simple import of bb.fetch2 in bitbake-layers fixes this.

Fixes [YOCTO #1855].

(Bitbake rev: a228f0a32c2c14d62effbbba5f4fada4cd3817f6)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-04 14:14:39 +00:00
Phil Blundell
e47a5daa4f bitbake.conf: remove some redundant/unnecessary variable exports
Specifically...

SLOT: apparently redundant, deleted.
STAGING_IDLDIR: likewise
QMAKE_MKSPEC_PATH: no longer exported, moved to qmake_base.bbclass
STAGING_SIPDIR: no longer exported, moved to sip.bbclass

(From OE-Core rev: 3dcbc8a700a3e7474026e858b1d20e9ff89a5eb1)

Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-04 14:14:10 +00:00
Richard Purdie
c4de612298 populate_sdk_ipk.bbclass: Ensure the correct environment is setup for postinstalls
Without this, various postinstalls get run with incorrect environments
leading to various failures when building the toolchains.

This adds some duplication and some variables we'd be better off
removing. It does unbreak the SDK ipk code for now though. This needs
revisiting.

(From OE-Core rev: c5e6a533eab2f5af4a52d22f8efe5b49b77cd26c)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-04 14:14:10 +00:00
Richard Purdie
3f4f440882 poky-tiny: remove poky-tiny, it was added to the wrong accidentally
(From OE-Core rev: 65db8166215d213098ab7332eb51b559b7e63328)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-04 14:14:09 +00:00
Paul Eggleton
c26554a2e3 distro-tracking-fields: update qt recipe info
* Update for Qt 4.8.0
* qt4-tools-native was replaced with qt4-native some time ago

(From OE-Core rev: 28a43969d0ebe2a249df4da09173d5e054418737)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-04 12:08:31 +00:00
Paul Eggleton
670706d1d3 qt4: add version 4.8.0
Version 4.8.0 makes a few minor changes in the internal build system -
the following issues had to be worked around:

* The -qt-gif configure option has been removed. This is actually the
  default and has been for some time, so remove it from qt4.inc.
* The mkspecs have been refactored requiring us to copy our g++.conf
  file over the top of g++-unix.conf instead. Some modifications to this
  file were also necessary to remove some settings that are now in other
  conf files (and we don't modify those values in any case).
* The LD environment variable needs to be unset during configure, or
  else the configure script overrides our value of QMAKE_LINK which
  selects ${CXX} as our linker.
* QMAKE_CXX contains a reference to OE_QMAKE_CXX which the configure
  script does not expect and cannot expand and this results in webkit
  being disabled, so add a workaround for this.

(From OE-Core rev: 6b2a5d15ad20573502142b635e6cab9bcfb3b40a)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-04 12:08:31 +00:00
Paul Eggleton
99a6e1a3a4 qt4: fix incorrect architecture for qt4 tools
Don't install the native staging versions of the qt4 tools in the bin
directory; we have been doing this for a very long time but it is no
longer necessary since we specify them via the QMAKE_UIC, QMAKE_MOC etc.
variables. Doing so was sometimes resulting in those executables being
the ones that end up being packaged (probably only sometimes due to
different date/time values on the staging files and the interaction
with make).

Fixes [YOCTO #1856].

(From OE-Core rev: dc154d698b3b455a35b65935f7f04a3b4f72f8b6)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-04 12:08:31 +00:00