linux/poky.git, branch 1.1_M3.rc2

local.conf.sample: Fix TUNENAME reference (should be DEFAULTTUNE)

2011-08-02T13:41:14+00:00

Signed-off-by: Richard Purdie

tune/ppc: Fix various TUNE_PKGARCH issues

2011-08-02T13:41:03+00:00

We need to ensure only one value ends up in TUNE_PKGARCH rather than several. This change ensures consistency accross all the PPC tune files and that they correctly inherit the core value but also allow it to be overwritten. (From OE-Core rev: f9a8b719dd3fc7593a509c8f288caf1486add2f8) Signed-off-by: Richard Purdie

eglibc: Add missing ${PN} and ${PKGSUFFIX} usages

2011-08-02T13:41:03+00:00

This fixes warning messages such as: The providers found were: ['virtual:nativesdk:eglibc_2.13.bb', 'eglibc_2.13.bb'] The PREFERRED_PROVIDER entries resulting in this conflict were: ['PREFERRED_PROVIDER_virtual/libc-nativesdk = eglibc-nativesdk', 'PREFERRED_PROVIDER_virtual/libc = eglibc'] NOTE: multiple providers are available for runtime glibc-utils (eglibc, eglibc-nativesdk, external-csl-toolchain, external-poky-toolchain) NOTE: consider defining a PREFERRED_PROVIDER entry to match glibc-utils This highlights how ugly adding to PN is when using BBCLASSEXTEND. We need to do this to eglibc so the nativesdk class continues to work correctly for now and ensure consistency in how the various eglibc packages are generated. Longer term, if we switch nativesdk to use the multilib approach and MLPREFIX, we can remove all the PKGSUFFIX mess. I'd rather not get into changing nativesdk right at this time though given all the other changes that are going on. (From OE-Core rev: 3a18aa65a4c123ea922b6cd09ca6a77090f12252) Signed-off-by: Richard Purdie

package_ipk: SDK generation workaround

2011-08-02T13:32:11+00:00

During SDK generation the multilib_sanity_check function is being called, however it is not available unless we've been called from the image.bbclass. Disable the check if MULTILIB_CHECK_FILE (also set in image.bbclass) doesn't exist or is empty. (From OE-Core rev: 0611cceca1595ea4656ebcb985cbd92bb9774ec8) Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie

populate_sdk_*: Sync SDK and regular rootfs functions

2011-08-02T13:32:11+00:00

In order for things to be easier to maintain in the future, sync up the sdk and rootfs versions. (From OE-Core rev: 3c78da15457d8d20c9964cd845f6e021d442aaae) Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie

bitbake.conf: Add SDK_PACKAGE_ARCHS

2011-08-02T13:32:11+00:00

Add SDK_PACKAGE_ARCHS to avoid the sed operations we were previously doing inside of the variouns populate_sdk functions and related items. Also add documentation to populate_sdk to explain when the various functions are expected to be doing. Finally fix a bug in populate_sdk_rpm where the wrong value was being set, noticed while working on this change. (From OE-Core rev: 587c1d5bac71fa6faa65ee3a271391cbf931e8f7) Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie

rootfs_rpm: Cleanup and minor bug fixes

2011-08-02T13:32:10+00:00

in packages_rpm.bbclass: Cleanup the way package_update_index_rpm works. Break this out into two functions, one for common functionality and one for controlling target vs sdk package processing. Similar change to package_generate_rpm_conf. Usage of IMAGE_ROOTFS should actually be "target_rootfs", this fixes a problem with the SDK case. in rootfs_rpm.bbclass: Minor re-order of the values, and avoid multiple uses of IMAGE_ROOTFS in order to make the merge with the SDK behavior easier. (From OE-Core rev: 46559f36d8a39655060b45d3d235de44a2c4c09b) Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie

oe-init-build-env, scripts/oe-buildenv-internal: add error detecting for $BDIR

2011-08-02T13:32:10+00:00

[YOCTO #671] "readlink -f" in Ubuntu 10.04 is buggy: it doesn't ignore a trailing / (e.g., "readlink -f /tmp/non-existent-dir/" returns nothing, but according to http://www.gnu.org/s/coreutils/manual/coreutils.pdf it should do that -- hence we get bug 671. It seems Ubuntu 10.10 or even later Ubuntu 11.04, and other Linux distributions(e.g., Open Suse 11.4) haven't such an issue. So I think we should detect this and ask Ubuntu 10.04 users to avoid supply a path with trailing slash here. Moreever, I also add the detection of non-existent path, e.g., source oe-init-build-env /non-existent-dir/build can be detected and we'll print an error msg. And, if we get errors in oe-buildenv-internal, we should stop the script and shouldn't further run. (From OE-Core rev: 651ccb3b031d9ccb8331505a51171372002230d9) Signed-off-by: Dexuan Cui Signed-off-by: Richard Purdie

scripts/runqemu: grep for line beginning with TMPDIR

2011-08-02T13:32:10+00:00

Currently the grep regexp matches any occurance of 'TMPDIR=' but if you have another variable defined e.g. OE_BUILD_TMPDIR=xxx then that gets picked up too. $ bitbake -e | grep TMPDIR=\" TMPDIR="/home/kraj/work/angstrom/build/tmp-angstrom_2010_x-eglibc" OE_BUILD_TMPDIR="/home/kraj/work/angstrom/build/tmp-angstrom_2010_x" So we become a bit more stringent and look for line starting with TMPDIR $ bitbake -e | grep ^TMPDIR=\" TMPDIR="/home/kraj/work/angstrom/build/tmp-angstrom_2010_x-eglibc" make sure that it greps only TMPDIR=xxx occurance and not values of other variables whose names happens to end with TMPDIR (From OE-Core rev: 12ddf6c6a7559d97d9b8f84fcc89ed02e30df85d) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie

arch-armv7a.inc: fix armv7a-vfp-neon -> armv7a compat case

2011-08-01T15:49:11+00:00

Without this 'armv7a' is used as TUNE_ARCH but does *not* end up in PACKAGE_EXTRA_ARCHS: arch all 1 arch any 6 arch noarch 11 arch arm 16 arch armv4 21 arch armv4t 26 arch armv5 31 arch armv5t 36 arch armv5-vfp 41 arch armv5t-vfp 46 arch armv5e 51 arch armv5te 56 arch armv5e-vfp 61 arch armv5te-vfp 66 arch armv6-vfp 71 arch armv6t-vfp 76 arch armv7-vfp 81 arch armv7t2-vfp 86 arch armv7a-vfp 91 arch armv7at2-vfp 96 arch armv7a-vfp-neon 101 arch armv7at2-vfp-neon 106 arch beagleboard 111 Which leads to a failing do_rootfs (From OE-Core rev: 2a41a311ddda11713296391050f3c2c1b2c1d3d3) Signed-off-by: Koen Kooi Signed-off-by: Richard Purdie