diff options
Diffstat (limited to 'meta-openpower/recipes-phosphor/host')
| -rw-r--r-- | meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb | 4 | ||||
| -rw-r--r-- | meta-openpower/recipes-phosphor/host/op-proc-control_git.bb | 28 |
2 files changed, 16 insertions, 16 deletions
diff --git a/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb b/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb index 8cedb62a5..f3c63adad 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb @@ -48,7 +48,7 @@ pkg_postinst:${PN}() { ln -s $TARGET $LINK # Only install certain units if phal enabled - if [ "${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" = phal ]; then + if [ "${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" = phal ]; then mkdir -p $D$systemd_system_unitdir/obmc-host-start@0.target.requires LINK="$D$systemd_system_unitdir/obmc-host-start@0.target.requires/phal-reinit-devtree.service" TARGET="../phal-reinit-devtree.service" @@ -115,7 +115,7 @@ pkg_prerm:${PN}() { rm $LINK # Remove phal specific units if enabled - if [ "${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" = phal ]; then + if [ "${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" = phal ]; then LINK="$D$systemd_system_unitdir/obmc-host-start@0.target.requires/phal-reinit-devtree.service" rm $LINK diff --git a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb index dc405cec8..1a3fde452 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb @@ -11,7 +11,7 @@ inherit meson obmc-phosphor-utils pkgconfig inherit systemd SRC_URI += "git://github.com/openbmc/openpower-proc-control" -SRCREV = "61c8757c6b81d61ae158af002810cdbe7cdae7e2" +SRCREV = "0ac7c38f64ce2c5a170ab6fe219d26e599713da3" DEPENDS += " \ phosphor-logging \ @@ -31,16 +31,16 @@ SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} = "${TEMPLATE} ${INSTANCES}" SYSTEMD_SERVICE:${PN} += " \ - xyz.openbmc_project.Control.Host.NMI.service \ - op-stop-instructions@.service \ - op-cfam-reset.service \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'set-spi-mux.service', '', d)} \ - op-continue-mpreboot@.service \ - op-enter-mpreboot@.service \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'phal-reinit-devtree.service', '', d)} \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'proc-pre-poweroff@.service', '', d)} \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'op-reset-host-check@.service', '', d)} \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'op-reset-host-clear.service', '', d)} \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'phal-import-devtree@.service', '', d)} \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'phal-export-devtree@.service', '', d)} \ - " + op-cfam-reset.service \ + op-continue-mpreboot@.service \ + op-enter-mpreboot@.service \ + op-stop-instructions@.service \ + xyz.openbmc_project.Control.Host.NMI.service \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'op-reset-host-check@.service', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'op-reset-host-clear.service', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'phal-export-devtree@.service', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'phal-import-devtree@.service', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'phal-reinit-devtree.service', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'proc-pre-poweroff@.service', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'set-spi-mux.service', '', d)} \ + " |