diff options
| author | Ed Tanous <ed.tanous@intel.com> | 2019-05-29 19:22:39 +0300 |
|---|---|---|
| committer | Ed Tanous <ed.tanous@intel.com> | 2019-05-29 19:22:39 +0300 |
| commit | 5364646cb66fa75cdcbf148e039e0383cda94f2a (patch) | |
| tree | 78b1711f353235e812435be90e124eab4037294e /meta-intel | |
| parent | 816d793003e93c1e5eec0a2e90fbd8b9dde9f7a5 (diff) | |
| parent | 7b595c2f82912a170774e84e5bb81d1b6030bf6b (diff) | |
| download | openbmc-5364646cb66fa75cdcbf148e039e0383cda94f2a.tar.xz | |
Merge branch 'master' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into intel
Diffstat (limited to 'meta-intel')
| -rwxr-xr-x | meta-intel/meta-common/recipes-intel/chassis/x86-power-control_git.bb | 8 | ||||
| -rwxr-xr-x | meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb | 2 |
2 files changed, 5 insertions, 5 deletions
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')}" diff --git a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb index 45ff9b395..2d8b6f531 100755 --- a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb +++ b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/intel-ipmi-oem" -SRCREV = "2a265d54ac0b3f0f64243195fa8f299fff3dd7e4" +SRCREV = "52ce662cab6e5646170c4092a4553e2208eef98d" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" |