diff options
| author | Vishwanatha Subbanna <vishwa@linux.vnet.ibm.com> | 2021-03-26 14:11:29 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2021-03-26 18:29:01 +0300 |
| commit | c5fd20a105916a2b6888dc16d770a15d117fa8c2 (patch) | |
| tree | 88d7e3070f691fde23feb370bd5e1ddf1d2658a9 /meta-phosphor/recipes-phosphor | |
| parent | a443c54ffcd06ee703cca039b7c127228f8430e3 (diff) | |
| download | openbmc-c5fd20a105916a2b6888dc16d770a15d117fa8c2.tar.xz | |
ledmanager: Remove phosphor-led-manager-ledmanager package
phosphor-led-manager has 3 packages
- phosphor-led-manager : Default
- phosphor-led-manager-ledmanager : Packages phosphor-ledmanager
- phosphor-ledmanager-faultmonitor : Packages phosphor-fru-fault-monitor
Because of this, it was not possible to install files via Makefile and
that always needed a corresponding update to FILES_{PN}-ledmanager.
Removing phosphor-led-manager-ledmanager will eliminate this problem.
Change-Id: I00ca4c34346a47f887872464b9050a46d8f5e8e9
Signed-off-by: Vishwanatha Subbanna <vishwa@linux.vnet.ibm.com>
Diffstat (limited to 'meta-phosphor/recipes-phosphor')
| -rw-r--r-- | meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb index beaf93183..3f70891b4 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb @@ -3,26 +3,17 @@ DESCRIPTION = "Daemon to cater to triggering actions on LED groups" PR = "r1" PV = "1.0+git${SRCPV}" -require ${BPN}.inc +require ${PN}.inc inherit autotools pkgconfig python3native inherit obmc-phosphor-dbus-service obmc-phosphor-systemd -LED_MGR_PACKAGES = " \ - ${PN}-ledmanager \ - ${PN}-faultmonitor \ -" - PACKAGECONFIG ??= "" PACKAGECONFIG[use-json] = "--enable-use-json, --disable-use-json" PACKAGECONFIG[use-lamp-test] = "--enable-use-lamp-test, --disable-use-lamp-test" -PACKAGE_BEFORE_PN += "${LED_MGR_PACKAGES}" -ALLOW_EMPTY_${PN} = "1" - -DBUS_PACKAGES = "${PN}-ledmanager" - -SYSTEMD_PACKAGES = "${LED_MGR_PACKAGES}" +SYSTEMD_PACKAGES = "${PN} ${PN}-faultmonitor" +PACKAGE_BEFORE_PN += "${PN}-faultmonitor" DEPENDS += "${PYTHON_PN}-native" DEPENDS += "${PYTHON_PN}-pyyaml-native" @@ -35,28 +26,27 @@ DEPENDS += "nlohmann-json" DEPENDS += "virtual/${PN}-config-native" -RDEPENDS_${PN}-ledmanager += "bash" +RDEPENDS_${PN} += "bash" S = "${WORKDIR}/git" -FILES_${PN}-ledmanager += "${bindir}/phosphor-ledmanager ${bindir}/led-set-all-groups-asserted.sh" FILES_${PN}-faultmonitor += "${bindir}/phosphor-fru-fault-monitor" -DBUS_SERVICE_${PN}-ledmanager += "xyz.openbmc_project.LED.GroupManager.service" +DBUS_SERVICE_${PN} += "xyz.openbmc_project.LED.GroupManager.service" -SYSTEMD_SERVICE_${PN}-ledmanager += "obmc-led-group-start@.service obmc-led-group-stop@.service" +SYSTEMD_SERVICE_${PN} += "obmc-led-group-start@.service obmc-led-group-stop@.service" SYSTEMD_SERVICE_${PN}-faultmonitor += "obmc-fru-fault-monitor.service" -SYSTEMD_LINK_${PN}-ledmanager += "../obmc-led-group-start@.service:multi-user.target.wants/obmc-led-group-start@bmc_booted.service" +SYSTEMD_LINK_${PN} += "../obmc-led-group-start@.service:multi-user.target.wants/obmc-led-group-start@bmc_booted.service" STATES = "start stop" TMPLFMT = "obmc-led-group-{0}@.service" TGTFMT = "obmc-power-{0}@0.target" INSTFMT = "obmc-led-group-{0}@power_on.service" FMT = "../${TMPLFMT}:${TGTFMT}.wants/${INSTFMT}" -SYSTEMD_LINK_${PN}-ledmanager += "${@compose_list(d, 'FMT', 'STATES')}" +SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'STATES')}" # Install the override to set up a Conflicts relation -SYSTEMD_OVERRIDE_${PN}-ledmanager += "bmc_booted.conf:obmc-led-group-start@bmc_booted.service.d/bmc_booted.conf" +SYSTEMD_OVERRIDE_${PN} += "bmc_booted.conf:obmc-led-group-start@bmc_booted.service.d/bmc_booted.conf" EXTRA_OECONF = "YAML_PATH=${STAGING_DATADIR_NATIVE}/${PN}" |