Commit Graph

15 Commits

Author SHA1 Message Date
Peter Kjellerstedt ea28de6d39 oe-init-build-env*: Remove unnecessary differences between the scripts
While at it, also fix:
* consistent indentation (four spaces)
* unset temporary variables
* use $(...) instead of `...`

(From OE-Core rev: 1295d413f27941d0763a3d58982378738bf3ca06)

Signed-off-by: Peter Kjellerstedt <>
Signed-off-by: Ross Burton <>
Signed-off-by: Richard Purdie <>
2016-03-20 23:12:30 +00:00
Peter Kjellerstedt 51aa00f0f8 oe-init-build-env*: Update/correct comment about specifying arguments
(From OE-Core rev: 9c7e3cfcff08bd47b0c1eeb63d8055d8a8b12935)

Signed-off-by: Peter Kjellerstedt <>
Signed-off-by: Ross Burton <>
Signed-off-by: Richard Purdie <>
2016-03-20 23:12:30 +00:00
Peter Kjellerstedt 16fb9b80e3 oe-init-build-env*: Allow $OEROOT to be predefined
The current implementation of oe-init-build-env and
oe-init-build-env-memres requires that they are sourced from the
directory that will be known as $OEROOT. This makes it hard to write a
wrapper script with the same name as the original OE script which,
e.g., sources the original OE script from a sub-directory.

With this change, $OEROOT can be predefined when oe-init-build-env or
oe-init-build-env-memres is sourced, allowing the original OE scripts
to be anywhere.

(From OE-Core rev: 3327e2a9222004d8ac7974cb1d9fe77c81176cfc)

Signed-off-by: Peter Kjellerstedt <>
Signed-off-by: Ross Burton <>
Signed-off-by: Richard Purdie <>
2016-03-20 23:12:30 +00:00
Marcus Müller e8d36f4886 scripts: hand the TEMPLATECONF local over to setup-builddir
(From OE-Core rev: 0bf9d919bba5780d34cc6ac9dde2c74bb07b8342)

Signed-off-by: Marcus Müller <>
Signed-off-by: Ross Burton <>
Signed-off-by: Richard Purdie <>
2015-12-28 09:25:19 +00:00
Joshua Lock 42131b6250 oe-init-build-env: fix for build dirs that have spaces in their path
Enclose expansions of BUILDDIR in quotes in order to correctly handle paths
which include spaces.

(From OE-Core rev: 0c08723cf5ebc1a7df7dc4ca36cffa090286468c)

Signed-off-by: Joshua Lock <>
Signed-off-by: Richard Purdie <>
2015-04-13 22:33:24 +01:00
Gary Thomas 61e8fdba04 oe-init-build-env: Improve script sourcing detection.
This script is only useful when sourced into a shell.
These changes improve the detection of this operation,
no matter how the script is referenced.

(From OE-Core rev: cac863e958a0c8fe0f8a84dc194273c699f0c40f)

Signed-off-by: Gary Thomas <>
Signed-off-by: Saul Wold <>
Signed-off-by: Richard Purdie <>
2014-03-11 08:11:41 -07:00
Jason Wessel 644a1a27ec oe-init-build-env: Allow startup with and without memres
Use the bitbake --status-only and the fact that bitbake.lock will
contain the host name and port to determine when to activate or
shutdown the stay resident bitbake server.

This allows a end developer to cleanly switch between the two ways to
use bitbake as well as enter the memres bitbake server from multiple
shells without starting the server if it is already running.

(From OE-Core rev: d71059c86a8160f39af6ddfdd30c86835f4eb959)

Signed-off-by: Jason Wessel <>
Signed-off-by: Richard Purdie <>
2013-12-02 11:28:27 +00:00
Richard Purdie 113398d258 oe-init-build-env: unset BBSERVER
If BBSERVER is set, we should unset it before proceeding. Its assumed the
user will have unloaded the server from memory should they have wished
to do so.

(From OE-Core rev: 5cc4d315709de195bfb0655c2f00ae2267bfa4c6)

Signed-off-by: Richard Purdie <>
2013-10-07 09:37:31 +01:00
Peter Kjellerstedt 813127247a oe-init-build-env: Make it use the correct $OEROOT with zsh
(From OE-Core rev: f0aa69296f4c1d4214f9dbea236b0ed330b8154b)

Signed-off-by: Peter Kjellerstedt <>
Signed-off-by: Richard Purdie <>
2013-04-05 23:05:34 +01:00
Robert P. J. Day 951aa5ea1f Various typoes fixed, all comments or output strings.
Typoes fixed: "enviroment", "editted", "spliting", "scheulder".

(From OE-Core rev: 17e981a857a51b0bec08c929e8539d36d83874b6)

Signed-off-by: Robert P. J. Day <>
Signed-off-by: Richard Purdie <>
2012-03-26 12:13:05 +01:00
Dexuan Cui be2a2764d8 oe-init-build-env, scripts/oe-buildenv-internal: add error detecting for $BDIR
[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 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 <>
2011-08-02 14:32:10 +01:00
Richard Purdie 65f4b65410 Further cleanup of various poky references
(From OE-Core rev: fe73ea8c510877fe4e3c117985e8f3d0b79ddf1b)

Signed-off-by: Richard Purdie <>
2011-04-21 12:56:16 +01:00
Richard Purdie 3ba0b8284d poky-setup-builddir: Rename to oe-setup-builddir and clean up POKY variable references
(From OE-Core rev: ac7411a885f53d687e65fdb6fd02510c09b97dc8)

Signed-off-by: Richard Purdie <>
2011-04-21 00:29:30 +01:00
Richard Purdie 0441fe20e7 oe-init-build-env: Fix typo
(From OE-Core rev: 16e7d595987634e503104395663f7084108ced9a)

Signed-off-by: Richard Purdie <>
2011-04-21 00:29:30 +01:00
Richard Purdie 46d0cc3dc8 Rename poky-init-build-env to oe-init-build-env
(From OE-Core rev: fa6176219b741eed346b21a3d923e9abc9b5442a)

Signed-off-by: Richard Purdie <>
2011-04-21 00:29:29 +01:00