From c472d9ba9e970ad4c9bacf7851fcf6245fd03c40 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Wed, 31 Aug 2022 13:12:25 +0200
Subject: [PATCH] meta-poky/conf: move default templates to
 conf/templates/default/

This follows the changes in oe-core, where templates are expected
to be under conf/templates.

(From meta-yocto rev: 29608bd03e1bffa124353061617b1d71370a4e5f)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .templateconf                                                   | 2 +-
 meta-poky/conf/{ => templates/default}/bblayers.conf.sample     | 0
 meta-poky/conf/{ => templates/default}/conf-notes.txt           | 0
 meta-poky/conf/{ => templates/default}/local.conf.sample        | 0
 .../conf/{ => templates/default}/local.conf.sample.extended     | 0
 meta-poky/conf/{ => templates/default}/site.conf.sample         | 0
 6 files changed, 1 insertion(+), 1 deletion(-)
 rename meta-poky/conf/{ => templates/default}/bblayers.conf.sample (100%)
 rename meta-poky/conf/{ => templates/default}/conf-notes.txt (100%)
 rename meta-poky/conf/{ => templates/default}/local.conf.sample (100%)
 rename meta-poky/conf/{ => templates/default}/local.conf.sample.extended (100%)
 rename meta-poky/conf/{ => templates/default}/site.conf.sample (100%)

diff --git a/.templateconf b/.templateconf
index 0fe6f825038..faf03480777 100644
--- a/.templateconf
+++ b/.templateconf
@@ -1,2 +1,2 @@
 # Template settings
-TEMPLATECONF=${TEMPLATECONF:-meta-poky/conf}
+TEMPLATECONF=${TEMPLATECONF:-meta-poky/conf/templates/default}
diff --git a/meta-poky/conf/bblayers.conf.sample b/meta-poky/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-poky/conf/bblayers.conf.sample
rename to meta-poky/conf/templates/default/bblayers.conf.sample
diff --git a/meta-poky/conf/conf-notes.txt b/meta-poky/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-poky/conf/conf-notes.txt
rename to meta-poky/conf/templates/default/conf-notes.txt
diff --git a/meta-poky/conf/local.conf.sample b/meta-poky/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-poky/conf/local.conf.sample
rename to meta-poky/conf/templates/default/local.conf.sample
diff --git a/meta-poky/conf/local.conf.sample.extended b/meta-poky/conf/templates/default/local.conf.sample.extended
similarity index 100%
rename from meta-poky/conf/local.conf.sample.extended
rename to meta-poky/conf/templates/default/local.conf.sample.extended
diff --git a/meta-poky/conf/site.conf.sample b/meta-poky/conf/templates/default/site.conf.sample
similarity index 100%
rename from meta-poky/conf/site.conf.sample
rename to meta-poky/conf/templates/default/site.conf.sample