diff options
7 files changed, 70 insertions, 2 deletions
diff --git a/meta-yadro/meta-nicole/recipes-core/systemd/systemd-conf/00-bmc-eth0.0.network b/meta-yadro/meta-nicole/recipes-core/systemd/systemd-conf/00-bmc-eth0.0.network new file mode 100644 index 0000000000..64a1436cbb --- /dev/null +++ b/meta-yadro/meta-nicole/recipes-core/systemd/systemd-conf/00-bmc-eth0.0.network @@ -0,0 +1,11 @@ +[Match] +Name=eth0 +KernelCommandLine=bmcposition=0 +[Network] +VLAN=eth0.4004 +DHCP=true +LinkLocalAddressing=yes +IPv6AcceptRA=false +Address=10.9.0.1/24 +[DHCP] +ClientIdentifier=mac diff --git a/meta-yadro/meta-nicole/recipes-core/systemd/systemd-conf/00-bmc-eth0.1.network b/meta-yadro/meta-nicole/recipes-core/systemd/systemd-conf/00-bmc-eth0.1.network new file mode 100644 index 0000000000..aaaa520dd9 --- /dev/null +++ b/meta-yadro/meta-nicole/recipes-core/systemd/systemd-conf/00-bmc-eth0.1.network @@ -0,0 +1,11 @@ +[Match] +Name=eth0 +KernelCommandLine=bmcposition=1 +[Network] +VLAN=eth0.4004 +DHCP=true +LinkLocalAddressing=yes +IPv6AcceptRA=false +Address=10.9.0.2/24 +[DHCP] +ClientIdentifier=mac diff --git a/meta-yadro/meta-nicole/recipes-core/systemd/systemd-conf/00-bmc-eth0.4004.0.network b/meta-yadro/meta-nicole/recipes-core/systemd/systemd-conf/00-bmc-eth0.4004.0.network new file mode 100644 index 0000000000..534cbe9b1b --- /dev/null +++ b/meta-yadro/meta-nicole/recipes-core/systemd/systemd-conf/00-bmc-eth0.4004.0.network @@ -0,0 +1,8 @@ +[Match] +Name=eth0.4004 +KernelCommandLine=bmcposition=0 +[Network] +LinkLocalAddressing=yes +IPv6AcceptRA=true +DHCP=no +Address=fd59:4144:524f:5441:544c:494e:3:1/122 diff --git a/meta-yadro/meta-nicole/recipes-core/systemd/systemd-conf/00-bmc-eth0.4004.1.network b/meta-yadro/meta-nicole/recipes-core/systemd/systemd-conf/00-bmc-eth0.4004.1.network new file mode 100644 index 0000000000..83a48eee7e --- /dev/null +++ b/meta-yadro/meta-nicole/recipes-core/systemd/systemd-conf/00-bmc-eth0.4004.1.network @@ -0,0 +1,8 @@ +[Match] +Name=eth0.4004 +KernelCommandLine=bmcposition=1 +[Network] +LinkLocalAddressing=yes +IPv6AcceptRA=true +DHCP=no +Address=fd59:4144:524f:5441:544c:494e:3:2/122 diff --git a/meta-yadro/meta-nicole/recipes-core/systemd/systemd-conf/eth0.4004.netdev b/meta-yadro/meta-nicole/recipes-core/systemd/systemd-conf/eth0.4004.netdev new file mode 100644 index 0000000000..e315f5e8a5 --- /dev/null +++ b/meta-yadro/meta-nicole/recipes-core/systemd/systemd-conf/eth0.4004.netdev @@ -0,0 +1,5 @@ +[NetDev] +Name=eth0.4004 +Kind=vlan +[VLAN] +Id=4004 diff --git a/meta-yadro/meta-nicole/recipes-core/systemd/systemd-conf_%.bbappend b/meta-yadro/meta-nicole/recipes-core/systemd/systemd-conf_%.bbappend new file mode 100644 index 0000000000..48d4a4a4c5 --- /dev/null +++ b/meta-yadro/meta-nicole/recipes-core/systemd/systemd-conf_%.bbappend @@ -0,0 +1,27 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI_append = " \ + file://00-bmc-eth0.4004.0.network \ + file://00-bmc-eth0.4004.1.network \ + file://00-bmc-eth0.0.network \ + file://00-bmc-eth0.1.network \ + file://eth0.4004.netdev \ +" + +do_install_append() { + install -m 0644 \ + ${WORKDIR}/00-bmc-eth0.4004.0.network \ + ${WORKDIR}/00-bmc-eth0.4004.1.network \ + ${WORKDIR}/00-bmc-eth0.0.network \ + ${WORKDIR}/00-bmc-eth0.1.network \ + ${WORKDIR}/eth0.4004.netdev \ + -D -t ${D}${sysconfdir}/systemd/network +} + +FILES_${PN}_append = " \ + ${sysconfdir}/systemd/network/00-bmc-eth0.4004.0.network \ + ${sysconfdir}/systemd/network/00-bmc-eth0.4004.1.network \ + ${sysconfdir}/systemd/network/00-bmc-eth0.0.network \ + ${sysconfdir}/systemd/network/00-bmc-eth0.1.network \ + ${sysconfdir}/systemd/network/eth0.4004.netdev \ +" 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 20ed5af41e..e71ba71a3d 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/network/phosphor-network_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/network/phosphor-network_%.bbappend @@ -1,7 +1,5 @@ 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" |