diff options
author | Patrick Venture <venture@google.com> | 2018-10-21 18:23:40 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-10-23 04:53:51 +0300 |
commit | dcb29965d2cebfdf28ec3775a0f5c8117bd3d294 (patch) | |
tree | 9fec84bee0d8bafd17f316d3e13a8f5b7ecf2b43 /meta-phosphor/recipes-phosphor/state | |
parent | 9ed709c3419cd8a3bd4c42229cce6e825072d05c (diff) | |
download | openbmc-dcb29965d2cebfdf28ec3775a0f5c8117bd3d294.tar.xz |
meta-phosphor: state-manager: drop symlink
Drop symlink and rename bb for phosphor-state-manager.
(From meta-phosphor rev: e22ac6b25822f8435a5b1a59c672af3169f4e37d)
Change-Id: I0f903bda11298323a68ee2ca4c5e13bf3e7a61bd
Signed-off-by: Patrick Venture <venture@google.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor/recipes-phosphor/state')
-rw-r--r-- | meta-phosphor/recipes-phosphor/state/phosphor-state-manager.bb | 142 | ||||
-rw-r--r--[l---------] | meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb | 144 |
2 files changed, 143 insertions, 143 deletions
diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager.bb b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager.bb deleted file mode 100644 index bee80766e..000000000 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager.bb +++ /dev/null @@ -1,142 +0,0 @@ -SUMMARY = "Phosphor State Management" -DESCRIPTION = "Phosphor State Manager provides a set of system state \ -management daemons. It is suitable for use on a wide variety of OpenBMC \ -platforms." -HOMEPAGE = "https://github.com/openbmc/phosphor-state-manager" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" - -STATE_MGR_PACKAGES = " \ - ${PN}-host \ - ${PN}-chassis \ - ${PN}-bmc \ - ${PN}-discover \ - ${PN}-host-check \ - ${PN}-reset-sensor-states \ -" -PACKAGE_BEFORE_PN += "${STATE_MGR_PACKAGES}" -ALLOW_EMPTY_${PN} = "1" - -DBUS_PACKAGES = "${STATE_MGR_PACKAGES}" - -SYSTEMD_PACKAGES = "${PN}-discover \ - ${PN}-reset-sensor-states \ -" - -# The host-check function will check if the host is running -# after a BMC reset. -# The reset-sensor-states function will reset the host -# sensors on a BMC reset or system power loss. -# Neither is required for host state function but are -# recommended to deal properly with these reset scenarios. -RRECOMMENDS_${PN}-host = "${PN}-host-check ${PN}-reset-sensor-states" - -inherit autotools pkgconfig -inherit obmc-phosphor-dbus-service - -DEPENDS += "autoconf-archive-native" -DEPENDS += "sdbusplus" -DEPENDS += "sdeventplus" -DEPENDS += "phosphor-logging" -DEPENDS += "phosphor-dbus-interfaces" -DEPENDS += "libcereal" -RDEPENDS_${PN} += "sdbusplus" - -RDEPENDS_${PN}-host += "libsystemd phosphor-dbus-interfaces" -RDEPENDS_${PN}-chassis += "libsystemd phosphor-dbus-interfaces" -RDEPENDS_${PN}-bmc += "libsystemd phosphor-dbus-interfaces" -RDEPENDS_${PN}-discover += "libsystemd phosphor-dbus-interfaces" -RDEPENDS_${PN}-host-check += "libsystemd phosphor-dbus-interfaces" -RDEPENDS_${PN}-reset-sensor-states += "libsystemd phosphor-dbus-interfaces" - -FILES_${PN}-host = "${sbindir}/phosphor-host-state-manager" -DBUS_SERVICE_${PN}-host += "xyz.openbmc_project.State.Host.service" -DBUS_SERVICE_${PN}-host += "phosphor-reboot-host@.service" -SYSTEMD_ENVIRONMENT_FILE_${PN}-host += "obmc/phosphor-reboot-host/reboot.conf" -SYSTEMD_SERVICE_${PN}-host += "phosphor-reset-host-reboot-attempts@.service" - -FILES_${PN}-chassis = "${sbindir}/phosphor-chassis-state-manager" -DBUS_SERVICE_${PN}-chassis += "xyz.openbmc_project.State.Chassis.service" - -FILES_${PN}-bmc = "${sbindir}/phosphor-bmc-state-manager" -DBUS_SERVICE_${PN}-bmc += "xyz.openbmc_project.State.BMC.service" - -FILES_${PN}-discover = "${sbindir}/phosphor-discover-system-state" -SYSTEMD_SERVICE_${PN}-discover += "phosphor-discover-system-state@.service" - -FILES_${PN}-host-check = "${sbindir}/phosphor-host-check" -SYSTEMD_SERVICE_${PN}-host-check += "phosphor-reset-host-check@.service" -SYSTEMD_SERVICE_${PN}-host-check += "phosphor-reset-host-running@.service" - -SYSTEMD_SERVICE_${PN}-reset-sensor-states += "phosphor-reset-sensor-states@.service" - -RESET_CHECK_TMPL = "phosphor-reset-host-check@.service" -RESET_CHECK_TGTFMT = "obmc-host-reset@{1}.target" -RESET_CHECK_INSTFMT = "phosphor-reset-host-check@{0}.service" -RESET_CHECK_FMT = "../${RESET_CHECK_TMPL}:${RESET_CHECK_TGTFMT}.requires/${RESET_CHECK_INSTFMT}" - -SENSOR_RESET_TMPL = "phosphor-reset-sensor-states@.service" -SENSOR_RESET_TGTFMT = "obmc-host-reset@{1}.target" -SENSOR_RESET_INSTFMT = "phosphor-reset-sensor-states@{0}.service" -SENSOR_RESET_FMT = "../${SENSOR_RESET_TMPL}:${SENSOR_RESET_TGTFMT}.requires/${SENSOR_RESET_INSTFMT}" - -RESET_RUNNING_TMPL = "phosphor-reset-host-running@.service" -RESET_RUNNING_TGTFMT = "obmc-host-reset@{1}.target" -RESET_RUNNING_INSTFMT = "phosphor-reset-host-running@{0}.service" -RESET_RUNNING_FMT = "../${RESET_RUNNING_TMPL}:${RESET_RUNNING_TGTFMT}.requires/${RESET_RUNNING_INSTFMT}" - -SYSTEMD_LINK_${PN}-host-check += "${@compose_list_zip(d, 'RESET_CHECK_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_LINK_${PN}-host-check += "${@compose_list_zip(d, 'RESET_RUNNING_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_HOST_INSTANCES')}" - -SYSTEMD_LINK_${PN}-reset-sensor-states += "${@compose_list_zip(d, 'SENSOR_RESET_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_HOST_INSTANCES')}" - -# Force the standby target to run the host reset check target -RESET_TMPL_CTRL = "obmc-host-reset@.target" -SYSD_TGT = "${SYSTEMD_DEFAULT_TARGET}" -RESET_INSTFMT_CTRL = "obmc-host-reset@{0}.target" -RESET_FMT_CTRL = "../${RESET_TMPL_CTRL}:${SYSD_TGT}.wants/${RESET_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN}-host-check += "${@compose_list_zip(d, 'RESET_FMT_CTRL', 'OBMC_HOST_INSTANCES')}" - -TMPL = "phosphor-discover-system-state@.service" -INSTFMT = "phosphor-discover-system-state@{0}.service" -FMT = "../${TMPL}:${SYSTEMD_DEFAULT_TARGET}.wants/${INSTFMT}" -SYSTEMD_LINK_${PN}-discover += "${@compose_list(d, 'FMT', 'OBMC_HOST_INSTANCES')}" - -# Force the shutdown target to run the chassis-poweroff target -CHASSIS_STOP_TMPL = "obmc-chassis-poweroff@.target" -HOST_STOP_TGTFMT = "obmc-host-shutdown@{1}.target" -CHASSIS_STOP_INSTFMT = "obmc-chassis-poweroff@{0}.target" -HOST_STOP_FMT = "../${CHASSIS_STOP_TMPL}:${HOST_STOP_TGTFMT}.requires/${CHASSIS_STOP_INSTFMT}" -SYSTEMD_LINK_${PN}-host += "${@compose_list_zip(d, 'HOST_STOP_FMT', 'OBMC_CHASSIS_INSTANCES', 'OBMC_HOST_INSTANCES')}" - -# Force the host reboot target to run the shutdown target -HOST_SHUTDOWN_TMPL = "obmc-host-shutdown@.target" -HOST_REBOOT_TGTFMT = "obmc-host-reboot@{0}.target" -HOST_SHUTDOWN_INSTFMT = "obmc-host-shutdown@{0}.target" -HOST_REBOOT_FMT = "../${HOST_SHUTDOWN_TMPL}:${HOST_REBOOT_TGTFMT}.requires/${HOST_SHUTDOWN_INSTFMT}" -SYSTEMD_LINK_${PN}-host += "${@compose_list_zip(d, 'HOST_REBOOT_FMT', 'OBMC_HOST_INSTANCES')}" - -# And also force the reboot target to call the host startmin service -HOST_REBOOT_SVC = "phosphor-reboot-host@.service" -HOST_REBOOT_SVC_INST = "phosphor-reboot-host@{0}.service" -HOST_REBOOT_SVC_FMT = "../${HOST_REBOOT_SVC}:${HOST_REBOOT_TGTFMT}.requires/${HOST_REBOOT_SVC_INST}" -SYSTEMD_LINK_${PN}-host += "${@compose_list_zip(d, 'HOST_REBOOT_SVC_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_HOST_INSTANCES')}" - -# Force the host-start target to call the host-startmin target -HOST_STARTMIN_TMPL = "obmc-host-startmin@.target" -HOST_START_TGTFMT = "obmc-host-start@{0}.target" -HOST_STARTMIN_INSTFMT = "obmc-host-startmin@{0}.target" -HOST_START_FMT = "../${HOST_STARTMIN_TMPL}:${HOST_START_TGTFMT}.requires/${HOST_STARTMIN_INSTFMT}" -SYSTEMD_LINK_${PN}-host += "${@compose_list_zip(d, 'HOST_START_FMT', 'OBMC_HOST_INSTANCES')}" - -# Force the host-start target to call the reboot count reset service -HOST_RST_RBT_ATTEMPTS_SVC = "phosphor-reset-host-reboot-attempts@.service" -HOST_RST_RBT_ATTEMPTS_SVC_INST = "phosphor-reset-host-reboot-attempts@{0}.service" -HOST_RST_RBT_ATTEMPTS_SVC_FMT = "../${HOST_RST_RBT_ATTEMPTS_SVC}:${HOST_START_TGTFMT}.requires/${HOST_RST_RBT_ATTEMPTS_SVC_INST}" -SYSTEMD_LINK_${PN}-host += "${@compose_list_zip(d, 'HOST_RST_RBT_ATTEMPTS_SVC_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_HOST_INSTANCES')}" - -SRC_URI += "git://github.com/openbmc/phosphor-state-manager" -SRCREV = "6425ab76f5bdde1ea098645acc3b578414406f4f" - -S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb index 8a32ae2c3..2ec65c11f 120000..100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb @@ -1 +1,143 @@ -phosphor-state-manager.bb
\ No newline at end of file +SUMMARY = "Phosphor State Management" +DESCRIPTION = "Phosphor State Manager provides a set of system state \ +management daemons. It is suitable for use on a wide variety of OpenBMC \ +platforms." +HOMEPAGE = "https://github.com/openbmc/phosphor-state-manager" +PR = "r1" +PV = "1.0+git${SRCPV}" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" + +STATE_MGR_PACKAGES = " \ + ${PN}-host \ + ${PN}-chassis \ + ${PN}-bmc \ + ${PN}-discover \ + ${PN}-host-check \ + ${PN}-reset-sensor-states \ +" +PACKAGE_BEFORE_PN += "${STATE_MGR_PACKAGES}" +ALLOW_EMPTY_${PN} = "1" + +DBUS_PACKAGES = "${STATE_MGR_PACKAGES}" + +SYSTEMD_PACKAGES = "${PN}-discover \ + ${PN}-reset-sensor-states \ +" + +# The host-check function will check if the host is running +# after a BMC reset. +# The reset-sensor-states function will reset the host +# sensors on a BMC reset or system power loss. +# Neither is required for host state function but are +# recommended to deal properly with these reset scenarios. +RRECOMMENDS_${PN}-host = "${PN}-host-check ${PN}-reset-sensor-states" + +inherit autotools pkgconfig +inherit obmc-phosphor-dbus-service + +DEPENDS += "autoconf-archive-native" +DEPENDS += "sdbusplus" +DEPENDS += "sdeventplus" +DEPENDS += "phosphor-logging" +DEPENDS += "phosphor-dbus-interfaces" +DEPENDS += "libcereal" +RDEPENDS_${PN} += "sdbusplus" + +RDEPENDS_${PN}-host += "libsystemd phosphor-dbus-interfaces" +RDEPENDS_${PN}-chassis += "libsystemd phosphor-dbus-interfaces" +RDEPENDS_${PN}-bmc += "libsystemd phosphor-dbus-interfaces" +RDEPENDS_${PN}-discover += "libsystemd phosphor-dbus-interfaces" +RDEPENDS_${PN}-host-check += "libsystemd phosphor-dbus-interfaces" +RDEPENDS_${PN}-reset-sensor-states += "libsystemd phosphor-dbus-interfaces" + +FILES_${PN}-host = "${sbindir}/phosphor-host-state-manager" +DBUS_SERVICE_${PN}-host += "xyz.openbmc_project.State.Host.service" +DBUS_SERVICE_${PN}-host += "phosphor-reboot-host@.service" +SYSTEMD_ENVIRONMENT_FILE_${PN}-host += "obmc/phosphor-reboot-host/reboot.conf" +SYSTEMD_SERVICE_${PN}-host += "phosphor-reset-host-reboot-attempts@.service" + +FILES_${PN}-chassis = "${sbindir}/phosphor-chassis-state-manager" +DBUS_SERVICE_${PN}-chassis += "xyz.openbmc_project.State.Chassis.service" + +FILES_${PN}-bmc = "${sbindir}/phosphor-bmc-state-manager" +DBUS_SERVICE_${PN}-bmc += "xyz.openbmc_project.State.BMC.service" + +FILES_${PN}-discover = "${sbindir}/phosphor-discover-system-state" +SYSTEMD_SERVICE_${PN}-discover += "phosphor-discover-system-state@.service" + +FILES_${PN}-host-check = "${sbindir}/phosphor-host-check" +SYSTEMD_SERVICE_${PN}-host-check += "phosphor-reset-host-check@.service" +SYSTEMD_SERVICE_${PN}-host-check += "phosphor-reset-host-running@.service" + +SYSTEMD_SERVICE_${PN}-reset-sensor-states += "phosphor-reset-sensor-states@.service" + +RESET_CHECK_TMPL = "phosphor-reset-host-check@.service" +RESET_CHECK_TGTFMT = "obmc-host-reset@{1}.target" +RESET_CHECK_INSTFMT = "phosphor-reset-host-check@{0}.service" +RESET_CHECK_FMT = "../${RESET_CHECK_TMPL}:${RESET_CHECK_TGTFMT}.requires/${RESET_CHECK_INSTFMT}" + +SENSOR_RESET_TMPL = "phosphor-reset-sensor-states@.service" +SENSOR_RESET_TGTFMT = "obmc-host-reset@{1}.target" +SENSOR_RESET_INSTFMT = "phosphor-reset-sensor-states@{0}.service" +SENSOR_RESET_FMT = "../${SENSOR_RESET_TMPL}:${SENSOR_RESET_TGTFMT}.requires/${SENSOR_RESET_INSTFMT}" + +RESET_RUNNING_TMPL = "phosphor-reset-host-running@.service" +RESET_RUNNING_TGTFMT = "obmc-host-reset@{1}.target" +RESET_RUNNING_INSTFMT = "phosphor-reset-host-running@{0}.service" +RESET_RUNNING_FMT = "../${RESET_RUNNING_TMPL}:${RESET_RUNNING_TGTFMT}.requires/${RESET_RUNNING_INSTFMT}" + +SYSTEMD_LINK_${PN}-host-check += "${@compose_list_zip(d, 'RESET_CHECK_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK_${PN}-host-check += "${@compose_list_zip(d, 'RESET_RUNNING_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_HOST_INSTANCES')}" + +SYSTEMD_LINK_${PN}-reset-sensor-states += "${@compose_list_zip(d, 'SENSOR_RESET_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_HOST_INSTANCES')}" + +# Force the standby target to run the host reset check target +RESET_TMPL_CTRL = "obmc-host-reset@.target" +SYSD_TGT = "${SYSTEMD_DEFAULT_TARGET}" +RESET_INSTFMT_CTRL = "obmc-host-reset@{0}.target" +RESET_FMT_CTRL = "../${RESET_TMPL_CTRL}:${SYSD_TGT}.wants/${RESET_INSTFMT_CTRL}" +SYSTEMD_LINK_${PN}-host-check += "${@compose_list_zip(d, 'RESET_FMT_CTRL', 'OBMC_HOST_INSTANCES')}" + +TMPL = "phosphor-discover-system-state@.service" +INSTFMT = "phosphor-discover-system-state@{0}.service" +FMT = "../${TMPL}:${SYSTEMD_DEFAULT_TARGET}.wants/${INSTFMT}" +SYSTEMD_LINK_${PN}-discover += "${@compose_list(d, 'FMT', 'OBMC_HOST_INSTANCES')}" + +# Force the shutdown target to run the chassis-poweroff target +CHASSIS_STOP_TMPL = "obmc-chassis-poweroff@.target" +HOST_STOP_TGTFMT = "obmc-host-shutdown@{1}.target" +CHASSIS_STOP_INSTFMT = "obmc-chassis-poweroff@{0}.target" +HOST_STOP_FMT = "../${CHASSIS_STOP_TMPL}:${HOST_STOP_TGTFMT}.requires/${CHASSIS_STOP_INSTFMT}" +SYSTEMD_LINK_${PN}-host += "${@compose_list_zip(d, 'HOST_STOP_FMT', 'OBMC_CHASSIS_INSTANCES', 'OBMC_HOST_INSTANCES')}" + +# Force the host reboot target to run the shutdown target +HOST_SHUTDOWN_TMPL = "obmc-host-shutdown@.target" +HOST_REBOOT_TGTFMT = "obmc-host-reboot@{0}.target" +HOST_SHUTDOWN_INSTFMT = "obmc-host-shutdown@{0}.target" +HOST_REBOOT_FMT = "../${HOST_SHUTDOWN_TMPL}:${HOST_REBOOT_TGTFMT}.requires/${HOST_SHUTDOWN_INSTFMT}" +SYSTEMD_LINK_${PN}-host += "${@compose_list_zip(d, 'HOST_REBOOT_FMT', 'OBMC_HOST_INSTANCES')}" + +# And also force the reboot target to call the host startmin service +HOST_REBOOT_SVC = "phosphor-reboot-host@.service" +HOST_REBOOT_SVC_INST = "phosphor-reboot-host@{0}.service" +HOST_REBOOT_SVC_FMT = "../${HOST_REBOOT_SVC}:${HOST_REBOOT_TGTFMT}.requires/${HOST_REBOOT_SVC_INST}" +SYSTEMD_LINK_${PN}-host += "${@compose_list_zip(d, 'HOST_REBOOT_SVC_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_HOST_INSTANCES')}" + +# Force the host-start target to call the host-startmin target +HOST_STARTMIN_TMPL = "obmc-host-startmin@.target" +HOST_START_TGTFMT = "obmc-host-start@{0}.target" +HOST_STARTMIN_INSTFMT = "obmc-host-startmin@{0}.target" +HOST_START_FMT = "../${HOST_STARTMIN_TMPL}:${HOST_START_TGTFMT}.requires/${HOST_STARTMIN_INSTFMT}" +SYSTEMD_LINK_${PN}-host += "${@compose_list_zip(d, 'HOST_START_FMT', 'OBMC_HOST_INSTANCES')}" + +# Force the host-start target to call the reboot count reset service +HOST_RST_RBT_ATTEMPTS_SVC = "phosphor-reset-host-reboot-attempts@.service" +HOST_RST_RBT_ATTEMPTS_SVC_INST = "phosphor-reset-host-reboot-attempts@{0}.service" +HOST_RST_RBT_ATTEMPTS_SVC_FMT = "../${HOST_RST_RBT_ATTEMPTS_SVC}:${HOST_START_TGTFMT}.requires/${HOST_RST_RBT_ATTEMPTS_SVC_INST}" +SYSTEMD_LINK_${PN}-host += "${@compose_list_zip(d, 'HOST_RST_RBT_ATTEMPTS_SVC_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_HOST_INSTANCES')}" + +SRC_URI += "git://github.com/openbmc/phosphor-state-manager" +SRCREV = "6425ab76f5bdde1ea098645acc3b578414406f4f" + +S = "${WORKDIR}/git" |