diff options
| author | Chris Larson <kergoth@openedhand.com> | 2006-08-27 09:07:44 +0000 |
|---|---|---|
| committer | Chris Larson <kergoth@openedhand.com> | 2006-08-27 09:07:44 +0000 |
| commit | 37d03b1b00610716b27259a42c8718c8628b2ad3 (patch) | |
| tree | 6cde8f70b1f962b44b3e18098ef739cddc31d7a0 | |
| parent | bd1b2b21bc9db64099e7f435b670f56ec1fda37c (diff) | |
| download | openembedded-core-37d03b1b00610716b27259a42c8718c8628b2ad3.tar.gz openembedded-core-37d03b1b00610716b27259a42c8718c8628b2ad3.tar.bz2 openembedded-core-37d03b1b00610716b27259a42c8718c8628b2ad3.tar.xz openembedded-core-37d03b1b00610716b27259a42c8718c8628b2ad3.zip | |
Directly make use of the OEROOT environment variable in the default local.conf, and set TMPDIR explicitly to avoid the requirement that one run bitbake from the build directory.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@650 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r--[-rwxr-xr-x] | build/conf/local.conf (renamed from build/conf/local.conf.sample) | 12 | ||||
| -rwxr-xr-x | poky-init-build-env | 8 |
2 files changed, 7 insertions, 13 deletions
diff --git a/build/conf/local.conf.sample b/build/conf/local.conf index 5de6ca64c..83bd007f5 100755..100644 --- a/build/conf/local.conf.sample +++ b/build/conf/local.conf @@ -1,12 +1,12 @@ # Where to cache the files OE downloads -DL_DIR = "POKYROOT/sources" -BBFILES := "POKYROOT/meta/packages/*/*.bb" +DL_DIR = "${OEROOT}/sources" +BBFILES = "${OEROOT}/meta/packages/*/*.bb" # To enable extra packages, uncomment the following lines: -# BBFILES := "POKYROOT/meta/packages/*/*.bb POKYROOT/meta-extras/packages/*/*.bb" +# BBFILES := "${OEROOT}/meta/packages/*/*.bb ${OEROOT}/meta-extras/packages/*/*.bb" # BBFILE_COLLECTIONS = "normal extras" -# BBFILE_PATTERN_normal = "^POKYROOT/meta/" -# BBFILE_PATTERN_extras = "^POKYROOT/meta/" +# BBFILE_PATTERN_normal = "^${OEROOT}/meta/" +# BBFILE_PATTERN_extras = "^${OEROOT}/meta/" # BBFILE_PRIORITY_normal = "5" # BBFILE_PRIORITY_extras = "5" @@ -34,7 +34,7 @@ DISTRO_TYPE = "debug" # Note that a full build of everything in OpenEmbedded will take GigaBytes of hard # disk space, so make sure to free enough space. The default TMPDIR is # <build directory>/tmp -# TMPDIR = /usr/local/projects/oetmp +TMPDIR = "${OEROOT}/build/tmp" # Uncomment these two if you want BitBake to build images useful for debugging. # DEBUG_BUILD = "1" diff --git a/poky-init-build-env b/poky-init-build-env index 6cda775ff..b9be03fb3 100755 --- a/poky-init-build-env +++ b/poky-init-build-env @@ -49,12 +49,6 @@ if ! (test -d $BBDIR && test -d $PKGDIR && test -d $BUILDDIR); then exit 1 fi -if ! (test -r $BUILDDIR/conf/local.conf); then - cat $BUILDDIR/conf/local.conf.sample | sed -e"s|POKYROOT|${OEROOT}|g" > $BUILDDIR/conf/local.conf - echo - echo "..Created initial 'build/conf/local.conf'" -fi - BBPATH=$BBDIR if test x"$BBDIR" != x"$PKGDIR"; then BBPATH=$PKGDIR:$BBPATH @@ -74,4 +68,4 @@ export LANG=C echo echo "### Shell environment set up for Poky builds. ###" -echo
\ No newline at end of file +echo |