| commit | da5d6d66b881ff26a89b3a5b1c99def53b6ae2f1 | [log] [tgz] |
|---|---|---|
| author | Patrick Williams <patrick@stwcx.xyz> | Fri Mar 24 09:29:39 2023 -0500 |
| committer | Patrick Williams <patrick@stwcx.xyz> | Mon Mar 27 15:00:06 2023 +0000 |
| tree | d111766e271c1d3be445a1454115b2f3d04e8ebb | |
| parent | 2fc4447bde26ed8da70cb4733b10bbdc15afda23 [diff] |
meta-facebook: switch '/usr/share' to datadir Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: I7b3ad5e0a59424110790ae53cacceee4d7d4a646
diff --git a/meta-facebook/meta-greatlakes/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-facebook/meta-greatlakes/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index b137790..eb7f9fc 100644 --- a/meta-facebook/meta-greatlakes/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-facebook/meta-greatlakes/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -3,7 +3,7 @@ SRC_URI += "file://greatlakes-phosphor-multi-gpio-monitor.json" do_install:append:() { - install -d ${D}/usr/share/phosphor-gpio-monitor + install -d ${D}${datadir}/phosphor-gpio-monitor install -m 0644 ${WORKDIR}/greatlakes-phosphor-multi-gpio-monitor.json \ - ${D}/usr/share/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.json + ${D}${datadir}/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.json }
diff --git a/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index e64313e..cd11f54 100644 --- a/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -15,9 +15,9 @@ do_install:append:fb-compute-multihost() { - install -d ${D}/usr/share/phosphor-gpio-monitor + install -d ${D}${datadir}/phosphor-gpio-monitor install -m 0644 ${WORKDIR}/phosphor-multi-gpio-monitor.json \ - ${D}/usr/share/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.json + ${D}${datadir}/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.json install -d ${D}${systemd_system_unitdir} install -m 0644 ${WORKDIR}/obmc-ipmb-rescan-fru.service \
diff --git a/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend index 9557c26..44eefb0 100644 --- a/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend +++ b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
@@ -4,5 +4,5 @@ do_install:append() { install -m 0644 -D ${WORKDIR}/ipmb-channels.json \ - ${D}/usr/share/ipmbbridge + ${D}${datadir}/ipmbbridge }
diff --git a/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend index 4487aa2..301766d 100644 --- a/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend +++ b/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
@@ -4,8 +4,8 @@ do_install:append() { - install -d ${D}/usr/share/phosphor-virtual-sensor + install -d ${D}${datadir}/phosphor-virtual-sensor install -m 0644 -D ${WORKDIR}/${MACHINE}_sensor_config.json \ - ${D}/usr/share/phosphor-virtual-sensor/virtual_sensor_config.json + ${D}${datadir}/phosphor-virtual-sensor/virtual_sensor_config.json }