diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2024-10-29 18:37:47 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2024-10-30 14:08:33 +0300 |
| commit | 5fdce6d5fb073511a62a17e20b2d6dd0f6e6af2c (patch) | |
| tree | 055359f9b73791e5d22deddd4d360b4901cfece2 /meta-openembedded/meta-python/recipes-devtools/python/python3-systemd | |
| parent | 6e09638598b4e0ad2f541aebcb91cf4f53f9b45a (diff) | |
| download | openbmc-5fdce6d5fb073511a62a17e20b2d6dd0f6e6af2c.tar.xz | |
meta-phosphor: remove obmc-fru-ipmi IMAGE_FEATURE
There is currently a lot of complexity of setting up an image feature
which is only used to enable the fru-device feature of entity-manager.
Simplify this by using RRECOMMENDS, in entity-manager, and eliminating
the IMAGE_FEATURE.
Tested:
Ran `bitbake entity-manager -ne` and observed the following on two
affected platforms:
In witherspoon:
```
# $PACKAGECONFIG [5 operations]
# :remove[pn-entity-manager] openbmc/openbmc/meta-ibm/conf/machine/witherspoon.conf:41
# "ipmi-fru"
# set openbmc/openbmc/meta/conf/documentation.conf:321
# [doc] "This variable provides a means of enabling or disabling features of a recipe on a per-recipe basis."
# set openbmc/openbmc/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb:14
# [_defaultval] "ipmi-fru"
# set openbmc/openbmc/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb:15
# [ipmi-fru] "-Dfru-device=true, -Dfru-device=false, i2c-tools,"
# set openbmc/openbmc/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb:18
# [validate-json] "-Dvalidate-json=true, -Dvalidate-json=false, ${PYTHON_PN}-jsonschema-native"
# pre-expansion value:
# "ipmi-fru"
PACKAGECONFIG=""
```
In p10bmc:
```
# $PACKAGECONFIG [7 operations]
# :append[pn-debug-trigger] openbmc/openbmc/meta-ibm/conf/machine/p10bmc.conf:72
# " triggers"
# :remove[pn-entity-manager] openbmc/openbmc/meta-ibm/conf/machine/p10bmc.conf:75
# "ipmi-fru"
# set openbmc/openbmc/meta/conf/documentation.conf:321
# [doc] "This variable provides a means of enabling or disabling features of a recipe on a per-recipe basis."
# set openbmc/openbmc/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb:14
# [_defaultval] "ipmi-fru"
# set openbmc/openbmc/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb:15
# [ipmi-fru] "-Dfru-device=true, -Dfru-device=false, i2c-tools,"
# set openbmc/openbmc/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb:18
# [validate-json] "-Dvalidate-json=true, -Dvalidate-json=false, ${PYTHON_PN}-jsonschema-native"
# override[pn-opkg]:set openbmc/openbmc/meta-ibm/conf/machine/p10bmc.conf:74
# "curl openssl ssl-curl"
# pre-expansion value:
# "ipmi-fru"
PACKAGECONFIG=""
```
Built an image for yosemite4 and confirmed that fru-device is still
installed:
```
root@yosemite4:~# systemctl | grep -i Fru
xyz.openbmc_project.FruDevice.service loaded active running Fru Device
root@yosemite4:~# systemctl status xyz.openbmc_project.FruDevice.service
* xyz.openbmc_project.FruDevice.service - Fru Device
Loaded: loaded (/usr/lib/systemd/system/xyz.openbmc_project.FruDevice.service; enabled; preset: enabled)
Active: active (running) since Tue 2024-02-27 09:26:26 PST; 8 months 1 day ago
Main PID: 368 (fru-device)
CPU: 757ms
CGroup: /system.slice/xyz.openbmc_project.FruDevice.service
`-368 /usr/libexec/entity-manager/fru-device
```
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Iaa3d9a8c2a2cf521816b42e36e15de21cf2a0bc2
Diffstat (limited to 'meta-openembedded/meta-python/recipes-devtools/python/python3-systemd')
0 files changed, 0 insertions, 0 deletions
