From 886437db3ae234730b8af03bc4fb7a804eb92c2f Mon Sep 17 00:00:00 2001
From: Xiwen Yu <13230610+VALLIS-NERIA@users.noreply.github.com>
Date: Wed, 6 Aug 2025 10:57:31 +0800
Subject: [PATCH] merge existing env fix

Signed-off-by: Xiwen Yu <13230610+VALLIS-NERIA@users.noreply.github.com>
---
 bringup_fix.sh                | 5 -----
 docker/common/install_base.sh | 1 +
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/bringup_fix.sh b/bringup_fix.sh
index 7c18044182..0e1d14e334 100644
--- a/bringup_fix.sh
+++ b/bringup_fix.sh
@@ -9,8 +9,6 @@ wget https://github.com/Kitware/CMake/releases/download/v4.0.3/cmake-4.0.3-linux
     bash cmake-4.0.3-linux-x86_64.sh --skip-license --prefix=/usr/local/cmake --exclude-subdir
 
 apt update
-apt remove -y ibverbs-providers libibverbs1
-apt install -y libibverbs-dev
 apt install -y libstdc++-14-dev
 
 elif [ $ARCH == "aarch64" ]; then
@@ -24,9 +22,6 @@ wget https://github.com/Kitware/CMake/releases/download/v4.0.3/cmake-4.0.3-linux
     bash cmake-4.0.3-linux-aarch64.sh --skip-license --prefix=/usr/local/cmake --exclude-subdir
 
 apt update
-# fix NXIL
-apt remove -y ibverbs-providers libibverbs1 # package version conflict with libibverbs-dev
-apt install -y libibverbs-dev
 # fix LLVM build
 apt install -y libstdc++-14-dev
 
diff --git a/docker/common/install_base.sh b/docker/common/install_base.sh
index cd5e45ee00..548e9c1b27 100644
--- a/docker/common/install_base.sh
+++ b/docker/common/install_base.sh
@@ -45,6 +45,7 @@ cleanup() {
 init_ubuntu() {
   apt-get update
   # libibverbs-dev is installed but libmlx5.so is missing, reinstall the package
+  apt remove -y ibverbs-providers libibverbs1
   apt-get --reinstall install -y libibverbs-dev
   apt-get install -y --no-install-recommends \
     ccache \