Skip to content

Commit

Permalink
oe-init-build-env-memres: Drop it
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
rpurdie committed Jul 21, 2017
1 parent b63fcff commit a17724d
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 101 deletions.
1 change: 0 additions & 1 deletion meta/classes/populate_sdk_ext.bbclass
Expand Up @@ -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 \
Expand Down
8 changes: 0 additions & 8 deletions oe-init-build-env
Expand Up @@ -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
90 changes: 0 additions & 90 deletions oe-init-build-env-memres

This file was deleted.

3 changes: 1 addition & 2 deletions scripts/oe-buildenv-internal
Expand Up @@ -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
Expand Down

0 comments on commit a17724d

Please sign in to comment.