diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2022-01-19 19:27:13 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2022-01-19 22:25:55 +0300 |
commit | b068a5378e272056b30012e0da77fe614c70bd3e (patch) | |
tree | 0598585aff202ac0d7b49a6060400eb36907cf74 /meta-facebook | |
parent | 71f04aa47224ab5c2be7bb94e73687339ad4a353 (diff) | |
download | openbmc-b068a5378e272056b30012e0da77fe614c70bd3e.tar.xz |
meta-bletchley: motor-ctrl: clean up SYSTEMD variables
motor-ctrl recipe was reported to periodically fail with:
ERROR: When reparsing motor-ctrl_0.1.bb:do_fetch, the basehash value
changed from AAA to BBB. The metadata is not deterministic and this
needs to be fixed.
There was inconsistencies in the way the SYSTEMD services were defined
and some of them appeared to not instantiate templates correctly.
Clean them all up to match.
Also perform trivial alphabetic sorting of some other variables.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I9c66fa1106a4003041f39c68c1a43ef8b6a2c00e
Diffstat (limited to 'meta-facebook')
-rw-r--r-- | meta-facebook/meta-bletchley/recipes-bletchley/motor-ctrl/motor-ctrl_0.1.bb | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/meta-facebook/meta-bletchley/recipes-bletchley/motor-ctrl/motor-ctrl_0.1.bb b/meta-facebook/meta-bletchley/recipes-bletchley/motor-ctrl/motor-ctrl_0.1.bb index fac0cd421b..ba682880f3 100644 --- a/meta-facebook/meta-bletchley/recipes-bletchley/motor-ctrl/motor-ctrl_0.1.bb +++ b/meta-facebook/meta-bletchley/recipes-bletchley/motor-ctrl/motor-ctrl_0.1.bb @@ -6,40 +6,42 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit obmc-phosphor-systemd RDEPENDS:${PN} += "bash" -RDEPENDS:${PN} += "libgpiod-tools" RDEPENDS:${PN} += "i2c-tools" +RDEPENDS:${PN} += "libgpiod-tools" S = "${WORKDIR}" -SRC_URI += "file://motor-init \ - file://motor-ctrl \ - file://power-ctrl " +SRC_URI += " \ + file://motor-ctrl \ + file://motor-init \ + file://power-ctrl \ + " do_install() { install -d ${D}${sbindir} install -m 0755 ${WORKDIR}/power-ctrl ${D}${sbindir} install -d ${D}${libexecdir} - install -m 0755 ${WORKDIR}/motor-init ${D}${libexecdir} install -m 0755 ${WORKDIR}/motor-ctrl ${D}${libexecdir} + install -m 0755 ${WORKDIR}/motor-init ${D}${libexecdir} } -MOTOR_INIT_INSTFMT= "motor-init-calibration@{0}.service" +MOTOR_INIT_INSTFMT="motor-init-calibration@.service:motor-init-calibration@{0}.service" PWR_ON_INSTFMT="host-poweron@.service:host-poweron@{0}.service" PWR_OFF_INSTFMT="host-poweroff@.service:host-poweroff@{0}.service" -AC_ON_INSTFMT="host-ac-on@{0}.service" +AC_ON_INSTFMT="host-ac-on@.service:host-ac-on@{0}.service" AC_OFF_INSTFMT="host-ac-off@.service:host-ac-off@{0}.service" -SYSTEMD_SERVICE:${PN} ="${@compose_list(d, 'MOTOR_INIT_INSTFMT', 'OBMC_HOST_INSTANCES')}" -FILES:${PN} += "${systemd_system_unitdir}/motor-init-calibration@.service" +SYSTEMD_SERVICE:${PN} += "motor-init-calibration@.service" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'MOTOR_INIT_INSTFMT', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_SERVICE:${PN} +="host-poweron@.service" +SYSTEMD_SERVICE:${PN} += "host-poweron@.service" SYSTEMD_LINK:${PN} += "${@compose_list(d, 'PWR_ON_INSTFMT', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_SERVICE:${PN} +="host-poweroff@.service" +SYSTEMD_SERVICE:${PN} += "host-poweroff@.service" SYSTEMD_LINK:${PN} += "${@compose_list(d, 'PWR_OFF_INSTFMT', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_SERVICE:${PN} +="${@compose_list(d, 'AC_ON_INSTFMT', 'OBMC_HOST_INSTANCES')}" -FILES:${PN} += "${systemd_system_unitdir}/host-ac-#@.service" +SYSTEMD_SERVICE:${PN} += "host-ac-on@.service" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'AC_ON_INSTFMT', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_SERVICE:${PN} +="host-ac-off@.service" +SYSTEMD_SERVICE:${PN} += "host-ac-off@.service" SYSTEMD_LINK:${PN} += "${@compose_list(d, 'AC_OFF_INSTFMT', 'OBMC_HOST_INSTANCES')}" |