diff options
| -rw-r--r-- | meta-yocto/conf/bblayers.conf.sample (renamed from meta/conf/bblayers.conf.sample) | 0 | ||||
| -rw-r--r-- | meta-yocto/conf/distro/poky-bleeding.conf (renamed from meta/conf/distro/poky-bleeding.conf) | 0 | ||||
| -rw-r--r-- | meta-yocto/conf/distro/poky-lsb.conf (renamed from meta/conf/distro/poky-lsb.conf) | 0 | ||||
| -rw-r--r-- | meta-yocto/conf/distro/poky.conf (renamed from meta/conf/distro/poky.conf) | 0 | ||||
| -rw-r--r-- | meta-yocto/conf/local.conf.sample (renamed from meta/conf/local.conf.sample) | 0 | ||||
| -rw-r--r-- | meta-yocto/conf/machine/atom-pc.conf (renamed from meta/conf/machine/atom-pc.conf) | 0 | ||||
| -rw-r--r-- | meta-yocto/conf/machine/beagleboard.conf (renamed from meta/conf/machine/beagleboard.conf) | 0 | ||||
| -rw-r--r-- | meta-yocto/conf/machine/mpc8315e-rdb.conf (renamed from meta/conf/machine/mpc8315e-rdb.conf) | 0 | ||||
| -rw-r--r-- | meta-yocto/conf/machine/routerstationpro.conf (renamed from meta/conf/machine/routerstationpro.conf) | 0 | ||||
| -rw-r--r-- | meta-yocto/conf/site.conf.sample (renamed from meta/conf/site.conf.sample) | 0 | ||||
| -rwxr-xr-x | scripts/poky-setup-builddir | 4 |
11 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/bblayers.conf.sample b/meta-yocto/conf/bblayers.conf.sample index b2f37c0..b2f37c0 100644 --- a/meta/conf/bblayers.conf.sample +++ b/meta-yocto/conf/bblayers.conf.sample diff --git a/meta/conf/distro/poky-bleeding.conf b/meta-yocto/conf/distro/poky-bleeding.conf index 328acfe..328acfe 100644 --- a/meta/conf/distro/poky-bleeding.conf +++ b/meta-yocto/conf/distro/poky-bleeding.conf diff --git a/meta/conf/distro/poky-lsb.conf b/meta-yocto/conf/distro/poky-lsb.conf index 749c858..749c858 100644 --- a/meta/conf/distro/poky-lsb.conf +++ b/meta-yocto/conf/distro/poky-lsb.conf diff --git a/meta/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf index 71e40de..71e40de 100644 --- a/meta/conf/distro/poky.conf +++ b/meta-yocto/conf/distro/poky.conf diff --git a/meta/conf/local.conf.sample b/meta-yocto/conf/local.conf.sample index 434c684..434c684 100644 --- a/meta/conf/local.conf.sample +++ b/meta-yocto/conf/local.conf.sample diff --git a/meta/conf/machine/atom-pc.conf b/meta-yocto/conf/machine/atom-pc.conf index b94deb2..b94deb2 100644 --- a/meta/conf/machine/atom-pc.conf +++ b/meta-yocto/conf/machine/atom-pc.conf diff --git a/meta/conf/machine/beagleboard.conf b/meta-yocto/conf/machine/beagleboard.conf index b1f7350..b1f7350 100644 --- a/meta/conf/machine/beagleboard.conf +++ b/meta-yocto/conf/machine/beagleboard.conf diff --git a/meta/conf/machine/mpc8315e-rdb.conf b/meta-yocto/conf/machine/mpc8315e-rdb.conf index 34b75bb..34b75bb 100644 --- a/meta/conf/machine/mpc8315e-rdb.conf +++ b/meta-yocto/conf/machine/mpc8315e-rdb.conf diff --git a/meta/conf/machine/routerstationpro.conf b/meta-yocto/conf/machine/routerstationpro.conf index d464842..d464842 100644 --- a/meta/conf/machine/routerstationpro.conf +++ b/meta-yocto/conf/machine/routerstationpro.conf diff --git a/meta/conf/site.conf.sample b/meta-yocto/conf/site.conf.sample index 4204204..4204204 100644 --- a/meta/conf/site.conf.sample +++ b/meta-yocto/conf/site.conf.sample diff --git a/scripts/poky-setup-builddir b/scripts/poky-setup-builddir index 7a49a8f..64240e1 100755 --- a/scripts/poky-setup-builddir +++ b/scripts/poky-setup-builddir @@ -56,7 +56,7 @@ if [ "x" != "x$POKYCONF" ]; then fi if [ "x" = "x$POKYLOCALCONF" ]; then - POKYLOCALCONF="$OEROOT/meta/conf/local.conf.sample" + POKYLOCALCONF="$OEROOT/meta-yocto/conf/local.conf.sample" fi if ! (test -r "$BUILDDIR/conf/local.conf"); then cat <<EOM @@ -74,7 +74,7 @@ EOM fi if [ "x" = "x$POKYLAYERCONF" ]; then - POKYLAYERCONF="$OEROOT/meta/conf/bblayers.conf.sample" + POKYLAYERCONF="$OEROOT/meta-yocto/conf/bblayers.conf.sample" fi if ! (test -r "$BUILDDIR/conf/bblayers.conf"); then cat <<EOM |
