summaryrefslogtreecommitdiffstats
path: root/scripts/poky-env-internal
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-07-22 13:19:24 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-22 13:19:24 +0100
commit9832fd3e2270b837c31cbb9b33f33452d6a3f398 (patch)
treece7e8b7543c5582f42d09ebbd0e3ec1bbbde7eb4 /scripts/poky-env-internal
parentc2f71a86f5eb040932adf695887a1885d760f536 (diff)
downloadpoky-9832fd3e2270b837c31cbb9b33f33452d6a3f398.tar.gz
poky-env-internal: Cleanup after the recent layer improvements
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'scripts/poky-env-internal')
-rwxr-xr-xscripts/poky-env-internal42
1 files changed, 2 insertions, 40 deletions
diff --git a/scripts/poky-env-internal b/scripts/poky-env-internal
index d25816c6a6..c814314744 100755
--- a/scripts/poky-env-internal
+++ b/scripts/poky-env-internal
@@ -44,55 +44,17 @@ if ! (test -w "$BUILDDIR"); then
44fi 44fi
45 45
46BITBAKEDIR="$OEROOT/bitbake$BBEXTRA/" 46BITBAKEDIR="$OEROOT/bitbake$BBEXTRA/"
47PKGDIR="$OEROOT/meta/"
48BBPATH="$BITBAKEDIR $PKGDIR"
49
50#
51# Add in any extra meta-* repositories to BBPATH
52#
53METAREPOS=`cd $OEROOT; find . -maxdepth 1 -name 'meta-*' -type d| sed -e 's#./##g'`
54for repo in $METAREPOS
55do
56 # meta-openmoko is disabled by default - see local.conf.sample to enable it
57 if [ $repo = "meta-openmoko" ]; then
58 continue
59 fi
60 # meta-extras is disabled by default - see local.conf.sample to enable it
61 if [ $repo = "meta-extras" ]; then
62 continue
63 fi
64 if [ -e $OEROOT/$repo/poky-extra-environment ]; then
65 . $OEROOT/$repo/poky-extra-environment
66 fi
67done
68
69BBPATH="$BBPATH $HOME/.oe $HOME/.poky $BUILDDIR"
70
71#
72# Remove any symlinks from BBPATH
73#
74NEWPATH=""
75for p in $BBPATH
76do
77 p2=`readlink -f "$p"`
78 NEWPATH="$p2:$NEWPATH"
79done
80BBPATH="$NEWPATH"
81
82
83MSG=''
84 47
85PATH="$BITBAKEDIR/bin/:$OEROOT/scripts:$PATH" 48PATH="$BITBAKEDIR/bin/:$OEROOT/scripts:$PATH"
86 49
87# Remove any symlinks from paths 50# Remove any symlinks from paths
88BITBAKEDIR=`readlink -f "$BITBAKEDIR"` 51BITBAKEDIR=`readlink -f "$BITBAKEDIR"`
89PKGDIR=`readlink -f "$PKGDIR"`
90BUILDDIR=`readlink -f "$BUILDDIR"` 52BUILDDIR=`readlink -f "$BUILDDIR"`
91OEROOT=`readlink -f "$OEROOT"` 53OEROOT=`readlink -f "$OEROOT"`
92 54
93cd "$BUILDDIR" 55cd "$BUILDDIR"
94 56
95if ! (test -d "$BITBAKEDIR" && test -d "$PKGDIR" && test -d "$BUILDDIR"); then 57if ! (test -d "$BITBAKEDIR" && test -d "$BUILDDIR"); then
96 echo >&2 "Error: Not all directories exist! Did you run this script in poky directory?" 58 echo >&2 "Error: Not all directories exist! Did you run this script in poky directory?"
97 return 59 return
98fi 60fi
@@ -124,7 +86,7 @@ fi
124unset POKYLOCALCONF 86unset POKYLOCALCONF
125unset POKYLAYERCONF 87unset POKYLAYERCONF
126 88
127export BBPATH OEROOT BUILDDIR 89export OEROOT BUILDDIR
128 90
129# Kill off the TERMINFO variable, as glibc will grab its contents in its 'make 91# Kill off the TERMINFO variable, as glibc will grab its contents in its 'make
130# install' if set 92# install' if set