diff options
| author | Matthew Allum <mallum@openedhand.com> | 2005-08-31 12:44:02 +0000 |
|---|---|---|
| committer | Matthew Allum <mallum@openedhand.com> | 2005-08-31 12:44:02 +0000 |
| commit | a716d991156aa04939496ba177c29ff87a26608c (patch) | |
| tree | 2870e62e9c3130ad3d6c999e5490b4caa3930dfa | |
| parent | ceb71677cf08997de6d0e8d50b9e7aadcc4048c9 (diff) | |
| download | openembedded-core-a716d991156aa04939496ba177c29ff87a26608c.tar.gz openembedded-core-a716d991156aa04939496ba177c29ff87a26608c.tar.bz2 openembedded-core-a716d991156aa04939496ba177c29ff87a26608c.zip | |
more local.conf rejigging
git-svn-id: https://svn.o-hand.com/repos/poky@6 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rwxr-xr-x | build/conf/local.conf.sample (renamed from build/conf/local.conf) | 4 | ||||
| -rw-r--r-- | openembedded/conf/local.conf.sample | 5 | ||||
| -rwxr-xr-x | setdevenv | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/build/conf/local.conf b/build/conf/local.conf.sample index 49d6fc7e1e..f933fb183f 100755 --- a/build/conf/local.conf +++ b/build/conf/local.conf.sample @@ -1,6 +1,6 @@ # Where to cache the files OE downloads -DL_DIR = "/usr/oe/sources" -BBFILES := "/usr/ohoe/openembedded/packages/*/*.bb" +DL_DIR = "POKYROOT/sources" +BBFILES := "POKYROOT/openembedded/packages/*/*.bb" BBMASK = "" PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie" diff --git a/openembedded/conf/local.conf.sample b/openembedded/conf/local.conf.sample index 489b0deb19..52a0d5f120 100644 --- a/openembedded/conf/local.conf.sample +++ b/openembedded/conf/local.conf.sample @@ -1,3 +1,8 @@ +# XXXX NOTE XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX +# +# This file is not used, see build/conf/local.conf instead +# +# XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX # # OpenEmbedded local configuration file (sample) # @@ -24,9 +24,9 @@ if ! (test -d $BBDIR && test -d $PKGDIR && test -d $BUILDDIR); then exit 1 fi -if !(test -r $PKGDIR/conf/local.conf); then +if !(test -r $BUILDDIR/conf/local.conf); then echo "Setting up initial '$PKGDIR/conf/local.conf'." - cat $PKGDIR/conf/local.conf.sample | sed -e"s|POKYROOT|${OEROOT}|" > $PKGDIR/conf/local.conf + cat $BUILDDIR/conf/local.conf.sample | sed -e"s|POKYROOT|${OEROOT}|" > $BUILDDIR/conf/local.conf fi BBPATH=$BBDIR |