treewide: switch '/usr/share' to datadir
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I8ea79d284356629f5b7b24ad3a99336e9e2e297e
diff --git a/meta-amd/meta-daytonax/recipes-phosphor/configuration/entity-manager_%.bbappend b/meta-amd/meta-daytonax/recipes-phosphor/configuration/entity-manager_%.bbappend
index cab4272..b1011c8 100644
--- a/meta-amd/meta-daytonax/recipes-phosphor/configuration/entity-manager_%.bbappend
+++ b/meta-amd/meta-daytonax/recipes-phosphor/configuration/entity-manager_%.bbappend
@@ -4,9 +4,9 @@
"
do_install:append() {
- rm -f ${D}/usr/share/entity-manager/configurations/*.json
- install -d ${D}/usr/share/entity-manager/configurations
- install -m 0444 ${WORKDIR}/daytonax-baseboard.json ${D}/usr/share/entity-manager/configurations
- install -m 0444 ${WORKDIR}/daytonax-chassis.json ${D}/usr/share/entity-manager/configurations
+ rm -f ${D}${datadir}/entity-manager/configurations/*.json
+ install -d ${D}${datadir}/entity-manager/configurations
+ install -m 0444 ${WORKDIR}/daytonax-baseboard.json ${D}${datadir}/entity-manager/configurations
+ install -m 0444 ${WORKDIR}/daytonax-chassis.json ${D}${datadir}/entity-manager/configurations
}
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/configuration/entity-manager_%.bbappend b/meta-amd/meta-ethanolx/recipes-phosphor/configuration/entity-manager_%.bbappend
index f55bf23..dc1d728 100644
--- a/meta-amd/meta-ethanolx/recipes-phosphor/configuration/entity-manager_%.bbappend
+++ b/meta-amd/meta-ethanolx/recipes-phosphor/configuration/entity-manager_%.bbappend
@@ -3,8 +3,8 @@
file://ethanolx-chassis.json"
do_install:append() {
- rm -f ${D}/usr/share/entity-manager/configurations/*.json
- install -d ${D}/usr/share/entity-manager/configurations
- install -m 0444 ${WORKDIR}/ethanolx-baseboard.json ${D}/usr/share/entity-manager/configurations
- install -m 0444 ${WORKDIR}/ethanolx-chassis.json ${D}/usr/share/entity-manager/configurations
+ rm -f ${D}${datadir}/entity-manager/configurations/*.json
+ install -d ${D}${datadir}/entity-manager/configurations
+ install -m 0444 ${WORKDIR}/ethanolx-baseboard.json ${D}${datadir}/entity-manager/configurations
+ install -m 0444 ${WORKDIR}/ethanolx-chassis.json ${D}${datadir}/entity-manager/configurations
}
diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
index 2a9ed5b..9a5bab4 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
+++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -22,7 +22,7 @@
"
FILES:${PN}-monitor += " \
- /usr/share/${PN}/phosphor-multi-gpio-monitor.json \
+ ${datadir}/${PN}/phosphor-multi-gpio-monitor.json \
/usr/sbin/ampere_scp_failover.sh \
/usr/sbin/ampere_psu_reset_hotswap.sh \
"
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-ampere/meta-mitchell/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
index 62fbc64..f98c043 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
+++ b/meta-ampere/meta-mitchell/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -12,7 +12,7 @@
"
FILES:${PN}-monitor += " \
- /usr/share/${PN}/phosphor-multi-gpio-monitor.json \
+ ${datadir}/${PN}/phosphor-multi-gpio-monitor.json \
"
SYSTEMD_LINK:${PN}-monitor:append = " ../phosphor-multi-gpio-monitor.service:multi-user.target.requires/phosphor-multi-gpio-monitor.service"
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/chassis/x86-power-control_%.bbappend b/meta-bytedance/meta-g220a/recipes-phosphor/chassis/x86-power-control_%.bbappend
index 4f9b9ac..9ce949a 100644
--- a/meta-bytedance/meta-g220a/recipes-phosphor/chassis/x86-power-control_%.bbappend
+++ b/meta-bytedance/meta-g220a/recipes-phosphor/chassis/x86-power-control_%.bbappend
@@ -3,8 +3,8 @@
SRC_URI += " file://power-config-host0.json"
do_install:append() {
- install -d ${D}/usr/share/x86-power-control/
- install -m 0644 ${WORKDIR}/power-config-host0.json ${D}/usr/share/x86-power-control/
+ install -d ${D}${datadir}/x86-power-control/
+ install -m 0644 ${WORKDIR}/power-config-host0.json ${D}${datadir}/x86-power-control/
}
EXTRA_OECMAKE = "-DWITH_RESETBUTTON=OFF"
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/configuration/entity-manager_%.bbappend b/meta-bytedance/meta-g220a/recipes-phosphor/configuration/entity-manager_%.bbappend
index e675c70..d5bd36f 100644
--- a/meta-bytedance/meta-g220a/recipes-phosphor/configuration/entity-manager_%.bbappend
+++ b/meta-bytedance/meta-g220a/recipes-phosphor/configuration/entity-manager_%.bbappend
@@ -2,6 +2,6 @@
SRC_URI:append = " file://g220a_baseboard.json \
"
do_install:append() {
- install -d ${D}/usr/share/entity-manager/configurations
- install -m 0444 ${WORKDIR}/*.json ${D}/usr/share/entity-manager/configurations
+ install -d ${D}${datadir}/entity-manager/configurations
+ install -m 0444 ${WORKDIR}/*.json ${D}${datadir}/entity-manager/configurations
}
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
index c088629..7d7f027 100644
--- a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
+++ b/meta-bytedance/meta-g220a/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-fii/meta-kudo/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
index 72dbde2..52f32c4 100644
--- a/meta-fii/meta-kudo/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
+++ b/meta-fii/meta-kudo/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
@@ -7,7 +7,7 @@
file://virtual_sensor_config.json \
"
do_install:append:kudo() {
- install -d ${D}/usr/share
- install -m 0644 ${WORKDIR}/virtual_sensor_config.json ${D}/usr/share/phosphor-virtual-sensor/virtual_sensor_config.json
+ install -d ${D}${datadir}
+ install -m 0644 ${WORKDIR}/virtual_sensor_config.json ${D}${datadir}/phosphor-virtual-sensor/virtual_sensor_config.json
}
diff --git a/meta-intel-openbmc/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-intel-openbmc/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
index 29b9858..fd9b844 100644
--- a/meta-intel-openbmc/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
+++ b/meta-intel-openbmc/meta-common/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-yadro/meta-vegman/recipes-phosphor/configuration/entity-manager_%.bbappend b/meta-yadro/meta-vegman/recipes-phosphor/configuration/entity-manager_%.bbappend
index 129d22b..b6b3d8a 100644
--- a/meta-yadro/meta-vegman/recipes-phosphor/configuration/entity-manager_%.bbappend
+++ b/meta-yadro/meta-vegman/recipes-phosphor/configuration/entity-manager_%.bbappend
@@ -4,5 +4,5 @@
"
do_install:append() {
- install -m 0444 ${WORKDIR}/blacklist.json -D -t ${D}/usr/share/entity-manager
+ install -m 0444 ${WORKDIR}/blacklist.json -D -t ${D}${datadir}/entity-manager
}
diff --git a/meta-yadro/meta-vegman/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-yadro/meta-vegman/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
index 4c1c55e..fdeb8b6 100644
--- a/meta-yadro/meta-vegman/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
+++ b/meta-yadro/meta-vegman/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/
}