summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 4791d74431..e31ee3722b 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"
69# COREBASE be preserved as well as untracked files. 69# COREBASE be preserved as well as untracked files.
70COREBASE_FILES ?= " \ 70COREBASE_FILES ?= " \
71 oe-init-build-env \ 71 oe-init-build-env \
72 oe-init-build-env-memres \
73 scripts \ 72 scripts \
74 LICENSE \ 73 LICENSE \
75 .templateconf \ 74 .templateconf \
diff --git a/oe-init-build-env b/oe-init-build-env
index 5fe68d1e2a..e813230a98 100755
--- a/oe-init-build-env
+++ b/oe-init-build-env
@@ -57,11 +57,3 @@ unset OEROOT
57 57
58[ -z "$BUILDDIR" ] || cd "$BUILDDIR" 58[ -z "$BUILDDIR" ] || cd "$BUILDDIR"
59 59
60# Shutdown any bitbake server if the BBSERVER variable is not set
61if [ -z "$BBSERVER" ] && [ -f bitbake.lock ]; then
62 grep ":" bitbake.lock > /dev/null && BBSERVER=$(cat bitbake.lock) bitbake --status-only
63 if [ $? = 0 ]; then
64 echo "Shutting down bitbake memory resident server with bitbake -m"
65 BBSERVER=$(cat bitbake.lock) bitbake -m
66 fi
67fi
diff --git a/oe-init-build-env-memres b/oe-init-build-env-memres
deleted file mode 100755
index 3f0d239a10..0000000000
--- a/oe-init-build-env-memres
+++ /dev/null
@@ -1,90 +0,0 @@
1#!/bin/sh
2
3# OE Build Environment Setup Script
4#
5# Copyright (C) 2006-2011 Linux Foundation
6#
7# This program is free software; you can redistribute it and/or modify
8# it under the terms of the GNU General Public License as published by
9# the Free Software Foundation; either version 2 of the License, or
10# (at your option) any later version.
11#
12# This program is distributed in the hope that it will be useful,
13# but WITHOUT ANY WARRANTY; without even the implied warranty of
14# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15# GNU General Public License for more details.
16#
17# You should have received a copy of the GNU General Public License
18# along with this program; if not, write to the Free Software
19# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20
21#
22# Normally this is called as '. ./oe-init-build-env-memres <builddir> [portnumber]'
23#
24# This works in most shells (not dash), but not all of them pass the arguments
25# when being sourced. To workaround the shell limitation use "set <builddir>
26# [portnumber]" prior to sourcing this script.
27#
28if [ -z "$2" ]; then
29 echo "No port specified, using dynamically selected port"
30 port=-1
31else
32 port=$2
33 set -- "$1" "$3" "$4" "$5" "$6"
34fi
35
36if [ -n "$BASH_SOURCE" ]; then
37 THIS_SCRIPT=$BASH_SOURCE
38elif [ -n "$ZSH_NAME" ]; then
39 THIS_SCRIPT=$0
40else
41 THIS_SCRIPT="$(pwd)/oe-init-build-env"
42fi
43if [ -n "$BBSERVER" ]; then
44 unset BBSERVER
45fi
46
47if [ -z "$ZSH_NAME" ] && [ "$0" = "$THIS_SCRIPT" ]; then
48 echo "Error: This script needs to be sourced. Please run as '. $THIS_SCRIPT'"
49 exit 1
50fi
51
52if [ -z "$OEROOT" ]; then
53 OEROOT=$(dirname "$THIS_SCRIPT")
54 OEROOT=$(readlink -f "$OEROOT")
55fi
56unset THIS_SCRIPT
57
58export OEROOT
59. $OEROOT/scripts/oe-buildenv-internal &&
60 TEMPLATECONF="$TEMPLATECONF" $OEROOT/scripts/oe-setup-builddir || {
61 unset OEROOT
62 return 1
63}
64unset OEROOT
65
66[ -z "$BUILDDIR" ] || cd "$BUILDDIR"
67
68res=1
69if [ -e bitbake.lock ] && grep : bitbake.lock > /dev/null; then
70 BBSERVER=$(cat bitbake.lock) bitbake --status-only
71 res=$?
72fi
73
74if [ $res != 0 ]; then
75 bitbake --server-only -t xmlrpc -B localhost:$port
76fi
77
78if [ $port = -1 ]; then
79 export BBSERVER=localhost:-1
80 echo "Bitbake server started on demand as needed, use bitbake -m to shut it down"
81else
82 export BBSERVER=$(cat bitbake.lock)
83
84 if [ $res = 0 ]; then
85 echo "Using existing bitbake server at: $BBSERVER, use bitbake -m to shut it down"
86 else
87 echo "Bitbake server started at: $BBSERVER, use bitbake -m to shut it down"
88 fi
89fi
90unset port res
diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal
index c8905524ff..e6cd141ff5 100755
--- a/scripts/oe-buildenv-internal
+++ b/scripts/oe-buildenv-internal
@@ -24,8 +24,7 @@ if ! $(return >/dev/null 2>&1) ; then
24 echo 'Usage: . $OEROOT/scripts/oe-buildenv-internal &&' 24 echo 'Usage: . $OEROOT/scripts/oe-buildenv-internal &&'
25 echo '' 25 echo ''
26 echo 'OpenEmbedded oe-buildenv-internal - an internal script that is' 26 echo 'OpenEmbedded oe-buildenv-internal - an internal script that is'
27 echo 'used in oe-init-build-env and oe-init-build-env-memres to' 27 echo 'used in oe-init-build-env to initialize oe build environment'
28 echo 'initialize oe build environment'
29 echo '' 28 echo ''
30 exit 2 29 exit 2
31fi 30fi