[oe-commits] [openembedded-core] 06/15: oe-init-env: search 'bitbake' outside of oe-core

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 38d6eff9509884fbea21581ef78cb6eae07ba2a2
Author: Enrico Scholz <enrico.scholz at sigma-chemnitz.de>
AuthorDate: Tue Feb 27 19:46:48 2018 +0100

    oe-init-env: search 'bitbake' outside of oe-core
    
    atm, 'oe-init-build-env' expects 'bitbake' to be within the OE core git
    repository.  This complicates the project setup because you have to
    manage the 'bitbake' directory or symlink manually (or specify the
    bitbake location explicitly).
    
    Looking for 'bitbake' outside the main git repository will ease project
    management significantly.  Now, you can put everything into git submodules,
    clone the project with
    
    | git clone --recursive ...
    
    and continue immediately with
    
    | ..../oe-init-build-env
    
    E.g. when you had previously
    
    | .
    | |-- build/
    | `-- sources/
    |     `-- org.openembedded.core/
    |         `-- bitbake -> ../bitbake
    
    (where 'bitbake' must be created manually after cloning the project),
    you can have now
    
    | .
    | |-- build/
    | `-- sources/
    |     |-- bitbake/
    |     `-- org.openembedded.core/
    
    which is completely managed by 'git'.
    
    Patch adds $OEROOT/.. to the search path for 'bitbake'
    
    Signed-off-by: Enrico Scholz <enrico.scholz at sigma-chemnitz.de>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 scripts/oe-buildenv-internal | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal
index 77f98a3..6773872 100755
--- a/scripts/oe-buildenv-internal
+++ b/scripts/oe-buildenv-internal
@@ -101,6 +101,7 @@ unset BDIR
 
 if [ -z "$BITBAKEDIR" ]; then
     BITBAKEDIR="$OEROOT/bitbake$BBEXTRA"
+    test -d "$BITBAKEDIR" || BITBAKEDIR="$OEROOT/../bitbake$BBEXTRA"
 fi
 
 BITBAKEDIR=$(readlink -f "$BITBAKEDIR")

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.