diff options
Diffstat (limited to 'meta-phosphor')
3 files changed, 11 insertions, 8 deletions
diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index 9d4dbc8bb..6aec40f68 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -5,6 +5,7 @@ # - obmc-bmc-state-mgmt - OpenBMC BMC state management # - obmc-chassis-mgmt - OpenBMC chassis management # - obmc-chassis-state-mgmt - OpenBMC chassis state management +# - obmc-devtools - OpenBMC development and debugging tools # - obmc-fan-control - OpenBMC fan management # - obmc-fan-mgmt - Deprecated - use obmc-fan-control instead # - obmc-flash-mgmt - OpenBMC flash management @@ -27,6 +28,7 @@ inherit core-image FEATURE_PACKAGES_obmc-bmc-state-mgmt ?= "packagegroup-obmc-apps-bmc-state-mgmt" FEATURE_PACKAGES_obmc-chassis-mgmt ?= "${@bb.utils.contains('COMBINED_FEATURES', 'obmc-phosphor-chassis-mgmt', 'virtual-obmc-chassis-mgmt', '', d)}" FEATURE_PACKAGES_obmc-chassis-state-mgmt ?= "packagegroup-obmc-apps-chassis-state-mgmt" +FEATURE_PACKAGES_obmc-devtools ?= "packagegroup-obmc-apps-devtools" FEATURE_PACKAGES_obmc-fan-control ?= "packagegroup-obmc-apps-fan-control" FEATURE_PACKAGES_obmc-fan-mgmt ?= "${@bb.utils.contains('COMBINED_FEATURES', 'obmc-phosphor-fan-mgmt', 'virtual-obmc-fan-mgmt', '', d)}" FEATURE_PACKAGES_obmc-flash-mgmt ?= "${@bb.utils.contains('COMBINED_FEATURES', 'obmc-phosphor-flash-mgmt', 'virtual-obmc-flash-mgmt', '', d)}" @@ -51,17 +53,13 @@ FEATURE_PACKAGES_obmc-user-mgmt ?= "packagegroup-obmc-apps-user-mgmt" # tree under phosphor-ipmi-host FEATURE_PACKAGES_obmc-net-ipmi_qemuall = "" -CORE_IMAGE_EXTRA_INSTALL_append = " bash \ +CORE_IMAGE_EXTRA_INSTALL_append = " \ packagegroup-obmc-apps-extras \ - packagegroup-obmc-apps-extrasdevtools \ - i2c-tools \ obmc-console \ pam-plugin-access \ ${OBMC_IMAGE_EXTRA_INSTALL} \ ffdc \ - rsync \ rng-tools \ - lrzsz \ " OBMC_IMAGE_EXTRA_INSTALL ?= "" diff --git a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb index a0c14fffe..c12b188c0 100644 --- a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb +++ b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb @@ -8,6 +8,7 @@ IMAGE_FEATURES += " \ obmc-bmc-state-mgmt \ obmc-chassis-mgmt \ obmc-chassis-state-mgmt \ + obmc-devtools \ obmc-fan-control \ obmc-fan-mgmt \ obmc-flash-mgmt \ diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb index f24cc4f90..41164a5dd 100644 --- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb +++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb @@ -8,7 +8,7 @@ PACKAGES = " \ ${PN}-bmc-state-mgmt \ ${PN}-chassis-state-mgmt \ ${PN}-extras \ - ${PN}-extrasdevtools \ + ${PN}-devtools \ ${PN}-fan-control \ ${PN}-host-state-mgmt \ ${PN}-inventory \ @@ -47,9 +47,13 @@ RDEPENDS_${PN}-extras = " \ phosphor-systemd-policy \ " -SUMMARY_${PN}-extrasdevtools = "Development tools" -RDEPENDS_${PN}-extrasdevtools = " \ +SUMMARY_${PN}-devtools = "Development tools" +RDEPENDS_${PN}-devtools = " \ + bash \ + i2c-tools \ libgpiod-tools \ + lrzsz \ + rsync \ " # Use the fan control package group for applications |