From 986c566d4a4439e39301faf30d88d28cd2918e23 Mon Sep 17 00:00:00 2001 From: Shantanu Shrivastava Date: Mon, 20 Nov 2023 20:08:03 +0000 Subject: [PATCH] Adding libsai and docker-dpu-base URLs --- platform/pensando/docker-dpu-base.mk | 2 +- platform/pensando/docker-dpu.mk | 21 ++------------------- platform/pensando/sdk.mk | 10 +++++----- slave.mk | 10 +--------- 4 files changed, 9 insertions(+), 34 deletions(-) diff --git a/platform/pensando/docker-dpu-base.mk b/platform/pensando/docker-dpu-base.mk index f4b7c1199840..129cba00e250 100644 --- a/platform/pensando/docker-dpu-base.mk +++ b/platform/pensando/docker-dpu-base.mk @@ -4,7 +4,7 @@ DOCKER_DPU_BASE_STEM = docker-dpu-base DOCKER_DPU_BASE = $(DOCKER_DPU_BASE_STEM).gz -$(DOCKER_DPU_BASE)_URL = https://sonicstorage.blob.core.windows.net/public/docker-dpu-base.gz +$(DOCKER_DPU_BASE)_URL = https://github.com/pensando/dsc-artifacts/blob/main/docker-dpu-base.gz?raw=true DOWNLOADED_DOCKER_IMAGES += $(DOCKER_DPU_BASE) diff --git a/platform/pensando/docker-dpu.mk b/platform/pensando/docker-dpu.mk index f479a4e1a564..073b4e7157d3 100644 --- a/platform/pensando/docker-dpu.mk +++ b/platform/pensando/docker-dpu.mk @@ -18,23 +18,6 @@ SONIC_DOCKER_IMAGES += $(DOCKER_DPU) $(DOCKER_DPU)_PACKAGE_NAME = dpu $(DOCKER_DPU)_CONTAINER_NAME = dpu $(DOCKER_DPU)_VERSION = 1.0.0 -$(DOCKER_DPU)_RUN_OPT += --privileged -t -$(DOCKER_DPU)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro - -#NIC_MOUNT="-v /dev/shm:/dev/shm -v /boot/nicA/nic_core:/nic -v /boot/nicA/shared/conf/gen:/nic/conf/gen" -$(DOCKER_DPU)_RUN_OPT += --privileged -t -$(DOCKER_DPU)_RUN_OPT += -v /host/dpu/update:/update -$(DOCKER_DPU)_RUN_OPT += -v /host/dpu/sysconfig/config0:/sysconfig/config0 -$(DOCKER_DPU)_RUN_OPT += -v /host/dpu/sysconfig/config1:/sysconfig/config1 -$(DOCKER_DPU)_RUN_OPT += -v /host/dpu/obfl:/obfl -$(DOCKER_DPU)_RUN_OPT += -v /host/dpu/data:/data -$(DOCKER_DPU)_RUN_OPT += -v /host/dpu/tmpfsshare:/tmp -$(DOCKER_DPU)_RUN_OPT += -v /host/dpu/runfs:/run -$(DOCKER_DPU)_RUN_OPT += -v /host/dpu/logfs:/var/log -$(DOCKER_DPU)_RUN_OPT += -v /sys:/sys -#$(DOCKER_DPU)_RUN_OPT += $NIC_MOUNT -$(DOCKER_DPU)_RUN_OPT += --net=host -$(DOCKER_DPU)_RUN_OPT += docker-dpu:v1 - -SONIC_BUSTER_DOCKERS += $(DOCKER_DPU) + +SONIC_BULLSEYE_DOCKERS += $(DOCKER_DPU) SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_DPU) diff --git a/platform/pensando/sdk.mk b/platform/pensando/sdk.mk index 517c034e037b..072ac893b760 100644 --- a/platform/pensando/sdk.mk +++ b/platform/pensando/sdk.mk @@ -1,10 +1,10 @@ -# Centec SAI +# Pensando SAI PENSANDO_SAI = libsai_1.10.1-0_arm64.deb PENSANDO_SAI_DEV = libsai-dev_1.10.1-0_arm64.deb -$(PENSANDO_SAI)_PATH = files/dsc -$(PENSANDO_SAI_DEV)_PATH = files/dsc +$(PENSANDO_SAI)_URL = https://github.com/pensando/dsc-artifacts/blob/main/libsai_1.10.1-0_arm64.deb?raw=true +$(PENSANDO_SAI_DEV)_URL = https://github.com/pensando/dsc-artifacts/blob/main/libsai-dev_1.10.1-0_arm64.deb?raw=true $(eval $(call add_conflict_package,$(PENSANDO_SAI_DEV),$(LIBSAIVS_DEV))) -SONIC_COPY_DEBS += $(PENSANDO_SAI) -SONIC_COPY_DEBS += $(PENSANDO_SAI_DEV) +SONIC_ONLINE_DEBS += $(PENSANDO_SAI) +SONIC_ONLINE_DEBS += $(PENSANDO_SAI_DEV) diff --git a/slave.mk b/slave.mk index d1f52a9473ff..2e2a81ed86a5 100644 --- a/slave.mk +++ b/slave.mk @@ -1096,15 +1096,6 @@ $(addprefix $(TARGET_PATH)/,$(DOWNLOADED_DOCKER_IMAGES)) : $(TARGET_PATH)/%.gz : $(FOOTER) -DOCKER_LOAD_DOWNLOADED_TARGETS = $(addsuffix -load,$(addprefix $(TARGET_PATH)/, \ - $(DOWNLOADED_DOCKER_IMAGES))) - -$(DOCKER_LOAD_DOWNLOADED_TARGETS) : $(TARGET_PATH)/%.gz-load : .platform docker-start $$(TARGET_PATH)/$$*.gz - $(HEADER) - $(call docker-image-load,$*) - $(FOOTER) - - # Targets for building docker images $(addprefix $(TARGET_PATH)/, $(DOCKER_IMAGES)) : $(TARGET_PATH)/%.gz : .platform docker-start \ $$(addprefix $$($$*.gz_DEBS_PATH)/,$$($$*.gz_DEPENDS)) \ @@ -1264,6 +1255,7 @@ SONIC_TARGET_LIST += $(addprefix $(TARGET_PATH)/, $(DOCKER_DBG_IMAGES)) DOCKER_LOAD_TARGETS = $(addsuffix -load,$(addprefix $(TARGET_PATH)/, \ $(SONIC_SIMPLE_DOCKER_IMAGES) \ + $(DOWNLOADED_DOCKER_IMAGES) \ $(DOCKER_IMAGES) \ $(DOCKER_DBG_IMAGES)))