diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2022-04-18 22:29:31 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2022-04-20 23:07:57 +0300 |
| commit | c0201c9390c014791474ac46b4ed7243897bc4e4 (patch) | |
| tree | a1de5bb7428c3713d92bc3e0a9ab56541fa2afc5 /meta-quanta | |
| parent | 439a39392cfde76e727b0622e66475e9e8959e29 (diff) | |
| download | openbmc-c0201c9390c014791474ac46b4ed7243897bc4e4.tar.xz | |
meta-phosphor: disable phosphor-dbus-monitor by default
phosphor-dbus-monitor still uses autoconf and has a hard dependency on
phosphor-snmp, causing phosphor-snmp to be brought in on systems that
have no interest in using SNMP. The vast majority of systems do not
supply any config for phosphor-dbus-monitor, so the usage of it does not
seem wide enough to enable the IMAGE_FEATURE by default.
- Remove 'obmc-dbus-monitor' from IMAGE_FEATURE by default.
- Clean up all systems that manually remove the dbus-monitor feature or
package.
- Explicitly add the 'obmc-dbus-monitor' to the following systems:
- meta-ibm: all
- meta-inspur: fp5280g2
- meta-quanta: s6q
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Iad6c4104466e21d1b9843dac964a634019eb6935
Diffstat (limited to 'meta-quanta')
| -rw-r--r-- | meta-quanta/meta-gbs/conf/machine/gbs.conf | 1 | ||||
| -rw-r--r-- | meta-quanta/meta-gsj/conf/machine/gsj.conf | 1 | ||||
| -rw-r--r-- | meta-quanta/meta-s6q/recipes-phosphor/images/obmc-phosphor-image.bbappend | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/meta-quanta/meta-gbs/conf/machine/gbs.conf b/meta-quanta/meta-gbs/conf/machine/gbs.conf index 8fb72f2865..803ecf67f5 100644 --- a/meta-quanta/meta-gbs/conf/machine/gbs.conf +++ b/meta-quanta/meta-gbs/conf/machine/gbs.conf @@ -30,7 +30,6 @@ 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" diff --git a/meta-quanta/meta-gsj/conf/machine/gsj.conf b/meta-quanta/meta-gsj/conf/machine/gsj.conf index ce58a91c34..90f6927dc7 100644 --- a/meta-quanta/meta-gsj/conf/machine/gsj.conf +++ b/meta-quanta/meta-gsj/conf/machine/gsj.conf @@ -25,7 +25,6 @@ IMAGE_FEATURES:remove = "obmc-bmcweb" IMAGE_FEATURES:remove = "obmc-chassis-state-mgmt" IMAGE_FEATURES:remove = "obmc-chassis-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" diff --git a/meta-quanta/meta-s6q/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-quanta/meta-s6q/recipes-phosphor/images/obmc-phosphor-image.bbappend index 3c1f006d8c..42c0f2a950 100644 --- a/meta-quanta/meta-s6q/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-quanta/meta-s6q/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1 +1,2 @@ OBMC_IMAGE_EXTRA_INSTALL:append:s6q = " usb-ethernet-gadget" +IMAGE_FEATURES:append:s6q = " obmc-dbus-monitor" |