From b58da29169874ee20486f4a2a8dad98b9c3180af Mon Sep 17 00:00:00 2001
From: Brad Bishop <bradleyb@fuzziesquirrel.com>
Date: Fri, 19 Apr 2019 14:10:44 -0400
Subject: witherspoon: Use first-boot-set-mac

Use the new first-boot-set-mac recipe from the openpower layer for
setting the mac address on first boot.  This replaces
obmc-mgr-inventory's sync_inventory_items.py script that achieves the
same - but is the last remaining requirement for python on Witherspoon
systems and first-boot-set-mac is shell!

(From meta-ibm rev: 1249fea4137fcf0107a0ad77d78039ddf87c55d4)

Tested-By: Built a witherspoon image and manually verified the root
           filesystem included a symlink to first-boot-set-mac@.service
           in /etc.
Change-Id: If26c6e2337ec182951a2484a09a4843418716980
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
 .../chassis/obmc-mgr-inventory%.bbappend           | 24 ----------------------
 .../images/obmc-phosphor-image.bbappend            |  2 +-
 .../network/first-boot-set-mac_%.bbappend          |  1 +
 3 files changed, 2 insertions(+), 25 deletions(-)
 delete mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend
 create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/network/first-boot-set-mac_%.bbappend

diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend
deleted file mode 100644
index 0165929a6..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend
+++ /dev/null
@@ -1,24 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-INSTANCES = "motherboard/uuid motherboard/bmc/ethernet"
-ITEMS_FMT = "system/chassis/{0}"
-
-ITEMS = "${@compose_list(d, 'ITEMS_FMT', 'INSTANCES')}"
-
-ENV_FILES = "obmc/sync_inventory_item/{0}"
-SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENV_FILES', 'ITEMS')}"
-
-TMPL = "obmc-sync-inventory-item@.service"
-TGT = "multi-user.target"
-
-ETH_SVC = "system-chassis-motherboard-bmc-ethernet.service"
-UUID_SVC = "system-chassis-motherboard-uuid.service"
-
-ETH_DROPIN_DIR = "obmc-sync-inventory-item@${ETH_SVC}.d"
-UUID_DROPIN_DIR = "obmc-sync-inventory-item@${UUID_SVC}.d"
-
-SYSTEMD_OVERRIDE_${PN} += "mac_sync_inventory.conf:${ETH_DROPIN_DIR}/mac_sync_inventory.conf"
-SYSTEMD_OVERRIDE_${PN} += "uuid_sync_inventory.conf:${UUID_DROPIN_DIR}/uuid_sync_inventory.conf"
-
-SYSTEMD_LINK_${PN} += "../${TMPL}:${TGT}.wants/obmc-sync-inventory-item@${ETH_SVC}"
-SYSTEMD_LINK_${PN} += "../${TMPL}:${TGT}.wants/obmc-sync-inventory-item@${UUID_SVC}"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend
index bea352f7d..aa7e786c0 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -1 +1 @@
-OBMC_IMAGE_EXTRA_INSTALL_append = " mboxd max31785-msl phosphor-msl-verify liberation-fonts uart-render-controller"
+OBMC_IMAGE_EXTRA_INSTALL_append = " mboxd max31785-msl phosphor-msl-verify liberation-fonts uart-render-controller first-boot-set-mac"
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
new file mode 100644
index 000000000..29d23c8c4
--- /dev/null
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/network/first-boot-set-mac_%.bbappend
@@ -0,0 +1 @@
+SYSTEMD_SERVICE_${PN} += "first-boot-set-mac@eth0.service"
-- 
cgit v1.2.3