From fe387289b1be6a42a92fb4302cf85b5ea7b2cf79 Mon Sep 17 00:00:00 2001
From: Nazarii Hnydyn <nazariig@mellanox.com>
Date: Fri, 31 Jul 2020 08:59:57 +0300
Subject: [PATCH] [Mellanox] Update MFT to 4.15.0-104 (#5075)

* [Mellanox] Update MFT to 4.15.0-104.
* [Mellanox] Remove build system W/A.

Signed-off-by: Nazarii Hnydyn <nazariig@mellanox.com>
---
 files/build_templates/sonic_debian_extension.j2 | 11 -----------
 platform/mellanox/mft.mk                        |  4 ++--
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 37b264304f..738c11a6f0 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -405,18 +405,7 @@ sudo chmod a+x $FILESYSTEM_ROOT/usr/sbin/policy-rc.d
 
 {% if installer_debs.strip() -%}
 {% for deb in installer_debs.strip().split(' ') -%}
-{% if sonic_asic_platform == "mellanox" %}
-if [ -e tmpdir ] ;
-then
-    rm -rf tmpdir;
-fi
-sudo mkdir tmpdir
-sudo dpkg --extract {{deb}} tmpdir
-for subdir in $(ls tmpdir) ; do sudo cp -R tmpdir/$subdir/* $FILESYSTEM_ROOT/$subdir; done
-sudo rm -rf tmpdir
-{% else %}
 sudo dpkg --root=$FILESYSTEM_ROOT -i {{deb}} || sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
-{% endif %}
 {% endfor %}
 {% endif %}
 
diff --git a/platform/mellanox/mft.mk b/platform/mellanox/mft.mk
index 0adfec10c3..213b7f9fc0 100644
--- a/platform/mellanox/mft.mk
+++ b/platform/mellanox/mft.mk
@@ -1,7 +1,7 @@
 # Mellanox SAI
 
-MFT_VERSION = 4.14.5
-MFT_REVISION = 2
+MFT_VERSION = 4.15.0
+MFT_REVISION = 104
 
 export MFT_VERSION MFT_REVISION