From 5b3afc9cfe38a9fb435fbe5fcabc59b9a60f4657 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Tue, 27 Feb 2018 19:46:48 +0100 Subject: 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 Signed-off-by: Richard Purdie --- scripts/oe-buildenv-internal | 1 + 1 file changed, 1 insertion(+) (limited to 'scripts') diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal index 77f98a32b9..6773872326 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") -- cgit 1.2.3-korg