meta-phosphor: Move layer content from common/

Adopt a more conventional directory hierarchy.  meta-phosphor is still
a _long_ way from suitable for hosting on yoctoproject.org but things
like this don't help.

(From meta-phosphor rev: 471cfcefa74b8c7ceb704cb670e6d915cf27c63b)

Change-Id: I3f106b2f6cdc6cec734be28a6090800546f362eb
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

406 files changed, 2 insertions, 2 deletions

diff --git a/meta-phosphor/conf/layer.conf b/meta-phosphor/conf/layer.conf
index a9d03faf78..3f2cf39ac9 100644
--- a/meta-phosphor/conf/layer.conf
+++ b/meta-phosphor/conf/layer.conf
@@ -2,8 +2,8 @@
 BBPATH .= ":${LAYERDIR}"
 
 # We have recipes-* directories, add to BBFILES
-BBFILES += "${LAYERDIR}/common/recipes-*/*/*.bb \
-            ${LAYERDIR}/common/recipes-*/*/*.bbappend"
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
+            ${LAYERDIR}/recipes-*/*/*.bbappend"
 
 BBFILE_COLLECTIONS += "phosphor-layer"
 BBFILE_PATTERN_phosphor-layer = "^${LAYERDIR}/"
diff --git a/meta-phosphor/common/recipes-connectivity/net-snmp/net-snmp_%.bbappend b/meta-phosphor/recipes-connectivity/net-snmp/net-snmp_%.bbappend
index 03c5c88784..03c5c88784 100644
--- a/meta-phosphor/common/recipes-connectivity/net-snmp/net-snmp_%.bbappend
+++ b/meta-phosphor/recipes-connectivity/net-snmp/net-snmp_%.bbappend
diff --git a/meta-phosphor/common/recipes-connectivity/openssl/openssl_%.bbappend b/meta-phosphor/recipes-connectivity/openssl/openssl_%.bbappend
index 44898f0de7..44898f0de7 100644
--- a/meta-phosphor/common/recipes-connectivity/openssl/openssl_%.bbappend
+++ b/meta-phosphor/recipes-connectivity/openssl/openssl_%.bbappend
diff --git a/meta-phosphor/common/recipes-core/base-files/base-files/fstab b/meta-phosphor/recipes-core/base-files/base-files/fstab
index 4a07668768..4a07668768 100644
--- a/meta-phosphor/common/recipes-core/base-files/base-files/fstab
+++ b/meta-phosphor/recipes-core/base-files/base-files/fstab
diff --git a/meta-phosphor/common/recipes-core/base-files/base-files_%.bbappend b/meta-phosphor/recipes-core/base-files/base-files_%.bbappend
index 4b48dc78bc..4b48dc78bc 100644
--- a/meta-phosphor/common/recipes-core/base-files/base-files_%.bbappend
+++ b/meta-phosphor/recipes-core/base-files/base-files_%.bbappend
diff --git a/meta-phosphor/common/recipes-core/busybox/busybox/0001-Stop-watchdog-first-on-startup.patch b/meta-phosphor/recipes-core/busybox/busybox/0001-Stop-watchdog-first-on-startup.patch
index 7128b8108d..7128b8108d 100644
--- a/meta-phosphor/common/recipes-core/busybox/busybox/0001-Stop-watchdog-first-on-startup.patch
+++ b/meta-phosphor/recipes-core/busybox/busybox/0001-Stop-watchdog-first-on-startup.patch
diff --git a/meta-phosphor/common/recipes-core/busybox/busybox/busybox.cfg b/meta-phosphor/recipes-core/busybox/busybox/busybox.cfg
index 99e83dbd93..99e83dbd93 100644
--- a/meta-phosphor/common/recipes-core/busybox/busybox/busybox.cfg
+++ b/meta-phosphor/recipes-core/busybox/busybox/busybox.cfg
diff --git a/meta-phosphor/common/recipes-core/busybox/busybox/flash.cfg b/meta-phosphor/recipes-core/busybox/busybox/flash.cfg
index 39ba10d74f..39ba10d74f 100644
--- a/meta-phosphor/common/recipes-core/busybox/busybox/flash.cfg
+++ b/meta-phosphor/recipes-core/busybox/busybox/flash.cfg
diff --git a/meta-phosphor/common/recipes-core/busybox/busybox/mountpoint.cfg b/meta-phosphor/recipes-core/busybox/busybox/mountpoint.cfg
index 8b009511ab..8b009511ab 100644
--- a/meta-phosphor/common/recipes-core/busybox/busybox/mountpoint.cfg
+++ b/meta-phosphor/recipes-core/busybox/busybox/mountpoint.cfg
diff --git a/meta-phosphor/common/recipes-core/busybox/busybox_%.bbappend b/meta-phosphor/recipes-core/busybox/busybox_%.bbappend
index e6678fc8a0..e6678fc8a0 100644
--- a/meta-phosphor/common/recipes-core/busybox/busybox_%.bbappend
+++ b/meta-phosphor/recipes-core/busybox/busybox_%.bbappend
diff --git a/meta-phosphor/common/recipes-core/dropbear/dropbear/0001-Only-load-dropbear-default-host-keys-if-a-key-is-not.patch b/meta-phosphor/recipes-core/dropbear/dropbear/0001-Only-load-dropbear-default-host-keys-if-a-key-is-not.patch
index e32baec83f..e32baec83f 100644
--- a/meta-phosphor/common/recipes-core/dropbear/dropbear/0001-Only-load-dropbear-default-host-keys-if-a-key-is-not.patch
+++ b/meta-phosphor/recipes-core/dropbear/dropbear/0001-Only-load-dropbear-default-host-keys-if-a-key-is-not.patch
diff --git a/meta-phosphor/common/recipes-core/dropbear/dropbear/0001-dropbear-Add-c-command-option-to-force-a-specific-co.patch b/meta-phosphor/recipes-core/dropbear/dropbear/0001-dropbear-Add-c-command-option-to-force-a-specific-co.patch
index 88d0ac0bb1..88d0ac0bb1 100644
--- a/meta-phosphor/common/recipes-core/dropbear/dropbear/0001-dropbear-Add-c-command-option-to-force-a-specific-co.patch
+++ b/meta-phosphor/recipes-core/dropbear/dropbear/0001-dropbear-Add-c-command-option-to-force-a-specific-co.patch
diff --git a/meta-phosphor/common/recipes-core/dropbear/dropbear/dropbearkey.service b/meta-phosphor/recipes-core/dropbear/dropbear/dropbearkey.service
index dfeb17f41d..dfeb17f41d 100644
--- a/meta-phosphor/common/recipes-core/dropbear/dropbear/dropbearkey.service
+++ b/meta-phosphor/recipes-core/dropbear/dropbear/dropbearkey.service
diff --git a/meta-phosphor/common/recipes-core/dropbear/dropbear_%.bbappend b/meta-phosphor/recipes-core/dropbear/dropbear_%.bbappend
index 80714977b7..80714977b7 100644
--- a/meta-phosphor/common/recipes-core/dropbear/dropbear_%.bbappend
+++ b/meta-phosphor/recipes-core/dropbear/dropbear_%.bbappend
diff --git a/meta-phosphor/common/recipes-core/glib-2.0/glib-2.0%.bbappend b/meta-phosphor/recipes-core/glib-2.0/glib-2.0%.bbappend
index f003a6b431..f003a6b431 100644
--- a/meta-phosphor/common/recipes-core/glib-2.0/glib-2.0%.bbappend
+++ b/meta-phosphor/recipes-core/glib-2.0/glib-2.0%.bbappend
diff --git a/meta-phosphor/common/recipes-core/os-release/os-release.bbappend b/meta-phosphor/recipes-core/os-release/os-release.bbappend
index 77249fc509..77249fc509 100644
--- a/meta-phosphor/common/recipes-core/os-release/os-release.bbappend
+++ b/meta-phosphor/recipes-core/os-release/os-release.bbappend
diff --git a/meta-phosphor/common/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend b/meta-phosphor/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend
index 96236ca73c..96236ca73c 100644
--- a/meta-phosphor/common/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend
+++ b/meta-phosphor/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend
diff --git a/meta-phosphor/common/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend b/meta-phosphor/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend
index 7eef4f9bb6..7eef4f9bb6 100644
--- a/meta-phosphor/common/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend
+++ b/meta-phosphor/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend
diff --git a/meta-phosphor/common/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend b/meta-phosphor/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
index 78b78e40b6..78b78e40b6 100644
--- a/meta-phosphor/common/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
+++ b/meta-phosphor/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets.bb b/meta-phosphor/recipes-core/systemd/obmc-targets.bb
index ac7835e6bf..ac7835e6bf 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets.bb
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets.bb
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target
index 48fc441694..48fc441694 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target
index 84c1ddab1f..84c1ddab1f 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target
index 080d72456b..080d72456b 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target
index 55f6d919b0..55f6d919b0 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target
index 8d7c47e6bc..8d7c47e6bc 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fan-control-ready@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-fan-control-ready@.target
index e041a55080..e041a55080 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fan-control-ready@.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-fan-control-ready@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fan-control.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-fan-control.target
index 50665db4a8..50665db4a8 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fan-control.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-fan-control.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fan-watchdog-takeover.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-fan-watchdog-takeover.target
index 8034083345..8034083345 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fan-watchdog-takeover.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-fan-watchdog-takeover.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fans-ready.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-fans-ready.target
index 59e61c626a..59e61c626a 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fans-ready.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-fans-ready.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-crash@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-crash@.target
index ea3798b522..ea3798b522 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-crash@.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-crash@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-quiesce@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-quiesce@.target
index 4f10419abc..4f10419abc 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-quiesce@.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-quiesce@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target
index dc280ea653..dc280ea653 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target
index 94bb2b130d..94bb2b130d 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reset@.target
index ca95d843c2..ca95d843c2 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset@.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reset@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-shutdown@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-shutdown@.target
index 4768a567fa..4768a567fa 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-shutdown@.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-shutdown@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target
index 2bc270c146..2bc270c146 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start@.target
index 144b633878..144b633878 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start@.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-started@.target
index eb0a9383be..eb0a9383be 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-started@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-starting@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-starting@.target
index 408139dd43..408139dd43 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-starting@.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-starting@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target
index 6e924adcd7..6e924adcd7 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target
index e88d3ea587..e88d3ea587 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stop@.target
index 8e99bccdb9..8e99bccdb9 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop@.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stop@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target
index 74039fc25c..74039fc25c 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target
index f087dea723..f087dea723 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-timeout@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-timeout@.target
index b87507bf10..b87507bf10 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-timeout@.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-timeout@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-mapper.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-mapper.target
index 5e52f4cd53..5e52f4cd53 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-mapper.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-mapper.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-off@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-off@.target
index c47b21e477..c47b21e477 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-off@.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-off@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-on@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-on@.target
index 52135ffc9c..52135ffc9c 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-on@.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-on@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-reset-on@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-reset-on@.target
index d24d401bfa..d24d401bfa 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-reset-on@.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-reset-on@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target
index 1a1ea63191..1a1ea63191 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-start@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-start@.target
index a977d5ad3c..a977d5ad3c 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-start@.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-start@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target
index 50d5050bb5..50d5050bb5 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-stop@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-stop@.target
index f0429d7865..f0429d7865 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-stop@.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-stop@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-standby.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-standby.target
index 95044a4044..95044a4044 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-standby.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-standby.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-webserver-pre.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-webserver-pre.target
index ea5200c006..ea5200c006 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-webserver-pre.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-webserver-pre.target
diff --git a/meta-phosphor/common/recipes-core/systemd/systemd/0001-sd-bus-Don-t-automatically-add-ObjectManager.patch b/meta-phosphor/recipes-core/systemd/systemd/0001-sd-bus-Don-t-automatically-add-ObjectManager.patch
index f8f5b08a96..f8f5b08a96 100644
--- a/meta-phosphor/common/recipes-core/systemd/systemd/0001-sd-bus-Don-t-automatically-add-ObjectManager.patch
+++ b/meta-phosphor/recipes-core/systemd/systemd/0001-sd-bus-Don-t-automatically-add-ObjectManager.patch
diff --git a/meta-phosphor/common/recipes-core/systemd/systemd/0003-basic-Factor-out-string-checking-from-name_to_prefix.patch b/meta-phosphor/recipes-core/systemd/systemd/0003-basic-Factor-out-string-checking-from-name_to_prefix.patch
index cd4dcad164..cd4dcad164 100644
--- a/meta-phosphor/common/recipes-core/systemd/systemd/0003-basic-Factor-out-string-checking-from-name_to_prefix.patch
+++ b/meta-phosphor/recipes-core/systemd/systemd/0003-basic-Factor-out-string-checking-from-name_to_prefix.patch
diff --git a/meta-phosphor/common/recipes-core/systemd/systemd/0004-basic-Use-path-escaping-when-mangling-path-instances.patch b/meta-phosphor/recipes-core/systemd/systemd/0004-basic-Use-path-escaping-when-mangling-path-instances.patch
index fca28de59f..fca28de59f 100644
--- a/meta-phosphor/common/recipes-core/systemd/systemd/0004-basic-Use-path-escaping-when-mangling-path-instances.patch
+++ b/meta-phosphor/recipes-core/systemd/systemd/0004-basic-Use-path-escaping-when-mangling-path-instances.patch
diff --git a/meta-phosphor/common/recipes-core/systemd/systemd/0005-dont-return-error-if-unable-to-create-network-namespace.patch b/meta-phosphor/recipes-core/systemd/systemd/0005-dont-return-error-if-unable-to-create-network-namespace.patch
index d83bf72ef4..d83bf72ef4 100644
--- a/meta-phosphor/common/recipes-core/systemd/systemd/0005-dont-return-error-if-unable-to-create-network-namespace.patch
+++ b/meta-phosphor/recipes-core/systemd/systemd/0005-dont-return-error-if-unable-to-create-network-namespace.patch
diff --git a/meta-phosphor/common/recipes-core/systemd/systemd/default.network b/meta-phosphor/recipes-core/systemd/systemd/default.network
index c75c3d60de..c75c3d60de 100644
--- a/meta-phosphor/common/recipes-core/systemd/systemd/default.network
+++ b/meta-phosphor/recipes-core/systemd/systemd/default.network
diff --git a/meta-phosphor/common/recipes-core/systemd/systemd_%.bbappend b/meta-phosphor/recipes-core/systemd/systemd_%.bbappend
index b403069a58..b403069a58 100644
--- a/meta-phosphor/common/recipes-core/systemd/systemd_%.bbappend
+++ b/meta-phosphor/recipes-core/systemd/systemd_%.bbappend
diff --git a/meta-phosphor/common/recipes-devtools/i2c-tools/i2c-tools/0001-4-byte-read-support-466.patch b/meta-phosphor/recipes-devtools/i2c-tools/i2c-tools/0001-4-byte-read-support-466.patch
index 31031119d6..31031119d6 100644
--- a/meta-phosphor/common/recipes-devtools/i2c-tools/i2c-tools/0001-4-byte-read-support-466.patch
+++ b/meta-phosphor/recipes-devtools/i2c-tools/i2c-tools/0001-4-byte-read-support-466.patch
diff --git a/meta-phosphor/common/recipes-devtools/i2c-tools/i2c-tools/0001-i2cget-Add-support-for-i2c-block-data.patch b/meta-phosphor/recipes-devtools/i2c-tools/i2c-tools/0001-i2cget-Add-support-for-i2c-block-data.patch
index fc918efe9c..fc918efe9c 100644
--- a/meta-phosphor/common/recipes-devtools/i2c-tools/i2c-tools/0001-i2cget-Add-support-for-i2c-block-data.patch
+++ b/meta-phosphor/recipes-devtools/i2c-tools/i2c-tools/0001-i2cget-Add-support-for-i2c-block-data.patch
diff --git a/meta-phosphor/common/recipes-devtools/i2c-tools/i2c-tools_%.bbappend b/meta-phosphor/recipes-devtools/i2c-tools/i2c-tools_%.bbappend
index 349888e8d6..349888e8d6 100644
--- a/meta-phosphor/common/recipes-devtools/i2c-tools/i2c-tools_%.bbappend
+++ b/meta-phosphor/recipes-devtools/i2c-tools/i2c-tools_%.bbappend
diff --git a/meta-phosphor/common/recipes-devtools/iotools/iotools/iotools-setup.service b/meta-phosphor/recipes-devtools/iotools/iotools/iotools-setup.service
index 7cc95a0dbc..7cc95a0dbc 100644
--- a/meta-phosphor/common/recipes-devtools/iotools/iotools/iotools-setup.service
+++ b/meta-phosphor/recipes-devtools/iotools/iotools/iotools-setup.service
diff --git a/meta-phosphor/common/recipes-devtools/iotools/iotools_1.6.bb b/meta-phosphor/recipes-devtools/iotools/iotools_1.6.bb
index af2cc76ac0..af2cc76ac0 100644
--- a/meta-phosphor/common/recipes-devtools/iotools/iotools_1.6.bb
+++ b/meta-phosphor/recipes-devtools/iotools/iotools_1.6.bb
diff --git a/meta-phosphor/common/recipes-devtools/perl/yaml-tiny_1.73.bb b/meta-phosphor/recipes-devtools/perl/yaml-tiny_1.73.bb
index 46640c4961..46640c4961 100644
--- a/meta-phosphor/common/recipes-devtools/perl/yaml-tiny_1.73.bb
+++ b/meta-phosphor/recipes-devtools/perl/yaml-tiny_1.73.bb
diff --git a/meta-phosphor/common/recipes-devtools/python/pyphosphor.bb b/meta-phosphor/recipes-devtools/python/pyphosphor.bb
index ffef08c0d0..ffef08c0d0 100644
--- a/meta-phosphor/common/recipes-devtools/python/pyphosphor.bb
+++ b/meta-phosphor/recipes-devtools/python/pyphosphor.bb
diff --git a/meta-phosphor/common/recipes-devtools/python/python-bottle.inc b/meta-phosphor/recipes-devtools/python/python-bottle.inc
index 159ded6605..159ded6605 100644
--- a/meta-phosphor/common/recipes-devtools/python/python-bottle.inc
+++ b/meta-phosphor/recipes-devtools/python/python-bottle.inc
diff --git a/meta-phosphor/common/recipes-devtools/python/python-bottle/LICENSE b/meta-phosphor/recipes-devtools/python/python-bottle/LICENSE
index 5f3e8de3a2..5f3e8de3a2 100644
--- a/meta-phosphor/common/recipes-devtools/python/python-bottle/LICENSE
+++ b/meta-phosphor/recipes-devtools/python/python-bottle/LICENSE
diff --git a/meta-phosphor/common/recipes-devtools/python/python-bottle/json-format.patch b/meta-phosphor/recipes-devtools/python/python-bottle/json-format.patch
index 9e754a996e..9e754a996e 100644
--- a/meta-phosphor/common/recipes-devtools/python/python-bottle/json-format.patch
+++ b/meta-phosphor/recipes-devtools/python/python-bottle/json-format.patch
diff --git a/meta-phosphor/common/recipes-devtools/python/python-bottle_0.12.13.bb b/meta-phosphor/recipes-devtools/python/python-bottle_0.12.13.bb
index 08d84ff4a1..08d84ff4a1 100644
--- a/meta-phosphor/common/recipes-devtools/python/python-bottle_0.12.13.bb
+++ b/meta-phosphor/recipes-devtools/python/python-bottle_0.12.13.bb
diff --git a/meta-phosphor/common/recipes-devtools/python/python-gevent-websocket_0.10.1.bb b/meta-phosphor/recipes-devtools/python/python-gevent-websocket_0.10.1.bb
index 8ac2a89828..8ac2a89828 100644
--- a/meta-phosphor/common/recipes-devtools/python/python-gevent-websocket_0.10.1.bb
+++ b/meta-phosphor/recipes-devtools/python/python-gevent-websocket_0.10.1.bb
diff --git a/meta-phosphor/common/recipes-devtools/python/python-inflection.inc b/meta-phosphor/recipes-devtools/python/python-inflection.inc
index 71d218cb26..71d218cb26 100644
--- a/meta-phosphor/common/recipes-devtools/python/python-inflection.inc
+++ b/meta-phosphor/recipes-devtools/python/python-inflection.inc
diff --git a/meta-phosphor/common/recipes-devtools/python/python-inflection_0.3.1.bb b/meta-phosphor/recipes-devtools/python/python-inflection_0.3.1.bb
index 318171c89f..318171c89f 100644
--- a/meta-phosphor/common/recipes-devtools/python/python-inflection_0.3.1.bb
+++ b/meta-phosphor/recipes-devtools/python/python-inflection_0.3.1.bb
diff --git a/meta-phosphor/common/recipes-devtools/python/python-mako_1.0.7.bb b/meta-phosphor/recipes-devtools/python/python-mako_1.0.7.bb
index 1bc2efcc83..1bc2efcc83 100644
--- a/meta-phosphor/common/recipes-devtools/python/python-mako_1.0.7.bb
+++ b/meta-phosphor/recipes-devtools/python/python-mako_1.0.7.bb
diff --git a/meta-phosphor/common/recipes-devtools/python/python-pygobject/obsolete_automake_macros.patch b/meta-phosphor/recipes-devtools/python/python-pygobject/obsolete_automake_macros.patch
index c2591123b3..c2591123b3 100644
--- a/meta-phosphor/common/recipes-devtools/python/python-pygobject/obsolete_automake_macros.patch
+++ b/meta-phosphor/recipes-devtools/python/python-pygobject/obsolete_automake_macros.patch
diff --git a/meta-phosphor/common/recipes-devtools/python/python-pygobject_2.28.7.bb b/meta-phosphor/recipes-devtools/python/python-pygobject_2.28.7.bb
index c6fb6fe26b..c6fb6fe26b 100644
--- a/meta-phosphor/common/recipes-devtools/python/python-pygobject_2.28.7.bb
+++ b/meta-phosphor/recipes-devtools/python/python-pygobject_2.28.7.bb
diff --git a/meta-phosphor/common/recipes-devtools/python/python-pyyaml_%.bbappend b/meta-phosphor/recipes-devtools/python/python-pyyaml_%.bbappend
index 2a590838b5..2a590838b5 100644
--- a/meta-phosphor/common/recipes-devtools/python/python-pyyaml_%.bbappend
+++ b/meta-phosphor/recipes-devtools/python/python-pyyaml_%.bbappend
diff --git a/meta-phosphor/common/recipes-devtools/python/python/0001-json-Use-int-long.__str__-to-convert-subclasses.patch b/meta-phosphor/recipes-devtools/python/python/0001-json-Use-int-long.__str__-to-convert-subclasses.patch
index 26669d848c..26669d848c 100644
--- a/meta-phosphor/common/recipes-devtools/python/python/0001-json-Use-int-long.__str__-to-convert-subclasses.patch
+++ b/meta-phosphor/recipes-devtools/python/python/0001-json-Use-int-long.__str__-to-convert-subclasses.patch
diff --git a/meta-phosphor/common/recipes-devtools/python/python_2.%.bbappend b/meta-phosphor/recipes-devtools/python/python_2.%.bbappend
index 6d0ff69018..6d0ff69018 100644
--- a/meta-phosphor/common/recipes-devtools/python/python_2.%.bbappend
+++ b/meta-phosphor/recipes-devtools/python/python_2.%.bbappend
diff --git a/meta-phosphor/common/recipes-devtools/python/wsgiref-2.7-manifest.inc b/meta-phosphor/recipes-devtools/python/wsgiref-2.7-manifest.inc
index a21d05ee22..a21d05ee22 100644
--- a/meta-phosphor/common/recipes-devtools/python/wsgiref-2.7-manifest.inc
+++ b/meta-phosphor/recipes-devtools/python/wsgiref-2.7-manifest.inc
diff --git a/meta-phosphor/common/recipes-devtools/rsync/rsync_%.bbappend b/meta-phosphor/recipes-devtools/rsync/rsync_%.bbappend
index eafb15b6dd..eafb15b6dd 100644
--- a/meta-phosphor/common/recipes-devtools/rsync/rsync_%.bbappend
+++ b/meta-phosphor/recipes-devtools/rsync/rsync_%.bbappend
diff --git a/meta-phosphor/common/recipes-extended/gpioplus/gpioplus_git.bb b/meta-phosphor/recipes-extended/gpioplus/gpioplus_git.bb
index 6fbc03cfa2..6fbc03cfa2 100644
--- a/meta-phosphor/common/recipes-extended/gpioplus/gpioplus_git.bb
+++ b/meta-phosphor/recipes-extended/gpioplus/gpioplus_git.bb
diff --git a/meta-phosphor/common/recipes-extended/sdbusplus/sdbusplus.bb b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus.bb
index 8a2d5ed2cf..8a2d5ed2cf 100644
--- a/meta-phosphor/common/recipes-extended/sdbusplus/sdbusplus.bb
+++ b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus.bb
diff --git a/meta-phosphor/common/recipes-extended/sdeventplus/sdeventplus_git.bb b/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb
index ef36051412..ef36051412 100644
--- a/meta-phosphor/common/recipes-extended/sdeventplus/sdeventplus_git.bb
+++ b/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.py b/meta-phosphor/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.py
index a68f2e511c..a68f2e511c 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.py
+++ b/meta-phosphor/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.py
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.service b/meta-phosphor/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.service
index e981dc06d1..e981dc06d1 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.service
+++ b/meta-phosphor/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.service
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-power.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-button-power.bb
index 144d4e1e7d..144d4e1e7d 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-power.bb
+++ b/meta-phosphor/recipes-phosphor/chassis/obmc-button-power.bb
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-power/org.openbmc.buttons.Power@.service b/meta-phosphor/recipes-phosphor/chassis/obmc-button-power/org.openbmc.buttons.Power@.service
index 443ecbbabd..443ecbbabd 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-power/org.openbmc.buttons.Power@.service
+++ b/meta-phosphor/recipes-phosphor/chassis/obmc-button-power/org.openbmc.buttons.Power@.service
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-reset.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-button-reset.bb
index 9435d31413..9435d31413 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-reset.bb
+++ b/meta-phosphor/recipes-phosphor/chassis/obmc-button-reset.bb
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-reset/org.openbmc.buttons.reset@.service b/meta-phosphor/recipes-phosphor/chassis/obmc-button-reset/org.openbmc.buttons.reset@.service
index e535e650c4..e535e650c4 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-reset/org.openbmc.buttons.reset@.service
+++ b/meta-phosphor/recipes-phosphor/chassis/obmc-button-reset/org.openbmc.buttons.reset@.service
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-control-chassis.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-control-chassis.bb
index 157d4169bd..157d4169bd 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-control-chassis.bb
+++ b/meta-phosphor/recipes-phosphor/chassis/obmc-control-chassis.bb
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-control-chassis/org.openbmc.control.Chassis@.service b/meta-phosphor/recipes-phosphor/chassis/obmc-control-chassis/org.openbmc.control.Chassis@.service
index 76acd19a15..76acd19a15 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-control-chassis/org.openbmc.control.Chassis@.service
+++ b/meta-phosphor/recipes-phosphor/chassis/obmc-control-chassis/org.openbmc.control.Chassis@.service
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-host-failure-reboots.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-host-failure-reboots.bb
index 645f40cbfd..645f40cbfd 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-host-failure-reboots.bb
+++ b/meta-phosphor/recipes-phosphor/chassis/obmc-host-failure-reboots.bb
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-host-failure-reboots/host-failure-reboots@.service b/meta-phosphor/recipes-phosphor/chassis/obmc-host-failure-reboots/host-failure-reboots@.service
index 88769c77ae..88769c77ae 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-host-failure-reboots/host-failure-reboots@.service
+++ b/meta-phosphor/recipes-phosphor/chassis/obmc-host-failure-reboots/host-failure-reboots@.service
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-mgr-inventory.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-mgr-inventory.bb
index a04aab29a9..a04aab29a9 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-mgr-inventory.bb
+++ b/meta-phosphor/recipes-phosphor/chassis/obmc-mgr-inventory.bb
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-mgr-inventory/obmc-sync-inventory-item@.service b/meta-phosphor/recipes-phosphor/chassis/obmc-mgr-inventory/obmc-sync-inventory-item@.service
index 0e294a1896..0e294a1896 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-mgr-inventory/obmc-sync-inventory-item@.service
+++ b/meta-phosphor/recipes-phosphor/chassis/obmc-mgr-inventory/obmc-sync-inventory-item@.service
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power.bb
index c3a1b9dacf..c3a1b9dacf 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb
+++ b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power.bb
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/obmc/power_control b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/obmc/power_control
index 8db8890347..8db8890347 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/obmc/power_control
+++ b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/obmc/power_control
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service
index c1de92f3b2..c1de92f3b2 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service
+++ b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service
index 40dbf36377..40dbf36377 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service
+++ b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-powered-off@.service b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-powered-off@.service
index b76db7bf41..b76db7bf41 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-powered-off@.service
+++ b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-powered-off@.service
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-on@.service b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-on@.service
index f2a7103254..f2a7103254 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-on@.service
+++ b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-on@.service
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-running@.service b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-running@.service
index 381f89dfca..381f89dfca 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-running@.service
+++ b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-running@.service
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service
index 11373618b5..11373618b5 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service
+++ b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service
index 1e65d08879..1e65d08879 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service
+++ b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/org.openbmc.control.Power@.service b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/org.openbmc.control.Power@.service
index 95ef0b88d4..95ef0b88d4 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/org.openbmc.control.Power@.service
+++ b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/org.openbmc.control.Power@.service
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-pcie-detect.bb
index 6e0ad97192..6e0ad97192 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect.bb
+++ b/meta-phosphor/recipes-phosphor/chassis/obmc-pcie-detect.bb
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect/pcie-slot-detect@.service b/meta-phosphor/recipes-phosphor/chassis/obmc-pcie-detect/pcie-slot-detect@.service
index 4545524d3c..4545524d3c 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect/pcie-slot-detect@.service
+++ b/meta-phosphor/recipes-phosphor/chassis/obmc-pcie-detect/pcie-slot-detect@.service
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-phosphor-chassisd.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-chassisd.bb
index b02787e54b..b02787e54b 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-phosphor-chassisd.bb
+++ b/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-chassisd.bb
diff --git a/meta-phosphor/common/recipes-phosphor/clear-once/clear-once.bb b/meta-phosphor/recipes-phosphor/clear-once/clear-once.bb
index 79a7ecd771..79a7ecd771 100644
--- a/meta-phosphor/common/recipes-phosphor/clear-once/clear-once.bb
+++ b/meta-phosphor/recipes-phosphor/clear-once/clear-once.bb
diff --git a/meta-phosphor/common/recipes-phosphor/clear-once/clear-once/clear-once.service b/meta-phosphor/recipes-phosphor/clear-once/clear-once/clear-once.service
index 132d11d697..132d11d697 100644
--- a/meta-phosphor/common/recipes-phosphor/clear-once/clear-once/clear-once.service
+++ b/meta-phosphor/recipes-phosphor/clear-once/clear-once/clear-once.service
diff --git a/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh.socket b/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console-ssh.socket
index 3174489efe..3174489efe 100644
--- a/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh.socket
+++ b/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console-ssh.socket
diff --git a/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service b/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service
index 82ffe7919a..82ffe7919a 100644
--- a/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service
+++ b/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service
diff --git a/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console.conf
index d42caa9355..d42caa9355 100644
--- a/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console.conf
+++ b/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console.conf
diff --git a/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console@.service b/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console@.service
index 26e452c3cb..26e452c3cb 100644
--- a/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console@.service
+++ b/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console@.service
diff --git a/meta-phosphor/common/recipes-phosphor/console/obmc-console_git.bb b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb
index d4d6e616c7..d4d6e616c7 100644
--- a/meta-phosphor/common/recipes-phosphor/console/obmc-console_git.bb
+++ b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb
diff --git a/meta-phosphor/common/recipes-phosphor/datetime/phosphor-time-manager/xyz.openbmc_project.Time.Manager.service b/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager/xyz.openbmc_project.Time.Manager.service
index e819e35ac4..e819e35ac4 100644
--- a/meta-phosphor/common/recipes-phosphor/datetime/phosphor-time-manager/xyz.openbmc_project.Time.Manager.service
+++ b/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager/xyz.openbmc_project.Time.Manager.service
diff --git a/meta-phosphor/common/recipes-phosphor/datetime/phosphor-time-manager_git.bb b/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb
index 59fa7b5184..59fa7b5184 100644
--- a/meta-phosphor/common/recipes-phosphor/datetime/phosphor-time-manager_git.bb
+++ b/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/dbus-perms.bb b/meta-phosphor/recipes-phosphor/dbus/dbus-perms.bb
index 8290ecce20..8290ecce20 100644
--- a/meta-phosphor/common/recipes-phosphor/dbus/dbus-perms.bb
+++ b/meta-phosphor/recipes-phosphor/dbus/dbus-perms.bb
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/dbus-perms/org.openbmc.conf b/meta-phosphor/recipes-phosphor/dbus/dbus-perms/org.openbmc.conf
index b51293b19e..b51293b19e 100644
--- a/meta-phosphor/common/recipes-phosphor/dbus/dbus-perms/org.openbmc.conf
+++ b/meta-phosphor/recipes-phosphor/dbus/dbus-perms/org.openbmc.conf
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bb
index c39e0a34f4..c39e0a34f4 100644
--- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bb
+++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-interfaces.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces.bb
index 790898cd15..790898cd15 100644
--- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-interfaces.bb
+++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces.bb
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native.bb
index 228ae5a634..228ae5a634 100644
--- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native.bb
+++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor.bb
index cfa684aa0b..cfa684aa0b 100644
--- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor.bb
+++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor.bb
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor.service b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor.service
index 9440f0c2d0..9440f0c2d0 100644
--- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor.service
+++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor.service
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-msl-verify.service b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-msl-verify.service
index cbefdeab14..cbefdeab14 100644
--- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-msl-verify.service
+++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-msl-verify.service
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-legacy-namespace-mapper-config-native.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-legacy-namespace-mapper-config-native.bb
index 67199f9f09..67199f9f09 100644
--- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-legacy-namespace-mapper-config-native.bb
+++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-legacy-namespace-mapper-config-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper-config-native.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper-config-native.bb
index 976c59b9c6..976c59b9c6 100644
--- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper-config-native.bb
+++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper-config-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper.bb
index ed7d4bb558..ed7d4bb558 100644
--- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper.bb
+++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper.bb
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service
index 4bd411e75f..4bd411e75f 100644
--- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service
+++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service
index f7744e2d8b..f7744e2d8b 100644
--- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service
+++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.conf b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.conf
index 3d9fcc3271..3d9fcc3271 100644
--- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.conf
+++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.conf
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service
index aeb734da7d..aeb734da7d 100644
--- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service
+++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service
diff --git a/meta-phosphor/common/recipes-phosphor/devtools/obmc-pydevtools.bb b/meta-phosphor/recipes-phosphor/devtools/obmc-pydevtools.bb
index b8911aa537..b8911aa537 100644
--- a/meta-phosphor/common/recipes-phosphor/devtools/obmc-pydevtools.bb
+++ b/meta-phosphor/recipes-phosphor/devtools/obmc-pydevtools.bb
diff --git a/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector.bb b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.bb
index b4800645bb..b4800645bb 100644
--- a/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector.bb
+++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.bb
diff --git a/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector.inc b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc
index 7837f3e35f..7837f3e35f 100644
--- a/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector.inc
+++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc
diff --git a/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector/obmc-dump-monitor.service b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector/obmc-dump-monitor.service
index 0e8ef3b5d8..0e8ef3b5d8 100644
--- a/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector/obmc-dump-monitor.service
+++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector/obmc-dump-monitor.service
diff --git a/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector/xyz.openbmc_project.Dump.Manager.service b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector/xyz.openbmc_project.Dump.Manager.service
index 131c8cdaf6..131c8cdaf6 100644
--- a/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector/xyz.openbmc_project.Dump.Manager.service
+++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector/xyz.openbmc_project.Dump.Manager.service
diff --git a/meta-phosphor/common/recipes-phosphor/fans/files/Makefile b/meta-phosphor/recipes-phosphor/fans/files/Makefile
index 10e3fa2ae2..10e3fa2ae2 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/files/Makefile
+++ b/meta-phosphor/recipes-phosphor/fans/files/Makefile
diff --git a/meta-phosphor/common/recipes-phosphor/fans/files/obmc-phosphor-fand.c b/meta-phosphor/recipes-phosphor/fans/files/obmc-phosphor-fand.c
index 558ba10bcb..558ba10bcb 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/files/obmc-phosphor-fand.c
+++ b/meta-phosphor/recipes-phosphor/fans/files/obmc-phosphor-fand.c
diff --git a/meta-phosphor/common/recipes-phosphor/fans/files/obmc-phosphor-fand.service b/meta-phosphor/recipes-phosphor/fans/files/obmc-phosphor-fand.service
index 958474989f..958474989f 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/files/obmc-phosphor-fand.service
+++ b/meta-phosphor/recipes-phosphor/fans/files/obmc-phosphor-fand.service
diff --git a/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan.bb b/meta-phosphor/recipes-phosphor/fans/obmc-control-fan.bb
index 60bc876160..60bc876160 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan.bb
+++ b/meta-phosphor/recipes-phosphor/fans/obmc-control-fan.bb
diff --git a/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/obmc-max-fans.service b/meta-phosphor/recipes-phosphor/fans/obmc-control-fan/obmc-max-fans.service
index f062fc9c8c..f062fc9c8c 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/obmc-max-fans.service
+++ b/meta-phosphor/recipes-phosphor/fans/obmc-control-fan/obmc-max-fans.service
diff --git a/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service b/meta-phosphor/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service
index ec6391d5cf..ec6391d5cf 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service
+++ b/meta-phosphor/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service
diff --git a/meta-phosphor/common/recipes-phosphor/fans/obmc-phosphor-fand.bb b/meta-phosphor/recipes-phosphor/fans/obmc-phosphor-fand.bb
index 6faab00a2c..6faab00a2c 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/obmc-phosphor-fand.bb
+++ b/meta-phosphor/recipes-phosphor/fans/obmc-phosphor-fand.bb
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-events-config-native.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-events-config-native.bb
index 740b194adf..740b194adf 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-events-config-native.bb
+++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-events-config-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-events-config/events.yaml b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-events-config/events.yaml
index b89d1dca7f..b89d1dca7f 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-events-config/events.yaml
+++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-events-config/events.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-fan-config-mrw-native.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-fan-config-mrw-native.bb
index 7ae05ce808..7ae05ce808 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-fan-config-mrw-native.bb
+++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-fan-config-mrw-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bb
index 76b0985ca5..76b0985ca5 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bb
+++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-fan-config/fans.yaml b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-fan-config/fans.yaml
index 8a6c271f2d..8a6c271f2d 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-fan-config/fans.yaml
+++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-fan-config/fans.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native.bb
index 065efa5393..065efa5393 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native.bb
+++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/zone_conditions.yaml b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/zone_conditions.yaml
index 13406207c7..13406207c7 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/zone_conditions.yaml
+++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/zone_conditions.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-zone-config-native.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-config-native.bb
index 4d8759e472..4d8759e472 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-zone-config-native.bb
+++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-config-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-zone-config/zones.yaml b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-config/zones.yaml
index d25803ce69..d25803ce69 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-zone-config/zones.yaml
+++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-config/zones.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-monitor-config-native.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-monitor-config-native.bb
index 02420e43e6..02420e43e6 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-monitor-config-native.bb
+++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-monitor-config-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-monitor-config/monitor.yaml b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-monitor-config/monitor.yaml
index ce60a22022..ce60a22022 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-monitor-config/monitor.yaml
+++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-monitor-config/monitor.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence-config-native.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-config-native.bb
index 0eb38737c4..0eb38737c4 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence-config-native.bb
+++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-config-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence-config/config.yaml b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-config/config.yaml
index 15a10f4094..15a10f4094 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence-config/config.yaml
+++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-config/config.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence-mrw-native.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-mrw-native.bb
index 47dc2a4a1a..47dc2a4a1a 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence-mrw-native.bb
+++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-mrw-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.bb
index 9e4db307a4..9e4db307a4 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.bb
+++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.bb
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.inc b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc
index 53b80bf2f1..53b80bf2f1 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.inc
+++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control-init@.service b/meta-phosphor/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control-init@.service
index 96b40f666b..96b40f666b 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control-init@.service
+++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control-init@.service
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control@.service b/meta-phosphor/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control@.service
index 8c5903e08f..8c5903e08f 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control@.service
+++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control@.service
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor-init@.service b/meta-phosphor/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor-init@.service
index e8a6f699a4..e8a6f699a4 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor-init@.service
+++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor-init@.service
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor@.service b/meta-phosphor/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor@.service
index ddecfba3c0..ddecfba3c0 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor@.service
+++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor@.service
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-presence-tach@.service b/meta-phosphor/recipes-phosphor/fans/phosphor-fan/phosphor-fan-presence-tach@.service
index a324740c5f..a324740c5f 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-presence-tach@.service
+++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan/phosphor-fan-presence-tach@.service
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-pid-control.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control.bb
index 28ad04b286..28ad04b286 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-pid-control.bb
+++ b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control.bb
diff --git a/meta-phosphor/common/recipes-phosphor/flash/files/OpenBMC.priv b/meta-phosphor/recipes-phosphor/flash/files/OpenBMC.priv
index 223d318098..223d318098 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/files/OpenBMC.priv
+++ b/meta-phosphor/recipes-phosphor/flash/files/OpenBMC.priv
diff --git a/meta-phosphor/common/recipes-phosphor/flash/files/obmc-phosphor-flashd.py b/meta-phosphor/recipes-phosphor/flash/files/obmc-phosphor-flashd.py
index 5e5dd8f36e..5e5dd8f36e 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/files/obmc-phosphor-flashd.py
+++ b/meta-phosphor/recipes-phosphor/flash/files/obmc-phosphor-flashd.py
diff --git a/meta-phosphor/common/recipes-phosphor/flash/files/obmc-phosphor-flashd.service b/meta-phosphor/recipes-phosphor/flash/files/obmc-phosphor-flashd.service
index 3a7f3d53a1..3a7f3d53a1 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/files/obmc-phosphor-flashd.service
+++ b/meta-phosphor/recipes-phosphor/flash/files/obmc-phosphor-flashd.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios.bb b/meta-phosphor/recipes-phosphor/flash/obmc-flash-bios.bb
index f42bef443e..f42bef443e 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios.bb
+++ b/meta-phosphor/recipes-phosphor/flash/obmc-flash-bios.bb
diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-init.service b/meta-phosphor/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-init.service
index de196d0ea7..de196d0ea7 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-init.service
+++ b/meta-phosphor/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-init.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/org.openbmc.control.Flash.service b/meta-phosphor/recipes-phosphor/flash/obmc-flash-bios/org.openbmc.control.Flash.service
index 842add34dd..842add34dd 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/org.openbmc.control.Flash.service
+++ b/meta-phosphor/recipes-phosphor/flash/obmc-flash-bios/org.openbmc.control.Flash.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bmc.bb b/meta-phosphor/recipes-phosphor/flash/obmc-flash-bmc.bb
index 5cf3855131..5cf3855131 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bmc.bb
+++ b/meta-phosphor/recipes-phosphor/flash/obmc-flash-bmc.bb
diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bmc/org.openbmc.control.BmcFlash.service b/meta-phosphor/recipes-phosphor/flash/obmc-flash-bmc/org.openbmc.control.BmcFlash.service
index bb97d8ab96..bb97d8ab96 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bmc/org.openbmc.control.BmcFlash.service
+++ b/meta-phosphor/recipes-phosphor/flash/obmc-flash-bmc/org.openbmc.control.BmcFlash.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-mgr-download.bb b/meta-phosphor/recipes-phosphor/flash/obmc-mgr-download.bb
index a608b0ab29..a608b0ab29 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/obmc-mgr-download.bb
+++ b/meta-phosphor/recipes-phosphor/flash/obmc-mgr-download.bb
diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-mgr-download/org.openbmc.managers.Download.service b/meta-phosphor/recipes-phosphor/flash/obmc-mgr-download/org.openbmc.managers.Download.service
index f3ff75dfed..f3ff75dfed 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/obmc-mgr-download/org.openbmc.managers.Download.service
+++ b/meta-phosphor/recipes-phosphor/flash/obmc-mgr-download/org.openbmc.managers.Download.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-op-flasher.bb b/meta-phosphor/recipes-phosphor/flash/obmc-op-flasher.bb
index e70c354743..e70c354743 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/obmc-op-flasher.bb
+++ b/meta-phosphor/recipes-phosphor/flash/obmc-op-flasher.bb
diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-phosphor-flashd.bb b/meta-phosphor/recipes-phosphor/flash/obmc-phosphor-flashd.bb
index 64a47a6cd0..64a47a6cd0 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/obmc-phosphor-flashd.bb
+++ b/meta-phosphor/recipes-phosphor/flash/obmc-phosphor-flashd.bb
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-image-signing.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-image-signing.bb
index 897bfdea4c..897bfdea4c 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-image-signing.bb
+++ b/meta-phosphor/recipes-phosphor/flash/phosphor-image-signing.bb
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-insecure-signing-key-native.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-insecure-signing-key-native.bb
index 55ebe57791..55ebe57791 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-insecure-signing-key-native.bb
+++ b/meta-phosphor/recipes-phosphor/flash/phosphor-insecure-signing-key-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-logging-error-logs-native.bbappend b/meta-phosphor/recipes-phosphor/flash/phosphor-logging-error-logs-native.bbappend
index beb70b0e60..beb70b0e60 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-logging-error-logs-native.bbappend
+++ b/meta-phosphor/recipes-phosphor/flash/phosphor-logging-error-logs-native.bbappend
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager-error-native.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager-error-native.bb
index bf55058de6..bf55058de6 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager-error-native.bb
+++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager-error-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.bb
index 0b6723c898..0b6723c898 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb
+++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.bb
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.inc b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc
index 8e4a2b59a4..8e4a2b59a4 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.inc
+++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc
index 0b1b16ed3f..0b1b16ed3f 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc
+++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-cleanup.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-cleanup.service
index f8c9135a16..f8c9135a16 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-cleanup.service
+++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-cleanup.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-mirroruboot.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-mirroruboot.service
index 361dd61cd6..361dd61cd6 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-mirroruboot.service
+++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-mirroruboot.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-setenv@.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-setenv@.service
index 73b55d4f39..73b55d4f39 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-setenv@.service
+++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-setenv@.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiremount.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiremount.service
index 388bb1a0df..388bb1a0df 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiremount.service
+++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiremount.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro-remove@.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro-remove@.service
index 42aa026b98..42aa026b98 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro-remove@.service
+++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro-remove@.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro@.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro@.service
index 5cd8565f56..5cd8565f56 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro@.service
+++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro@.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw-remove.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw-remove.service
index 68c4ab2569..68c4ab2569 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw-remove.service
+++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw-remove.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw.service
index 79d0ea3876..79d0ea3876 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw.service
+++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-updateubootvars@.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-updateubootvars@.service
index bab0b0297c..bab0b0297c 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-updateubootvars@.service
+++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-updateubootvars@.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/reboot-guard-disable.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/reboot-guard-disable.service
index b09df99d3c..b09df99d3c 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/reboot-guard-disable.service
+++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/reboot-guard-disable.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/reboot-guard-enable.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/reboot-guard-enable.service
index 4405e3dbbe..4405e3dbbe 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/reboot-guard-enable.service
+++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/reboot-guard-enable.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/software.conf b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/software.conf
index 09ecd92e4b..09ecd92e4b 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/software.conf
+++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/software.conf
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/synclist b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/synclist
index 8213ce6a05..8213ce6a05 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/synclist
+++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/synclist
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/usr-local.mount b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/usr-local.mount
index 7aa2cf656a..7aa2cf656a 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/usr-local.mount
+++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/usr-local.mount
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.BMC.Updater.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.BMC.Updater.service
index ef1a1c434f..ef1a1c434f 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.BMC.Updater.service
+++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.BMC.Updater.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Download.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Download.service
index a4934f865f..a4934f865f 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Download.service
+++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Download.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Sync.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Sync.service
index 1ff33a2fe3..1ff33a2fe3 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Sync.service
+++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Sync.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Version.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Version.service
index 0141245b2f..0141245b2f 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Version.service
+++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Version.service
diff --git a/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor.bb b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor.bb
index b6b92fd6c1..b6b92fd6c1 100644
--- a/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor.bb
+++ b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor.bb
diff --git a/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-monitor@.service b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-monitor@.service
index 8d0f4cd5bb..8d0f4cd5bb 100644
--- a/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-monitor@.service
+++ b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-monitor@.service
diff --git a/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service
index df758246ff..df758246ff 100644
--- a/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service
+++ b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service
diff --git a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host.bb b/meta-phosphor/recipes-phosphor/host/obmc-op-control-host.bb
index 627f75956d..627f75956d 100644
--- a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host.bb
+++ b/meta-phosphor/recipes-phosphor/host/obmc-op-control-host.bb
diff --git a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service b/meta-phosphor/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service
index 8703a4301f..8703a4301f 100644
--- a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service
+++ b/meta-phosphor/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service
diff --git a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/org.openbmc.control.Host@.service b/meta-phosphor/recipes-phosphor/host/obmc-op-control-host/org.openbmc.control.Host@.service
index 9a64002ec4..9a64002ec4 100644
--- a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/org.openbmc.control.Host@.service
+++ b/meta-phosphor/recipes-phosphor/host/obmc-op-control-host/org.openbmc.control.Host@.service
diff --git a/meta-phosphor/common/recipes-phosphor/host/phosphor-host-postd.bb b/meta-phosphor/recipes-phosphor/host/phosphor-host-postd.bb
index 92ff4890e3..92ff4890e3 100644
--- a/meta-phosphor/common/recipes-phosphor/host/phosphor-host-postd.bb
+++ b/meta-phosphor/recipes-phosphor/host/phosphor-host-postd.bb
diff --git a/meta-phosphor/common/recipes-phosphor/host/phosphor-host-postd.inc b/meta-phosphor/recipes-phosphor/host/phosphor-host-postd.inc
index 8148950369..8148950369 100644
--- a/meta-phosphor/common/recipes-phosphor/host/phosphor-host-postd.inc
+++ b/meta-phosphor/recipes-phosphor/host/phosphor-host-postd.inc
diff --git a/meta-phosphor/common/recipes-phosphor/host/phosphor-host-postd/lpcsnoop.service b/meta-phosphor/recipes-phosphor/host/phosphor-host-postd/lpcsnoop.service
index 117702c04b..117702c04b 100644
--- a/meta-phosphor/common/recipes-phosphor/host/phosphor-host-postd/lpcsnoop.service
+++ b/meta-phosphor/recipes-phosphor/host/phosphor-host-postd/lpcsnoop.service
diff --git a/meta-phosphor/common/recipes-phosphor/images/obmc-phosphor-debug-tarball.bb b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-debug-tarball.bb
index e00e928433..e00e928433 100644
--- a/meta-phosphor/common/recipes-phosphor/images/obmc-phosphor-debug-tarball.bb
+++ b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-debug-tarball.bb
diff --git a/meta-phosphor/common/recipes-phosphor/images/obmc-phosphor-image.bb b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb
index 8e481a1bd6..8e481a1bd6 100644
--- a/meta-phosphor/common/recipes-phosphor/images/obmc-phosphor-image.bb
+++ b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb
diff --git a/meta-phosphor/common/recipes-phosphor/images/obmc-phosphor-initramfs.bb b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-initramfs.bb
index b68048a50d..b68048a50d 100644
--- a/meta-phosphor/common/recipes-phosphor/images/obmc-phosphor-initramfs.bb
+++ b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-initramfs.bb
diff --git a/meta-phosphor/common/recipes-phosphor/initrdscripts/files/obmc-init.sh b/meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-init.sh
index 62be89f039..62be89f039 100644
--- a/meta-phosphor/common/recipes-phosphor/initrdscripts/files/obmc-init.sh
+++ b/meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-init.sh
diff --git a/meta-phosphor/common/recipes-phosphor/initrdscripts/files/obmc-shutdown.sh b/meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-shutdown.sh
index d3c8835959..d3c8835959 100644
--- a/meta-phosphor/common/recipes-phosphor/initrdscripts/files/obmc-shutdown.sh
+++ b/meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-shutdown.sh
diff --git a/meta-phosphor/common/recipes-phosphor/initrdscripts/files/obmc-update.sh b/meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-update.sh
index 278cd41d7b..278cd41d7b 100755
--- a/meta-phosphor/common/recipes-phosphor/initrdscripts/files/obmc-update.sh
+++ b/meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-update.sh
diff --git a/meta-phosphor/common/recipes-phosphor/initrdscripts/files/whitelist b/meta-phosphor/recipes-phosphor/initrdscripts/files/whitelist
index 20f1ec2a6d..20f1ec2a6d 100644
--- a/meta-phosphor/common/recipes-phosphor/initrdscripts/files/whitelist
+++ b/meta-phosphor/recipes-phosphor/initrdscripts/files/whitelist
diff --git a/meta-phosphor/common/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bb b/meta-phosphor/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bb
index ab2c38e90e..ab2c38e90e 100644
--- a/meta-phosphor/common/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bb
+++ b/meta-phosphor/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bb
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/bmcweb.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb.bb
index c0f53251f6..c0f53251f6 100644
--- a/meta-phosphor/common/recipes-phosphor/interfaces/bmcweb.bb
+++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb.bb
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/bmcweb/bmcweb.service b/meta-phosphor/recipes-phosphor/interfaces/bmcweb/bmcweb.service
index 86a7279a50..86a7279a50 100644
--- a/meta-phosphor/common/recipes-phosphor/interfaces/bmcweb/bmcweb.service
+++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb/bmcweb.service
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/bmcweb/bmcweb.socket b/meta-phosphor/recipes-phosphor/interfaces/bmcweb/bmcweb.socket
index b1db27d475..b1db27d475 100644
--- a/meta-phosphor/common/recipes-phosphor/interfaces/bmcweb/bmcweb.socket
+++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb/bmcweb.socket
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-gevent.bb b/meta-phosphor/recipes-phosphor/interfaces/phosphor-gevent.bb
index 0150571208..0150571208 100644
--- a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-gevent.bb
+++ b/meta-phosphor/recipes-phosphor/interfaces/phosphor-gevent.bb
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-gevent/phosphor-gevent.service b/meta-phosphor/recipes-phosphor/interfaces/phosphor-gevent/phosphor-gevent.service
index 2dfc4cc10f..2dfc4cc10f 100644
--- a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-gevent/phosphor-gevent.service
+++ b/meta-phosphor/recipes-phosphor/interfaces/phosphor-gevent/phosphor-gevent.service
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-gevent/phosphor-gevent.socket b/meta-phosphor/recipes-phosphor/interfaces/phosphor-gevent/phosphor-gevent.socket
index 1ee86da087..1ee86da087 100644
--- a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-gevent/phosphor-gevent.socket
+++ b/meta-phosphor/recipes-phosphor/interfaces/phosphor-gevent/phosphor-gevent.socket
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest.bb b/meta-phosphor/recipes-phosphor/interfaces/phosphor-rest.bb
index f18e55caa8..f18e55caa8 100644
--- a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest.bb
+++ b/meta-phosphor/recipes-phosphor/interfaces/phosphor-rest.bb
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest.inc b/meta-phosphor/recipes-phosphor/interfaces/phosphor-rest.inc
index 46aeb8bb56..46aeb8bb56 100644
--- a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest.inc
+++ b/meta-phosphor/recipes-phosphor/interfaces/phosphor-rest.inc
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest/obmc/wsgi_app b/meta-phosphor/recipes-phosphor/interfaces/phosphor-rest/obmc/wsgi_app
index 7bbffe74ef..7bbffe74ef 100644
--- a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest/obmc/wsgi_app
+++ b/meta-phosphor/recipes-phosphor/interfaces/phosphor-rest/obmc/wsgi_app
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest/rest-dbus.conf b/meta-phosphor/recipes-phosphor/interfaces/phosphor-rest/rest-dbus.conf
index a92f0f1ecf..a92f0f1ecf 100644
--- a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest/rest-dbus.conf
+++ b/meta-phosphor/recipes-phosphor/interfaces/phosphor-rest/rest-dbus.conf
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest/url_config.json b/meta-phosphor/recipes-phosphor/interfaces/phosphor-rest/url_config.json
index d11b555b95..d11b555b95 100644
--- a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest/url_config.json
+++ b/meta-phosphor/recipes-phosphor/interfaces/phosphor-rest/url_config.json
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/rest-dbus.bb b/meta-phosphor/recipes-phosphor/interfaces/rest-dbus.bb
index 9d4217b7ad..9d4217b7ad 100644
--- a/meta-phosphor/common/recipes-phosphor/interfaces/rest-dbus.bb
+++ b/meta-phosphor/recipes-phosphor/interfaces/rest-dbus.bb
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/rest-dbus/rest-dbus.service b/meta-phosphor/recipes-phosphor/interfaces/rest-dbus/rest-dbus.service
index 9afd0c45d5..9afd0c45d5 100644
--- a/meta-phosphor/common/recipes-phosphor/interfaces/rest-dbus/rest-dbus.service
+++ b/meta-phosphor/recipes-phosphor/interfaces/rest-dbus/rest-dbus.service
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/rest-dbus/rest-dbus.socket b/meta-phosphor/recipes-phosphor/interfaces/rest-dbus/rest-dbus.socket
index 7ab1959256..7ab1959256 100644
--- a/meta-phosphor/common/recipes-phosphor/interfaces/rest-dbus/rest-dbus.socket
+++ b/meta-phosphor/recipes-phosphor/interfaces/rest-dbus/rest-dbus.socket
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/slpd-lite.bb b/meta-phosphor/recipes-phosphor/interfaces/slpd-lite.bb
index 608796b360..608796b360 100644
--- a/meta-phosphor/common/recipes-phosphor/interfaces/slpd-lite.bb
+++ b/meta-phosphor/recipes-phosphor/interfaces/slpd-lite.bb
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/slpd-lite/slpd-lite.service b/meta-phosphor/recipes-phosphor/interfaces/slpd-lite/slpd-lite.service
index 5d587093f3..5d587093f3 100644
--- a/meta-phosphor/common/recipes-phosphor/interfaces/slpd-lite/slpd-lite.service
+++ b/meta-phosphor/recipes-phosphor/interfaces/slpd-lite/slpd-lite.service
diff --git a/meta-phosphor/common/recipes-phosphor/inventory/obmc-inventory.bb b/meta-phosphor/recipes-phosphor/inventory/obmc-inventory.bb
index db3a5b404c..db3a5b404c 100644
--- a/meta-phosphor/common/recipes-phosphor/inventory/obmc-inventory.bb
+++ b/meta-phosphor/recipes-phosphor/inventory/obmc-inventory.bb
diff --git a/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager-assettag-native.bb b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager-assettag-native.bb
index fe9e6ed053..fe9e6ed053 100644
--- a/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager-assettag-native.bb
+++ b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager-assettag-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager-assettag/assettag.yaml b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager-assettag/assettag.yaml
index d3a0104b97..d3a0104b97 100644
--- a/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager-assettag/assettag.yaml
+++ b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager-assettag/assettag.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager-config-native.bb b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager-config-native.bb
index 0b1c4533d5..0b1c4533d5 100644
--- a/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager-config-native.bb
+++ b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager-config-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager.bb b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.bb
index 46a1d2904b..46a1d2904b 100644
--- a/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager.bb
+++ b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.bb
diff --git a/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager.inc b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc
index b65d568637..b65d568637 100644
--- a/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager.inc
+++ b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc
diff --git a/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager/xyz.openbmc_project.Inventory.Manager.service b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager/xyz.openbmc_project.Inventory.Manager.service
index c3ae5adcc4..c3ae5adcc4 100644
--- a/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager/xyz.openbmc_project.Inventory.Manager.service
+++ b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager/xyz.openbmc_project.Inventory.Manager.service
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-bt.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt.bb
index 8138803c55..8138803c55 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-bt.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-bt/org.openbmc.HostIpmi.service b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt/org.openbmc.HostIpmi.service
index f5abfb5ffd..f5abfb5ffd 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-bt/org.openbmc.HostIpmi.service
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt/org.openbmc.HostIpmi.service
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory-native.bb
index 33c2aba90d..33c2aba90d 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory/channel.yaml b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory/channel.yaml
index 819f25198f..819f25198f 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory/channel.yaml
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory/channel.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config.bb
index 933fd3b48c..933fd3b48c 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config/cipher_list.json b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config/cipher_list.json
index 767fc708c5..767fc708c5 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config/cipher_list.json
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config/cipher_list.json
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_cap.json b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_cap.json
index 2d88320819..2d88320819 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_cap.json
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_cap.json
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json
index 502f6d1625..502f6d1625 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json
index 3440e0b2fd..3440e0b2fd 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config/power_reading.json b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config/power_reading.json
index f3d051f6eb..f3d051f6eb 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config/power_reading.json
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config/power_reading.json
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-hostfw-config-example-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-hostfw-config-example-native.bb
index aca1d0aabb..aca1d0aabb 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-hostfw-config-example-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-hostfw-config-example-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-example-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-example-native.bb
index acd98355ce..acd98355ce 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-example-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-example-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-mrw-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-mrw-native.bb
index 795c9b9c94..795c9b9c94 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-mrw-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-mrw-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb
index a44774ea1e..a44774ea1e 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw-native.bb
index 0a1c8bd1d3..0a1c8bd1d3 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw/config.yaml b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw/config.yaml
index ad55610002..ad55610002 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw/config.yaml
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw/config.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native.bb
index 8040f889d8..8040f889d8 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties/extra-properties.yaml b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties/extra-properties.yaml
index 626ef33b88..626ef33b88 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties/extra-properties.yaml
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties/extra-properties.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb
index 2f845d524d..2f845d524d 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory/bmc-fru-config.yaml b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory/bmc-fru-config.yaml
index ac13efb44f..ac13efb44f 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory/bmc-fru-config.yaml
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory/bmc-fru-config.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-example-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-example-native.bb
index 6031322f6e..6031322f6e 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-example-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-example-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-mrw-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-mrw-native.bb
index 3c5e36fce7..3c5e36fce7 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-mrw-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-mrw-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb
index 029e6a3b02..029e6a3b02 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory/fru-config-not-sent-by-host.yaml b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory/fru-config-not-sent-by-host.yaml
index 9fa1fed43f..9fa1fed43f 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory/fru-config-not-sent-by-host.yaml
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory/fru-config-not-sent-by-host.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-whitelist-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-whitelist-native.bb
index 30c2443c3e..30c2443c3e 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-whitelist-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-whitelist-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-whitelist/phosphor-ipmi-fru-whitelist-native.conf b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-whitelist/phosphor-ipmi-fru-whitelist-native.conf
index 365c3d9526..365c3d9526 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-whitelist/phosphor-ipmi-fru-whitelist-native.conf
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-whitelist/phosphor-ipmi-fru-whitelist-native.conf
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.bb
index 251df427c2..251df427c2 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc
index 0b348ba1a3..0b348ba1a3 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service
index 4bae65d3f1..4bae65d3f1 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.bb
index 7a2f7c1fd7..7a2f7c1fd7 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc
index c6247fb5c7..c6247fb5c7 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host.inc
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py
index 5e6c4b5e66..5e6c4b5e66 100755
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service
index 3f10e11db0..3f10e11db0 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service
index 600c86ac2b..600c86ac2b 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-hw-example.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-hw-example.bb
index 4639a9025d..4639a9025d 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-hw-example.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-hw-example.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw-native.bb
index f04d89f7d4..f04d89f7d4 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw/config.yaml b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw/config.yaml
index a6e5550d34..a6e5550d34 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw/config.yaml
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw/config.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-native.bb
index 272e533885..272e533885 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel/config.yaml b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel/config.yaml
index c3b4ba186f..c3b4ba186f 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel/config.yaml
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel/config.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-kcs/org.openbmc.HostIpmi.service b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs/org.openbmc.HostIpmi.service
index 1f0da75334..1f0da75334 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-kcs/org.openbmc.HostIpmi.service
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs/org.openbmc.HostIpmi.service
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb
index 9f25c0bf8c..9f25c0bf8c 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-net.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net.bb
index 481e8f32f6..481e8f32f6 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-net.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-net/phosphor-ipmi-net.service b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net/phosphor-ipmi-net.service
index b1f51dc65c..b1f51dc65c 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-net/phosphor-ipmi-net.service
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net/phosphor-ipmi-net.service
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-net/phosphor-ipmi-net.socket b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net/phosphor-ipmi-net.socket
index 077b7804c5..077b7804c5 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-net/phosphor-ipmi-net.socket
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net/phosphor-ipmi-net.socket
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bb
index 7fe9ae3da2..7fe9ae3da2 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config-native.bb
index a33eb2b547..a33eb2b547 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml
index d0e4f57d50..d0e4f57d50 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb
index e58e02a64a..e58e02a64a 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw/merge_sensor_config.py b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw/merge_sensor_config.py
index 6ae3bcae9f..6ae3bcae9f 120000
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw/merge_sensor_config.py
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw/merge_sensor_config.py
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-native.bb
index 2464ff0056..2464ff0056 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory/config.yaml b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory/config.yaml
index cc463c421a..cc463c421a 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory/config.yaml
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory/config.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-tool.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-tool.bb
index dbc50aabaf..dbc50aabaf 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-tool.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-tool.bb
diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-config-example-native.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-config-example-native.bb
index 4b546d05ff..4b546d05ff 100644
--- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-config-example-native.bb
+++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-config-example-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb
index 920f637453..920f637453 100644
--- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb
+++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-error-native.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-error-native.bb
index c8ec04127f..c8ec04127f 100644
--- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-error-native.bb
+++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-error-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.bb
index d501d332a1..d501d332a1 100644
--- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager.bb
+++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.bb
diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager.inc b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc
index 0562742e55..0562742e55 100644
--- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager.inc
+++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc
diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/bmc_booted.conf b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/bmc_booted.conf
index a300f6ace3..a300f6ace3 100644
--- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/bmc_booted.conf
+++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/bmc_booted.conf
diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-fru-fault-monitor.service b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/obmc-fru-fault-monitor.service
index 4810a7e860..4810a7e860 100644
--- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-fru-fault-monitor.service
+++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/obmc-fru-fault-monitor.service
diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-start@.service b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-start@.service
index e0e1fc9356..e0e1fc9356 100644
--- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-start@.service
+++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-start@.service
diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-stop@.service b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-stop@.service
index 7b3966943a..7b3966943a 100644
--- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-stop@.service
+++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-stop@.service
diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/xyz.openbmc_project.LED.GroupManager.service b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/xyz.openbmc_project.LED.GroupManager.service
index 2f9a25e91e..2f9a25e91e 100644
--- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/xyz.openbmc_project.LED.GroupManager.service
+++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/xyz.openbmc_project.LED.GroupManager.service
diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-sysfs.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs.bb
index 76da1b56af..76da1b56af 100644
--- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-sysfs.bb
+++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs.bb
diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-sysfs/70-leds.rules b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs/70-leds.rules
index 372d81293f..372d81293f 100644
--- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-sysfs/70-leds.rules
+++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs/70-leds.rules
diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-sysfs/xyz.openbmc_project.led.controller@.service b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs/xyz.openbmc_project.led.controller@.service
index c673cda66f..c673cda66f 100644
--- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-sysfs/xyz.openbmc_project.led.controller@.service
+++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs/xyz.openbmc_project.led.controller@.service
diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-logging-error-logs-native.bbappend b/meta-phosphor/recipes-phosphor/leds/phosphor-logging-error-logs-native.bbappend
index 3f2c5c811b..3f2c5c811b 100644
--- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-logging-error-logs-native.bbappend
+++ b/meta-phosphor/recipes-phosphor/leds/phosphor-logging-error-logs-native.bbappend
diff --git a/meta-phosphor/common/recipes-phosphor/logging/ffdc.bb b/meta-phosphor/recipes-phosphor/logging/ffdc.bb
index 8c832d7082..8c832d7082 100644
--- a/meta-phosphor/common/recipes-phosphor/logging/ffdc.bb
+++ b/meta-phosphor/recipes-phosphor/logging/ffdc.bb
diff --git a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging-callouts-example-native.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-example-native.bb
index f76d202e16..f76d202e16 100644
--- a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging-callouts-example-native.bb
+++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-example-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging-callouts-example/callouts.yaml b/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-example/callouts.yaml
index 5b92a04c4f..5b92a04c4f 100644
--- a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging-callouts-example/callouts.yaml
+++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-example/callouts.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging-callouts-mrw-native.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-mrw-native.bb
index 96852d4cab..96852d4cab 100644
--- a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging-callouts-mrw-native.bb
+++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-mrw-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging-error-logs-native.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging-error-logs-native.bb
index 0dfacb1b60..0dfacb1b60 100644
--- a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging-error-logs-native.bb
+++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging-error-logs-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging.bb
index 9adbc4ff4b..9adbc4ff4b 100644
--- a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging.bb
+++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging.bb
diff --git a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Logging.service b/meta-phosphor/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Logging.service
index 946c3bf161..946c3bf161 100644
--- a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Logging.service
+++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Logging.service
diff --git a/meta-phosphor/common/recipes-phosphor/mboxd/files/99-aspeed-lpc-ctrl.rules b/meta-phosphor/recipes-phosphor/mboxd/files/99-aspeed-lpc-ctrl.rules
index 9cf2fbad13..9cf2fbad13 100644
--- a/meta-phosphor/common/recipes-phosphor/mboxd/files/99-aspeed-lpc-ctrl.rules
+++ b/meta-phosphor/recipes-phosphor/mboxd/files/99-aspeed-lpc-ctrl.rules
diff --git a/meta-phosphor/common/recipes-phosphor/mboxd/files/99-aspeed-mbox.rules b/meta-phosphor/recipes-phosphor/mboxd/files/99-aspeed-mbox.rules
index 12e90d86c8..12e90d86c8 100644
--- a/meta-phosphor/common/recipes-phosphor/mboxd/files/99-aspeed-mbox.rules
+++ b/meta-phosphor/recipes-phosphor/mboxd/files/99-aspeed-mbox.rules
diff --git a/meta-phosphor/common/recipes-phosphor/mboxd/files/aspeed-lpc-ctrl-h.patch b/meta-phosphor/recipes-phosphor/mboxd/files/aspeed-lpc-ctrl-h.patch
index 122594e9f0..122594e9f0 100644
--- a/meta-phosphor/common/recipes-phosphor/mboxd/files/aspeed-lpc-ctrl-h.patch
+++ b/meta-phosphor/recipes-phosphor/mboxd/files/aspeed-lpc-ctrl-h.patch
diff --git a/meta-phosphor/common/recipes-phosphor/mboxd/mboxd.bb b/meta-phosphor/recipes-phosphor/mboxd/mboxd.bb
index 03428b7a8a..03428b7a8a 100644
--- a/meta-phosphor/common/recipes-phosphor/mboxd/mboxd.bb
+++ b/meta-phosphor/recipes-phosphor/mboxd/mboxd.bb
diff --git a/meta-phosphor/common/recipes-phosphor/mboxd/mboxd/mboxd-reload@.service b/meta-phosphor/recipes-phosphor/mboxd/mboxd/mboxd-reload@.service
index be02c7a2ce..be02c7a2ce 100644
--- a/meta-phosphor/common/recipes-phosphor/mboxd/mboxd/mboxd-reload@.service
+++ b/meta-phosphor/recipes-phosphor/mboxd/mboxd/mboxd-reload@.service
diff --git a/meta-phosphor/common/recipes-phosphor/mboxd/mboxd/mboxd.service b/meta-phosphor/recipes-phosphor/mboxd/mboxd/mboxd.service
index 35081d85ab..35081d85ab 100644
--- a/meta-phosphor/common/recipes-phosphor/mboxd/mboxd/mboxd.service
+++ b/meta-phosphor/recipes-phosphor/mboxd/mboxd/mboxd.service
diff --git a/meta-phosphor/common/recipes-phosphor/mrw/mrw-api-native.bb b/meta-phosphor/recipes-phosphor/mrw/mrw-api-native.bb
index 1930388ed4..1930388ed4 100644
--- a/meta-phosphor/common/recipes-phosphor/mrw/mrw-api-native.bb
+++ b/meta-phosphor/recipes-phosphor/mrw/mrw-api-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/mrw/mrw-native.bb b/meta-phosphor/recipes-phosphor/mrw/mrw-native.bb
index db9cbd9027..db9cbd9027 100644
--- a/meta-phosphor/common/recipes-phosphor/mrw/mrw-native.bb
+++ b/meta-phosphor/recipes-phosphor/mrw/mrw-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/mrw/mrw-patch-native.bb b/meta-phosphor/recipes-phosphor/mrw/mrw-patch-native.bb
index acaec73aa1..acaec73aa1 100644
--- a/meta-phosphor/common/recipes-phosphor/mrw/mrw-patch-native.bb
+++ b/meta-phosphor/recipes-phosphor/mrw/mrw-patch-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/mrw/mrw-perl-tools-native.bb b/meta-phosphor/recipes-phosphor/mrw/mrw-perl-tools-native.bb
index 91651227b3..91651227b3 100644
--- a/meta-phosphor/common/recipes-phosphor/mrw/mrw-perl-tools-native.bb
+++ b/meta-phosphor/recipes-phosphor/mrw/mrw-perl-tools-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/network/inarp.bb b/meta-phosphor/recipes-phosphor/network/inarp.bb
index 90969c2487..90969c2487 100644
--- a/meta-phosphor/common/recipes-phosphor/network/inarp.bb
+++ b/meta-phosphor/recipes-phosphor/network/inarp.bb
diff --git a/meta-phosphor/common/recipes-phosphor/network/inarp/inarp.service b/meta-phosphor/recipes-phosphor/network/inarp/inarp.service
index 5d26559f06..5d26559f06 100644
--- a/meta-phosphor/common/recipes-phosphor/network/inarp/inarp.service
+++ b/meta-phosphor/recipes-phosphor/network/inarp/inarp.service
diff --git a/meta-phosphor/common/recipes-phosphor/network/network.bb b/meta-phosphor/recipes-phosphor/network/network.bb
index 3170d56ee0..3170d56ee0 100644
--- a/meta-phosphor/common/recipes-phosphor/network/network.bb
+++ b/meta-phosphor/recipes-phosphor/network/network.bb
diff --git a/meta-phosphor/common/recipes-phosphor/network/network/xyz.openbmc_project.Network.service b/meta-phosphor/recipes-phosphor/network/network/xyz.openbmc_project.Network.service
index b9f7da7285..b9f7da7285 100644
--- a/meta-phosphor/common/recipes-phosphor/network/network/xyz.openbmc_project.Network.service
+++ b/meta-phosphor/recipes-phosphor/network/network/xyz.openbmc_project.Network.service
diff --git a/meta-phosphor/common/recipes-phosphor/network/phosphor-snmp/xyz.openbmc_project.Network.SNMP.service b/meta-phosphor/recipes-phosphor/network/phosphor-snmp/xyz.openbmc_project.Network.SNMP.service
index f5a1d7274f..f5a1d7274f 100644
--- a/meta-phosphor/common/recipes-phosphor/network/phosphor-snmp/xyz.openbmc_project.Network.SNMP.service
+++ b/meta-phosphor/recipes-phosphor/network/phosphor-snmp/xyz.openbmc_project.Network.SNMP.service
diff --git a/meta-phosphor/common/recipes-phosphor/network/phosphor-snmp_git.bb b/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb
index 7818579f05..7818579f05 100644
--- a/meta-phosphor/common/recipes-phosphor/network/phosphor-snmp_git.bb
+++ b/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb
diff --git a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
index 5c184babf6..5c184babf6 100644
--- a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
+++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
diff --git a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bb
index cbe7e7fb98..cbe7e7fb98 100644
--- a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bb
+++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bb
diff --git a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bb
index 1a6d4b7876..1a6d4b7876 100644
--- a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bb
+++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bb
diff --git a/meta-phosphor/common/recipes-phosphor/preinit-mounts/preinit-mounts.bb b/meta-phosphor/recipes-phosphor/preinit-mounts/preinit-mounts.bb
index 30e0f3613a..30e0f3613a 100644
--- a/meta-phosphor/common/recipes-phosphor/preinit-mounts/preinit-mounts.bb
+++ b/meta-phosphor/recipes-phosphor/preinit-mounts/preinit-mounts.bb
diff --git a/meta-phosphor/common/recipes-phosphor/preinit-mounts/preinit-mounts/init b/meta-phosphor/recipes-phosphor/preinit-mounts/preinit-mounts/init
index 91f8038f9e..91f8038f9e 100644
--- a/meta-phosphor/common/recipes-phosphor/preinit-mounts/preinit-mounts/init
+++ b/meta-phosphor/recipes-phosphor/preinit-mounts/preinit-mounts/init
diff --git a/meta-phosphor/common/recipes-phosphor/sensors/obmc-mgr-sensor.bb b/meta-phosphor/recipes-phosphor/sensors/obmc-mgr-sensor.bb
index 5eacac0671..5eacac0671 100644
--- a/meta-phosphor/common/recipes-phosphor/sensors/obmc-mgr-sensor.bb
+++ b/meta-phosphor/recipes-phosphor/sensors/obmc-mgr-sensor.bb
diff --git a/meta-phosphor/common/recipes-phosphor/sensors/obmc-mgr-sensor/org.openbmc.Sensors.service b/meta-phosphor/recipes-phosphor/sensors/obmc-mgr-sensor/org.openbmc.Sensors.service
index a4cb16439c..a4cb16439c 100644
--- a/meta-phosphor/common/recipes-phosphor/sensors/obmc-mgr-sensor/org.openbmc.Sensors.service
+++ b/meta-phosphor/recipes-phosphor/sensors/obmc-mgr-sensor/org.openbmc.Sensors.service
diff --git a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon-config-mrw.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon-config-mrw.bb
index c6d0cba731..c6d0cba731 100644
--- a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon-config-mrw.bb
+++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon-config-mrw.bb
diff --git a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon.bb
index fe051b57a9..fe051b57a9 100644
--- a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon.bb
+++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon.bb
diff --git a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/70-hwmon.rules b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/70-hwmon.rules
index 503b2d002b..503b2d002b 100644
--- a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/70-hwmon.rules
+++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/70-hwmon.rules
diff --git a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/70-iio.rules b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/70-iio.rules
index 45fb4b0fb6..45fb4b0fb6 100644
--- a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/70-iio.rules
+++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/70-iio.rules
diff --git a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/phosphor-max31785-msl@.service b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/phosphor-max31785-msl@.service
index d9de6c0810..d9de6c0810 100644
--- a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/phosphor-max31785-msl@.service
+++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/phosphor-max31785-msl@.service
diff --git a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/start_hwmon.sh b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/start_hwmon.sh
index cde0f96ca6..cde0f96ca6 100755
--- a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/start_hwmon.sh
+++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/start_hwmon.sh
diff --git a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service
index 9d3e2635e3..9d3e2635e3 100644
--- a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service
+++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service
diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-defaults-native.bb b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults-native.bb
index 37b8d4ef61..37b8d4ef61 100644
--- a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-defaults-native.bb
+++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-defaults/defaults.yaml b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults/defaults.yaml
index de00b8e68d..de00b8e68d 100644
--- a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-defaults/defaults.yaml
+++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults/defaults.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager.bb b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager.bb
index a63a1f24aa..a63a1f24aa 100644
--- a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager.bb
+++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager.bb
diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager.inc b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager.inc
index b6c6b0b8ae..b6c6b0b8ae 100644
--- a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager.inc
+++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager.inc
diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager/merge_settings.py b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager/merge_settings.py
index 01f5e35523..01f5e35523 100755
--- a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager/merge_settings.py
+++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager/merge_settings.py
diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager/xyz.openbmc_project.Settings.service b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager/xyz.openbmc_project.Settings.service
index 50e21665ce..50e21665ce 100644
--- a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager/xyz.openbmc_project.Settings.service
+++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager/xyz.openbmc_project.Settings.service
diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bb b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bb
index d5ec1bc531..d5ec1bc531 100644
--- a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bb
+++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bb
diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-read-settings-mrw/mrw-override-settings.yaml b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-read-settings-mrw/mrw-override-settings.yaml
index c0fbedeccb..c0fbedeccb 100644
--- a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-read-settings-mrw/mrw-override-settings.yaml
+++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-read-settings-mrw/mrw-override-settings.yaml
diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings/merge_settings.py b/meta-phosphor/recipes-phosphor/settings/phosphor-settings/merge_settings.py
index f1395f0010..f1395f0010 120000
--- a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings/merge_settings.py
+++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings/merge_settings.py
diff --git a/meta-phosphor/common/recipes-phosphor/skeleton/obmc-libobmc-intf.bb b/meta-phosphor/recipes-phosphor/skeleton/obmc-libobmc-intf.bb
index b02b83234f..b02b83234f 100644
--- a/meta-phosphor/common/recipes-phosphor/skeleton/obmc-libobmc-intf.bb
+++ b/meta-phosphor/recipes-phosphor/skeleton/obmc-libobmc-intf.bb
diff --git a/meta-phosphor/common/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json b/meta-phosphor/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json
index 6e4ef9ff96..6e4ef9ff96 100644
--- a/meta-phosphor/common/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json
+++ b/meta-phosphor/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json
diff --git a/meta-phosphor/common/recipes-phosphor/state/files/obmc/phosphor-reboot-host/reboot.conf b/meta-phosphor/recipes-phosphor/state/files/obmc/phosphor-reboot-host/reboot.conf
index 2e3ca1a5bc..2e3ca1a5bc 100644
--- a/meta-phosphor/common/recipes-phosphor/state/files/obmc/phosphor-reboot-host/reboot.conf
+++ b/meta-phosphor/recipes-phosphor/state/files/obmc/phosphor-reboot-host/reboot.conf
diff --git a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-discover-system-state@.service b/meta-phosphor/recipes-phosphor/state/files/phosphor-discover-system-state@.service
index f398038993..f398038993 100644
--- a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-discover-system-state@.service
+++ b/meta-phosphor/recipes-phosphor/state/files/phosphor-discover-system-state@.service
diff --git a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reboot-host@.service b/meta-phosphor/recipes-phosphor/state/files/phosphor-reboot-host@.service
index 27479f2def..27479f2def 100644
--- a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reboot-host@.service
+++ b/meta-phosphor/recipes-phosphor/state/files/phosphor-reboot-host@.service
diff --git a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-host-check@.service b/meta-phosphor/recipes-phosphor/state/files/phosphor-reset-host-check@.service
index 6062320b20..6062320b20 100644
--- a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-host-check@.service
+++ b/meta-phosphor/recipes-phosphor/state/files/phosphor-reset-host-check@.service
diff --git a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-host-reboot-attempts@.service b/meta-phosphor/recipes-phosphor/state/files/phosphor-reset-host-reboot-attempts@.service
index 35de4304bd..35de4304bd 100644
--- a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-host-reboot-attempts@.service
+++ b/meta-phosphor/recipes-phosphor/state/files/phosphor-reset-host-reboot-attempts@.service
diff --git a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-host-running@.service b/meta-phosphor/recipes-phosphor/state/files/phosphor-reset-host-running@.service
index a49bbdd16b..a49bbdd16b 100644
--- a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-host-running@.service
+++ b/meta-phosphor/recipes-phosphor/state/files/phosphor-reset-host-running@.service
diff --git a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-sensor-states@.service b/meta-phosphor/recipes-phosphor/state/files/phosphor-reset-sensor-states@.service
index 689372f4a2..689372f4a2 100644
--- a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-sensor-states@.service
+++ b/meta-phosphor/recipes-phosphor/state/files/phosphor-reset-sensor-states@.service
diff --git a/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service b/meta-phosphor/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service
index 057af648d8..057af648d8 100644
--- a/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service
+++ b/meta-phosphor/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service
diff --git a/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Chassis.service b/meta-phosphor/recipes-phosphor/state/files/xyz.openbmc_project.State.Chassis.service
index 259dd16af0..259dd16af0 100644
--- a/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Chassis.service
+++ b/meta-phosphor/recipes-phosphor/state/files/xyz.openbmc_project.State.Chassis.service
diff --git a/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service b/meta-phosphor/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service
index 26f523eaab..26f523eaab 100644
--- a/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service
+++ b/meta-phosphor/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service
diff --git a/meta-phosphor/common/recipes-phosphor/state/phosphor-state-manager.bb b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager.bb
index 4acaa56888..4acaa56888 100644
--- a/meta-phosphor/common/recipes-phosphor/state/phosphor-state-manager.bb
+++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager.bb
diff --git a/meta-phosphor/common/recipes-phosphor/system/files/obmc-phosphor-sysd.py b/meta-phosphor/recipes-phosphor/system/files/obmc-phosphor-sysd.py
index c8080ac2c9..c8080ac2c9 100644
--- a/meta-phosphor/common/recipes-phosphor/system/files/obmc-phosphor-sysd.py
+++ b/meta-phosphor/recipes-phosphor/system/files/obmc-phosphor-sysd.py
diff --git a/meta-phosphor/common/recipes-phosphor/system/files/obmc-phosphor-sysd.service b/meta-phosphor/recipes-phosphor/system/files/obmc-phosphor-sysd.service
index d4dacf546d..d4dacf546d 100644
--- a/meta-phosphor/common/recipes-phosphor/system/files/obmc-phosphor-sysd.service
+++ b/meta-phosphor/recipes-phosphor/system/files/obmc-phosphor-sysd.service
diff --git a/meta-phosphor/common/recipes-phosphor/system/obmc-control-bmc.bb b/meta-phosphor/recipes-phosphor/system/obmc-control-bmc.bb
index eb5b4a8107..eb5b4a8107 100644
--- a/meta-phosphor/common/recipes-phosphor/system/obmc-control-bmc.bb
+++ b/meta-phosphor/recipes-phosphor/system/obmc-control-bmc.bb
diff --git a/meta-phosphor/common/recipes-phosphor/system/obmc-control-bmc/org.openbmc.control.Bmc@.service b/meta-phosphor/recipes-phosphor/system/obmc-control-bmc/org.openbmc.control.Bmc@.service
index 9685efecd5..9685efecd5 100644
--- a/meta-phosphor/common/recipes-phosphor/system/obmc-control-bmc/org.openbmc.control.Bmc@.service
+++ b/meta-phosphor/recipes-phosphor/system/obmc-control-bmc/org.openbmc.control.Bmc@.service
diff --git a/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-system.bb b/meta-phosphor/recipes-phosphor/system/obmc-mgr-system.bb
index 0df36f9c17..0df36f9c17 100644
--- a/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-system.bb
+++ b/meta-phosphor/recipes-phosphor/system/obmc-mgr-system.bb
diff --git a/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-system/org.openbmc.managers.System.service b/meta-phosphor/recipes-phosphor/system/obmc-mgr-system/org.openbmc.managers.System.service
index 9d1761fd85..9d1761fd85 100644
--- a/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-system/org.openbmc.managers.System.service
+++ b/meta-phosphor/recipes-phosphor/system/obmc-mgr-system/org.openbmc.managers.System.service
diff --git a/meta-phosphor/common/recipes-phosphor/system/obmc-phosphor-sysd.bb b/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd.bb
index 7a21c2fe6f..7a21c2fe6f 100644
--- a/meta-phosphor/common/recipes-phosphor/system/obmc-phosphor-sysd.bb
+++ b/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd.bb
diff --git a/meta-phosphor/common/recipes-phosphor/systemd-policy/phosphor-systemd-policy.bb b/meta-phosphor/recipes-phosphor/systemd-policy/phosphor-systemd-policy.bb
index ce58a532a4..ce58a532a4 100644
--- a/meta-phosphor/common/recipes-phosphor/systemd-policy/phosphor-systemd-policy.bb
+++ b/meta-phosphor/recipes-phosphor/systemd-policy/phosphor-systemd-policy.bb
diff --git a/meta-phosphor/common/recipes-phosphor/systemd-policy/phosphor-systemd-policy/disable-duplicate-kernel-msg.conf b/meta-phosphor/recipes-phosphor/systemd-policy/phosphor-systemd-policy/disable-duplicate-kernel-msg.conf
index beb2f445f9..beb2f445f9 100644
--- a/meta-phosphor/common/recipes-phosphor/systemd-policy/phosphor-systemd-policy/disable-duplicate-kernel-msg.conf
+++ b/meta-phosphor/recipes-phosphor/systemd-policy/phosphor-systemd-policy/disable-duplicate-kernel-msg.conf
diff --git a/meta-phosphor/common/recipes-phosphor/systemd-policy/phosphor-systemd-policy/service-restart-policy.conf b/meta-phosphor/recipes-phosphor/systemd-policy/phosphor-systemd-policy/service-restart-policy.conf
index 54516c2d47..54516c2d47 100644
--- a/meta-phosphor/common/recipes-phosphor/systemd-policy/phosphor-systemd-policy/service-restart-policy.conf
+++ b/meta-phosphor/recipes-phosphor/systemd-policy/phosphor-systemd-policy/service-restart-policy.conf
diff --git a/meta-phosphor/common/recipes-phosphor/users/phosphor-user-manager.bb b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager.bb
index 2c05c9ba7d..2c05c9ba7d 100644
--- a/meta-phosphor/common/recipes-phosphor/users/phosphor-user-manager.bb
+++ b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager.bb
diff --git a/meta-phosphor/common/recipes-phosphor/users/phosphor-user-manager/xyz.openbmc_project.User.Manager.service b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager/xyz.openbmc_project.User.Manager.service
index f8926e77cf..f8926e77cf 100644
--- a/meta-phosphor/common/recipes-phosphor/users/phosphor-user-manager/xyz.openbmc_project.User.Manager.service
+++ b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager/xyz.openbmc_project.User.Manager.service
diff --git a/meta-phosphor/common/recipes-phosphor/video/fbterm/fb.modes b/meta-phosphor/recipes-phosphor/video/fbterm/fb.modes
index dfc51fe973..dfc51fe973 100644
--- a/meta-phosphor/common/recipes-phosphor/video/fbterm/fb.modes
+++ b/meta-phosphor/recipes-phosphor/video/fbterm/fb.modes
diff --git a/meta-phosphor/common/recipes-phosphor/video/fbterm/fbterm b/meta-phosphor/recipes-phosphor/video/fbterm/fbterm
index 0cf29d433c..0cf29d433c 100644
--- a/meta-phosphor/common/recipes-phosphor/video/fbterm/fbterm
+++ b/meta-phosphor/recipes-phosphor/video/fbterm/fbterm
diff --git a/meta-phosphor/common/recipes-phosphor/video/fbterm/fbterm.service b/meta-phosphor/recipes-phosphor/video/fbterm/fbterm.service
index 2b18c91ef1..2b18c91ef1 100644
--- a/meta-phosphor/common/recipes-phosphor/video/fbterm/fbterm.service
+++ b/meta-phosphor/recipes-phosphor/video/fbterm/fbterm.service
diff --git a/meta-phosphor/common/recipes-phosphor/video/fbterm_git.bb b/meta-phosphor/recipes-phosphor/video/fbterm_git.bb
index 0c171dd3a4..0c171dd3a4 100644
--- a/meta-phosphor/common/recipes-phosphor/video/fbterm_git.bb
+++ b/meta-phosphor/recipes-phosphor/video/fbterm_git.bb
diff --git a/meta-phosphor/common/recipes-phosphor/video/liberation-fonts_2.00.1.bbappend b/meta-phosphor/recipes-phosphor/video/liberation-fonts_2.00.1.bbappend
index 5283a7841f..5283a7841f 100644
--- a/meta-phosphor/common/recipes-phosphor/video/liberation-fonts_2.00.1.bbappend
+++ b/meta-phosphor/recipes-phosphor/video/liberation-fonts_2.00.1.bbappend
diff --git a/meta-phosphor/common/recipes-phosphor/video/uart-render-controller/uart-render-controller.service b/meta-phosphor/recipes-phosphor/video/uart-render-controller/uart-render-controller.service
index 3fd688f31c..3fd688f31c 100644
--- a/meta-phosphor/common/recipes-phosphor/video/uart-render-controller/uart-render-controller.service
+++ b/meta-phosphor/recipes-phosphor/video/uart-render-controller/uart-render-controller.service
diff --git a/meta-phosphor/common/recipes-phosphor/video/uart-render-controller_git.bb b/meta-phosphor/recipes-phosphor/video/uart-render-controller_git.bb
index c8780a4e77..c8780a4e77 100644
--- a/meta-phosphor/common/recipes-phosphor/video/uart-render-controller_git.bb
+++ b/meta-phosphor/recipes-phosphor/video/uart-render-controller_git.bb
diff --git a/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog.bb b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog.bb
index fe94365225..fe94365225 100644
--- a/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog.bb
+++ b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog.bb
diff --git a/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/obmc-enable-host-watchdog@.service b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/obmc-enable-host-watchdog@.service
index 0cf5e7cd37..0cf5e7cd37 100644
--- a/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/obmc-enable-host-watchdog@.service
+++ b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/obmc-enable-host-watchdog@.service
diff --git a/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/poweron b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/poweron
index 591d6dcd7c..591d6dcd7c 100644
--- a/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/poweron
+++ b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/poweron
diff --git a/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service
index 52c1290256..52c1290256 100644
--- a/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service
+++ b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service
diff --git a/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/poweron.conf b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/poweron.conf
index b253249829..b253249829 100644
--- a/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/poweron.conf
+++ b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/poweron.conf
diff --git a/meta-phosphor/common/recipes-phosphor/webui/phosphor-webui.bb b/meta-phosphor/recipes-phosphor/webui/phosphor-webui.bb
index 5ec201f634..5ec201f634 100644
--- a/meta-phosphor/common/recipes-phosphor/webui/phosphor-webui.bb
+++ b/meta-phosphor/recipes-phosphor/webui/phosphor-webui.bb
diff --git a/meta-phosphor/common/recipes-support/cjson/cjson_git.bb b/meta-phosphor/recipes-support/cjson/cjson_git.bb
index 096e3c988a..096e3c988a 100644
--- a/meta-phosphor/common/recipes-support/cjson/cjson_git.bb
+++ b/meta-phosphor/recipes-support/cjson/cjson_git.bb
diff --git a/meta-phosphor/common/recipes-support/libgpg-error/libgpg-error/0001-syscfg-Add-ppc64le-cross-build-support.patch b/meta-phosphor/recipes-support/libgpg-error/libgpg-error/0001-syscfg-Add-ppc64le-cross-build-support.patch
index e171b3191a..e171b3191a 100644
--- a/meta-phosphor/common/recipes-support/libgpg-error/libgpg-error/0001-syscfg-Add-ppc64le-cross-build-support.patch
+++ b/meta-phosphor/recipes-support/libgpg-error/libgpg-error/0001-syscfg-Add-ppc64le-cross-build-support.patch
diff --git a/meta-phosphor/common/recipes-support/libgpg-error/libgpg-error_%.bbappend b/meta-phosphor/recipes-support/libgpg-error/libgpg-error_%.bbappend
index 16137de0cc..16137de0cc 100644
--- a/meta-phosphor/common/recipes-support/libgpg-error/libgpg-error_%.bbappend
+++ b/meta-phosphor/recipes-support/libgpg-error/libgpg-error_%.bbappend
diff --git a/meta-phosphor/common/recipes-support/lm_sensors/lmsensors-config_1.0.bbappend b/meta-phosphor/recipes-support/lm_sensors/lmsensors-config_1.0.bbappend
index 83c9ea1450..83c9ea1450 100644
--- a/meta-phosphor/common/recipes-support/lm_sensors/lmsensors-config_1.0.bbappend
+++ b/meta-phosphor/recipes-support/lm_sensors/lmsensors-config_1.0.bbappend
diff --git a/meta-phosphor/common/recipes-support/nlohmann-json/nlohmann-json_git.bb b/meta-phosphor/recipes-support/nlohmann-json/nlohmann-json_git.bb
index bbb63a1bf5..bbb63a1bf5 100644
--- a/meta-phosphor/common/recipes-support/nlohmann-json/nlohmann-json_git.bb
+++ b/meta-phosphor/recipes-support/nlohmann-json/nlohmann-json_git.bb
diff --git a/meta-phosphor/common/recipes-support/rng-tools/rng-tools/rngd.service b/meta-phosphor/recipes-support/rng-tools/rng-tools/rngd.service
index 7b0e9a71f5..7b0e9a71f5 100644
--- a/meta-phosphor/common/recipes-support/rng-tools/rng-tools/rngd.service
+++ b/meta-phosphor/recipes-support/rng-tools/rng-tools/rngd.service
diff --git a/meta-phosphor/common/recipes-support/rng-tools/rng-tools_%.bbappend b/meta-phosphor/recipes-support/rng-tools/rng-tools_%.bbappend
index cda8e0b51b..cda8e0b51b 100644
--- a/meta-phosphor/common/recipes-support/rng-tools/rng-tools_%.bbappend
+++ b/meta-phosphor/recipes-support/rng-tools/rng-tools_%.bbappend
diff --git a/meta-phosphor/common/recipes-support/serialization/cereal_1.2.2.bb b/meta-phosphor/recipes-support/serialization/cereal_1.2.2.bb
index 50c85787cd..50c85787cd 100644
--- a/meta-phosphor/common/recipes-support/serialization/cereal_1.2.2.bb
+++ b/meta-phosphor/recipes-support/serialization/cereal_1.2.2.bb
diff --git a/meta-phosphor/common/recipes-textproc/json-perl/json-perl_2.97001.bb b/meta-phosphor/recipes-textproc/json-perl/json-perl_2.97001.bb
index 9196e8e576..9196e8e576 100644
--- a/meta-phosphor/common/recipes-textproc/json-perl/json-perl_2.97001.bb
+++ b/meta-phosphor/recipes-textproc/json-perl/json-perl_2.97001.bb
diff --git a/meta-phosphor/common/recipes.txt b/meta-phosphor/recipes.txt
index ccd19b2f78..ccd19b2f78 100644
--- a/meta-phosphor/common/recipes.txt
+++ b/meta-phosphor/recipes.txt