Fix code following code review comments

dprital · Jul 29, 2024 · f469e92 · f469e92
1 parent ed2c94c
commit f469e92
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 5 deletions.
diff --git a/platform/mellanox/mlnx-sai.mk b/platform/mellanox/mlnx-sai.mk
@@ -19,7 +19,7 @@ export MLNX_SAI_VERSION MLNX_SAI_SOURCE_BASE_URL
 
 MLNX_SAI = mlnx-sai_1.mlnx.$(MLNX_SAI_VERSION)_$(CONFIGURED_ARCH).deb
 $(MLNX_SAI)_SRC_PATH = $(PLATFORM_PATH)/mlnx-sai
-$(MLNX_SAI)_DEPENDS += $(MLNX_SDK_DEBS) $(LIBNL3_DEV) $(LIBNL_GENL3_DEV) $(LIBNL_ROUTE3_DEV) $(LIBNL_NF3_DEV)
+$(MLNX_SAI)_DEPENDS += $(MLNX_SDK_DEBS) $(LIBNL_ROUTE3_DEV)
 $(MLNX_SAI)_RDEPENDS += $(MLNX_SDK_RDEBS) $(MLNX_SDK_DEBS) $(LIBNL_ROUTE3)
 $(eval $(call add_conflict_package,$(MLNX_SAI),$(LIBSAIVS_DEV)))
 MLNX_SAI_DBGSYM = mlnx-sai-dbgsym_1.mlnx.$(MLNX_SAI_VERSION)_$(CONFIGURED_ARCH).deb

diff --git a/platform/mellanox/sdk-src/sys-sdk/Makefile b/platform/mellanox/sdk-src/sys-sdk/Makefile
@@ -7,7 +7,6 @@ DERIVED_TARGETS = sys-sdk_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH)-dev.
 PACKAGE_NAME = sys_sdk
 
 $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
-
         # get sources
 	rm -rf $(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION)
 
@@ -16,7 +15,6 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	wget -c $(MLNX_SDK_SOURCE_BASE_URL)/$(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION).tar.gz -O - | tar -xz
 
         # build
-
 	rm -rf builds/cmake
 
 	cmake -B builds/cmake -DPYTHON_INTERPRETERS=python3 -DSKIP_UNINSTALL_INSTALL_DEPENDENCY=on -DSKIP_DEPMOD_IN_INSTALL_PHASE=on -DUSE_API_TESTER=OFF -DUSE_KERNEL=OFF -DCMAKE_PROJECT_VERSION=$(MLNX_SDK_DEB_VERSION)

diff --git a/sonic-slave-bookworm/Dockerfile.j2 b/sonic-slave-bookworm/Dockerfile.j2
@@ -484,7 +484,6 @@ RUN wget https://github.com/Kitware/CMake/releases/download/v3.27.6/cmake-3.27.6
 RUN chmod +x cmake-3.27.6-linux-x86_64.sh
 RUN sudo ./cmake-3.27.6-linux-x86_64.sh --skip-license --prefix=/usr
 RUN sudo apt-get update -y
-RUN sudo apt-get install -y libnl-genl-3-dev
 
 {%- if CROSS_BUILD_ENVIRON == "y" %}
 # Arm vs. amd64 versions conflict - remove amd64 packages

diff --git a/sonic-slave-bullseye/Dockerfile.j2 b/sonic-slave-bullseye/Dockerfile.j2
@@ -463,7 +463,6 @@ RUN wget https://github.com/Kitware/CMake/releases/download/v3.27.6/cmake-3.27.6
 RUN chmod +x cmake-3.27.6-linux-x86_64.sh
 RUN sudo ./cmake-3.27.6-linux-x86_64.sh --skip-license --prefix=/usr
 RUN sudo apt-get update -y
-RUN sudo apt-get install -y libnl-genl-3-dev
 
 {%- if CROSS_BUILD_ENVIRON == "y" %}
 # Arm vs. amd64 versions conflict - remove amd64 packages