From ad67a14a47c8f5aa7da9342af392f1c0b42a2761 Mon Sep 17 00:00:00 2001
From: Alexander Allen <admin@altechcode.com>
Date: Mon, 1 Nov 2021 18:59:33 -0400
Subject: [PATCH] Mellanox bullseye merge (#1)

* Make neccesary changed to mellanox platform code to build on Debian 11

* Revert use of backported kernel to build mft and elect to only build kernel module under bullseye
---
 platform/mellanox/mft.mk         | 4 ++--
 platform/mellanox/mft/Makefile   | 4 +++-
 platform/mellanox/rules.mk       | 6 ------
 sonic-slave-buster/Dockerfile.j2 | 4 ----
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/platform/mellanox/mft.mk b/platform/mellanox/mft.mk
index 97d31f8fe46d..f068520d2b94 100644
--- a/platform/mellanox/mft.mk
+++ b/platform/mellanox/mft.mk
@@ -26,11 +26,11 @@ $(MFT)_SRC_PATH = $(PLATFORM_PATH)/mft
 SONIC_MAKE_DEBS += $(MFT)
 
 ifeq ($(BLDENV), bullseye)
-$(MFT)_DEPENDS = $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
-endif
+$(MFT)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
 
 KERNEL_MFT = kernel-mft-dkms-modules-$(KVERSION)_$(MFT_VERSION)_amd64.deb
 $(eval $(call add_derived_package,$(MFT),$(KERNEL_MFT)))
+endif
 
 MFT_OEM = mft-oem_$(MFT_VERSION)-$(MFT_REVISION)_amd64.deb
 $(eval $(call add_derived_package,$(MFT),$(MFT_OEM)))
diff --git a/platform/mellanox/mft/Makefile b/platform/mellanox/mft/Makefile
index efa791dba1db..2de2f7745c8e 100644
--- a/platform/mellanox/mft/Makefile
+++ b/platform/mellanox/mft/Makefile
@@ -35,6 +35,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	wget -O $(MFT_TGZ) http://www.mellanox.com/downloads/MFT/$(MFT_TGZ)
 	tar xzf $(MFT_TGZ)
 
+ifeq ($(BLDENV), bullseye)
 	pushd $(MFT_NAME)/SDEBS
 
 	# put a lock here because dpkg does not allow installing packages in parallel
@@ -46,7 +47,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 
 	popd
 
-	sudo dkms build kernel-mft-dkms/$(MFT_VERSION) -k $(KVERSION) -a amd64 --kernelsourcedir /usr/src/linux-headers-$(KVERSION)
+	sudo dkms build kernel-mft-dkms/$(MFT_VERSION) -k $(KVERSION) -a amd64
 	sudo dkms mkbmdeb kernel-mft-dkms/$(MFT_VERSION) -k $(KVERSION) -a amd64
 
 	# w/a: remove dependencies
@@ -62,6 +63,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	popd
 
 	rm -rf $(DKMS_TMP)
+endif
 
 	# fix timestamp because we do not actually build tools, only kernel
 	touch $(MFT_NAME)/DEBS/*.deb
diff --git a/platform/mellanox/rules.mk b/platform/mellanox/rules.mk
index f4d13abbc180..be046bed91eb 100644
--- a/platform/mellanox/rules.mk
+++ b/platform/mellanox/rules.mk
@@ -14,12 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-# Set KVERSION correctly depending on build environment
-ifeq ($(BLDENV), buster)
-KVERSION = 5.10.0-0.bpo.9-amd64
-endif
-
 include $(PLATFORM_PATH)/sdk.mk
 include $(PLATFORM_PATH)/fw.mk
 include $(PLATFORM_PATH)/mft.mk
diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2
index 2c8b144d7d5a..3ac1709d20d2 100644
--- a/sonic-slave-buster/Dockerfile.j2
+++ b/sonic-slave-buster/Dockerfile.j2
@@ -153,10 +153,6 @@ RUN apt-get update && apt-get install -y \
 # For mellanox sai build
         libtool-bin \
         libxml2-dev \
-# For mellanox MFT build
-	linux-image-5.10.0-0.bpo.9-amd64 \
-	linux-headers-5.10.0-0.bpo.9-amd64 \
-	linux-headers-5.10.0-0.bpo.9-common \
 # For BFN sdk build
         libusb-1.0-0-dev \
         libcurl3-nss-dev \