diff options
-rw-r--r-- | openembedded/conf/local.conf.sample | 7 | ||||
-rwxr-xr-x | setdevenv | 11 |
2 files changed, 12 insertions, 6 deletions
diff --git a/openembedded/conf/local.conf.sample b/openembedded/conf/local.conf.sample index 7a7afb4277..489b0deb19 100644 --- a/openembedded/conf/local.conf.sample +++ b/openembedded/conf/local.conf.sample | |||
@@ -20,11 +20,12 @@ | |||
20 | # expansion. Stuff like starting with ${HOME} or ${TOPDIR} is ok). | 20 | # expansion. Stuff like starting with ${HOME} or ${TOPDIR} is ok). |
21 | 21 | ||
22 | # Use this to specify where BitBake should place the downloaded sources into | 22 | # Use this to specify where BitBake should place the downloaded sources into |
23 | DL_DIR = "${HOME}/sources" | 23 | DL_DIR = "POKYROOT/sources" |
24 | 24 | ||
25 | # Delete the line below. Then specify which .bb files to consider for | 25 | # Delete the line below. Then specify which .bb files to consider for |
26 | # your build. Typically this will be something like BBFILES = "/path/to/openembedded/packages/*/*.bb" | 26 | # your build. Typically this will be something like BBFILES = "/path/to/openembedded/packages/*/*.bb" |
27 | BBFILES := "${@bb.fatal('Edit your conf/local.conf: BBFILES')}" | 27 | #BBFILES := "${@bb.fatal('Edit your conf/local.conf: BBFILES')}" |
28 | BBFILES := "POKYROOT/openembedded/packages/*/*.bb" | ||
28 | 29 | ||
29 | # Use the BBMASK below to instruct BitBake to _NOT_ consider some .bb files | 30 | # Use the BBMASK below to instruct BitBake to _NOT_ consider some .bb files |
30 | # This is a regulary expression, so be sure to get your parenthesis balanced. | 31 | # This is a regulary expression, so be sure to get your parenthesis balanced. |
@@ -119,4 +120,4 @@ BBINCLUDELOGS = "yes" | |||
119 | CVS_TARBALL_STASH = "http://www.oesources.org/source/current/" | 120 | CVS_TARBALL_STASH = "http://www.oesources.org/source/current/" |
120 | 121 | ||
121 | # EDIT THIS FILE and then remove the line below before using! | 122 | # EDIT THIS FILE and then remove the line below before using! |
122 | REMOVE_THIS_LINE:="${@oe.fatal('Read the comments in your conf/local.conf')}" | 123 | #REMOVE_THIS_LINE:="${@oe.fatal('Read the comments in your conf/local.conf')}" |
@@ -4,7 +4,7 @@ | |||
4 | # Change this to the location of this file. | 4 | # Change this to the location of this file. |
5 | # Also update the locations at the top of conf/local.conf | 5 | # Also update the locations at the top of conf/local.conf |
6 | # | 6 | # |
7 | OEROOT=/usr/ohoe/ | 7 | OEROOT=`pwd` |
8 | 8 | ||
9 | BBDIR=$OEROOT/bitbake/ | 9 | BBDIR=$OEROOT/bitbake/ |
10 | PKGDIR=$OEROOT/openembedded/ | 10 | PKGDIR=$OEROOT/openembedded/ |
@@ -20,10 +20,15 @@ PKGDIR=`readlink -f $PKGDIR` | |||
20 | BUILDDIR=`readlink -f $BUILDDIR` | 20 | BUILDDIR=`readlink -f $BUILDDIR` |
21 | 21 | ||
22 | if ! (test -d $BBDIR && test -d $PKGDIR && test -d $BUILDDIR); then | 22 | if ! (test -d $BBDIR && test -d $PKGDIR && test -d $BUILDDIR); then |
23 | echo >&2 "Error: Not all directories exist!" | 23 | echo >&2 "Error: Not all directories exist! Did you run this script in poky directory?" |
24 | exit 1 | 24 | exit 1 |
25 | fi | 25 | fi |
26 | 26 | ||
27 | if !(test -r $PKGDIR/conf/local.conf); then | ||
28 | echo "Setting up initial '$PKGDIR/conf/local.conf'." | ||
29 | cat $PKGDIR/conf/local.conf.sample | sed -e"s|POKYROOT|${OEROOT}|" > $PKGDIR/conf/local.conf | ||
30 | fi | ||
31 | |||
27 | BBPATH=$BBDIR | 32 | BBPATH=$BBDIR |
28 | if test x"$BBDIR" != x"$PKGDIR"; then | 33 | if test x"$BBDIR" != x"$PKGDIR"; then |
29 | BBPATH=$PKGDIR:$BBPATH | 34 | BBPATH=$PKGDIR:$BBPATH |