From a68422b555ac8abd917383be57cb71a937672686 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 4 Apr 2022 17:54:01 -0700 Subject: meta-google: google-usb-network: Allow specifying interface name Change-Id: Icdf1b12993b96d13008ddae93a54aa5bd6b35173 Signed-off-by: William A. Kennington III --- .../recipes-google/networking/google-usb-network/usb_network.service.m4 | 2 +- meta-google/recipes-google/networking/google-usb-network_git.bb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'meta-google') diff --git a/meta-google/recipes-google/networking/google-usb-network/usb_network.service.m4 b/meta-google/recipes-google/networking/google-usb-network/usb_network.service.m4 index cefaff9400..252f4093fc 100644 --- a/meta-google/recipes-google/networking/google-usb-network/usb_network.service.m4 +++ b/meta-google/recipes-google/networking/google-usb-network/usb_network.service.m4 @@ -21,7 +21,7 @@ ExecStart=M_SCRIPT_INSTALL_DIR/usb_network.sh \ --dev-type "M_BMC_USB_TYPE" \ HOST_MAC_ARG(M_BMC_USB_HOST_MAC) \ DEV_MAC_ARG(M_BMC_USB_DEV_MAC) \ - --iface-name usb0 \ + --iface-name "M_BMC_USB_IFACE" \ --bind-device "M_BMC_USB_BIND_DEV" ExecStop=M_SCRIPT_INSTALL_DIR/usb_network.sh stop 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 882b755f8e..9ba7c529fa 100644 --- a/meta-google/recipes-google/networking/google-usb-network_git.bb +++ b/meta-google/recipes-google/networking/google-usb-network_git.bb @@ -26,6 +26,7 @@ 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" @@ -48,6 +49,7 @@ do_compile() { -DM_BMC_USB_TYPE="${BMC_USB_TYPE}" \ -DM_BMC_USB_HOST_MAC="${BMC_USB_ECM_HOST_MAC}" \ -DM_BMC_USB_DEV_MAC="${BMC_USB_ECM_DEV_MAC}" \ + -DM_BMC_USB_IFACE="${BMC_USB_IFACE}" \ -DM_BMC_USB_BIND_DEV="${BMC_USB_ECM_BIND_DEV}" \ -DM_SCRIPT_INSTALL_DIR="${bindir}" \ ${WORKDIR}/usb_network.service.m4 > ${S}/usb_network.service -- cgit v1.2.3