| commit | 8fb4768fe3e9a3beeb0ade0883e2d67792f4d814 | [log] [tgz] |
|---|---|---|
| author | Alexander Filippov <a.filippov@yadro.com> | Tue Jun 30 19:00:17 2020 +0300 |
| committer | Andrew Geissler <geissonator@yahoo.com> | Thu Jul 02 16:13:26 2020 -0500 |
| tree | 88243dcdb2d4db7d1ab259e72ee2aec75a2cda8a | |
| parent | fbde5944c7d78e1988cbb52858c259e93f642965 [diff] |
meta-nicole: phosphor-network: use sync mac option The phosphor-network now has the sync-mac feature. It does the same thing as the first-boot-set-mac without any additional services. This commit enables this new feature in phosphor-network and removes obsolete first-boot-set-mac service. (From meta-yadro rev: fea7a8d7a57accd658aa60248cb203afc735c73b) Change-Id: I31e530850b2550de70f72091c683153ecb6968a7 Signed-off-by: Alexander Filippov <a.filippov@yadro.com> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
diff --git a/meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend index 8f69024..b538c5f 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -1,7 +1,6 @@ OBMC_IMAGE_EXTRA_INSTALL_append = " \ admin-account \ first-boot-set-hostname \ - first-boot-set-mac \ mboxd \ obmc-yadro-cli \ openpower-fru-vpd \
diff --git a/meta-yadro/meta-nicole/recipes-phosphor/network/first-boot-set-mac_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/network/first-boot-set-mac_%.bbappend deleted file mode 100644 index 29d23c8..0000000 --- a/meta-yadro/meta-nicole/recipes-phosphor/network/first-boot-set-mac_%.bbappend +++ /dev/null
@@ -1 +0,0 @@ -SYSTEMD_SERVICE_${PN} += "first-boot-set-mac@eth0.service"
diff --git a/meta-yadro/meta-nicole/recipes-phosphor/network/phosphor-network/config.json b/meta-yadro/meta-nicole/recipes-phosphor/network/phosphor-network/config.json new file mode 100644 index 0000000..52280a4 --- /dev/null +++ b/meta-yadro/meta-nicole/recipes-phosphor/network/phosphor-network/config.json
@@ -0,0 +1,3 @@ +{ + "eth0":"ethernet" +}
diff --git a/meta-yadro/meta-nicole/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/network/phosphor-network_%.bbappend index 99d3031..20ed5af 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/network/phosphor-network_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/network/phosphor-network_%.bbappend
@@ -1 +1,12 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + RDEPENDS_${PN}_append = " vlan-4004" + +EXTRA_OECONF_append = " --enable-sync-mac " +SRC_URI_append = " file://config.json " +FILES_${PN} += "${datadir}/network/*.json" + +do_install_append() { + install -d ${D}${datadir}/network/ + install -m 0644 ${WORKDIR}/config.json ${D}${datadir}/network/ +}