Commit Graph

22778 Commits

Author SHA1 Message Date
Michel Thebeau 83716e40ed routerstationpro: use KERNEL_IMAGE_MAXSIZE to test the image
routerstationpro is limited to 16mb flash size.  Exceeding that size may
not be noticed immediately, which we don't want.

"The current latest kernel for the routerstationpro machine is far
beyond the 16MB of it's flash size [0]. I think it would be good to
[test if the size of the image is above that size]."

Setting this variable will enable the do_sizecheck task and produce an
error when the image is too large:

"ERROR: This kernel (size=90230265 > 16777216) is too big for your
device. Please reduce the size of the kernel by making more of it
modular."

[YOCTO #3514]

(From meta-yocto rev: bb25e15c62cdde749f34050933d056a79dd2d3c5)

Signed-off-by: Michel Thebeau <michel.thebeau@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:39 +00:00
Emilia Ciobanu dae3eecaac package_regex.inc: added new regexes
Added/Updated regexes for:
		* btrfs-tools
		* xf86-video-omap
		* remake
		* sqlite3

(From meta-yocto rev: 241a50419e1bc341b367d33842851c34708a8bc4)

Signed-off-by: Emilia Ciobanu <emilia.maria.silvia.ciobanu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:39 +00:00
Andrei Dinu cd4f88e0ea bitbake: Adjust spacing on information windows
[Hob #4070]

- tweaked the spacing on info windows

- fixed text bolding in simple settings dialog

(Bitbake rev: 2ecb102968cdbbdbbfa91e1dcccf45bcd0b59a89)

Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:39 +00:00
Cristiana Voicu 860f826753 bitbake: hob: implementation of search functionality in Hob
Implemented the search functionality for recipes and packages using
filters on the listmodel. I have used the design which can be found in
bugzilla.

[YOCTO #3529]
(Bitbake rev: b77166ad7b8571895f73a84f7789d93fbd4f6d04)

Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:39 +00:00
Cristiana Voicu ab7d8bd172 bitbake: hob: Hob custom image build error
For a custom image from scratch, the image version is not set and
it gives an error.

[YOCTO #4065]
(Bitbake rev: 43703f3eb5f71a117e6315fa5df91711653636a3)

Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:38 +00:00
Darren Hart acc5f0d94b mkefidisk: Use msdos partition tables
While GPT works fine when writing to actual media, it cannot be reliably
used for distributing disk images as it requires the backup table to be
on the last block on the device, which of course varies from device to
device. Use MSDOS tables instead.

Use mkfs to label the filesystems as msdos tables do not support
partition labeling.

(From OE-Core rev: 049ea1e0a6a1017a5020de38bd7ce93515bd62f4)

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:38 +00:00
Darren Hart 663c39dc1e mkefidisk: Remove startup.nsh
Most firmware implementations use the EFI specified
EFI/BOOT/bootia32.efi (and similar) boot paths. Only broken firmware
uses different paths for removable media. In those cases, the user can
add their own startup.nsh.

For the compliant case, selecting "Shell" from the EFI boot menu should
go to the shell.

(From OE-Core rev: d031cdbf40231b8c103d78c69252bf9d584d0605)

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:38 +00:00
Darren Hart d20eea7830 mkefidisk: Always use rootwait and document kernel parameters used
Without a reliable way of knowing if the target device with be an
asyncronous block device on the target (MMC or USB), err on the side of
caution of always specifcy "rootwait", ensuring the kernel will wait for
the device to appear and not abort if it hasn't appeared in time for
mount.

Document the remaining kernel parameters added by this script on the
same line as rootwait.

(From OE-Core rev: 5b6a6a3872fd341cf978be40c69707223e3c29df)

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:38 +00:00
Darren Hart 24cd3ddeb7 mkefidisk: Boot with ro kernel parameter instead of rw
There is no need to boot with "rw". Booting with "ro" will allow for
fsck to be run during boot, and a proper /etc/fstab will still ensure
the rootfs is "rw" by the time the user can interact with the system.

Change the "rw" to "ro" in the kernel parameters specified in the
generated grub.cfg file.

Fixes [YOCTO 4036] mkefidisk.sh hardcodes 'rw' as root mount option

(From OE-Core rev: 960f0cbf85a4124adbc74d8b2ceb09a7d39ecc04)

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Cc: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:38 +00:00
Darren Hart ca67cd9334 mkefidisk: Cleanup comment length
Keep comments under 80 characters in length.

(From OE-Core rev: 1fbab279edd0057193900646cf9f66323698e774)

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Cc: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:38 +00:00
Darren Hart c38da2675b mkefidisk: Always specify a root= kernel parameter
The current script only replaces an existing root= kernel parameter
which can result images created without a root= paremeter, even though
the script expects a target rootfs parameter.

Rather than replacing the root= parameter, delete the root= parameter if
it exists, then append an appropriate root= parameter.

Fixes [YOCTO 4035] mkefidisk.sh forgets to add root= parameter

(From OE-Core rev: e5dbec7e7d3bb29676280823b0337ad429c75120)

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Cc: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:38 +00:00
Ross Burton 403d969678 consolekit: don't inherit gnome
By inheriting gnome this package was build-depending on
gtk-update-icon-cache-native, gconf, gconf-native, shared-mime-info and
hicolor-icon-theme for no reason.  Change this to inherit autotools pkgconfig to
reduce the build-dependencies.

Also, add a missing dbus-glib build-dependency that was previously pulled in
through something in the gnome class.

(From OE-Core rev: bde2c0ab1500976e2cb50f1526df04fb8b2cd408)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:38 +00:00
Christopher Larson b10f2a74e4 package_{ipk, deb, rpm}: drop the TARGET_OS conditional
The tclibc file for uclibc already empties IMAGE_LINGUAS, so there's no point
to this conditional as far as I can tell, and it can cause issues for certain
values of TARGET_OS.

(From OE-Core rev: 0fdda5840452c7715ed775d5d18d9f850396f483)

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:38 +00:00
Christopher Larson 331c1f1fe5 package_deb: don't install glibc-localedata-i18n separately
This was removed from package_rpm and package_ipk years ago, and shouldn't be
needed, installing the packages from package_linguas should be sufficient.

(From OE-Core rev: e9485c7077e5a9508371bbbbebdaaf1e9685da61)

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:38 +00:00
Marcin Juszkiewicz 99f8d0242a coreutils: disable ACL as we do not depend on it
Coreutils does not depend on ACL but also does not disable it. Effect is
that from time to time I have a copy in sstate-cache which got built
with ACL and then I have problem while building images or sdk:

| Collected errors:
|  * satisfy_dependencies_for: Cannot satisfy the following dependencies for packagegroup-core-standalone-hhvm-sdk-target:
|  *    libacl1 (>= 2.2.51) *
|  * opkg_install_cmd: Cannot install package packagegroup-core-standalone-hhvm-sdk-target.

(From OE-Core rev: d54141130475b091358807dce17ba8d244d33ea1)

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:38 +00:00
Paul Eggleton cf3c96a425 perl: avoid splitting out .debug directories as packages
The recursive parameter is set to True, the regex for the first call to
do_split_packages matches any path under ${libdir}/perl/${PV}/auto/, and
the .debug directories contain .so files, so each one was getting picked
up as a package. Change the regex to disallow dots in the path beneath
auto/ and thus avoid the .debug directories.

Fixes [YOCTO #4048].

(From OE-Core rev: f8f6992fe0f29db1cc4df15b7449e06188052041)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:37 +00:00
Jukka Rissanen 9299df1ebc connman-conf: Avoid appending IPv4 address
If run more than once, the IP addresses would be appended
to IPv4 variable. Avoid that by rewriting the IPv4 always.

(From OE-Core rev: da682e752e351e5bb7636ee187db3eabc208c177)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:37 +00:00
Jukka Rissanen e93b6376a0 connman-conf: Move the setup script into /usr/lib/connman
The /etc/connman is not suitable for the setup script.
There are other connman related scripts in /usr/lib/connman
so moving the wired setup script there.

(From OE-Core rev: 858ad53aee9ef5848c09d76c0e6bf464bc31d30e)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:37 +00:00
Emilia Ciobanu fdd76ead85 distrodata.bbclass: added some more git processing
* Truncated all git MD5 sums to 7 digits
	* Added regex checking for git packages as well

(From OE-Core rev: bc830ab3f6e9704c830e934c6f39c85ef11f867d)

Signed-off-by: Emilia Ciobanu <emilia.maria.silvia.ciobanu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:37 +00:00
Richard Purdie 0e72763987 distro: Add separatebuilddir.inc
Going forward its going to be useful to separate build data from source data
in those autotooled projects which support it. Unfortunately there is a lot
of breakage so for now, this starts the creation of an opt in list which
we can iterate over enable more recipes over time.

(From OE-Core rev: 9e64079063fc4748b48eee0e2592caf8ba9de10e)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:37 +00:00
Richard Purdie 0b679927fe apt: Fix case where ${B} != ${S}
Need to reference objects from ${B}.

(From OE-Core rev: 0610cf3ef864acc9ca98498b9810bcce0fbb935a)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:37 +00:00
Richard Purdie 6594412126 base-passwd: Fix case where ${B} != ${S}
Need to reference build objects from ${B}.

(From OE-Core rev: 2b58618406195aa53df2335c354d7e45ad08f4d5)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:37 +00:00
Richard Purdie 32dadb9ef2 babeltrace: Fix case where ${B} != ${S}
Autotools need to run in ${S}.

(From OE-Core rev: 2a64b618755cc1b97c21c8dc30ffd7d0938e9f91)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:37 +00:00
Richard Purdie dacf40d503 dhcp: Fix case where ${B} != ${S}
Add patch to allow out of tree builds to work.

(From OE-Core rev: a3238c1e1317c4fd5526c8854403a2160cb51bb0)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:37 +00:00
Richard Purdie 29a1c77d21 directfb: Fix case where ${B} != ${S}
Add patch to allow out of tree builds to work.

(From OE-Core rev: 15d7fe81bf3c52a14bfdd6a8a854836c8571e14f)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:37 +00:00
Richard Purdie dfc25eb699 mtdev: Fix case where ${B} != ${S}
Add patch to allow out of tree builds to work.

(From OE-Core rev: d14012cbf4a55a66030a51da281cc68fc727d9f6)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:36 +00:00
Richard Purdie 55de04d147 pth: Fix case where ${B} != ${S}
Ensure the autotools commands are executed in ${S} to allow out of tree
builds to work.

(From OE-Core rev: afeea8a616ea43553a7cd6c160d5f8b23ddcfa38)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:36 +00:00
Richard Purdie 224b0c3130 lzop: Fix case where ${B} != ${S}
Remove path assumptions and ensure out of tree builds work.

(From OE-Core rev: a0f054a733afb6dd6b1f53d304caefe90727d7a3)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:36 +00:00
Richard Purdie 512b8d2273 pm-utils: Fix case where ${B} != ${S}
Change to the correct directory to execute gnu-configize.

(From OE-Core rev: 6972e82b33af69cfef2d05b3637ecfd79a5125da)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:36 +00:00
Richard Purdie 902b785e93 rpm: Fix case where ${B} != ${S}
We need to run autogen.sh in the correct directory (${S}).

(From OE-Core rev: f352f9f25695635bbaad09774f02e66684971fc0)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:36 +00:00
Richard Purdie 5306f72e7a python-pygtk: Fix case where ${B} != ${S}
Fix out of tree builds by adding missing path component.

(From OE-Core rev: fd86061e02bd175dcc5816db1cf15d705d338062)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:36 +00:00
Richard Purdie 21fd35ac14 dpkg: Fix case where ${B} != ${S}
Add missing path component to make out of tree builds work.

(From OE-Core rev: 04515f61e2768435126f0c8ccfb5ad1e368710ee)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:36 +00:00
Richard Purdie d988fe1831 xinted: Fix case where ${B} != ${S}
do_install needs to reference files in ${B} and we need to run
do_configuze in ${S}.

(From OE-Core rev: 5a5aff6a77dfc0bae66077589a93ba6d1755bcdc)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:36 +00:00
Richard Purdie 4dce60bd7d texinfo: Fix case where ${B} != ${S}
The install function needs to reference generated files in ${B}.

(From OE-Core rev: feebca46f3ef798ab4a203bc0b9419d883feaee7)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:36 +00:00
Richard Purdie 55f1e47eaa watchdog: Fix case where ${B} != ${S}
(From OE-Core rev: 0ecfe4fd7d89252a7db6c9361fb5674cb098796d)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:36 +00:00
Richard Purdie dbfb8dc7fb pam: Fix case where ${B} != ${S}
(From OE-Core rev: 3d27366f17e597380fee738f14f119d880a77985)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:35 +00:00
Richard Purdie 211aeccc17 libuser: Fix case where ${B} != ${S}
Fix out of tree builds and a parallel make race, see the patch header
for details.

(From OE-Core rev: ef259227fc6d8147b493554e381aa196f5a7a96a)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:35 +00:00
Richard Purdie 6211a2bdd3 scripts/qemu-testlib: Add more debugging information
This extra information should allow better forensics if the sanity tests
fail as they're currently doing occasionaly on the autobuilder for unknown
reasons.

The patch also tightens up certain checks to remove pointless noise and
error output from the logs.

(From OE-Core rev: f9970aa0a44aca8ffe6c7a6a3261887fb0db38d2)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-21 17:05:15 +00:00
Richard Purdie 9ffee9add2 scripts/runqemu-internal: Fix lock races
There are two problems here. Firstly the grep command is unanchored so
pid 345 will match against 12345 and so on.

The second issue is that there are several context switched between attempting
the lock and then writing the pid to it.

Between the two issues, there were issues appearing on the autobuilder due
to these conflicts. This patch replaces the mechanism with flock on fd 8
which should be a safer mechanism to use.

(From OE-Core rev: 98471be6e58451016200cfd10e64e8ae6266c801)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-20 23:09:45 +00:00
Saul Wold ecb30a910b alsa-tools: add patch for mips since it does not have io.h
[YOCTO #4051]

(From OE-Core rev: 67f1083a10f7435aeb861ba2e872d6498375d927)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-20 17:26:17 +00:00
Alexandru DAMIAN e7f7fcb831 grep: Always use locale.h
The changes in the grep 2.5 configuration always leave out
HAVE_LOCALE_H - it has been removed from other files, but
not from everywhere.

This leads to a crash in certain configurations where the
size of int is not the size of pointer; this happens because
setlocale() is used while being undeclared.

[YOCTO #3959]

(From OE-Core rev: 4ca3a19c6fb93a6e85017f7ae465b5d2eba9463e)

Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-20 17:26:16 +00:00
Mark Hatle 998ec3bbcc core-image-multilib-example: Location of core-image-sato.bb changed
(From OE-Core rev: 6aacf7b2c571bf1004caaa9883e58c1f22e37fec)

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>
2013-03-20 17:26:16 +00:00
Richard Purdie ebf4d7a90d runqemu: Improve error handling/exit codes
runqemu-internal is sourced so should be returning with an error code in
case of errors. runqemu needs to deal with this.

This patch fixes up the various error paths so we're consistent and get
a sane exit status for runqemu which helps a lot in its use in the qemu
runtime testing on the autobuilder.

(From OE-Core rev: 753533b2f338ff2ef97eebd5eace7623404ae457)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-20 11:53:06 +00:00
Richard Purdie 8207e3f48b qemuimage-testlib: Add extra debugging and sanity check
Check for a zero IP address since its clearly incorrect if that value
is found. Also add debugging for cases where we can't find the qemu
process. A process listing is handy to help understand what the problem
might be.

(From OE-Core rev: 817a8dc6424050973d8fad4f003475ac83ea6bb5)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-20 11:53:06 +00:00
Richard Purdie a317cc911a qemuimage-testlib: Add delay to work around races in qemu startup
Qemu changes pid when starting up. On a loaded machine, this can result
in the incorrect pid being returned. Since qemu will take a few seconds to
boot anyway, we might as well delay a short while and allow things to settle
which should fix various race issues being seen on the autobuilder.

(From OE-Core rev: c0cecc16d4305b16ecfb4a51f6d5020d34909794)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-20 09:29:29 +00:00
Richard Purdie 808967b84c qemuimage-testlib: Fix IP address handling
Remove some pointless code and also fix the return handling
for the function since it returns null, not 0 as the comments
would suggest.

(From OE-Core rev: 6b8d7767ff14345af29d7774b7e16e29c3f7fa8e)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-19 23:35:01 +00:00
Martin Jansa 0ff4529c64 bitbake: runqueue: Use taskData.fn_index[depdata] instead of uninitialized dep
* dep variable was removed in
  commit 3190cb83e2af195a464f669c5aa8aedbf795160e
  Author: Richard Purdie <richard.purdie@linuxfoundation.org>
  Date:   Wed Jun 27 11:04:06 2012 +0100

    taskdata: Add gettask_id_fromfnid helper function

    This is like gettask_id but doesn't require translation of fnid -> fn
    first which the function then translates back. This gives a sizeable
    performance improvement since a significant number of lookups are avoided.

* now it fails completely instead of showing which task is missing

(Bitbake rev: 58847fabd389e5b8d02d5a9c6827aabedb30312f)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-19 20:58:11 +00:00
Cristiana Voicu b844a4292b bitbake: hob: some settings in Hob are not remembered
Some settings in Hob were not saved in Bitbake and they were not displayed
correcty in Hob, because Hob used some other variables with the extension "_HOB".
I have removed this, in order to have a consistency for the variables.
ALso, I called a function to load the extra variables saved in .hob/template_default.hob.

[YOCTO #3957]
(Bitbake rev: 0f62a12ef3fa4daf8f3a289c984115302b75c23d)

Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-19 20:58:11 +00:00
Richard Purdie 8852e51bdc scripts/qemutestlib: Add better process debugging and fix process group issue
In single testing with a shutdown scenario the processes are cleaned up correctly
but the manual cleanup fall back used for a minimal image do not work properly.
This patch fixes the kill commands to revert to non-process groups, fixing
the hung process issues that were occuring.

(From OE-Core rev: 6a0134fd4f1b64ef788be0791bd655dc7703d505)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-19 20:58:11 +00:00
Robert Yang ee416ad6f4 bitbake: utils.py: fix BB_ENV_WHITELIST
The BB_ENV_WHITELIST doesn't work well and flushes BB_ENV_EXTRAWHITE,
here is an example:

$ export BB_ENV_WHITELIST

$ export BB_NUMBER_THREADS=10 (or other value)

Edit conf/local.conf, change "BB_NUMBER_THREADS =" to "BB_NUMBER_THREADS ?="

$ bitbake -e | grep '^BB_NUMBER_THREADS ='
we will notice that BB_NUMBER_THREADS' value doesn't change, though
BB_NUMBER_THREADS in both BB_ENV_WHITELIST and BB_ENV_EXTRAWHITE.

This is because the "approved" inside the function approved_variables
doesn't include BB_ENV_WHITELIST or BB_ENV_EXTRAWHITE when
BB_ENV_WHITELIST is set (they are incuded by preserved_envvars()), so
the BB_ENV_WHITELIST and BB_ENV_EXTRAWHITE will be removed from the env
in the first call from bin/bitbake, and when it is called again by
cooker.py, their value will be None, then the vars inside them will be
removed from the env.

Add BB_ENV_WHITELIST and BB_ENV_EXTRAWHITE to the "approved" would fix
the problem.

[YOCTO #4031]

(Bitbake rev: d2b07e6516dd308d0045a7fdb72b588af9d676ad)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-19 13:56:03 +00:00