scripts/oe-setup-builddir: Fix up OE-Core/Poky mismatch for now (and fix permissions)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

12 files changed, 4 insertions, 2 deletions

diff --git a/scripts/oe-find-native-sysroot b/scripts/oe-find-native-sysroot
index 26fc730c60..26fc730c60 100644..100755
--- a/scripts/oe-find-native-sysroot
+++ b/scripts/oe-find-native-sysroot
diff --git a/scripts/oe-git-proxy-command b/scripts/oe-git-proxy-command
index d31f85abd8..d31f85abd8 100644..100755
--- a/scripts/oe-git-proxy-command
+++ b/scripts/oe-git-proxy-command
diff --git a/scripts/oe-git-proxy-socks-command b/scripts/oe-git-proxy-socks-command
index 90fa14e1ed..90fa14e1ed 100644..100755
--- a/scripts/oe-git-proxy-socks-command
+++ b/scripts/oe-git-proxy-socks-command
diff --git a/scripts/oe-git-proxy-socks.c b/scripts/oe-git-proxy-socks.c
index f5747117ab..f5747117ab 100644..100755
--- a/scripts/oe-git-proxy-socks.c
+++ b/scripts/oe-git-proxy-socks.c
diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir
index 2f8a0646b9..58c9ad67e1 100644..100755
--- a/scripts/oe-setup-builddir
+++ b/scripts/oe-setup-builddir
@@ -37,6 +37,8 @@ fi
 
 cd "$BUILDDIR"
 
+TEMPLATECONF=meta-yocto/conf
+
 # 
 # $TEMPLATECONF can point to a directory for the template local.conf & bblayers.conf
 #
@@ -51,8 +53,8 @@ if [ "x" != "x$TEMPLATECONF" ]; then
             return
         fi
     fi
-    OECORELAYERCONF="$TEMPLATECONF/bblayers.conf"
-    OECORELOCALCONF="$TEMPLATECONF/local.conf"
+    OECORELAYERCONF="$TEMPLATECONF/bblayers.conf.sample"
+    OECORELOCALCONF="$TEMPLATECONF/local.conf.sample"
 fi
 
 if [ "x" = "x$OECORELOCALCONF" ]; then
diff --git a/scripts/oe-setup-rpmrepo b/scripts/oe-setup-rpmrepo
index 03372b6199..03372b6199 100644..100755
--- a/scripts/oe-setup-rpmrepo
+++ b/scripts/oe-setup-rpmrepo
diff --git a/scripts/oe-trim-schemas b/scripts/oe-trim-schemas
index 29fb3a1b67..29fb3a1b67 100644..100755
--- a/scripts/oe-trim-schemas
+++ b/scripts/oe-trim-schemas
diff --git a/scripts/qemuimage-testlib b/scripts/qemuimage-testlib
index 5318ca636c..5318ca636c 100644..100755
--- a/scripts/qemuimage-testlib
+++ b/scripts/qemuimage-testlib
diff --git a/scripts/runqemu-addptable2image b/scripts/runqemu-addptable2image
index f0195ad8a3..f0195ad8a3 100644..100755
--- a/scripts/runqemu-addptable2image
+++ b/scripts/runqemu-addptable2image
diff --git a/scripts/runqemu-export-rootfs b/scripts/runqemu-export-rootfs
index 6b4aee8116..6b4aee8116 100644..100755
--- a/scripts/runqemu-export-rootfs
+++ b/scripts/runqemu-export-rootfs
diff --git a/scripts/runqemu-extract-sdk b/scripts/runqemu-extract-sdk
index d30e5a64aa..d30e5a64aa 100644..100755
--- a/scripts/runqemu-extract-sdk
+++ b/scripts/runqemu-extract-sdk
diff --git a/scripts/runqemu-gen-tapdevs b/scripts/runqemu-gen-tapdevs
index 995e1d5204..995e1d5204 100644..100755
--- a/scripts/runqemu-gen-tapdevs
+++ b/scripts/runqemu-gen-tapdevs