From eda6f00c1f0479d4c3aeee59be80b6c7c6a4792c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 11 May 2021 03:09:54 -0700 Subject: meta-google: gbmc-bridge: Fix misconfigured MAC The network addresses derived from the MAC address are supposed to go in the .network file instead of the .netdev file. Change-Id: I9e9dc2c213414ae458392beab32334b89a897267 Signed-off-by: William A. Kennington III --- meta-google/recipes-google/networking/gbmc-bridge.bb | 19 +++++++++---------- .../networking/gbmc-bridge/-bmc-gbmcbr.netdev | 5 +++++ .../networking/gbmc-bridge/-bmc-gbmcbr.netdev.in | 7 ------- .../networking/gbmc-bridge/-bmc-gbmcbr.network | 8 -------- .../networking/gbmc-bridge/-bmc-gbmcbr.network.in | 9 +++++++++ 5 files changed, 23 insertions(+), 25 deletions(-) create mode 100644 meta-google/recipes-google/networking/gbmc-bridge/-bmc-gbmcbr.netdev delete mode 100644 meta-google/recipes-google/networking/gbmc-bridge/-bmc-gbmcbr.netdev.in delete mode 100644 meta-google/recipes-google/networking/gbmc-bridge/-bmc-gbmcbr.network create mode 100644 meta-google/recipes-google/networking/gbmc-bridge/-bmc-gbmcbr.network.in (limited to 'meta-google') diff --git a/meta-google/recipes-google/networking/gbmc-bridge.bb b/meta-google/recipes-google/networking/gbmc-bridge.bb index fc7dfbfb36..c132bff5e3 100644 --- a/meta-google/recipes-google/networking/gbmc-bridge.bb +++ b/meta-google/recipes-google/networking/gbmc-bridge.bb @@ -7,8 +7,8 @@ inherit systemd FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += " \ - file://-bmc-gbmcbr.netdev.in \ - file://-bmc-gbmcbr.network \ + file://-bmc-gbmcbr.netdev \ + file://-bmc-gbmcbr.network.in \ file://-bmc-gbmcbrdummy.netdev \ file://-bmc-gbmcbrdummy.network \ file://+-bmc-gbmcbrusb.network \ @@ -61,17 +61,16 @@ do_install() { install -d -m0755 $netdir if [ ! -z "${GBMC_BR_MAC_ADDR}" ]; then - sed -i 's,@MAC@,Address=fe80::${@mac_to_eui64(GBMC_BR_MAC_ADDR)}/64,' \ - ${WORKDIR}/-bmc-gbmcbr.netdev.in - addr=${GBMC_ULA_PREFIX}:${@mac_to_eui64(GBMC_BR_MAC_ADDR)}/64 - sed -i "s,@ADDR@,Address=$addr," ${WORKDIR}/-bmc-gbmcbr.netdev.in + local addr= + addr+='Address=fe80::${@mac_to_eui64(GBMC_BR_MAC_ADDR)}/64\n' + addr+='Address=${GBMC_ULA_PREFIX}:${@mac_to_eui64(GBMC_BR_MAC_ADDR)}/64' + sed -i "s,@ADDR@,$addr," ${WORKDIR}/-bmc-gbmcbr.network.in else - sed -i '/@MAC@/d' ${WORKDIR}/-bmc-gbmcbr.netdev.in - sed -i '/@ADDR@/d' ${WORKDIR}/-bmc-gbmcbr.netdev.in + sed -i '/@ADDR@/d' ${WORKDIR}/-bmc-gbmcbr.network.in fi - install -m0644 ${WORKDIR}/-bmc-gbmcbr.netdev.in $netdir/-bmc-gbmcbr.netdev - install -m0644 ${WORKDIR}/-bmc-gbmcbr.network $netdir/ + install -m0644 ${WORKDIR}/-bmc-gbmcbr.netdev $netdir/ + install -m0644 ${WORKDIR}/-bmc-gbmcbr.network.in $netdir/-bmc-gbmcbr.network install -m0644 ${WORKDIR}/-bmc-gbmcbrdummy.netdev $netdir/ install -m0644 ${WORKDIR}/-bmc-gbmcbrdummy.network $netdir/ install -m0644 ${WORKDIR}/+-bmc-gbmcbrusb.network $netdir/ diff --git a/meta-google/recipes-google/networking/gbmc-bridge/-bmc-gbmcbr.netdev b/meta-google/recipes-google/networking/gbmc-bridge/-bmc-gbmcbr.netdev new file mode 100644 index 0000000000..d890ef9ff1 --- /dev/null +++ b/meta-google/recipes-google/networking/gbmc-bridge/-bmc-gbmcbr.netdev @@ -0,0 +1,5 @@ +[NetDev] +Name=gbmcbr +Kind=bridge +[Bridge] +STP=true diff --git a/meta-google/recipes-google/networking/gbmc-bridge/-bmc-gbmcbr.netdev.in b/meta-google/recipes-google/networking/gbmc-bridge/-bmc-gbmcbr.netdev.in deleted file mode 100644 index a7e91332c2..0000000000 --- a/meta-google/recipes-google/networking/gbmc-bridge/-bmc-gbmcbr.netdev.in +++ /dev/null @@ -1,7 +0,0 @@ -[NetDev] -Name=gbmcbr -Kind=bridge -@MAC@ -@ADDR@ -[Bridge] -STP=true diff --git a/meta-google/recipes-google/networking/gbmc-bridge/-bmc-gbmcbr.network b/meta-google/recipes-google/networking/gbmc-bridge/-bmc-gbmcbr.network deleted file mode 100644 index 37aea6c1e8..0000000000 --- a/meta-google/recipes-google/networking/gbmc-bridge/-bmc-gbmcbr.network +++ /dev/null @@ -1,8 +0,0 @@ -[Match] -Name=gbmcbr -[Network] -DHCP=false -IPv6AcceptRA=true -LLMNR=true -MulticastDNS=true -LinkLocalAddressing=ipv6 diff --git a/meta-google/recipes-google/networking/gbmc-bridge/-bmc-gbmcbr.network.in b/meta-google/recipes-google/networking/gbmc-bridge/-bmc-gbmcbr.network.in new file mode 100644 index 0000000000..c6097bbdb0 --- /dev/null +++ b/meta-google/recipes-google/networking/gbmc-bridge/-bmc-gbmcbr.network.in @@ -0,0 +1,9 @@ +[Match] +Name=gbmcbr +[Network] +@ADDR@ +DHCP=false +IPv6AcceptRA=true +LLMNR=true +MulticastDNS=true +LinkLocalAddressing=ipv6 -- cgit v1.2.3