From 026925dd6641c96768d9636b6114acbfcdb8579f Mon Sep 17 00:00:00 2001
From: David Wang <davidwang@quantatw.com>
Date: Fri, 13 Aug 2021 11:39:20 +0800
Subject: meta-quanta: Cleanup for Yocto override syntax change

- Cleanup subtree meta-f0b, meta-olympus-nuvoton, meta-q71l with

convert-overrides.py meta-quanta/meta-f0b
convert-overrides.py meta-quanta/meta-olympus-nuvoton
convert-overrides.py meta-quanta/meta-q71l

git grep "_[a-z0-9_/-]*[ :]" -- meta-quanta/meta-f0b
git grep "_[a-z0-9_/-]*[ :]" -- meta-quanta/meta-olympus-nuvoton
git grep "_[a-z0-9_/-]*[ :]" -- meta-quanta/meta-q71l

git grep -l _f0b -- meta-quanta/meta-f0b | xargs sed -i 's/_f0b/:f0b/'
git grep -l _olympus-nuvoton -- meta-quanta/meta-olympus-nuvoton | xargs sed -i 's/_olympus-nuvoton/:olympus-nuvoton/'
git grep -l _quanta-q71l -- meta-quanta/meta-q71l | xargs sed -i 's/_quanta-q71l/:quanta-q71l/'

- Fix up a few by hand
- Revert 'BBFILE_PATTERN' and 'LAYERSERIES_COMPAT'
- Add honister to 'LAYERSERIES_COMPAT'
- Update 'CONF_VERSION'
- Fix up 'SYSTEMD_ENVIRONMENT_FILE', 'SYSTEMD_LINK' and 'SYSTEMD_OVERRIDE' in all subtree

Signed-off-by: David Wang <davidwang@quantatw.com>
Change-Id: Ic431624d09dc5899b1d84439559bea9efca08ad8
---
 meta-quanta/meta-f0b/conf/layer.conf        |  2 +-
 meta-quanta/meta-f0b/conf/local.conf.sample | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'meta-quanta/meta-f0b/conf')

diff --git a/meta-quanta/meta-f0b/conf/layer.conf b/meta-quanta/meta-f0b/conf/layer.conf
index fc0a1a720..f29015eb6 100644
--- a/meta-quanta/meta-f0b/conf/layer.conf
+++ b/meta-quanta/meta-f0b/conf/layer.conf
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "f0b-layer"
 BBFILE_PATTERN_f0b-layer = ""
-LAYERSERIES_COMPAT_f0b-layer = "gatesgarth hardknott"
+LAYERSERIES_COMPAT_f0b-layer = "gatesgarth hardknott honister"
diff --git a/meta-quanta/meta-f0b/conf/local.conf.sample b/meta-quanta/meta-f0b/conf/local.conf.sample
index aa00f10cf..40b76ba9c 100644
--- a/meta-quanta/meta-f0b/conf/local.conf.sample
+++ b/meta-quanta/meta-f0b/conf/local.conf.sample
@@ -1,12 +1,11 @@
-
 MACHINE ??= "f0b"
-DISTRO = "openbmc-phosphor"
+DISTRO ?= "openbmc-phosphor"
 PACKAGE_CLASSES ?= "package_rpm"
-SANITY_TESTED_DISTROS_append ?= " *"
-EXTRA_IMAGE_FEATURES = "debug-tweaks"
-USER_CLASSES ?= "buildstats image-prelink"
+SANITY_TESTED_DISTROS:append ?= " *"
+EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
+USER_CLASSES ?= "buildstats"
 PATCHRESOLVE = "noop"
-BB_DISKMON_DIRS = "\
+BB_DISKMON_DIRS ??= "\
     STOPTASKS,${TMPDIR},1G,100K \
     STOPTASKS,${DL_DIR},1G,100K \
     STOPTASKS,${SSTATE_DIR},1G,100K \
@@ -15,5 +14,5 @@ BB_DISKMON_DIRS = "\
     ABORT,${DL_DIR},100M,1K \
     ABORT,${SSTATE_DIR},100M,1K \
     ABORT,/tmp,10M,1K"
-CONF_VERSION = "1"
+CONF_VERSION = "2"
 INHERIT += "extrausers"
-- 
cgit v1.2.3