meta-ibm: set OBMC_ORG_YAML_SUBDIRS in machines
The OBMC_ORG_YAML_SUBDIRS variable is intended to be set system-wide
and not via bbappends. There was an existing 'ibm-distrovars.inc'
that was unused. Rename it as appropriate, add it to the machines,
and remove the bbappend files.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Id5acd359f41c17ec9e68d1f0717e2f5c1bf96dcf
diff --git a/meta-ibm/conf/distro/include/ibm-distrovars.inc b/meta-ibm/conf/distro/include/ibm-yaml.inc
similarity index 100%
rename from meta-ibm/conf/distro/include/ibm-distrovars.inc
rename to meta-ibm/conf/distro/include/ibm-yaml.inc
diff --git a/meta-ibm/conf/machine/mihawk.conf b/meta-ibm/conf/machine/mihawk.conf
index bb54c6a..2bb67ed 100644
--- a/meta-ibm/conf/machine/mihawk.conf
+++ b/meta-ibm/conf/machine/mihawk.conf
@@ -15,6 +15,7 @@
require conf/machine/include/obmc-bsp-common.inc
require conf/machine/include/openpower.inc
require conf/machine/include/p9.inc
+require conf/distro/include/ibm-yaml.inc
PHOSPHOR_MRW_LICENSE = "Apache-2.0"
PHOSPHOR_MRW_LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
diff --git a/meta-ibm/conf/machine/p10bmc.conf b/meta-ibm/conf/machine/p10bmc.conf
index 22b59b4..2cab74e 100644
--- a/meta-ibm/conf/machine/p10bmc.conf
+++ b/meta-ibm/conf/machine/p10bmc.conf
@@ -14,6 +14,7 @@
require conf/distro/include/openpower-virtual-pnor.inc
require conf/distro/include/phosphor-mmc.inc
require conf/distro/include/ibm-mpreboot.inc
+require conf/distro/include/ibm-yaml.inc
SERIAL_CONSOLES = "115200;ttyS4"
diff --git a/meta-ibm/conf/machine/witherspoon-tacoma.conf b/meta-ibm/conf/machine/witherspoon-tacoma.conf
index 8d2a907..9826d55 100644
--- a/meta-ibm/conf/machine/witherspoon-tacoma.conf
+++ b/meta-ibm/conf/machine/witherspoon-tacoma.conf
@@ -10,6 +10,7 @@
require conf/machine/include/obmc-bsp-common.inc
require conf/machine/include/openpower.inc
require conf/machine/include/p9.inc
+require conf/distro/include/ibm-yaml.inc
require conf/distro/include/openpower-virtual-pnor.inc
require conf/distro/include/phosphor-mmc.inc
require conf/distro/include/ibm-mpreboot.inc
diff --git a/meta-ibm/conf/machine/witherspoon.conf b/meta-ibm/conf/machine/witherspoon.conf
index c037a78..08f2935 100644
--- a/meta-ibm/conf/machine/witherspoon.conf
+++ b/meta-ibm/conf/machine/witherspoon.conf
@@ -15,6 +15,7 @@
require conf/machine/include/obmc-bsp-common.inc
require conf/machine/include/openpower.inc
require conf/machine/include/p9.inc
+require conf/distro/include/ibm-yaml.inc
PHOSPHOR_MRW_LICENSE = "Apache-2.0"
PHOSPHOR_MRW_LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
diff --git a/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend
deleted file mode 100644
index d782a38..0000000
--- a/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-OBMC_ORG_YAML_SUBDIRS_append_witherspoon = " com/ibm"
-OBMC_ORG_YAML_SUBDIRS_append_p10bmc = " com/ibm"