diff options
Diffstat (limited to 'meta-phosphor/common/recipes-phosphor')
-rw-r--r-- | meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.bb | 14 | ||||
-rw-r--r-- | meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb | 1 |
2 files changed, 6 insertions, 9 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.bb b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.bb index e7a6d7eca..e7f8dc719 100644 --- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.bb +++ b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.bb @@ -23,11 +23,11 @@ FAN_PACKAGES = " \ ${PN}-presence-tach \ ${PN}-control \ ${PN}-monitor \ - phosphor-chassis-cooling-type \ " + PACKAGES_remove = "${PN}" PACKAGES += "${FAN_PACKAGES}" -PACKAGECONFIG ??= "presence control cooling-type monitor" +PACKAGECONFIG ??= "presence control monitor" SYSTEMD_PACKAGES = "${FAN_PACKAGES}" RDEPENDS_${PN}-dev = "${FAN_PACKAGES}" RDEPENDS_${PN}-staticdev = "${FAN_PACKAGES}" @@ -85,12 +85,6 @@ SYSTEMD_LINK_${PN}-control += "${@compose_list(d, 'FMT_CONTROL', 'OBMC_CHASSIS_I SYSTEMD_LINK_${PN}-control += "${@compose_list(d, 'FMT_CONTROL_INIT', 'OBMC_CHASSIS_INSTANCES')}" # -------------------------------------- -# phosphor-chassis-cooling-type specific configuration -PACKAGECONFIG[cooling-type] = "--enable-cooling-type,--disable-cooling-type,libevdev," -RDEPENDS_phosphor-chassis-cooling-type += "libevdev" -FILES_phosphor-chassis-cooling-type = "${sbindir}/phosphor-cooling-type" - -# -------------------------------------- # ${PN}-monitor specific configuration PACKAGECONFIG[monitor] = "--enable-monitor \ FAN_MONITOR_YAML_FILE=${STAGING_DIR_NATIVE}${monitor_datadir}/monitor.yaml \ @@ -109,3 +103,7 @@ FMT_MONITOR = "../${TMPL_MONITOR}:${FAN_CONTROL_TGT}.requires/${INSTFMT_MONITOR} FILES_${PN}-monitor = "${sbindir}/phosphor-fan-monitor" SYSTEMD_SERVICE_${PN}-monitor += "${TMPL_MONITOR}" SYSTEMD_LINK_${PN}-monitor += "${@compose_list(d, 'FMT_MONITOR', 'OBMC_CHASSIS_INSTANCES')}" + +# -------------------------------------- +# phosphor-cooling-type specific configuration +PACKAGECONFIG[cooling-type] = "--enable-cooling-type,--disable-cooling-type,libevdev," diff --git a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb index 8ce984f2f..fae607780 100644 --- a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb +++ b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb @@ -67,7 +67,6 @@ SUMMARY_${PN}-inventory = "Inventory applications" RDEPENDS_${PN}-inventory = " \ ${VIRTUAL-RUNTIME_obmc-inventory-manager} \ ${VIRTUAL-RUNTIME_obmc-fan-presence} \ - phosphor-chassis-cooling-type \ " SUMMARY_${PN}-leds = "LED applications" |