summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Allum <mallum@openedhand.com>2005-08-31 12:44:02 +0000
committerMatthew Allum <mallum@openedhand.com>2005-08-31 12:44:02 +0000
commita716d991156aa04939496ba177c29ff87a26608c (patch)
tree2870e62e9c3130ad3d6c999e5490b4caa3930dfa
parentceb71677cf08997de6d0e8d50b9e7aadcc4048c9 (diff)
downloadpoky-a716d991156aa04939496ba177c29ff87a26608c.tar.gz
more local.conf rejigging
git-svn-id: https://svn.o-hand.com/repos/poky@6 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rwxr-xr-xbuild/conf/local.conf.sample (renamed from build/conf/local.conf)4
-rw-r--r--openembedded/conf/local.conf.sample5
-rwxr-xr-xsetdevenv4
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 @@
1# Where to cache the files OE downloads 1# Where to cache the files OE downloads
2DL_DIR = "/usr/oe/sources" 2DL_DIR = "POKYROOT/sources"
3BBFILES := "/usr/ohoe/openembedded/packages/*/*.bb" 3BBFILES := "POKYROOT/openembedded/packages/*/*.bb"
4 4
5BBMASK = "" 5BBMASK = ""
6PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie" 6PREFERRED_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 @@
1# XXXX NOTE XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
2#
3# This file is not used, see build/conf/local.conf instead
4#
5# XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
1# 6#
2# OpenEmbedded local configuration file (sample) 7# OpenEmbedded local configuration file (sample)
3# 8#
diff --git a/setdevenv b/setdevenv
index 0c3c572fe0..decbf6a30f 100755
--- a/setdevenv
+++ b/setdevenv
@@ -24,9 +24,9 @@ if ! (test -d $BBDIR && test -d $PKGDIR && test -d $BUILDDIR); then
24 exit 1 24 exit 1
25fi 25fi
26 26
27if !(test -r $PKGDIR/conf/local.conf); then 27if !(test -r $BUILDDIR/conf/local.conf); then
28 echo "Setting up initial '$PKGDIR/conf/local.conf'." 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 29 cat $BUILDDIR/conf/local.conf.sample | sed -e"s|POKYROOT|${OEROOT}|" > $BUILDDIR/conf/local.conf
30fi 30fi
31 31
32BBPATH=$BBDIR 32BBPATH=$BBDIR