meta-google: google-usb-network: Remove unused IP option
None of our configurations use the IPv4 address for the BMC, so we can
remove all of the configuration.
Change-Id: Ib7fd08afc48c189d5e79ceaf64deedacdf6ff6a4
Signed-off-by: William A. Kennington III <wak@google.com>
diff --git a/meta-google/recipes-google/networking/google-usb-network/00-bmc-usb0.network.m4 b/meta-google/recipes-google/networking/google-usb-network/00-bmc-usb0.network.m4
deleted file mode 100644
index 699ee85..0000000
--- a/meta-google/recipes-google/networking/google-usb-network/00-bmc-usb0.network.m4
+++ /dev/null
@@ -1,7 +0,0 @@
-[Match]
-Name=usb0
-[Address]
-Address=M_BMC_IP_ADDR
-[Network]
-LinkLocalAddressing=ipv6
-IPv6AcceptRA=no
diff --git a/meta-google/recipes-google/networking/google-usb-network/usb_network.sh b/meta-google/recipes-google/networking/google-usb-network/usb_network.sh
index ebba57d..ba271b7 100755
--- a/meta-google/recipes-google/networking/google-usb-network/usb_network.sh
+++ b/meta-google/recipes-google/networking/google-usb-network/usb_network.sh
@@ -45,21 +45,26 @@
}
gadget_start() {
- # Add the gbmcbr configuration if this is a relevant device
- if (( ID_VENDOR == 0x18d1 && ID_PRODUCT == 0x22b )); then
- mkdir -p /run/systemd/network || return
- cat >/run/systemd/network/+-bmc-"${IFACE_NAME}".network <<EOF
+ # Always provide a basic network configuration
+ mkdir -p /run/systemd/network || return
+ cat >/run/systemd/network/+-bmc-"${IFACE_NAME}".network <<EOF
[Match]
Name=${IFACE_NAME}
+EOF
+
+ # Add the gbmcbr configuration if this is a relevant device
+ if (( ID_VENDOR == 0x18d1 && ID_PRODUCT == 0x22b )); then
+ cat >>/run/systemd/network/+-bmc-"${IFACE_NAME}".network <<EOF
[Network]
Bridge=gbmcbr
[Bridge]
Cost=85
EOF
- # Ignore any failures due to systemd being unavailable at boot
- networkctl reload || true
fi
+ # Ignore any failures due to systemd being unavailable at boot
+ networkctl reload || true
+
local gadget_dir="${CONFIGFS_HOME}/usb_gadget/${GADGET_DIR_NAME}"
mkdir -p "${gadget_dir}" || return
echo ${ID_VENDOR} > "${gadget_dir}/idVendor" || return
diff --git a/meta-google/recipes-google/networking/google-usb-network_git.bb b/meta-google/recipes-google/networking/google-usb-network_git.bb
index 9ba7c52..083cb2e 100644
--- a/meta-google/recipes-google/networking/google-usb-network_git.bb
+++ b/meta-google/recipes-google/networking/google-usb-network_git.bb
@@ -17,28 +17,18 @@
SYSTEMD_PACKAGES = "${PN}"
SYSTEMD_SERVICE:${PN} = "usb_network.service"
-BMC_IP_ADDR ??= "169.254.95.118/16"
BMC_USB_ECM_PRODUCT_ID ??= ""
BMC_USB_ECM_PRODUCT_NAME ??= "${MACHINE} BMC"
BMC_USB_ECM_HOST_MAC ??= "invalid"
BMC_USB_ECM_DEV_MAC ??= "invalid"
BMC_USB_ECM_BIND_DEV ??= ""
-BMC_USB_CONFIG_PRIORITY ??= ""
-BMC_USB_CONFIG_FILENAME ??= "${BMC_USB_CONFIG_PRIORITY}-bmc-usb0.network"
BMC_USB_TYPE ??= "eem"
BMC_USB_IFACE ??= "gusb0"
-SRC_URI += "file://00-bmc-usb0.network.m4"
SRC_URI += "file://usb_network.service.m4"
SRC_URI += "file://usb_network.sh"
-FILES:${PN} = "${bindir}/usb_network.sh"
-FILES:${PN}:append = " ${systemd_unitdir}/network/${BMC_USB_CONFIG_FILENAME}"
-
do_compile() {
- test "X${BMC_IP_ADDR}" != "X" || bberror "Please define BMC_IP_ADDR"
- m4 -DM_BMC_IP_ADDR=${BMC_IP_ADDR} ${WORKDIR}/00-bmc-usb0.network.m4 > ${S}/00-bmc-usb0.network
-
test "X${BMC_USB_ECM_PRODUCT_ID}" != "X" || bberror "Please define BMC_USB_ECM_PRODUCT_ID"
test "X${BMC_USB_ECM_PRODUCT_NAME}" != "X" || bberror "Please define BMC_USB_ECM_PRODUCT_NAME"
test "X${BMC_USB_ECM_BIND_DEV}" != "X" || bberror "Please define BMC_USB_ECM_BIND_DEV"
@@ -61,8 +51,4 @@
install -d ${D}${systemd_system_unitdir}
install -m 0644 ${S}/usb_network.service ${D}${systemd_system_unitdir}
-
- install -d ${D}${systemd_unitdir}/network
- install -m 0644 ${S}/00-bmc-usb0.network \
- ${D}${systemd_unitdir}/network/${BMC_USB_CONFIG_FILENAME}
}