diff options
| author | Joshua Lock <josh@linux.intel.com> | 2010-08-17 17:34:59 +0100 |
|---|---|---|
| committer | Joshua Lock <josh@linux.intel.com> | 2010-08-17 17:41:20 +0100 |
| commit | e624b2700abc93990b58bef0ba9447373148a31c (patch) | |
| tree | 1e8c6773d5eebb7177da07499fa33647e2b4945d | |
| parent | 2225e1214285f0e9a3c0ee2962b3d678c5c05292 (diff) | |
| download | openembedded-core-e624b2700abc93990b58bef0ba9447373148a31c.tar.gz openembedded-core-e624b2700abc93990b58bef0ba9447373148a31c.tar.bz2 openembedded-core-e624b2700abc93990b58bef0ba9447373148a31c.tar.xz openembedded-core-e624b2700abc93990b58bef0ba9447373148a31c.zip | |
build/conf: move sample conf files to meta/conf
Currently rm -fr build breaks things badly but will work if we move the sample
configuration files to meta/conf - this patch does so.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
| -rw-r--r-- | meta/conf/bblayers.conf.sample (renamed from build/conf/bblayers.conf.sample) | 0 | ||||
| -rw-r--r-- | meta/conf/local.conf.sample (renamed from build/conf/local.conf.sample) | 0 | ||||
| -rw-r--r-- | meta/conf/site.conf.sample (renamed from build/conf/site.conf.sample) | 0 | ||||
| -rwxr-xr-x | scripts/poky-env-internal | 4 |
4 files changed, 2 insertions, 2 deletions
diff --git a/build/conf/bblayers.conf.sample b/meta/conf/bblayers.conf.sample index d361f244d..d361f244d 100644 --- a/build/conf/bblayers.conf.sample +++ b/meta/conf/bblayers.conf.sample diff --git a/build/conf/local.conf.sample b/meta/conf/local.conf.sample index 66acaa49a..66acaa49a 100644 --- a/build/conf/local.conf.sample +++ b/meta/conf/local.conf.sample diff --git a/build/conf/site.conf.sample b/meta/conf/site.conf.sample index 42042042f..42042042f 100644 --- a/build/conf/site.conf.sample +++ b/meta/conf/site.conf.sample diff --git a/scripts/poky-env-internal b/scripts/poky-env-internal index 3279fb0be..e8d8f2b03 100755 --- a/scripts/poky-env-internal +++ b/scripts/poky-env-internal @@ -59,7 +59,7 @@ if ! (test -d "$BITBAKEDIR" && test -d "$BUILDDIR"); then fi if [ "x" = "x$POKYLOCALCONF" ]; then - POKYLOCALCONF="$OEROOT/build/conf/local.conf.sample" + POKYLOCALCONF="$OEROOT/meta/conf/local.conf.sample" fi if ! (test -r "$BUILDDIR/conf/local.conf"); then echo "You had no conf/local.conf file. Poky has created this configuration file for you" @@ -73,7 +73,7 @@ if ! (test -r "$BUILDDIR/conf/local.conf"); then fi if [ "x" = "x$POKYLAYERCONF" ]; then - POKYLAYERCONF="$OEROOT/build/conf/bblayers.conf.sample" + POKYLAYERCONF="$OEROOT/meta/conf/bblayers.conf.sample" fi if ! (test -r "$BUILDDIR/conf/bblayers.conf"); then echo "You had no conf/bblayers.conf file. Poky has created this configuration file for you" |