From bb789d5694b3696a9aa81d2cd37a1c7f39908ed8 Mon Sep 17 00:00:00 2001
From: Patrick Williams <patrick@stwcx.xyz>
Date: Fri, 9 Sep 2022 09:47:35 -0500
Subject: treewide: handle upstream TEMPLATECONF move

The latest poky commit is requiring us to have all of
our template configs in a subdirectory instead of directly in
the `conf` directory.  Without this we end up with errors during
setup like:

```
Error: TEMPLATECONF value (which is .../openbmc/meta-facebook/meta-bletchley/conf) must point to meta-some-layer/conf/templates/template-name
```

Fix this by moving all of our template files into the 'default'
template subdirectory (following the pattern of poky) and modifying
`setup` as necessary to follow.

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Iecefde73d55acbb6bc63ae3d68c4311adaf327ae
---
 meta-asrock/meta-e3c246d4i/conf/bblayers.conf.sample   | 18 ------------------
 meta-asrock/meta-e3c246d4i/conf/local.conf.sample      | 17 -----------------
 .../conf/templates/default/bblayers.conf.sample        | 18 ++++++++++++++++++
 .../conf/templates/default/local.conf.sample           | 17 +++++++++++++++++
 4 files changed, 35 insertions(+), 35 deletions(-)
 delete mode 100644 meta-asrock/meta-e3c246d4i/conf/bblayers.conf.sample
 delete mode 100644 meta-asrock/meta-e3c246d4i/conf/local.conf.sample
 create mode 100644 meta-asrock/meta-e3c246d4i/conf/templates/default/bblayers.conf.sample
 create mode 100644 meta-asrock/meta-e3c246d4i/conf/templates/default/local.conf.sample

(limited to 'meta-asrock/meta-e3c246d4i')

diff --git a/meta-asrock/meta-e3c246d4i/conf/bblayers.conf.sample b/meta-asrock/meta-e3c246d4i/conf/bblayers.conf.sample
deleted file mode 100644
index 409a775a83..0000000000
--- a/meta-asrock/meta-e3c246d4i/conf/bblayers.conf.sample
+++ /dev/null
@@ -1,18 +0,0 @@
-# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
-# changes incompatibly
-LCONF_VERSION = "8"
-
-BBPATH = "${TOPDIR}"
-BBFILES ?= ""
-
-BBLAYERS ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-asrock \
-  ##OEROOT##/meta-asrock/meta-e3c246d4i \
-  "
diff --git a/meta-asrock/meta-e3c246d4i/conf/local.conf.sample b/meta-asrock/meta-e3c246d4i/conf/local.conf.sample
deleted file mode 100644
index a8066b3d82..0000000000
--- a/meta-asrock/meta-e3c246d4i/conf/local.conf.sample
+++ /dev/null
@@ -1,17 +0,0 @@
-MACHINE ??= "e3c246d4i"
-DISTRO ?= "openbmc-phosphor"
-PACKAGE_CLASSES ?= "package_ipk"
-SANITY_TESTED_DISTROS:append ?= " *"
-EXTRA_IMAGE_FEATURES = "debug-tweaks"
-USER_CLASSES ?= "buildstats"
-PATCHRESOLVE = "noop"
-BB_DISKMON_DIRS = "\
-    STOPTASKS,${TMPDIR},1G,100K \
-    STOPTASKS,${DL_DIR},1G,100K \
-    STOPTASKS,${SSTATE_DIR},1G,100K \
-    STOPTASKS,/tmp,100M,100K \
-    HALT,${TMPDIR},100M,1K \
-    HALT,${DL_DIR},100M,1K \
-    HALT,${SSTATE_DIR},100M,1K \
-    HALT,/tmp,10M,1K"
-CONF_VERSION = "2"
diff --git a/meta-asrock/meta-e3c246d4i/conf/templates/default/bblayers.conf.sample b/meta-asrock/meta-e3c246d4i/conf/templates/default/bblayers.conf.sample
new file mode 100644
index 0000000000..409a775a83
--- /dev/null
+++ b/meta-asrock/meta-e3c246d4i/conf/templates/default/bblayers.conf.sample
@@ -0,0 +1,18 @@
+# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+LCONF_VERSION = "8"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+
+BBLAYERS ?= " \
+  ##OEROOT##/meta \
+  ##OEROOT##/meta-poky \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-phosphor \
+  ##OEROOT##/meta-aspeed \
+  ##OEROOT##/meta-asrock \
+  ##OEROOT##/meta-asrock/meta-e3c246d4i \
+  "
diff --git a/meta-asrock/meta-e3c246d4i/conf/templates/default/local.conf.sample b/meta-asrock/meta-e3c246d4i/conf/templates/default/local.conf.sample
new file mode 100644
index 0000000000..a8066b3d82
--- /dev/null
+++ b/meta-asrock/meta-e3c246d4i/conf/templates/default/local.conf.sample
@@ -0,0 +1,17 @@
+MACHINE ??= "e3c246d4i"
+DISTRO ?= "openbmc-phosphor"
+PACKAGE_CLASSES ?= "package_ipk"
+SANITY_TESTED_DISTROS:append ?= " *"
+EXTRA_IMAGE_FEATURES = "debug-tweaks"
+USER_CLASSES ?= "buildstats"
+PATCHRESOLVE = "noop"
+BB_DISKMON_DIRS = "\
+    STOPTASKS,${TMPDIR},1G,100K \
+    STOPTASKS,${DL_DIR},1G,100K \
+    STOPTASKS,${SSTATE_DIR},1G,100K \
+    STOPTASKS,/tmp,100M,100K \
+    HALT,${TMPDIR},100M,1K \
+    HALT,${DL_DIR},100M,1K \
+    HALT,${SSTATE_DIR},100M,1K \
+    HALT,/tmp,10M,1K"
+CONF_VERSION = "2"
-- 
cgit v1.2.3