From 009b029f99eac7149409dd6ee841961a9bc3580b Mon Sep 17 00:00:00 2001 From: Nazarii Hnydyn Date: Sat, 23 Mar 2024 00:13:32 +0200 Subject: [PATCH] [Mellanox][MFT]: Update MFT to 4.27.0-83: bash login fix (#18443) * Revert "[Mellanox] Disable MFT bash autocompletion (#17442)" This reverts commit 278a9585171eedfc60f942374602ad52ff928071. * [mellanox][mft]: Update MFT to 4.27.0-83: bash login fix. Signed-off-by: Nazarii Hnydyn --------- Signed-off-by: Nazarii Hnydyn --- platform/mellanox/mft.mk | 4 ++-- platform/mellanox/mft/Makefile | 16 +--------------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/platform/mellanox/mft.mk b/platform/mellanox/mft.mk index 2fd01811ea..4dbdf07cff 100644 --- a/platform/mellanox/mft.mk +++ b/platform/mellanox/mft.mk @@ -16,8 +16,8 @@ # # Mellanox SAI -MFT_VERSION = 4.25.0 -MFT_REVISION = 62 +MFT_VERSION = 4.27.0 +MFT_REVISION = 83 MLNX_MFT_INTERNAL_SOURCE_BASE_URL = diff --git a/platform/mellanox/mft/Makefile b/platform/mellanox/mft/Makefile index 2447e4b2aa..2f331ea879 100644 --- a/platform/mellanox/mft/Makefile +++ b/platform/mellanox/mft/Makefile @@ -42,8 +42,7 @@ DERIVED_TARGETS = mft-oem_$(MFT_VERSION)-$(MFT_REVISION)_$(CONFIGURED_ARCH).deb DKMS_CTRL = /var/lib/dkms/kernel-mft-dkms/ DKMS_TMP := $(shell mktemp -u -d -t dkms.XXXXXXXXXX) -MFT_DEB_TMP := $(shell mktemp -u -d -t mft.deb.XXXXXXXXXX) -MFT_TMP := $(shell mktemp -u -d -t mft.XXXXXXXXXX) +MFT_TMP = /tmp/mft_build/ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : mkdir -p $(MFT_TMP) @@ -51,19 +50,6 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : wget -O $(MFT_TGZ) $(MFT_TGZ_URL) tar xzf $(MFT_TGZ) - # w/a: disable bash autocompletion - mkdir -p $(MFT_DEB_TMP)/DEBIAN - - dpkg -e $(MFT_NAME)/DEBS/$(MAIN_TARGET) $(MFT_DEB_TMP)/DEBIAN - dpkg -x $(MFT_NAME)/DEBS/$(MAIN_TARGET) $(MFT_DEB_TMP) - - rm -rf $(MFT_DEB_TMP)/etc/bash_completion.d - sed -i '/bash_completion.d/d' $(MFT_DEB_TMP)/DEBIAN/conffiles - - dpkg -b $(MFT_DEB_TMP) $(MFT_NAME)/DEBS/$(MAIN_TARGET) - - rm -rf $(MFT_DEB_TMP) - # fix timestamp touch $(MFT_NAME)/DEBS/*.deb mv $(MFT_NAME)/DEBS/*.deb $(DEST)