meta-ibm/genesis3: Include the meta-ibm layer

Adjust meta-ibm to add support for the new machine.

Change-Id: I2eb61f3d9c85c23b16f026f8f9eb4506c78e97ad
Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>

5 files changed, 10 insertions, 9 deletions

diff --git a/meta-ibm/meta-genesis3/conf/templates/default/bblayers.conf.sample b/meta-ibm/meta-genesis3/conf/templates/default/bblayers.conf.sample
index 09e39a9b21..c3afdeb4be 100644
--- a/meta-ibm/meta-genesis3/conf/templates/default/bblayers.conf.sample
+++ b/meta-ibm/meta-genesis3/conf/templates/default/bblayers.conf.sample
@@ -13,5 +13,6 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-aspeed \
+  ##OEROOT##/meta-ibm \
   ##OEROOT##/meta-ibm/meta-genesis3 \
   "
diff --git a/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend
index dbcb6ab640..88cef06141 100644
--- a/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend
+++ b/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend
@@ -1,7 +1,7 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI:remove = "file://${BPN}.conf"
-SRC_URI += "file://server.ttyVUART0.conf"
+SRC_URI:remove:df-openpower = "file://${BPN}.conf"
+SRC_URI:append:df-openpower = " file://server.ttyVUART0.conf"
 
 install_concurrent_console_config() {
         # Install configuration for the servers and clients. Keep commandline
diff --git a/meta-ibm/recipes-phosphor/dbus/fan-policy.bb b/meta-ibm/recipes-phosphor/dbus/fan-policy.bb
index 2ff9d4a0b7..cd3b19ae54 100644
--- a/meta-ibm/recipes-phosphor/dbus/fan-policy.bb
+++ b/meta-ibm/recipes-phosphor/dbus/fan-policy.bb
@@ -8,9 +8,9 @@ inherit phosphor-dbus-monitor
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 
-SRC_URI += "file://air-cooled.yaml"
+SRC_URI:append:df-openpower = " file://air-cooled.yaml"
 SRC_URI:append:ibm-ac-server = " file://water-cooled.yaml"
-SRC_URI += "file://fan-errors.yaml"
+SRC_URI:append:df-openpower = " file://fan-errors.yaml"
 
 SRC_URI:remove:p10bmc = "file://air-cooled.yaml"
 SRC_URI:remove:p10bmc = "file://fan-errors.yaml"
diff --git a/meta-ibm/recipes-phosphor/fans/fan-watchdog.bb b/meta-ibm/recipes-phosphor/fans/fan-watchdog.bb
index 3e5f87ab6d..a6708ed646 100644
--- a/meta-ibm/recipes-phosphor/fans/fan-watchdog.bb
+++ b/meta-ibm/recipes-phosphor/fans/fan-watchdog.bb
@@ -19,5 +19,5 @@ WATCHDOG_FMT = "../${WATCHDOG_SERVICE}:${TGTFMT}.wants/${WATCHDOG_SERVICE}"
 
 SYSTEMD_SERVICE:${PN} += "${RESET_SERVICE} ${MONITOR_SERVICE} ${WATCHDOG_SERVICE}"
 SYSTEMD_LINK:${PN} += "${RESET_FMT} ${WATCHDOG_FMT}"
-SYSTEMD_ENVIRONMENT_FILE:${PN} += "obmc/fan-watchdog/reset-fan-watchdog.conf"
-SYSTEMD_ENVIRONMENT_FILE:${PN} += "obmc/fan-watchdog/fan-watchdog.conf"
+SYSTEMD_ENVIRONMENT_FILE:${PN}:append:df-openpower = " obmc/fan-watchdog/reset-fan-watchdog.conf"
+SYSTEMD_ENVIRONMENT_FILE:${PN}:append:df-openpower = " obmc/fan-watchdog/fan-watchdog.conf"
diff --git a/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend
index 1502840ec0..0ba7e97e2d 100644
--- a/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend
+++ b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend
@@ -2,7 +2,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 inherit obmc-phosphor-systemd
 
-SRC_URI += "file://psu.json"
+SRC_URI:append:df-openpower = " file://psu.json"
 
 EXTRA_OEMESON:append:ibm-ac-server = " -Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml"
 EXTRA_OEMESON:append:p10bmc = " -Dibm-vpd=true"
@@ -14,10 +14,10 @@ PACKAGECONFIG:append:ibm-ac-server = " monitor"
 PACKAGECONFIG:append:swift = " monitor"
 PACKAGECONFIG:append:p10bmc = " monitor-ng"
 
-do_install:append(){
+do_install:append:df-openpower(){
     install -D ${WORKDIR}/psu.json ${D}${datadir}/phosphor-power/psu.json
 }
-FILES:${PN} += "${datadir}/phosphor-power/psu.json"
+FILES:${PN}:append:df-openpower = " ${datadir}/phosphor-power/psu.json"
 
 PSU_MONITOR_ENV_FMT = "obmc/power-supply-monitor/power-supply-monitor-{0}.conf"
 SYSTEMD_ENVIRONMENT_FILE:${PN}-monitor:append:ibm-ac-server = " ${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}"