diff options
author | Brandon Kim <brandonkim@google.com> | 2021-08-11 01:46:03 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2021-08-11 22:01:40 +0300 |
commit | 1e42709b7e9bf6fa56ee39f3daed9a24c4b5ad69 (patch) | |
tree | aa61ed90d971756919629369fc8297cbbd929e47 /meta-quanta/meta-gbs/conf | |
parent | a38b7ccc3fc59b7375d1f317691e3f753e228e0f (diff) | |
download | openbmc-1e42709b7e9bf6fa56ee39f3daed9a24c4b5ad69.tar.xz |
meta-quanta: meta-gbs: Cleanup for Yocto override syntax change
Cleanup with
```
convert-overrides.py meta-quanta/meta-gbs
git grep "_[a-z0-9_/-]*[ :]" -- meta-quanta/meta-gbs
git grep -l _gbs -- meta-quanta/meta-gbs \
| xargs sed -i 's/_gbs/:gbs/'
```
After cleanup
```
$ git grep "_[a-z0-9_/-]*[ :]" -- meta-quanta/meta-gbs/ | grep '.bb'
meta-quanta/meta-gbs/recipes-bsp/images/npcm7xx-igps-native_%.bbappend:addtask do_gbs_prepare_xmls after do_patch before do_install
meta-quanta/meta-gbs/recipes-gbs/gbs-sysinit/gbs-sysinit.bb:do_install () {
meta-quanta/meta-gbs/recipes-google/acpi-power-state/acpi-power-state-daemon_%.bbappend:do_install:append:gbs() {
meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control_%.bbappend:do_install:append:gbs() {
meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend:do_install:append:gbs() {
meta-quanta/meta-gbs/recipes-phosphor/interfaces/bmcweb_%.bbappend:do_install:append:gbs(){
meta-quanta/meta-gbs/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend:do_install:append:gbs() {
meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_%.bbappend:do_install:append:gbs() {
meta-quanta/meta-gbs/recipes-phosphor/leds/phosphor-led-manager_%.bbappend:do_install:append:gbs() {
meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-nvme_%.bbappend:do_install:append:gbs() {
meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend:do_install:append:gbs() {
meta-quanta/meta-gbs/recipes-quanta/network/usb-network.bbappend:do_install:append:gbs() {
meta-quanta/meta-gbs/recipes-x86/chassis/x86-power-control_%.bbappend:do_install:append:gbs() {
```
Signed-off-by: Brandon Kim <brandonkim@google.com>
Change-Id: If640ddd3c6f6084bb0a1d82e2d18fa2640d9d83e
Diffstat (limited to 'meta-quanta/meta-gbs/conf')
-rw-r--r-- | meta-quanta/meta-gbs/conf/layer.conf | 2 | ||||
-rw-r--r-- | meta-quanta/meta-gbs/conf/local.conf.sample | 8 | ||||
-rw-r--r-- | meta-quanta/meta-gbs/conf/machine/gbs.conf | 64 |
3 files changed, 37 insertions, 37 deletions
diff --git a/meta-quanta/meta-gbs/conf/layer.conf b/meta-quanta/meta-gbs/conf/layer.conf index ec03a3ad6..3f738a053 100644 --- a/meta-quanta/meta-gbs/conf/layer.conf +++ b/meta-quanta/meta-gbs/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "gbs-layer" BBFILE_PATTERN_gbs-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_gbs-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_gbs-layer = "gatesgarth hardknott honister" diff --git a/meta-quanta/meta-gbs/conf/local.conf.sample b/meta-quanta/meta-gbs/conf/local.conf.sample index f590e64f8..9b0e14fb8 100644 --- a/meta-quanta/meta-gbs/conf/local.conf.sample +++ b/meta-quanta/meta-gbs/conf/local.conf.sample @@ -1,11 +1,11 @@ MACHINE ??= "gbs" DISTRO ?= "gbmc" 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-gbs/conf/machine/gbs.conf b/meta-quanta/meta-gbs/conf/machine/gbs.conf index 59973e80c..f2ab09ccb 100644 --- a/meta-quanta/meta-gbs/conf/machine/gbs.conf +++ b/meta-quanta/meta-gbs/conf/machine/gbs.conf @@ -25,35 +25,35 @@ PREFERRED_PROVIDER_virtual/bios-update = "gbs-bios-update" PREFERRED_PROVIDER_virtual/bmc-update = "gbs-bmc-update" # Remove unneeded binaries from image -IMAGE_FEATURES_remove = "obmc-bmc-state-mgmt" -IMAGE_FEATURES_remove = "obmc-bmcweb" -IMAGE_FEATURES_remove = "obmc-chassis-mgmt" -IMAGE_FEATURES_remove = "obmc-chassis-state-mgmt" -IMAGE_FEATURES_remove = "obmc-console" -IMAGE_FEATURES_remove = "obmc-dbus-monitor" -IMAGE_FEATURES_remove = "obmc-devtools" -IMAGE_FEATURES_remove = "obmc-fan-control" -IMAGE_FEATURES_remove = "obmc-fan-mgmt" -IMAGE_FEATURES_remove = "obmc-flash-mgmt" -IMAGE_FEATURES_remove = "obmc-fru-ipmi" -IMAGE_FEATURES_remove = "obmc-health-monitor" -IMAGE_FEATURES_remove = "obmc-host-ctl" -IMAGE_FEATURES_remove = "obmc-host-ipmi" -IMAGE_FEATURES_remove = "obmc-host-state-mgmt" -IMAGE_FEATURES_remove = "obmc-ikvm" -IMAGE_FEATURES_remove = "obmc-inventory" -IMAGE_FEATURES_remove = "obmc-leds" -IMAGE_FEATURES_remove = "obmc-logging-mgmt" -IMAGE_FEATURES_remove = "obmc-remote-logging-mgmt" -IMAGE_FEATURES_remove = "obmc-rng" -IMAGE_FEATURES_remove = "obmc-net-ipmi" -IMAGE_FEATURES_remove = "obmc-sensors" -IMAGE_FEATURES_remove = "obmc-software" -IMAGE_FEATURES_remove = "obmc-system-mgmt" -IMAGE_FEATURES_remove = "obmc-telemetry" -IMAGE_FEATURES_remove = "obmc-debug-collector" -IMAGE_FEATURES_remove = "obmc-settings-mgmt" -IMAGE_FEATURES_remove = "obmc-network-mgmt" -IMAGE_FEATURES_remove = "obmc-user-mgmt" -IMAGE_FEATURES_remove = "obmc-user-mgmt-ldap" -OBMC_IMAGE_BASE_INSTALL_remove = "packagegroup-obmc-apps-extras" +IMAGE_FEATURES:remove = "obmc-bmc-state-mgmt" +IMAGE_FEATURES:remove = "obmc-bmcweb" +IMAGE_FEATURES:remove = "obmc-chassis-mgmt" +IMAGE_FEATURES:remove = "obmc-chassis-state-mgmt" +IMAGE_FEATURES:remove = "obmc-console" +IMAGE_FEATURES:remove = "obmc-dbus-monitor" +IMAGE_FEATURES:remove = "obmc-devtools" +IMAGE_FEATURES:remove = "obmc-fan-control" +IMAGE_FEATURES:remove = "obmc-fan-mgmt" +IMAGE_FEATURES:remove = "obmc-flash-mgmt" +IMAGE_FEATURES:remove = "obmc-fru-ipmi" +IMAGE_FEATURES:remove = "obmc-health-monitor" +IMAGE_FEATURES:remove = "obmc-host-ctl" +IMAGE_FEATURES:remove = "obmc-host-ipmi" +IMAGE_FEATURES:remove = "obmc-host-state-mgmt" +IMAGE_FEATURES:remove = "obmc-ikvm" +IMAGE_FEATURES:remove = "obmc-inventory" +IMAGE_FEATURES:remove = "obmc-leds" +IMAGE_FEATURES:remove = "obmc-logging-mgmt" +IMAGE_FEATURES:remove = "obmc-remote-logging-mgmt" +IMAGE_FEATURES:remove = "obmc-rng" +IMAGE_FEATURES:remove = "obmc-net-ipmi" +IMAGE_FEATURES:remove = "obmc-sensors" +IMAGE_FEATURES:remove = "obmc-software" +IMAGE_FEATURES:remove = "obmc-system-mgmt" +IMAGE_FEATURES:remove = "obmc-telemetry" +IMAGE_FEATURES:remove = "obmc-debug-collector" +IMAGE_FEATURES:remove = "obmc-settings-mgmt" +IMAGE_FEATURES:remove = "obmc-network-mgmt" +IMAGE_FEATURES:remove = "obmc-user-mgmt" +IMAGE_FEATURES:remove = "obmc-user-mgmt-ldap" +OBMC_IMAGE_BASE_INSTALL:remove = "packagegroup-obmc-apps-extras" |