meta-facebook: remove excess override syntaxes
When a bbappend file is already in a meta-machine layer, there is no
reason for extra ":machine" override syntax usage. Remove them all.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I610e72633adb5bc36b63fe2b727e394c61070185
diff --git a/meta-facebook/meta-harma/recipes-phosphor/configuration/entity-manager_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/configuration/entity-manager_%.bbappend
index 03f1c63..6e89557 100644
--- a/meta-facebook/meta-harma/recipes-phosphor/configuration/entity-manager_%.bbappend
+++ b/meta-facebook/meta-harma/recipes-phosphor/configuration/entity-manager_%.bbappend
@@ -1,9 +1,9 @@
-FILESEXTRAPATHS:prepend:harma := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-SRC_URI:append:harma = " \
+SRC_URI:append = " \
file://blacklist.json \
"
-do_install:append:harma () {
+do_install:append() {
install -m 0644 -D ${WORKDIR}/blacklist.json ${D}${datadir}/${PN}/blacklist.json
}
diff --git a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
index e13d98d..6a8fe3f 100644
--- a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
+++ b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -19,7 +19,7 @@
file://deassert-reset-button \
"
-RDEPENDS:${PN}:append:harma = " bash"
+RDEPENDS:${PN}:append = " bash"
FILES:${PN} += "${systemd_system_unitdir}/*"
@@ -56,4 +56,4 @@
install -m 0755 ${WORKDIR}/deassert-power-good ${D}${libexecdir}/${PN}/
}
-SYSTEMD_OVERRIDE:${PN}-monitor:harma += "phosphor-multi-gpio-monitor.conf:phosphor-multi-gpio-monitor.service.d/phosphor-multi-gpio-monitor.conf"
+SYSTEMD_OVERRIDE:${PN}-monitor += "phosphor-multi-gpio-monitor.conf:phosphor-multi-gpio-monitor.service.d/phosphor-multi-gpio-monitor.conf"
diff --git a/meta-facebook/meta-harma/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
index 01f0304..eb22418 100644
--- a/meta-facebook/meta-harma/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
+++ b/meta-facebook/meta-harma/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
@@ -1,6 +1,6 @@
-IPMB_CHANNELS:harma = "\
+IPMB_CHANNELS = "\
/dev/ipmb-14 \
"
-IPMB_REMOTE_ADDR:harma = "\
+IPMB_REMOTE_ADDR = "\
96 \
"
diff --git a/meta-facebook/meta-harma/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
index 23710e8..6b12a39 100644
--- a/meta-facebook/meta-harma/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
+++ b/meta-facebook/meta-harma/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
@@ -1,7 +1,7 @@
-FILESEXTRAPATHS:prepend:harma := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-SRC_URI:append:harma = " file://led-group-config.json"
+SRC_URI:append = " file://led-group-config.json"
-do_install:append:harma() {
+do_install:append() {
install -m 0644 ${WORKDIR}/led-group-config.json ${D}${datadir}/phosphor-led-manager/
}
diff --git a/meta-facebook/meta-harma/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/network/phosphor-network_%.bbappend
index 253b76e..7eeaf22 100644
--- a/meta-facebook/meta-harma/recipes-phosphor/network/phosphor-network_%.bbappend
+++ b/meta-facebook/meta-harma/recipes-phosphor/network/phosphor-network_%.bbappend
@@ -1,10 +1,10 @@
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-SRC_URI:append:harma = " \
+SRC_URI:append = " \
file://00-bmc-usb0.network \
"
-FILES:${PN}:append:harma = " ${systemd_unitdir}/network/00-bmc-usb0.network"
+FILES:${PN}:append = " ${systemd_unitdir}/network/00-bmc-usb0.network"
do_install:append() {
install -d ${D}${systemd_unitdir}/network/
diff --git a/meta-facebook/meta-harma/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/sensors/dbus-sensors_%.bbappend
index ed13a10..a7c4a54 100644
--- a/meta-facebook/meta-harma/recipes-phosphor/sensors/dbus-sensors_%.bbappend
+++ b/meta-facebook/meta-harma/recipes-phosphor/sensors/dbus-sensors_%.bbappend
@@ -1,6 +1,6 @@
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-PACKAGECONFIG:harma = " \
+PACKAGECONFIG = " \
adcsensor \
hwmontempsensor \
psusensor \
diff --git a/meta-facebook/meta-harma/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
index bd420f0..5edbc32 100644
--- a/meta-facebook/meta-harma/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
+++ b/meta-facebook/meta-harma/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
@@ -1,3 +1,3 @@
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-SRC_URI:append:harma = " file://virtual_sensor_config.json "
+SRC_URI:append = " file://virtual_sensor_config.json "
diff --git a/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager_%.bbappend
index 954bc39..e75785c 100644
--- a/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager_%.bbappend
+++ b/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager_%.bbappend
@@ -3,28 +3,28 @@
PACKAGECONFIG:remove = "no-warm-reboot only-run-apr-on-power-loss"
-CHASSIS_DEFAULT_TARGETS:remove:harma = " \
+CHASSIS_DEFAULT_TARGETS:remove = " \
obmc-chassis-powerreset@{}.target.requires/phosphor-reset-chassis-on@{}.service \
obmc-chassis-powerreset@{}.target.requires/phosphor-reset-chassis-running@{}.service \
obmc-chassis-poweroff@{}.target.requires/obmc-power-stop@{}.service \
obmc-chassis-poweron@{}.target.requires/obmc-power-start@{}.service \
"
-CHASSIS_DEFAULT_TARGETS:append:harma = " \
+CHASSIS_DEFAULT_TARGETS:append = " \
obmc-chassis-hard-poweroff@{}.target.wants/host-poweroff@0.service \
"
-HOST_DEFAULT_TARGETS:remove:harma = " \
+HOST_DEFAULT_TARGETS:remove = " \
obmc-host-start@{}.target.wants/host-poweron@{}.service \
obmc-host-force-warm-reboot@{}.target.requires/obmc-host-stop@{}.target \
obmc-host-force-warm-reboot@{}.target.requires/phosphor-reboot-host@{}.service \
"
-HOST_DEFAULT_TARGETS:append:harma = " \
+HOST_DEFAULT_TARGETS:append = " \
obmc-host-startmin@{}.target.requires/host-poweron@{}.service \
"
-SRC_URI:append:harma = " \
+SRC_URI:append = " \
file://chassis-powercycle@.service \
file://host-poweroff@.service \
file://host-poweron@.service \
@@ -41,9 +41,9 @@
file://phosphor-state-manager-init.conf \
"
-RDEPENDS:${PN}:append:harma = " bash"
+RDEPENDS:${PN}:append = " bash"
-do_install:append:harma() {
+do_install:append() {
install -d ${D}${systemd_system_unitdir}
install -m 0644 ${WORKDIR}/*.service ${D}${systemd_system_unitdir}/
@@ -56,5 +56,5 @@
install -m 0755 ${WORKDIR}/power-cmd ${D}${libexecdir}/${PN}/
install -m 0755 ${WORKDIR}/phosphor-state-manager-init ${D}${libexecdir}/${PN}/
}
-SYSTEMD_OVERRIDE:${PN}-discover:harma += "discover-sys-init.conf:phosphor-discover-system-state@0.service.d/discover-sys-init.conf"
-SYSTEMD_OVERRIDE:${PN}-systemd-target-monitor:harma += "phosphor-state-manager-init.conf:phosphor-systemd-target-monitor.service.d/phosphor-state-manager-init.conf"
+SYSTEMD_OVERRIDE:${PN}-discover += "discover-sys-init.conf:phosphor-discover-system-state@0.service.d/discover-sys-init.conf"
+SYSTEMD_OVERRIDE:${PN}-systemd-target-monitor += "phosphor-state-manager-init.conf:phosphor-systemd-target-monitor.service.d/phosphor-state-manager-init.conf"