From 63e9fa87f24988253058a8a9ba1914612affa26e Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Fri, 5 Apr 2019 07:43:36 -0700 Subject: meta-intel: common: move all services to multi-user.target Hard-code multi-user.target instead of SYSTEMD_DEFAULT_TARGET. x86-power-control: srcrev bump 6ce6ab4548..2c714052d6 Patrick Venture (1): move all services s/obmc-standby/multi-user/g (From meta-intel rev: d6627dc3382296e7434abf45e496b2c7af1bb4cb) Signed-off-by: Patrick Venture Change-Id: I6b599ce7af132f347da5b1feb0607d55c0049042 Signed-off-by: Brad Bishop --- .../meta-common/recipes-intel/chassis/x86-power-control_git.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'meta-intel') diff --git a/meta-intel/meta-common/recipes-intel/chassis/x86-power-control_git.bb b/meta-intel/meta-common/recipes-intel/chassis/x86-power-control_git.bb index 658063cbe..b2d8a1f9b 100755 --- a/meta-intel/meta-common/recipes-intel/chassis/x86-power-control_git.bb +++ b/meta-intel/meta-common/recipes-intel/chassis/x86-power-control_git.bb @@ -7,17 +7,17 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/x86-power-control.git" -SRCREV = "6ce6ab45484d0dc89f82fe15db024da534c456c1" +SRCREV = "2c714052d62b1e8fdd19951bbd340ec41fd7ac5b" inherit cmake pkgconfig pythonnative systemd SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.Chassis.Control.Power@.service" # Force the standby target to run these services -SYSD_TGT = "${SYSTEMD_DEFAULT_TARGET}" +SYSD_TGT = "multi-user.target" POWER_TMPL_CTRL = "xyz.openbmc_project.Chassis.Control.Power@.service" -#SYSD_TGT = "${SYSTEMD_DEFAULT_TARGET}" +#SYSD_TGT = "multi-user.target" POWER_INSTFMT_CTRL = "xyz.openbmc_project.Chassis.Control.Power@{0}.service" POWER_FMT_CTRL = "../${POWER_TMPL_CTRL}:${SYSD_TGT}.wants/${POWER_INSTFMT_CTRL}" SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'POWER_FMT_CTRL', 'OBMC_HOST_INSTANCES')}" @@ -51,7 +51,7 @@ SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_ON_CHASSIS_FMT', 'OBMC_CHAS # Force the standby target to run the chassis reset check target RESET_TMPL_CTRL = "obmc-chassis-powerreset@.target" -SYSD_TGT = "${SYSTEMD_DEFAULT_TARGET}" +SYSD_TGT = "multi-user.target" RESET_INSTFMT_CTRL = "obmc-chassis-powerreset@{0}.target" RESET_FMT_CTRL = "../${RESET_TMPL_CTRL}:${SYSD_TGT}.wants/${RESET_INSTFMT_CTRL}" SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" -- cgit v1.2.1