summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPotin Lai <potin.lai@quantatw.com>2023-06-27 04:20:19 +0300
committerPatrick Williams <patrick@stwcx.xyz>2023-06-28 01:37:23 +0300
commite7625571cdad4115740f913309c1846b5cad3123 (patch)
treec21532a8a88804b98d16dc87f9c4517305e4518b
parentd3fe9dfdb7290694b40aae47e2009db5fdb4f991 (diff)
downloadopenbmc-e7625571cdad4115740f913309c1846b5cad3123.tar.xz
meta-facebook: fix phosphor-state-manager build error
The `systemd_system_unitdir` path changs after enabling 'usrmerge', replace actual path with `systemd_system_unitdir` to avoid build issues due to path changes. Add machine name into FILESEXTRAPATHS to fix files not included issue. Signed-off-by: Potin Lai <potin.lai@quantatw.com> Change-Id: I5bb58f48dcf5e689ad44265f0b6add50b7d141bd
-rw-r--r--meta-facebook/recipes-phosphor/state/phosphor-state-manager_%.bbappend4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-facebook/recipes-phosphor/state/phosphor-state-manager_%.bbappend
index b0acf75a07..ce091f4f0d 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager_%.bbappend
+++ b/meta-facebook/recipes-phosphor/state/phosphor-state-manager_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/${MACHINE}:"
HOST_DEFAULT_TARGETS:append = " \
obmc-host-shutdown@{}.target.wants/host-poweroff@{}.service \
@@ -55,6 +55,6 @@ do_install:append:greatlakes() {
install -m 0777 ${WORKDIR}/power-ctrl-init ${D}${libexecdir}/${PN}/
}
-FILES:${PN} += " /lib/systemd/system/*.service"
+FILES:${PN} += " ${systemd_system_unitdir}/*.service"
SYSTEMD_SERVICE:${PN}-bmc:append:greatlakes = "power-ctrl-init.service"