Fixed OpenIPMI service failure in the runtime (#24)

Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com> Co-authored-by: Vivek Reddy Karri <vkarri@nvidia.com>
oleksandrivantsiv · Feb 2, 2022 · 18ee2c6 · 18ee2c6
1 parent 5b3f7b9
commit 18ee2c6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/platform/nvidia-bluefield/mlx-openipmi/Makefile b/platform/nvidia-bluefield/mlx-openipmi/Makefile
@@ -33,7 +33,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	pushd ${MLX_OPENIPMI}
 
 	# Build the package
-	DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -rfakeroot -us -uc -b -d -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
+	dpkg-buildpackage -rfakeroot -us -uc -b -d -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 
 	popd
 

diff --git a/platform/nvidia-bluefield/recipes/bfscripts.mk b/platform/nvidia-bluefield/recipes/bfscripts.mk
@@ -23,5 +23,6 @@ MLNX_BLUEFIELD_BUILD_SCRIPTS = mlxbf-scripts_$(MLNX_BLUEFIELD_BUILD_SCRIPTS_VERS
 
 $(MLNX_BLUEFIELD_BUILD_SCRIPTS)_SRC_PATH = $(PLATFORM_PATH)/bfscripts
 $(MLNX_BLUEFIELD_BUILD_SCRIPTS)_DEPENDS += $(MLXBF_BOOTCTL_DEB) $(BOOTIMAGES)
+$(MLNX_BLUEFIELD_BUILD_SCRIPTS)_RDEPENDS += $(MLXBF_BOOTCTL_DEB) $(BOOTIMAGES)
 
 SONIC_DPKG_DEBS += $(MLNX_BLUEFIELD_BUILD_SCRIPTS)
diff --git a/platform/nvidia-bluefield/recipes/installer-image.mk b/platform/nvidia-bluefield/recipes/installer-image.mk
@@ -31,6 +31,9 @@ $(SONIC_BF2_IMAGE_BASE)_INSTALLS += $(ETHTOOL) \
                                     $(KERNEL_MFT) \
                                     $(MFT_OEM) \
                                     $(MFT) \
+                                    $(BOOTIMAGES) \
+                                    $(MLXBF_BOOTCTL_DEB) \
+                                    $(MLNX_BLUEFIELD_BUILD_SCRIPTS) \
                                     $(MLX_OPENIPMI_DEB) \
                                     $(MLX_OPENIPMI_SERVER_DEB) \
                                     $(BF2_PLATFORM_MODULE)

diff --git a/platform/nvidia-bluefield/recipes/mlx-openipmi.mk b/platform/nvidia-bluefield/recipes/mlx-openipmi.mk
@@ -22,6 +22,9 @@ MLX_OPENIPMI_SERVER_DEB = mlx-openipmi_${MLX_OPENIPMI_DRIVER_VERSION}-3_arm64.de
 
 $(MLX_OPENIPMI_DEB)_SRC_PATH = $(PLATFORM_PATH)/mlx-openipmi
 $(MLX_OPENIPMI_DEB)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON) libsnmp-dev_$(SNMPD_VERSION_FULL)_$(CONFIGURED_ARCH).deb
+# openipmi server has a runtime dependency on mlxbf-scripts package
+$(MLX_OPENIPMI_DEB)_RDEPENDS += $(MLNX_BLUEFIELD_BUILD_SCRIPTS)
+
 SONIC_MAKE_DEBS += $(MLX_OPENIPMI_DEB)
 $(eval $(call add_derived_package,$(MLX_OPENIPMI_DEB),$(MLX_OPENIPMI_SERVER_DEB)))