diff options
| author | Willy Tu <wltu@google.com> | 2021-08-11 01:33:55 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2021-08-11 20:30:35 +0300 |
| commit | a38b7ccc3fc59b7375d1f317691e3f753e228e0f (patch) | |
| tree | c3e5d7d6ac7ef21ca7d33bdc0cf25ed381d4d15b /meta-quanta/meta-gsj/conf | |
| parent | b96c75046da8f72359d101c813f0694409bbe0d1 (diff) | |
| download | openbmc-a38b7ccc3fc59b7375d1f317691e3f753e228e0f.tar.xz | |
meta-quanta: meta-gsj: Cleanup for Yocto override syntax change
Cleanup with
```
convert-overrides.py meta-quanta/meta-gsj
git grep "_[a-z0-9_/-]*[ :]" -- meta-quanta/meta-gsj
git grep -l _gsj -- meta-quanta/meta-gsj \
| xargs sed -i 's/_gsj/:gsj/'
```
Note:
Need to revert the change to BBFILE_PATTERN and LAYERSERIES_COMPAT.
After cleanup
```
$ git grep "_[a-z0-9_/-]*[ :]" -- meta-quanta/meta-gsj/ | grep '.bb'
meta-quanta/meta-gsj/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend:do_install:append:gsj () {
meta-quanta/meta-gsj/recipes-google/ipmi/google-ipmi-sys_%.bbappend:do_install:append:gsj() {
meta-quanta/meta-gsj/recipes-gsj/detect-fan-fail/detect-fan-fail.bb:do_install:append:gsj() {
meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/quanta-nvme-powerctrl.bb:do_install () {
meta-quanta/meta-gsj/recipes-phosphor/fans/phosphor-pid-control_%.bbappend:do_install:append:gsj() {
meta-quanta/meta-gsj/recipes-quanta/network/mac-address_%.bbappend:do_install:append:gsj() {
```
Change-Id: I058371ed32214d665aaaf616a650c2efeaf5be66
Signed-off-by: Willy Tu <wltu@google.com>
Diffstat (limited to 'meta-quanta/meta-gsj/conf')
| -rw-r--r-- | meta-quanta/meta-gsj/conf/distro/openbmc-gsj.conf | 4 | ||||
| -rw-r--r-- | meta-quanta/meta-gsj/conf/layer.conf | 2 | ||||
| -rw-r--r-- | meta-quanta/meta-gsj/conf/local.conf.sample | 8 | ||||
| -rw-r--r-- | meta-quanta/meta-gsj/conf/machine/gsj.conf | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/meta-quanta/meta-gsj/conf/distro/openbmc-gsj.conf b/meta-quanta/meta-gsj/conf/distro/openbmc-gsj.conf index f6433733b4..34b1dacea3 100644 --- a/meta-quanta/meta-gsj/conf/distro/openbmc-gsj.conf +++ b/meta-quanta/meta-gsj/conf/distro/openbmc-gsj.conf @@ -1,4 +1,4 @@ require conf/distro/openbmc-phosphor.conf -DISTRO_FEATURES_remove = "avahi" -DISTRO_FEATURES_remove = "slp" +DISTRO_FEATURES:remove = "avahi" +DISTRO_FEATURES:remove = "slp" diff --git a/meta-quanta/meta-gsj/conf/layer.conf b/meta-quanta/meta-gsj/conf/layer.conf index 9bb671876c..a429102b1a 100644 --- a/meta-quanta/meta-gsj/conf/layer.conf +++ b/meta-quanta/meta-gsj/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "gsj-layer" BBFILE_PATTERN_gsj-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_gsj-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_gsj-layer = "gatesgarth hardknott honister" diff --git a/meta-quanta/meta-gsj/conf/local.conf.sample b/meta-quanta/meta-gsj/conf/local.conf.sample index eacba35bc2..18e729c813 100644 --- a/meta-quanta/meta-gsj/conf/local.conf.sample +++ b/meta-quanta/meta-gsj/conf/local.conf.sample @@ -1,11 +1,11 @@ MACHINE ??= "gsj" DISTRO ?= "openbmc-gsj" 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 \ diff --git a/meta-quanta/meta-gsj/conf/machine/gsj.conf b/meta-quanta/meta-gsj/conf/machine/gsj.conf index b0d508e447..cef4e89d2c 100644 --- a/meta-quanta/meta-gsj/conf/machine/gsj.conf +++ b/meta-quanta/meta-gsj/conf/machine/gsj.conf @@ -20,7 +20,7 @@ OBMC_MACHINE_FEATURES += "\ obmc-bmc-state-mgmt \ " # Remove unneeded binaries from image -IMAGE_FEATURES_remove = "obmc-debug-collector" +IMAGE_FEATURES:remove = "obmc-debug-collector" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-gsj-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-gsj-apps" |