summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-20 17:04:39 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-20 23:29:30 (GMT)
commit3ba0b8284dfe6b631bddde9c1654ffa680cd2de1 (patch)
tree01695fdbc251fe5f26601288e5844886e3ca427c
parente7126c1e53a85c36c312fedebac8bce983e55fb3 (diff)
downloadpoky-3ba0b8284dfe6b631bddde9c1654ffa680cd2de1.tar.gz
poky-setup-builddir: Rename to oe-setup-builddir and clean up POKY variable references
(From OE-Core rev: ac7411a885f53d687e65fdb6fd02510c09b97dc8) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xoe-init-build-env2
-rw-r--r--[-rwxr-xr-x]scripts/oe-setup-builddir (renamed from scripts/poky-setup-builddir)36
2 files changed, 19 insertions, 19 deletions
diff --git a/oe-init-build-env b/oe-init-build-env
index 4b1b708..7e2b2ce 100755
--- a/oe-init-build-env
+++ b/oe-init-build-env
@@ -36,7 +36,7 @@ else
36 OEROOT=`readlink -f "$OEROOT"` 36 OEROOT=`readlink -f "$OEROOT"`
37 export OEROOT 37 export OEROOT
38 . $OEROOT/scripts/oe-buildenv-internal 38 . $OEROOT/scripts/oe-buildenv-internal
39 $OEROOT/scripts/poky-setup-builddir 39 $OEROOT/scripts/oe-setup-builddir
40 unset OEROOT 40 unset OEROOT
41 unset BBPATH 41 unset BBPATH
42 [ -n "$BUILDDIR" ] && cd $BUILDDIR 42 [ -n "$BUILDDIR" ] && cd $BUILDDIR
diff --git a/scripts/poky-setup-builddir b/scripts/oe-setup-builddir
index c900d0e..0e616a7 100755..100644
--- a/scripts/poky-setup-builddir
+++ b/scripts/oe-setup-builddir
@@ -38,25 +38,25 @@ fi
38cd "$BUILDDIR" 38cd "$BUILDDIR"
39 39
40# 40#
41# $POKYCONF can point to a directory for the template local.conf & bblayers.conf 41# $TEMPLATECONF can point to a directory for the template local.conf & bblayers.conf
42# 42#
43if [ "x" != "x$POKYCONF" ]; then 43if [ "x" != "x$TEMPLATECONF" ]; then
44 if ! (test -d "$POKYCONF"); then 44 if ! (test -d "$TEMPLATECONF"); then
45 # Allow POKYCONF=meta-xyz/conf as a shortcut 45 # Allow TEMPLATECONF=meta-xyz/conf as a shortcut
46 if [ -d "$OEROOT/$POKYCONF" ]; then 46 if [ -d "$OEROOT/$TEMPLATECONF" ]; then
47 POKYCONF="$OEROOT/$POKYCONF" 47 TEMPLATECONF="$OEROOT/$POKYCONF"
48 fi 48 fi
49 if ! (test -d "$POKYCONF"); then 49 if ! (test -d "$TEMPLATECONF"); then
50 echo >&2 "Error: '$POKYCONF' must be a directory containing local.conf & bblayers.conf" 50 echo >&2 "Error: '$TEMPLATECONF' must be a directory containing local.conf & bblayers.conf"
51 return 51 return
52 fi 52 fi
53 fi 53 fi
54 POKYLAYERCONF="$POKYCONF/bblayers.conf" 54 OECORELAYERCONF="$TEMPLATECONF/bblayers.conf"
55 POKYLOCALCONF="$POKYCONF/local.conf" 55 OECORELOCALCONF="$TEMPLATECONF/local.conf"
56fi 56fi
57 57
58if [ "x" = "x$POKYLOCALCONF" ]; then 58if [ "x" = "x$OECORELOCALCONF" ]; then
59 POKYLOCALCONF="$OEROOT/meta-yocto/conf/local.conf.sample" 59 OECORELOCALCONF="$OEROOT/meta/conf/local.conf.sample"
60fi 60fi
61if ! (test -r "$BUILDDIR/conf/local.conf"); then 61if ! (test -r "$BUILDDIR/conf/local.conf"); then
62cat <<EOM 62cat <<EOM
@@ -70,11 +70,11 @@ Also, for more information see the Poky Reference Manual:
70 http://yoctoproject.org/community/documentation 70 http://yoctoproject.org/community/documentation
71 71
72EOM 72EOM
73 cp -f $POKYLOCALCONF $BUILDDIR/conf/local.conf 73 cp -f $OECORELOCALCONF $BUILDDIR/conf/local.conf
74fi 74fi
75 75
76if [ "x" = "x$POKYLAYERCONF" ]; then 76if [ "x" = "x$OECORELAYERCONF" ]; then
77 POKYLAYERCONF="$OEROOT/meta-yocto/conf/bblayers.conf.sample" 77 OECORELAYERCONF="$OEROOT/meta/conf/bblayers.conf.sample"
78fi 78fi
79if ! (test -r "$BUILDDIR/conf/bblayers.conf"); then 79if ! (test -r "$BUILDDIR/conf/bblayers.conf"); then
80cat <<EOM 80cat <<EOM
@@ -89,12 +89,12 @@ EOM
89 89
90 # Put the abosolute path to the layers in bblayers.conf so we can run 90 # Put the abosolute path to the layers in bblayers.conf so we can run
91 # bitbake without the init script after the first run 91 # bitbake without the init script after the first run
92 sed "s|##COREBASE##|$OEROOT|g" $POKYLAYERCONF > $BUILDDIR/conf/bblayers.conf 92 sed "s|##COREBASE##|$OEROOT|g" $OECORELAYERCONF > $BUILDDIR/conf/bblayers.conf
93fi 93fi
94 94
95# Prevent disturbing a new GIT clone in same console 95# Prevent disturbing a new GIT clone in same console
96unset POKYLOCALCONF 96unset OECORELOCALCONF
97unset POKYLAYERCONF 97unset OECORELAYERCONF
98 98
99cat <<EOM 99cat <<EOM
100 100