diff options
author | Chris Larson <kergoth@openedhand.com> | 2006-08-29 08:36:28 +0000 |
---|---|---|
committer | Chris Larson <kergoth@openedhand.com> | 2006-08-29 08:36:28 +0000 |
commit | bc83fd8803ecd472af197819dc7f58e71fb1e045 (patch) | |
tree | 34a8e9f93fd7835905d055da4bc68b47d608bfce | |
parent | ecb32bdee770c3ff6c73ac2a57e612872b13910f (diff) | |
download | poky-bc83fd8803ecd472af197819dc7f58e71fb1e045.tar.gz |
Rename the supplied default local.conf to local.conf.sample, per mallum's request.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@671 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r-- | build/conf/local.conf.sample (renamed from build/conf/local.conf) | 0 | ||||
-rwxr-xr-x | poky-init-build-env | 4 |
2 files changed, 4 insertions, 0 deletions
diff --git a/build/conf/local.conf b/build/conf/local.conf.sample index 83bd007f53..83bd007f53 100644 --- a/build/conf/local.conf +++ b/build/conf/local.conf.sample | |||
diff --git a/poky-init-build-env b/poky-init-build-env index b8ddc64dc5..c2f2c04406 100755 --- a/poky-init-build-env +++ b/poky-init-build-env | |||
@@ -49,6 +49,10 @@ if ! (test -d $BBDIR && test -d $PKGDIR && test -d $BUILDDIR); then | |||
49 | exit 1 | 49 | exit 1 |
50 | fi | 50 | fi |
51 | 51 | ||
52 | if ! (test -r $BUILDDIR/conf/local.conf); then | ||
53 | cp -f $BUILDDIR/conf/local.conf.sample $BUILDDIR/conf/local.conf | ||
54 | fi | ||
55 | |||
52 | BBPATH=$BBDIR | 56 | BBPATH=$BBDIR |
53 | if test x"$BBDIR" != x"$PKGDIR"; then | 57 | if test x"$BBDIR" != x"$PKGDIR"; then |
54 | BBPATH=$PKGDIR:$BBPATH | 58 | BBPATH=$PKGDIR:$BBPATH |