aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-18 22:52:07 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-21 08:44:18 +0100
commita17724d687f9c04dc21f2f369da2b492f7119ba0 (patch)
treee3f0cc0360ad2a14cffd4073f7ba20af0ba5196f
parentb63fcffe8b6a3f94d4812cd03fb974e173eff3e5 (diff)
downloadopenembedded-core-contrib-a17724d687f9c04dc21f2f369da2b492f7119ba0.tar.gz
openembedded-core-contrib-a17724d687f9c04dc21f2f369da2b492f7119ba0.tar.bz2
openembedded-core-contrib-a17724d687f9c04dc21f2f369da2b492f7119ba0.zip
oe-init-build-env-memres: Drop it
With the new server structure we no longer need this separate environment init script. Just set BB_SERVER_TIMEOUT to be greater than zero and bitbake will remain in memory and the UI will auto-reconnect to it. Also clean out the old shutdown code from oe-init-build-env which also doesn't make sense now. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/populate_sdk_ext.bbclass1
-rwxr-xr-xoe-init-build-env8
-rwxr-xr-xoe-init-build-env-memres90
-rwxr-xr-xscripts/oe-buildenv-internal3
4 files changed, 1 insertions, 101 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index 4791d744312..e31ee3722b6 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -69,7 +69,6 @@ OE_INIT_ENV_SCRIPT ?= "oe-init-build-env"
# COREBASE be preserved as well as untracked files.
COREBASE_FILES ?= " \
oe-init-build-env \
- oe-init-build-env-memres \
scripts \
LICENSE \
.templateconf \
diff --git a/oe-init-build-env b/oe-init-build-env
index 5fe68d1e2a3..e813230a988 100755
--- a/oe-init-build-env
+++ b/oe-init-build-env
@@ -57,11 +57,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
diff --git a/oe-init-build-env-memres b/oe-init-build-env-memres
deleted file mode 100755
index 3f0d239a10b..00000000000
--- a/oe-init-build-env-memres
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-
-# OE Build Environment Setup Script
-#
-# 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.
-#
-# 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-memres <builddir> [portnumber]'
-#
-# This works in most shells (not dash), but not all of them pass the arguments
-# when being sourced. To workaround the shell limitation use "set <builddir>
-# [portnumber]" prior to sourcing this script.
-#
-if [ -z "$2" ]; then
- echo "No port specified, using dynamically selected port"
- port=-1
-else
- port=$2
- set -- "$1" "$3" "$4" "$5" "$6"
-fi
-
-if [ -n "$BASH_SOURCE" ]; then
- THIS_SCRIPT=$BASH_SOURCE
-elif [ -n "$ZSH_NAME" ]; then
- THIS_SCRIPT=$0
-else
- THIS_SCRIPT="$(pwd)/oe-init-build-env"
-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'"
- exit 1
-fi
-
-if [ -z "$OEROOT" ]; then
- OEROOT=$(dirname "$THIS_SCRIPT")
- OEROOT=$(readlink -f "$OEROOT")
-fi
-unset THIS_SCRIPT
-
-export OEROOT
-. $OEROOT/scripts/oe-buildenv-internal &&
- TEMPLATECONF="$TEMPLATECONF" $OEROOT/scripts/oe-setup-builddir || {
- unset OEROOT
- return 1
-}
-unset OEROOT
-
-[ -z "$BUILDDIR" ] || cd "$BUILDDIR"
-
-res=1
-if [ -e bitbake.lock ] && grep : bitbake.lock > /dev/null; then
- BBSERVER=$(cat bitbake.lock) bitbake --status-only
- res=$?
-fi
-
-if [ $res != 0 ]; then
- bitbake --server-only -t xmlrpc -B localhost:$port
-fi
-
-if [ $port = -1 ]; then
- export BBSERVER=localhost:-1
- echo "Bitbake server started on demand as needed, use bitbake -m to shut it down"
-else
- export BBSERVER=$(cat bitbake.lock)
-
- if [ $res = 0 ]; then
- echo "Using existing bitbake server at: $BBSERVER, use bitbake -m to shut it down"
- else
- echo "Bitbake server started at: $BBSERVER, use bitbake -m to shut it down"
- fi
-fi
-unset port res
diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal
index c8905524ff5..e6cd141ff54 100755
--- a/scripts/oe-buildenv-internal
+++ b/scripts/oe-buildenv-internal
@@ -24,8 +24,7 @@ if ! $(return >/dev/null 2>&1) ; then
echo 'Usage: . $OEROOT/scripts/oe-buildenv-internal &&'
echo ''
echo 'OpenEmbedded oe-buildenv-internal - an internal script that is'
- echo 'used in oe-init-build-env and oe-init-build-env-memres to'
- echo 'initialize oe build environment'
+ echo 'used in oe-init-build-env to initialize oe build environment'
echo ''
exit 2
fi