From 67cc385e3667492f11645b0e2a789b9bea3762ee Mon Sep 17 00:00:00 2001 From: Guohan Lu Date: Mon, 3 Feb 2020 11:42:13 +0000 Subject: [PATCH] [baseimage]: remove ixgbe.ko as 4.19 has new ixgbe driver Signed-off-by: Guohan Lu --- build_debian.sh | 5 ----- slave.mk | 1 - 2 files changed, 6 deletions(-) diff --git a/build_debian.sh b/build_debian.sh index 6981f698a1..f1e8a2eb61 100755 --- a/build_debian.sh +++ b/build_debian.sh @@ -184,11 +184,6 @@ if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then cat files/initramfs-tools/modules.arm | sudo tee -a $FILESYSTEM_ROOT/etc/initramfs-tools/modules > /dev/null fi -if [[ $CONFIGURED_ARCH == amd64 ]]; then - ## Install latest intel ixgbe driver - sudo cp $files_path/ixgbe.ko $FILESYSTEM_ROOT/lib/modules/${LINUX_KERNEL_VERSION}-amd64/kernel/drivers/net/ethernet/intel/ixgbe/ixgbe.ko -fi - ## Install docker echo '[INFO] Install docker' ## Install apparmor utils since they're missing and apparmor is enabled in the kernel diff --git a/slave.mk b/slave.mk index a2378462ec..098a5f12f0 100644 --- a/slave.mk +++ b/slave.mk @@ -781,7 +781,6 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \ $$(addprefix $(TARGET_PATH)/,$$($$*_DOCKERS)) \ $$(addprefix $(FILES_PATH)/,$$($$*_FILES)) \ $(if $(findstring y,$(ENABLE_ZTP)),$(addprefix $(IMAGE_DISTRO_DEBS_PATH)/,$(SONIC_ZTP))) \ - $(addprefix $(IMAGE_DISTRO_FILES_PATH)/, $(if $(filter $(CONFIGURED_ARCH),amd64), $(IXGBE_DRIVER))) \ $(addprefix $(PYTHON_DEBS_PATH)/,$(SONIC_UTILS)) \ $(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_CONFIG_ENGINE)) \ $(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_PLATFORM_COMMON_PY2)) \