diff options
Diffstat (limited to 'oe-init-build-env')
-rwxr-xr-x | oe-init-build-env | 32 |
1 files changed, 9 insertions, 23 deletions
diff --git a/oe-init-build-env b/oe-init-build-env index 5fe68d1e2a..38333ab858 100755 --- a/oe-init-build-env +++ b/oe-init-build-env @@ -4,19 +4,8 @@ # # Copyright (C) 2006-2011 Linux Foundation # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. +# SPDX-License-Identifier: GPL-2.0-or-later # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # Normally this is called as '. ./oe-init-build-env <builddir>' @@ -31,13 +20,18 @@ elif [ -n "$ZSH_NAME" ]; then THIS_SCRIPT=$0 else THIS_SCRIPT="$(pwd)/oe-init-build-env" + if [ ! -e "$THIS_SCRIPT" ]; then + echo "Error: $THIS_SCRIPT doesn't exist!" >&2 + echo "Please run this script in oe-init-build-env's directory." >&2 + exit 1 + fi fi if [ -n "$BBSERVER" ]; then unset BBSERVER fi if [ -z "$ZSH_NAME" ] && [ "$0" = "$THIS_SCRIPT" ]; then - echo "Error: This script needs to be sourced. Please run as '. $THIS_SCRIPT'" + echo "Error: This script needs to be sourced. Please run as '. $THIS_SCRIPT'" >&2 exit 1 fi @@ -48,8 +42,8 @@ fi unset THIS_SCRIPT export OEROOT -. $OEROOT/scripts/oe-buildenv-internal && - TEMPLATECONF="$TEMPLATECONF" $OEROOT/scripts/oe-setup-builddir || { +. "$OEROOT"/scripts/oe-buildenv-internal && + TEMPLATECONF="$TEMPLATECONF" "$OEROOT"/scripts/oe-setup-builddir || { unset OEROOT return 1 } @@ -57,11 +51,3 @@ unset OEROOT [ -z "$BUILDDIR" ] || cd "$BUILDDIR" -# Shutdown any bitbake server if the BBSERVER variable is not set -if [ -z "$BBSERVER" ] && [ -f bitbake.lock ]; then - grep ":" bitbake.lock > /dev/null && BBSERVER=$(cat bitbake.lock) bitbake --status-only - if [ $? = 0 ]; then - echo "Shutting down bitbake memory resident server with bitbake -m" - BBSERVER=$(cat bitbake.lock) bitbake -m - fi -fi |