summaryrefslogtreecommitdiff
path: root/meta-facebook
diff options
context:
space:
mode:
authorPatrick Williams <patrick@stwcx.xyz>2023-03-24 17:46:00 +0300
committerPatrick Williams <patrick@stwcx.xyz>2023-03-27 18:00:06 +0300
commitedf8fe5c16e77003bca92fa61df2792dcbff1572 (patch)
treedd72e39c5c2661d2d11150a74234701892943098 /meta-facebook
parentda5d6d66b881ff26a89b3a5b1c99def53b6ae2f1 (diff)
downloadopenbmc-edf8fe5c16e77003bca92fa61df2792dcbff1572.tar.xz
meta-facebook: switch '/usr/libexec' to libexecdir
Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: I6263aa9f0c24f53494ffc42d233bf2bd48f0c96a
Diffstat (limited to 'meta-facebook')
-rw-r--r--meta-facebook/recipes-phosphor/datetime/phosphor-time-manager_%.bbappend4
-rw-r--r--meta-facebook/recipes-phosphor/fans/phosphor-fan_%.bbappend6
-rw-r--r--meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend4
3 files changed, 7 insertions, 7 deletions
diff --git a/meta-facebook/recipes-phosphor/datetime/phosphor-time-manager_%.bbappend b/meta-facebook/recipes-phosphor/datetime/phosphor-time-manager_%.bbappend
index 0e4429ecbf..278f7b6584 100644
--- a/meta-facebook/recipes-phosphor/datetime/phosphor-time-manager_%.bbappend
+++ b/meta-facebook/recipes-phosphor/datetime/phosphor-time-manager_%.bbappend
@@ -12,8 +12,8 @@ do_install:append:fb-withhost(){
install -d ${D}$/lib/systemd/system
install -m 0644 ${WORKDIR}/bmc-set-time.service ${D}$/lib/systemd/system
- install -d ${D}/usr/libexec
- install -m 0777 ${WORKDIR}/set-bmc-time-from-host ${D}/usr/libexec
+ install -d ${D}${libexecdir}
+ install -m 0777 ${WORKDIR}/set-bmc-time-from-host ${D}${libexecdir}
}
SYSTEMD_SERVICE:${PN}:fb-withhost += "bmc-set-time.service"
diff --git a/meta-facebook/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-facebook/recipes-phosphor/fans/phosphor-fan_%.bbappend
index 9ed68ab838..e9dcf33489 100644
--- a/meta-facebook/recipes-phosphor/fans/phosphor-fan_%.bbappend
+++ b/meta-facebook/recipes-phosphor/fans/phosphor-fan_%.bbappend
@@ -30,8 +30,8 @@ do_install:append:fb-withhost() {
install -m 0755 -d ${D}/var/lib/phosphor-fan-presence/sensor-monitor
- install -d ${D}/usr/libexec/phosphor-fan-sensor-monitor
- install -m 0777 ${WORKDIR}/host-poweroff ${D}/usr/libexec/phosphor-fan-sensor-monitor/
+ install -d ${D}${libexecdir}/phosphor-fan-sensor-monitor
+ install -m 0777 ${WORKDIR}/host-poweroff ${D}${libexecdir}/phosphor-fan-sensor-monitor/
}
pkg_postinst:${PN}-sensor-monitor() {
@@ -48,5 +48,5 @@ pkg_postinst:${PN}-sensor-monitor() {
ln -s $TARGET $LINK
}
-FILES:${PN}-sensor-monitor += "/usr/libexec/phosphor-fan-sensor-monitor/host-poweroff"
+FILES:${PN}-sensor-monitor += "${libexecdir}/phosphor-fan-sensor-monitor/host-poweroff"
FILES:${PN}-sensor-monitor += "${systemd_system_unitdir}"
diff --git a/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
index cd11f5419b..398ccf77ad 100644
--- a/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
+++ b/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -23,7 +23,7 @@ do_install:append:fb-compute-multihost() {
install -m 0644 ${WORKDIR}/obmc-ipmb-rescan-fru.service \
${D}${systemd_system_unitdir}
- install -d ${D}/usr/libexec/phosphor-gpio-monitor
- install -m 0777 ${WORKDIR}/ipmb-rescan-fru.sh ${D}/usr/libexec/phosphor-gpio-monitor/
+ install -d ${D}${libexecdir}/phosphor-gpio-monitor
+ install -m 0777 ${WORKDIR}/ipmb-rescan-fru.sh ${D}${libexecdir}/phosphor-gpio-monitor/
}
FILES:${PN} += "/lib/systemd/system/obmc-ipmb-rescan-fru.service"