diff options
| author | David Wang <davidwang@quantatw.com> | 2021-08-13 06:39:20 +0300 |
|---|---|---|
| committer | David Wang <davidwang@quantatw.com> | 2021-08-13 12:36:23 +0300 |
| commit | 026925dd6641c96768d9636b6114acbfcdb8579f (patch) | |
| tree | cdec2edbb3b471b1bd83f621a3983c6440dfe3cd /meta-quanta/meta-q71l/conf | |
| parent | ca3e1d9f86212282ca59f384055497eb0d156d49 (diff) | |
| download | openbmc-026925dd6641c96768d9636b6114acbfcdb8579f.tar.xz | |
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
Diffstat (limited to 'meta-quanta/meta-q71l/conf')
| -rw-r--r-- | meta-quanta/meta-q71l/conf/layer.conf | 2 | ||||
| -rw-r--r-- | meta-quanta/meta-q71l/conf/local.conf.sample | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/meta-quanta/meta-q71l/conf/layer.conf b/meta-quanta/meta-q71l/conf/layer.conf index 9e5616029..98e71463b 100644 --- a/meta-quanta/meta-q71l/conf/layer.conf +++ b/meta-quanta/meta-q71l/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "q71l" BBFILE_PATTERN_q71l = "" -LAYERSERIES_COMPAT_q71l = "gatesgarth hardknott" +LAYERSERIES_COMPAT_q71l = "gatesgarth hardknott honister" diff --git a/meta-quanta/meta-q71l/conf/local.conf.sample b/meta-quanta/meta-q71l/conf/local.conf.sample index 5a686f4eb..9fadf8298 100644 --- a/meta-quanta/meta-q71l/conf/local.conf.sample +++ b/meta-quanta/meta-q71l/conf/local.conf.sample @@ -1,11 +1,11 @@ MACHINE ??= "quanta-q71l" DISTRO ?= "openbmc-phosphor" PACKAGE_CLASSES ?= "package_rpm" -SANITY_TESTED_DISTROS_append ?= " RedHatEnterpriseWorkstation-6.*" -EXTRA_IMAGE_FEATURES = "debug-tweaks" -USER_CLASSES ?= "buildstats image-prelink" +SANITY_TESTED_DISTROS:append ?= " RedHatEnterpriseWorkstation-6.*" +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 \ @@ -14,7 +14,7 @@ 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" EXTRA_USERS_PARAMS = " \ usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \ |