[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6831/8267] oe-init-build-env-memres: Drop it

[Emmanuele Bassi <ebassi src gnome org>]

commit 0ad65be8bffaa84042c170b46ca320d0a69f012e
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Tue Jul 18 22:52:07 2017 +0100

    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.
    
    (From OE-Core rev: a17724d687f9c04dc21f2f369da2b492f7119ba0)
    
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/populate_sdk_ext.bbclass |    1 -
 oe-init-build-env                     |    8 ---
 oe-init-build-env-memres              |   90 ---------------------------------
 scripts/oe-buildenv-internal          |    3 +-
 4 files changed, 1 insertions(+), 101 deletions(-)
---
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index 4791d74..e31ee37 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 5fe68d1..e813230 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/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal
index c890552..e6cd141 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