meta-ibm: only use openpower bbappend when including layer

There is a desire to add non-openpower systems to the meta-ibm layer. To
do that, need to ensure the bbappend files that are appending to
openpower recipes are only included if the machine being built includes
the meta-openpower layer.

Tested:
- Confirmed a system not including meta-openpower builds ok with this
- Confirmed p10bmc still uses the bbappend files

Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I32a08e9f20a20152d51c77cdfca6bbc15b5e93d4

7 files changed, 62 insertions, 0 deletions

diff --git a/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_%.bbappend b/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_%.bbappend
new file mode 100644
index 0000000000..d20060c85e
--- /dev/null
+++ b/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_%.bbappend
@@ -0,0 +1 @@
+EXTRA_OEMESON:append:p10bmc = " -Dhostboot-dump-collection=enabled "
diff --git a/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/flash/openpower-software-manager_%.bbappend b/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/flash/openpower-software-manager_%.bbappend
new file mode 100644
index 0000000000..38b5e4749c
--- /dev/null
+++ b/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/flash/openpower-software-manager_%.bbappend
@@ -0,0 +1 @@
+PACKAGECONFIG:append:ibm-ac-server = " verify_pnor_signature"
\ No newline at end of file
diff --git a/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/host/op-proc-control_git.bbappend b/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/host/op-proc-control_git.bbappend
new file mode 100644
index 0000000000..47869c4f31
--- /dev/null
+++ b/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/host/op-proc-control_git.bbappend
@@ -0,0 +1 @@
+PACKAGECONFIG:append:p10bmc = " phal"
diff --git a/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/host/p9-host-start.bbappend b/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/host/p9-host-start.bbappend
new file mode 100644
index 0000000000..b2a9fd8225
--- /dev/null
+++ b/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/host/p9-host-start.bbappend
@@ -0,0 +1,3 @@
+RDEPENDS:${PN}:append:ibm-ac-server = " avsbus-control"
+RDEPENDS:${PN}:append:witherspoon = " vrm-control"
+RDEPENDS:${PN}:append:ibm-ac-server = " power-workarounds"
diff --git a/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend b/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend
new file mode 100644
index 0000000000..8ce54e536e
--- /dev/null
+++ b/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend
@@ -0,0 +1,5 @@
+DEPENDS:append:ibm-ac-server = " acx22-yaml-config"
+
+EXTRA_OECONF:ibm-ac-server = " \
+    INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-inventory-sensors.yaml \
+    "
\ No newline at end of file
diff --git a/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bbappend b/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bbappend
new file mode 100644
index 0000000000..3561360f6f
--- /dev/null
+++ b/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bbappend
@@ -0,0 +1 @@
+RDEPENDS:${PN}-system:remove:witherspoon = "croserver"
diff --git a/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend b/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend
new file mode 100644
index 0000000000..5b7b8808ab
--- /dev/null
+++ b/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend
@@ -0,0 +1,50 @@
+DEPENDS:append:p10bmc = " cli11"
+DEPENDS:append:p10bmc = " nlohmann-json"
+DEPENDS:append:p10bmc = " phosphor-dbus-interfaces"
+DEPENDS:append:p10bmc = " libgpiod"
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+SYSTEMD_SERVICE:${PN}:append:p10bmc = " ibm-vpd-parser@.service"
+SYSTEMD_SERVICE:${PN}:append:p10bmc = " system-vpd.service"
+SYSTEMD_SERVICE:${PN}:append:p10bmc = " com.ibm.VPD.Manager.service"
+SYSTEMD_SERVICE:${PN}:append:p10bmc = " wait-vpd-parsers.service"
+SYSTEMD_SERVICE:${PN}:remove:p10bmc = " op-vpd-parser.service"
+PACKAGECONFIG:append:p10bmc = " ibm-parser vpd-manager"
+
+FILES:${PN}:append:p10bmc = " ${datadir}/vpd/*.json"
+
+do_install:append:p10bmc() {
+        # Remove files that are used by openpower-read-vpd
+        DEST=${D}${inventory_envdir}
+        rm ${DEST}/inventory
+        rm ${D}/${nonarch_base_libdir}/udev/rules.d/70-op-vpd.rules
+}
+
+do_install:append:witherspoon() {
+        DEST=${D}${inventory_envdir}
+        printf "\nEEPROM=/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-11/11-0051/eeprom" >> ${DEST}/inventory
+}
+
+do_install:append:swift() {
+        DEST=${D}${inventory_envdir}
+        printf "\nEEPROM=/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a340.i2c-bus/i2c-8/8-0051/eeprom" >> ${DEST}/inventory
+}
+
+do_install:append:witherspoon-tacoma() {
+        DEST=${D}${inventory_envdir}
+        printf "FRUS=BMC,ETHERNET" > ${DEST}/inventory
+        printf "\nPATHS=/system/chassis/motherboard/bmc,/system/chassis/motherboard/bmc/eth0" >> ${DEST}/inventory
+        printf "\nEEPROM=/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a600.i2c-bus/i2c-11/11-0051/eeprom" >> ${DEST}/inventory
+}
+
+pkg_postinst:${PN}:p10bmc() {
+    mkdir -p $D$systemd_system_unitdir/obmc-chassis-poweroff@0.target.wants
+    LINK="$D$systemd_system_unitdir/obmc-chassis-poweroff@0.target.wants/wait-vpd-parsers.service"
+    TARGET="../wait-vpd-parsers.service"
+    ln -s $TARGET $LINK
+}
+pkg_prerm:${PN}:p10bmc() {
+    LINK="$D$systemd_system_unitdir/obmc-chassis-poweroff@0.target.wants/wait-vpd-parsers.service"
+    rm $LINK
+}