From 18ee2c64f1391abceaec1c84bc4d883e25977ceb Mon Sep 17 00:00:00 2001 From: Vivek Reddy Date: Wed, 2 Feb 2022 01:14:31 -0800 Subject: [PATCH] Fixed OpenIPMI service failure in the runtime (#24) Signed-off-by: Vivek Reddy Karri Co-authored-by: Vivek Reddy Karri --- platform/nvidia-bluefield/mlx-openipmi/Makefile | 2 +- platform/nvidia-bluefield/recipes/bfscripts.mk | 1 + platform/nvidia-bluefield/recipes/installer-image.mk | 3 +++ platform/nvidia-bluefield/recipes/mlx-openipmi.mk | 3 +++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/platform/nvidia-bluefield/mlx-openipmi/Makefile b/platform/nvidia-bluefield/mlx-openipmi/Makefile index b25a0c47ad71..32a631a1fa63 100644 --- 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 index dc27c81f227d..f2e468d73597 100644 --- 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 index d797161ddb8e..79a0175d3be2 100644 --- 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 index 6e53046fe41e..5951b4816bcf 100644 --- 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)))