summaryrefslogtreecommitdiff
path: root/poky/bitbake/bin
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2018-11-16 01:30:15 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2018-11-26 15:46:19 +0300
commitc4ea075d918124f556619e8e75b7ca38b3f2dac8 (patch)
tree9e2cffe8b1767635307bb0bfef5cbcc432fa4214 /poky/bitbake/bin
parenta7999f57d119bdb9377220db06b8c047fc39d49e (diff)
downloadopenbmc-c4ea075d918124f556619e8e75b7ca38b3f2dac8.tar.xz
poky: sumo refresh eebbc00b25..64a257fa22
Update poky to sumo HEAD. Armin Kuster (1): dhcp: allow for excluding the external bind Awais Belal (1): bitbake: bitbake: toaster: allow OE_ROOT to be provided through environment Changqing Li (2): unzip: fix for CVE-2018-18384 curl: fix for CVE-2018-16839/CVE-2018-16840/CVE-2018-16842 Fabien Lahoudere (1): archiver: Drop unwanted directories Ioan-Adrian Ratiu (1): wic: isoimage-isohybrid: fix UEFI spec breakage Kosta Zertsekel (1): meta: Use double colon for chown OWNER:GROUP Matthias Schiffer (1): base.bbclass: avoid 'find -ignore_readdir_race -delete' Mohamad Noor Alim Hussin (1): oeqa/selftest/recipetool: Fix problems from changing upstream source Peter Kjellerstedt (4): common-licenses: Correct the FreeType license text apr: Trim license info extracted from apr_lib.h apr-util: Trim license info extracted from apu_version.h pixman: Trim license info extracted from pixman-matrix.c Richard Purdie (4): oeqa/selftest/wic: Use a subdir of builddir, not /var/ oeqa/selftest/wic: Ensure initramfs exists for test_iso_image selftest/wic: Improve error message for test_fixed_size crosssdk: Remove usage of host flags for cross-compilation Ross Burton (3): unzip: actually apply CVE-2018-18384 curl: actually apply latest CVE patches gnupg: patch gnupg-native to allow path relocation Scott Rifenbark (1): kernel-dev: Updated phrasing for what a "defconfig" file is. Change-Id: I08f7fbe91f3f7ed6f00b6ea691c33ee1e0d3205b Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/bitbake/bin')
-rwxr-xr-xpoky/bitbake/bin/toaster4
1 files changed, 3 insertions, 1 deletions
diff --git a/poky/bitbake/bin/toaster b/poky/bitbake/bin/toaster
index 9fffbc6ae..ecf66fa51 100755
--- a/poky/bitbake/bin/toaster
+++ b/poky/bitbake/bin/toaster
@@ -161,7 +161,9 @@ fi
export BBBASEDIR=`dirname $TOASTER`/..
MANAGE="python3 $BBBASEDIR/lib/toaster/manage.py"
-OE_ROOT=`dirname $TOASTER`/../..
+if [ -z "$OE_ROOT" ]; then
+ OE_ROOT=`dirname $TOASTER`/../..
+fi
# this is the configuraton file we are using for toaster
# we are using the same logic that oe-setup-builddir uses