From bb9160afb99eaf8646a963195d2d9b7b3ecd8e81 Mon Sep 17 00:00:00 2001 From: George Liu Date: Thu, 27 May 2021 19:42:33 +0800 Subject: fp5280g2: network: Enable First Boot Set MAC Feature The intent behind this commit is to enable First Boot Set MAC Feature for Network Service and remove first-boot-set-mac. Because the `sync-mac` of the Network Service can set the MAC address at runtime(if the Inventory Objects are Added at Runtime). Tested: Built fp5280g2 successfully and saw eth0 & eth1 worked. Signed-off-by: George Liu Change-Id: I99967f84c64cbcac34adf95cf6a5084f8b1a185d --- .../recipes-phosphor/network/first-boot-set-mac_%.bbappend | 1 - .../recipes-phosphor/network/phosphor-network/config.json | 4 ++++ .../recipes-phosphor/network/phosphor-network_%.bbappend | 12 ++++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) delete mode 100644 meta-inspur/meta-fp5280g2/recipes-phosphor/network/first-boot-set-mac_%.bbappend create mode 100644 meta-inspur/meta-fp5280g2/recipes-phosphor/network/phosphor-network/config.json create mode 100644 meta-inspur/meta-fp5280g2/recipes-phosphor/network/phosphor-network_%.bbappend (limited to 'meta-inspur') diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/network/first-boot-set-mac_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/network/first-boot-set-mac_%.bbappend deleted file mode 100644 index 934b328c7..000000000 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/network/first-boot-set-mac_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -SYSTEMD_SERVICE_${PN} += " first-boot-set-mac@eth0.service first-boot-set-mac@eth1.service" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/network/phosphor-network/config.json b/meta-inspur/meta-fp5280g2/recipes-phosphor/network/phosphor-network/config.json new file mode 100644 index 000000000..1df4eda7d --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/network/phosphor-network/config.json @@ -0,0 +1,4 @@ +{ + "eth0":"eth0", + "eth1":"eth1" +} diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/network/phosphor-network_%.bbappend new file mode 100644 index 000000000..e8ac0e29c --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/network/phosphor-network_%.bbappend @@ -0,0 +1,12 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +PACKAGECONFIG_append = " sync-mac" + +SRC_URI += "file://config.json" + +FILES_${PN} += "${datadir}/network" + +do_install_append() { + install -d ${D}${datadir}/network + install -m 0644 ${WORKDIR}/config.json ${D}${datadir}/network/ +} -- cgit v1.2.3