diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2020-08-11 15:20:31 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2020-08-14 02:28:47 +0300 |
commit | 8c09b1465bfd0d86468a2ec6beb8d9d0209ba31b (patch) | |
tree | e90c03251c32b6e90cdfe433a58a36da09b0a66a /meta-phosphor/recipes-phosphor | |
parent | 0e72d71a67f8d29df926af2a8c249a521ee62680 (diff) | |
download | openbmc-8c09b1465bfd0d86468a2ec6beb8d9d0209ba31b.tar.xz |
phosphor-image: Avoid CORE_IMAGE_EXTRA_INSTALL
CORE_IMAGE_EXTRA_INSTALL is a dumping ground. Move packages to proper
packagroups (console/sol, rng) and create IMAGE_FEATURES for easy
opt-out.
Move the ffdc application to the debugging packagegroup. Move the
pam-access plugin to the user management packagegroup.
(From meta-phosphor rev: 94bf53d44193b6c5d123c462333fdedf91613370)
Change-Id: If43af92f9bfcb6e0eef08adefbce077defd90b8d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor/recipes-phosphor')
-rw-r--r-- | meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb | 2 | ||||
-rw-r--r-- | meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb | 16 |
2 files changed, 18 insertions, 0 deletions
diff --git a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb index c12b188c0..3d2b7b77d 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-console \ obmc-devtools \ obmc-fan-control \ obmc-fan-mgmt \ @@ -19,6 +20,7 @@ IMAGE_FEATURES += " \ obmc-leds \ obmc-logging-mgmt \ obmc-remote-logging-mgmt \ + obmc-rng \ obmc-net-ipmi \ obmc-sensors \ obmc-software \ diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb index 057509d1a..1da216c1d 100644 --- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb +++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb @@ -7,6 +7,7 @@ PROVIDES = "${PACKAGES}" PACKAGES = " \ ${PN}-bmc-state-mgmt \ ${PN}-chassis-state-mgmt \ + ${PN}-console \ ${PN}-extras \ ${PN}-devtools \ ${PN}-fan-control \ @@ -15,6 +16,7 @@ PACKAGES = " \ ${PN}-leds \ ${PN}-logging \ ${PN}-remote-logging \ + ${PN}-rng \ ${PN}-sensors \ ${PN}-software \ ${PN}-host-check-mgmt \ @@ -36,6 +38,11 @@ RDEPENDS_${PN}-chassis-state-mgmt = " \ obmc-phosphor-power \ " +SUMMARY_${PN}-console = "Serial over LAN support" +RDEPENDS_${PN}-console = " \ + obmc-console \ + " + SUMMARY_${PN}-extras = "Extra features" RDEPENDS_${PN}-extras = " \ bmcweb \ @@ -49,6 +56,7 @@ RDEPENDS_${PN}-extras = " \ SUMMARY_${PN}-devtools = "Development tools" RDEPENDS_${PN}-devtools = " \ bash \ + ffdc \ i2c-tools \ libgpiod-tools \ lrzsz \ @@ -95,6 +103,11 @@ RDEPENDS_${PN}-remote-logging = " \ phosphor-rsyslog-config \ " +SUMMARY_${PN}-rng = "Random Number Generator support" +RDEPENDS_${PN}-rng = " \ + rng-tools \ + " + SUMMARY_${PN}-sensors = "Sensor applications" RDEPENDS_${PN}-sensors = " \ ${VIRTUAL-RUNTIME_obmc-sensors-hwmon} \ @@ -142,3 +155,6 @@ RDEPENDS_${PN}-user-mgmt = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', 'nss-pam-ldapd', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', 'phosphor-ldap', '', d)} \ " +RRECOMMENDS_${PN}-user-mgmt = " \ + pam-plugin-access \ + " |