meta-ibm: use ibm-ac-server MACHINEOVERRIDE
Use an override in bbappends in meta-witherspoon as described and
recommended in the "following best practices when creating layers"
section of the the Yocto development tasks manual.
ibm-ac-server represents common machine configuration shared by all of
IBMs "Accelerated Compute" class of servers. Apply it wherever any
variables are un-bounded by any override.
This enables more flexible use of meta-witherspoon in build
configurations, and easy addition of machines to the layer.
Change-Id: I637588acbaf76f90809b02e48e7fce461b46f6db
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-witherspoon/recipes-phosphor/network/first-boot-set-mac_%.bbappend b/meta-witherspoon/recipes-phosphor/network/first-boot-set-mac_%.bbappend
index 29d23c8..cb167ee 100644
--- a/meta-witherspoon/recipes-phosphor/network/first-boot-set-mac_%.bbappend
+++ b/meta-witherspoon/recipes-phosphor/network/first-boot-set-mac_%.bbappend
@@ -1 +1 @@
-SYSTEMD_SERVICE_${PN} += "first-boot-set-mac@eth0.service"
+SYSTEMD_SERVICE_${PN}_append_ibm-ac-server = " first-boot-set-mac@eth0.service"
diff --git a/meta-witherspoon/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-witherspoon/recipes-phosphor/network/phosphor-network_%.bbappend
index 5137f4e..ba6e393 100644
--- a/meta-witherspoon/recipes-phosphor/network/phosphor-network_%.bbappend
+++ b/meta-witherspoon/recipes-phosphor/network/phosphor-network_%.bbappend
@@ -1,8 +1,8 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/network:"
-SRC_URI += "file://ncsi-netlink.service"
-SYSTEMD_SERVICE_${PN} += "ncsi-netlink.service"
+SRC_URI_append_ibm-ac-server = " file://ncsi-netlink.service"
+SYSTEMD_SERVICE_${PN}_append_ibm-ac-server = " ncsi-netlink.service"
-do_install_append() {
+do_install_append_ibm-ac-server() {
install -d ${D}${systemd_system_unitdir}
install -m 0644 ${WORKDIR}/ncsi-netlink.service ${D}${systemd_system_unitdir}
}