diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
commit | 8d6ae7f2a817751fad151168fa10ce28ee0869d8 (patch) | |
tree | 281032f7ec07c41589aa094bd165cc2a98f2d3a7 /meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb | |
parent | c16fb8893b19075db4bcf3b5bf33c1db8c3ca2bd (diff) | |
parent | 5da3c2284560a7e08ffafd03c5b5ba44a3242228 (diff) | |
download | openbmc-8d6ae7f2a817751fad151168fa10ce28ee0869d8.tar.xz |
Merge tag '0.26' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb')
-rw-r--r-- | meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb | 88 |
1 files changed, 69 insertions, 19 deletions
diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb index 8e6fe769c..e080ff635 100644 --- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb +++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb @@ -6,16 +6,22 @@ inherit packagegroup PROVIDES = "${PACKAGES}" PACKAGES = " \ ${PN}-bmc-state-mgmt \ + ${PN}-bmcweb \ ${PN}-chassis-state-mgmt \ + ${PN}-console \ + ${PN}-dbus-monitor \ ${PN}-extras \ - ${PN}-extrasdev \ - ${PN}-extrasdevtools \ + ${PN}-devtools \ ${PN}-fan-control \ + ${PN}-fru-ipmi \ + ${PN}-health-monitor \ ${PN}-host-state-mgmt \ + ${PN}-ikvm \ ${PN}-inventory \ ${PN}-leds \ ${PN}-logging \ ${PN}-remote-logging \ + ${PN}-rng \ ${PN}-sensors \ ${PN}-software \ ${PN}-host-check-mgmt \ @@ -23,6 +29,7 @@ PACKAGES = " \ ${PN}-settings \ ${PN}-network \ ${PN}-user-mgmt \ + ${PN}-user-mgmt-ldap \ " SUMMARY_${PN}-bmc-state-mgmt = "BMC state management" @@ -31,30 +38,40 @@ RDEPENDS_${PN}-bmc-state-mgmt = " \ phosphor-state-manager-systemd-target-monitor \ " +SUMMARY_${PN}-bmcweb = "bmcweb support" +RDEPENDS_${PN}-bmcweb = " \ + bmcweb \ + phosphor-bmcweb-cert-config \ + " + SUMMARY_${PN}-chassis-state-mgmt = "Chassis state management" RDEPENDS_${PN}-chassis-state-mgmt = " \ ${VIRTUAL-RUNTIME_obmc-chassis-state-manager} \ obmc-phosphor-power \ " -SUMMARY_${PN}-extras = "Extra features" -RDEPENDS_${PN}-extras = " \ - bmcweb \ - phosphor-bmcweb-cert-config \ - phosphor-nslcd-cert-config \ - phosphor-nslcd-authority-cert-config \ - obmc-ikvm \ - phosphor-dbus-monitor \ - phosphor-systemd-policy \ +SUMMARY_${PN}-console = "Serial over LAN support" +RDEPENDS_${PN}-console = " \ + obmc-console \ " -SUMMARY_${PN}-extrasdev = "Development features" -RDEPENDS_${PN}-extrasdev = " \ - " +# Deprecated - add new packages to an existing packagegroup or create a new one. +SUMMARY_${PN}-extras = "Extra features" +RDEPENDS_${PN}-extras = "" -SUMMARY_${PN}-extrasdevtools = "Development tools" -RDEPENDS_${PN}-extrasdevtools = " \ +SUMMARY_${PN}-devtools = "Development tools" +RDEPENDS_${PN}-devtools = " \ + bash \ + ffdc \ + i2c-tools \ libgpiod-tools \ + lrzsz \ + rsync \ + " + +SUMMARY_${PN}-dbus-monitor = "Support for dbus monitoring" +RDEPENDS_${PN}-dbus-monitor = " \ + phosphor-dbus-monitor \ " # Use the fan control package group for applications @@ -67,12 +84,27 @@ RDEPENDS_${PN}-fan-control = " \ phosphor-fan-monitor \ " +SUMMARY_${PN}-fru-ipmi = "Support for EEPROMS with IPMI FRU" +RDEPENDS_${PN}-fru-ipmi = " \ + fru-device \ + " + +SUMMARY_${PN}-health-monitor = "Support for health monitoring" +RDEPENDS_${PN}-health-monitor = " \ + phosphor-health-monitor \ + " + SUMMARY_${PN}-host-state-mgmt = "Host state management" RDEPENDS_${PN}-host-state-mgmt = " \ ${VIRTUAL-RUNTIME_obmc-host-state-manager} \ ${VIRTUAL-RUNTIME_obmc-discover-system-state} \ " +SUMMARY_${PN}-ikvm = "KVM over IP support" +RDEPENDS_${PN}-ikvm = " \ + obmc-ikvm \ + " + SUMMARY_${PN}-inventory = "Inventory applications" RDEPENDS_${PN}-inventory = " \ ${VIRTUAL-RUNTIME_obmc-inventory-manager} \ @@ -97,6 +129,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} \ @@ -105,10 +142,13 @@ RDEPENDS_${PN}-sensors = " \ ${PN}-software-extras = "" ${PN}-software-extras_df-obmc-ubi-fs = " \ - phosphor-image-signing \ phosphor-software-manager-updater-ubi \ " +${PN}-software-extras_df-phosphor-mmc = " \ + phosphor-software-manager-updater-mmc \ + " + SUMMARY_${PN}-software = "Software applications" RDEPENDS_${PN}-software = " \ ${VIRTUAL-RUNTIME_obmc-bmc-download-mgr} \ @@ -138,6 +178,16 @@ RDEPENDS_${PN}-network = " \ SUMMARY_${PN}-user-mgmt = "User management applications" RDEPENDS_${PN}-user-mgmt = " \ ${VIRTUAL-RUNTIME_obmc-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 \ + " + +SUMMARY_${PN}-user-mgmt-ldap = "LDAP users and groups support" +RDEPENDS_${PN}-user-mgmt-ldap = " \ + ${PN}-user-mgmt \ + nss-pam-ldapd \ + phosphor-ldap \ + phosphor-nslcd-cert-config \ + phosphor-nslcd-authority-cert-config \ " |