Commit Graph

12616 Commits

Author SHA1 Message Date
Richard Purdie
eda23733f0 bitbake/data_smart: Change overrides behaviour to remove expanded variables from the datastore
Currently if you do:

OVERRIDES = "z"
DEPENDS_prepend = "a "
DEPENDS = "b"
DEPENDS_z = "c"

d.update_data()
d.getVar("DEPENDS")

gives "a c"

d.update_data()
d.getVar("DEPENDS")

then gives "c"

This patch changes the behaviour such that at the time bitbake expands the DEPENDS_z
override, it removes "DEPENDS_z" from the data store. In the above example this would
mean that it wouldn't matter how often you call d.update_data(), you'd always get
"a c" back.

See the bitbake-devel mailing list for further discussion and analysis of the
potential impact of this change.

(Bitbake rev: 899d45b90061eb3cf3e71029072eee42cd80930c)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-09 22:43:44 +01:00
Scott Garman
73871c2712 cache.py: fix bitbake -s command
This uses the correct index of self.pn when setting up cachedata's
pkg_pn, fixing the output of bitbake -s.

This fixes bug [YOCTO #1149].

(Bitbake rev: d000493c09ac5c1dcbab22d3a91296a9cb194ac0)

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-09 22:18:50 +01:00
Mark Hatle
4b66ce4728 pseudo: Fix problem related to realpath
When pseudo is disabled, certain programs that call realpath may not
work properly.  This was discovered when using the Qt MOC tool when
certain qmake project features are used.

[YOCTO #1150]

(From OE-Core rev: d1d87429d751e0bff115ff60d1b5fc55b8fa6249)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-09 18:20:29 +01:00
Paul Eggleton
dc15ddd161 bitbake-layers: handle skipped recipes
Report bbappends correctly for skipped recipes instead of reporting the
bbappends as not having any matching recipe.

(From Poky rev: 39d72ecf6bc1da85aefb11e6481719185f0cb953)

(Bitbake rev: a71183762e5d7d9f8153832efb9595e3a21d62f1)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-09 18:12:51 +01:00
Paul Eggleton
81e2f52fb8 track skipped packages
Add skiplist to cooker that allows access to the list of packages skipped
via SkipPackage (this includes COMPATIBLE_MACHINE, INCOMPATIBLE_LICENSE,
etc.) This can be used to enhance error reporting.

(From Poky rev: 6c12b7b1099c77b87d4431d55e949cf7c5f52ded)

(Bitbake rev: 7d2363f35350be27a33f568c23eb07fcd3d27e53)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-09 18:12:51 +01:00
Dexuan Cui
c9503d59ea icon-naming-utils-native: inherit perlnative
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
2011-06-09 16:58:34 +01:00
Dexuan Cui
a74e428e34 libxml-simple-perl: fix EXTRA_PERLFLAGS due the the perlnative change
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
2011-06-09 16:58:34 +01:00
Dexuan Cui
f70eeea07d libconvert-asn1-perl: fix EXTRA_PERLFLAGS due to the perl-native change
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
2011-06-09 16:58:34 +01:00
Dexuan Cui
ac4fba3e55 libxml-parser-perl: inherit perlnative
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
2011-06-09 16:58:34 +01:00
Dexuan Cui
c13b10a6ae cpan.bbclass, cpan-base.bbclas: update them for the perlnative change
Since perl-native now populates into its own dir, here we need
change accordingly.

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
2011-06-09 16:58:34 +01:00
Dexuan Cui
38d0c607d8 perl: inherit perlnative
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
2011-06-09 16:58:34 +01:00
Dexuan Cui
d1965badc7 webkit-gtk: should depend on perl-native-runtime rather than perl-native
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
2011-06-09 16:58:34 +01:00
Dexuan Cui
f695cecb9c dpkg: should depend on perl-native-runtime rather than perl-native
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
2011-06-09 16:58:33 +01:00
Dexuan Cui
5af87edf2b coreutils: remove unnecessary dependency on perl
OE's coreutils doesn't depend on perl, either.

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
2011-06-09 16:58:33 +01:00
Dexuan Cui
4c790efa24 git: should depend on perl-native-runtime rather than perl-native
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
2011-06-09 16:58:33 +01:00
Dexuan Cui
ac21b3d935 openssl: should depend on perl-native-runtime rather than perl-native
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
2011-06-09 16:58:33 +01:00
Dexuan Cui
a2f850d122 libcap: should depend on perl-native-runtime rather than perl-native
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
2011-06-09 16:58:33 +01:00
Dexuan Cui
c7a7c5a00b gnu-config-native: should depend on perl-native-runtime rather than perl-native
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
2011-06-09 16:58:33 +01:00
Dexuan Cui
89b91fde9b perlnative.bbclass: add the file
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
2011-06-09 16:58:33 +01:00
Dexuan Cui
3ba6d0183e perl-native: populate into its own dir
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
2011-06-09 16:58:33 +01:00
Dexuan Cui
5565b30589 native.bbclass: allow a native package to be populated into its own dir
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
2011-06-09 16:58:33 +01:00
Richard Purdie
7a086abc25 scripts/bitbake: Only build tar-replacement-native when the build system tar version < 1.24
(From OE-Core rev: d3e105451413617cf6415ae1600dc063f3d8d452)

Signed-off-by: Richard  Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-09 16:44:39 +01:00
Saul Wold
5de3d14f8e core-image-lsb-sdk: ensure testapps is part of sdk image
(From OE-Core rev: 3ccf7409d7014a850f4014c7e939d26188e1ae4b)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-09 16:44:39 +01:00
Saul Wold
644cc126ac core-image-sato-sdk: ensure testapps is part of sdk image
(From OE-Core rev: fd8967d30c41d8efd6333b5670022e65c5044f18)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-09 16:44:38 +01:00
Saul Wold
163f4df219 task-core-tools: add mesa-demos to testapps list
(From OE-Core rev: 254c07e4b1f153202bffbf4836788c44f6a96d70)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-09 16:44:38 +01:00
Saul Wold
b71f3e4cea local.conf.sample: remove default EXTRA_IMAGE_FEATURES
The default list of EXTRA_IMAGE_FEATURES adds alot to the generic non-dev and non-sdk image
so ensure that the sato-sdk and lsb-sdk includes this list by default.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
2011-06-09 16:17:47 +01:00
Koen Kooi
43d84e6feb metacity 2.30.3: fix build on GNOME-less hosts and fix packaging
(From OE-Core rev: 919956bf3114a4af5177d30a0c4ea4907e930439)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-09 15:51:37 +01:00
Koen Kooi
b0c29c253d sysvinit: split inittab into it's own recipe
Implements the improvements suggested in the original fix for [YOCTO #1131]

(From OE-Core rev: e9cde6962d369fb620799d0370ea9dc7d6234d37)

Signed-off-by: <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-09 15:48:29 +01:00
Koen Kooi
67119c5a2d consolekit: update to 0.4.5
(From OE-Core rev: 3c5009a0d19c8e27d3687e27880d5c1088086adc)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-09 15:48:29 +01:00
Koen Kooi
f28c134cc6 librsvg 2.32.1: fix loader packaging when using gtk >2.20
When using the gtk+ from OE-core you would get:

WARNING: the following files were installed but not shipped in any package:
WARNING:   /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.so

(From OE-Core rev: 6012828219bbfc55b273f4795853433bbde0ea37)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-09 15:48:28 +01:00
Phil Blundell
37524cb5c1 kexec-tools: don't depend on virtual/kernel
There doesn't appear to be any terribly good reason for kexec-tools to
depend on the kernel.  (I verified that kexec-tools is buildable in a
clean TMPDIR without having previously built virtual/kernel.)

Having this dependency in place is a nuisance because it makes it
awkward to put kexec into an initramfs.  So, it seems like we would be
better off without.

(From OE-Core rev: ba6da75657d0bf9ed48f0d6c4132f12993648e7a)

Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-09 15:48:28 +01:00
Paul Eggleton
cd8694d736 iproute2: update to 2.6.38
Fixes "ip route get" not producing any output (a regression in 2.6.35).
See http://marc.info/?l=linux-netdev&m=129442470405398&w=2 and
http://marc.info/?l=linux-netdev&m=130038222321440&w=2 for a list of
other changes since 2.6.35.

Fixes [YOCTO #1006] (reopened)

(From OE-Core rev: 25ed1f931c1dd337911b1f059c71b37b5586fd3f)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-09 15:48:28 +01:00
Koen Kooi
e8b3a12444 avahi: fix dbus system-service packaging and move more things to .inc
(From OE-Core rev: dca03beb98f123cfc3e09a3b2870f7537f49dd3c)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-09 15:48:28 +01:00
Mei Lei
2c6ac68006 distro_tracking_fields.inc: Fix a incorrect date format
One incorrect date format caused a checking failure in package report system.

(From OE-Core rev: e2822a65715858c84654debee2219cf954db4d8c)

Signed-off-by: Mei Lei <lei.mei@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-09 15:48:28 +01:00
Dongxiao Xu
4d9b298c33 udev: Fix udevd launch issue after system second boot
"grep" command will return 1 if nothing is grepped, which will cause
the udevd daemon not working correctly.

This fixes [YOCTO #1146]

(From OE-Core rev: 155a10287bbcac583d95325ab2a7b09e04bb4b90)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-09 15:48:27 +01:00
Mark Hatle
c647c7a54c pseudo: Update pseudo to 1.1.1 version
Update both the core and pseudo_git packages to the latest 1.1.1 verison.

This fixes an issues where the call system() was not wrapped.  This could
lead to issues where certain spawned commands broke out of a pseudo-chroot
and created files in the wrong place.

Also the update the 1.0 -> 1.1.1 adds additional capabilities such as
beginning support for MacOS X.

(From OE-Core rev: 9eaa9ed38a197be76317cd3e42f54d1808c3e971)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-09 15:48:27 +01:00
Mark Hatle
a91d4987fa distro_tracking_fields.inc: add pseudo
Add pseudo to tracking, with me as the maintainer.

(From OE-Core rev: 8b33a17f45b31a76eadaab7e8934358eb2e96859)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-09 15:48:27 +01:00
Saul Wold
f865e83632 bitbake.conf: Create staticdev pacakge for static libraries
(From OE-Core rev: bbb1b2063cee3d022b5fc11b13a5aa8045187801)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-09 15:48:27 +01:00
Tom Zanussi
10cf515710 initramfs-live-install: comment out allarch inherit to resolve no provider
initramfs-live-install is only compatible with i.86|x86_64 so
shouldn't inherit 'allarch'.  This comments it out.

More specifically, commit 52295fa3de
(Improve handling of 'all' architecture recipes and their interaction
with sstate) sets TARGET_ARCH which due to the COMPATIBLE_HOST setting
in the recipe causes it to be skipped and gives the following error
for any -live build:

NOTE: Resolving any missing task queue dependencies
NOTE: Runtime target 'initramfs-live-install' is unbuildable, removing...
Missing or unbuildable dependency chain was: ['initramfs-live-install']
ERROR: Required build target 'core-image-sato-live' has no buildable providers.
Missing or unbuildable dependency chain was: ['core-image-sato-live', 'core-ima\
ge-minimal-initramfs', 'initramfs-live-install']
ERROR: Nothing RPROVIDES 'initramfs-live-install'

(From OE-Core rev: e576e4aa91fc1608f706a341088f9a7b9a21cd2a)

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>

Commented out with explaination instead of remove

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-09 15:48:27 +01:00
Mark Hatle
d2a9470342 create-pull-request: Add URL documentation
If we can't find the URL, tell the user how to correct the issue.

(From OE-Core rev: e5edda2e84e19a90ca2b0a6d4c265e5d5f59d42a)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-09 15:48:26 +01:00
Richard Purdie
1f0e24236f package.bbclass: PACKAGELOCK is a shared lock file so inform sstate as such
(From OE-Core rev: 60f74e47160508c9150d880b1f627dc7e3f0d3ab)

Signed-off-by: Richard  Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-09 15:48:26 +01:00
Richard Purdie
3dc2615e1a sstate.bbclass: When removing files, take an exclusive lock, even for shared lockfiles
(From OE-Core rev: 4a3e94c2ec014a8aef5e8ebb21bdbdf8d28416b3)

Signed-off-by: Richard  Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-09 15:48:26 +01:00
Richard Purdie
e55dc39c37 Drop psyco support
At best it gave 1-2% improvement now, its 32 bit x86 only and isn't
supported after python 2.6.

PyPy is probably a better option now.

(Bitbake rev: 3c3bd0c2fa80d747f25401c17b785c7c2f3787ca)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-09 15:48:23 +01:00
Richard Purdie
c7f76a1bc9 bitbake/data/runqueue: Sync up with upstream to clean up environment variable handling
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-08 20:38:28 +01:00
Richard Purdie
bdab8e9354 bitbake/build.py: Drop exec_shell environment as its now unneeded
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-08 20:38:28 +01:00
Richard Purdie
fe967227dd runqueue.py: Wrap parsing with exception trapping
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-08 20:38:28 +01:00
Chris Larson
95f02a2ab1 Shift traceback pre-formatting into LogHandler
It's cleaner to leave it behaving as usual, passing the exception data in the
exc_info attribute of the LogRecord where it normally lies, and then let
LogHandler make it pickleable so it can be sent to the UI.

(Bitbake rev: 3539c9474a0b53f57e614544c70a7197ecdfb130)

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-08 20:38:27 +01:00
Richard Purdie
355338c40c bitbake/cooker.py: Misc sync with upstream
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-08 20:38:27 +01:00
Chris Larson
9f33dde6e7 cooker: use BBHandler.inherit for INHERIT
Ideally we'd avoid direct BBHandler usage, but honestly, to say the whole
bb.parse abstraction is incredibly leaky is an understatement.  If we try to
make handle() not reparse classes, things get ugly fairly quickly, as
inherit() calls handle() itself after adding the class to the inherit cache.

This change fixes it so we no longer risk reparsing a class if:

- it's listed in INHERIT multiple times
- it's listed in INHERIT and is 'inherit'ed from a class in INHERIT

(Bitbake rev: 057c3cddeb72584c6c3908bd702288cece9b66ea)

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-08 20:38:26 +01:00
Chris Larson
88f4ba28bc cooker: simplify self.configuration.data vs data usage
(Bitbake rev: 87112adee4e8add0a97ff8be8311d9afe202412d)

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-08 20:38:26 +01:00