diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2 index 5e6f5ae880..de24617940 100644 --- a/files/build_templates/sonic_debian_extension.j2 +++ b/files/build_templates/sonic_debian_extension.j2 @@ -939,7 +939,8 @@ for fw_file_name in ${!FW_FILE_MAP[@]}; do # Link old FW location to not break existing automation/scripts sudo ln -s /host/image-$SONIC_IMAGE_VERSION/$PLATFORM_DIR/fw/asic/${FW_FILE_MAP[$fw_file_name]} $FILESYSTEM_ROOT/etc/mlnx/${FW_FILE_MAP[$fw_file_name]} done -sudo cp $files_path/$ISSU_VERSION_FILE $FILESYSTEM_ROOT/$PLATFORM_DIR/fw/asic/issu-version +# TODO: reenable for bookworm +#sudo cp $files_path/$ISSU_VERSION_FILE $FILESYSTEM_ROOT/$PLATFORM_DIR/fw/asic/issu-version sudo ln -s /host/image-$SONIC_IMAGE_VERSION/$PLATFORM_DIR/fw/asic/issu-version $FILESYSTEM_ROOT/etc/mlnx/issu-version sudo cp $files_path/$MLNX_FFB_SCRIPT $FILESYSTEM_ROOT/usr/bin/mlnx-ffb.sh sudo cp $files_path/$MLNX_ONIE_FW_UPDATE $FILESYSTEM_ROOT/usr/bin/$MLNX_ONIE_FW_UPDATE diff --git a/platform/mellanox/rules.dep b/platform/mellanox/rules.dep index 5dce51d83b..37c1aab80c 100644 --- a/platform/mellanox/rules.dep +++ b/platform/mellanox/rules.dep @@ -1,8 +1,9 @@ # DPKG FRK +# TODO: update for Bookworm: mft include $(PLATFORM_PATH)/sdk.dep include $(PLATFORM_PATH)/fw.dep -include $(PLATFORM_PATH)/mft.dep +#include $(PLATFORM_PATH)/mft.dep include $(PLATFORM_PATH)/mlnx-sai.dep include $(PLATFORM_PATH)/hw-management.dep include $(PLATFORM_PATH)/mlnx-platform-api.dep diff --git a/platform/mellanox/rules.mk b/platform/mellanox/rules.mk index 654c6b65ab..2326e059b6 100644 --- a/platform/mellanox/rules.mk +++ b/platform/mellanox/rules.mk @@ -14,9 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# TODO: update for Bookworm: mft, iproute2 include $(PLATFORM_PATH)/sdk.mk include $(PLATFORM_PATH)/fw.mk -include $(PLATFORM_PATH)/mft.mk +#include $(PLATFORM_PATH)/mft.mk include $(PLATFORM_PATH)/mft-fwtrace-cfg.mk include $(PLATFORM_PATH)/mlnx-sai.mk include $(PLATFORM_PATH)/hw-management.mk @@ -27,10 +28,10 @@ include $(PLATFORM_PATH)/docker-saiserver-mlnx.mk include $(PLATFORM_PATH)/one-image.mk include $(PLATFORM_PATH)/libsaithrift-dev.mk include $(PLATFORM_PATH)/mlnx-ffb.mk -include $(PLATFORM_PATH)/issu-version.mk +#include $(PLATFORM_PATH)/issu-version.mk include $(PLATFORM_PATH)/mlnx-onie-fw-update.mk include $(PLATFORM_PATH)/mlnx-ssd-fw-update.mk -include $(PLATFORM_PATH)/iproute2.mk +#include $(PLATFORM_PATH)/iproute2.mk include $(PLATFORM_PATH)/install-pending-fw.mk include $(PLATFORM_PATH)/integration-scripts.mk diff --git a/platform/mellanox/sdk.dep b/platform/mellanox/sdk.dep index 122548192c..33716d12b6 100644 --- a/platform/mellanox/sdk.dep +++ b/platform/mellanox/sdk.dep @@ -210,13 +210,14 @@ endif # SX_KERNEL -SPATH := $($(SX_KERNEL)_SRC_PATH) -SLINKS := $(shell find $(SPATH) -type l -exec echo {} \; | grep -Ev ' ') -SMDEP_PATHS := $(shell git submodule status --recursive -- $(SPATH) | awk '{print $$2}' | grep -Ev ' ') -SMDEP_FILES := $(foreach path,$(SMDEP_PATHS),$(filter-out $(SMDEP_PATHS),$(addprefix $(path)/,$(shell cd $(path) && git ls-files | grep -Ev ' ')))) -DEP_FILES := $(SONIC_COMMON_FILES_LIST) $(PLATFORM_PATH)/sdk.mk $(PLATFORM_PATH)/sdk.dep -DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) -DEP_FILES += $(filter-out $(SMDEP_PATHS),$(shell git ls-files -- $(SPATH) | grep -Ev ' ')) +# TODO: enable for bookworm +#SPATH := $($(SX_KERNEL)_SRC_PATH) +#SLINKS := $(shell find $(SPATH) -type l -exec echo {} \; | grep -Ev ' ') +#SMDEP_PATHS := $(shell git submodule status --recursive -- $(SPATH) | awk '{print $$2}' | grep -Ev ' ') +#SMDEP_FILES := $(foreach path,$(SMDEP_PATHS),$(filter-out $(SMDEP_PATHS),$(addprefix $(path)/,$(shell cd $(path) && git ls-files | grep -Ev ' ')))) +#DEP_FILES := $(SONIC_COMMON_FILES_LIST) $(PLATFORM_PATH)/sdk.mk $(PLATFORM_PATH)/sdk.dep +#DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) +#DEP_FILES += $(filter-out $(SMDEP_PATHS),$(shell git ls-files -- $(SPATH) | grep -Ev ' ')) $(SX_KERNEL)_CACHE_MODE := GIT_CONTENT_SHA $(SX_KERNEL)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST) diff --git a/platform/mellanox/sdk.mk b/platform/mellanox/sdk.mk index 096432b3ef..c3d5752f2a 100644 --- a/platform/mellanox/sdk.mk +++ b/platform/mellanox/sdk.mk @@ -152,11 +152,12 @@ ifeq ($(SDK_FROM_SRC),y) $(eval $(call add_derived_package,$(SX_HASH_CALC),$(SX_HASH_CALC_DBGSYM))) endif -SX_KERNEL = sx-kernel_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb -$(SX_KERNEL)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON) -$(SX_KERNEL)_SRC_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel -SX_KERNEL_DEV = sx-kernel-dev_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb -$(eval $(call add_derived_package,$(SX_KERNEL),$(SX_KERNEL_DEV))) +# TODO: enable for bookworm +#SX_KERNEL = sx-kernel_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb +#$(SX_KERNEL)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON) +#$(SX_KERNEL)_SRC_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel +#SX_KERNEL_DEV = sx-kernel-dev_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb +#$(eval $(call add_derived_package,$(SX_KERNEL),$(SX_KERNEL_DEV))) define make_url $(1)_URL = $(MLNX_SDK_ASSETS_URL)/$(1)