From edf8fe5c16e77003bca92fa61df2792dcbff1572 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Fri, 24 Mar 2023 09:46:00 -0500 Subject: meta-facebook: switch '/usr/libexec' to libexecdir Signed-off-by: Patrick Williams Change-Id: I6263aa9f0c24f53494ffc42d233bf2bd48f0c96a --- .../recipes-phosphor/datetime/phosphor-time-manager_%.bbappend | 4 ++-- meta-facebook/recipes-phosphor/fans/phosphor-fan_%.bbappend | 6 +++--- .../recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'meta-facebook') 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" -- cgit v1.2.3