From a29c2d5e6187adb2c309d049226085eb1283b555 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Wed, 17 Jul 2019 17:35:55 -0400 Subject: 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. (From meta-ibm rev: bb0e1d0699a4b9905c053c94af7d882cd71779fc) Change-Id: I82f7338b0d7a64b5e7a67e19bcdff07f48a332d4 Signed-off-by: Brad Bishop --- .../recipes-phosphor/network/first-boot-set-mac_%.bbappend | 2 +- .../recipes-phosphor/network/phosphor-network_%.bbappend | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'meta-ibm/meta-witherspoon/recipes-phosphor/network') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/network/first-boot-set-mac_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/network/first-boot-set-mac_%.bbappend index 29d23c8c41..cb167ee3f6 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/network/first-boot-set-mac_%.bbappend +++ b/meta-ibm/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-ibm/meta-witherspoon/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/network/phosphor-network_%.bbappend index 5137f4e009..ba6e393bb5 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/network/phosphor-network_%.bbappend +++ b/meta-ibm/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} } -- cgit v1.2.3