From 72f516adbebd09c8596ef1b16759486dad001ff6 Mon Sep 17 00:00:00 2001 From: Stephen Sun Date: Thu, 29 Jul 2021 17:46:01 +0800 Subject: [PATCH] Use predefined macro as vendor information Signed-off-by: Stephen Sun --- files/build_templates/docker_image_ctl.j2 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/files/build_templates/docker_image_ctl.j2 b/files/build_templates/docker_image_ctl.j2 index ffaeab2adbf..46be9427398 100644 --- a/files/build_templates/docker_image_ctl.j2 +++ b/files/build_templates/docker_image_ctl.j2 @@ -287,9 +287,6 @@ start() { {%- endif %} {%- if docker_container_name == "swss" %} - # Obtain the vendor name - ASIC_VENDOR=`$SONIC_CFGGEN -y /etc/sonic/sonic_version.yml -v asic_type` - # Generate the asic_table.json and peripheral_table.json if [ ! -f /etc/sonic/asic_table.json ] && [ -f /usr/share/sonic/templates/asic_table.j2 ]; then sonic-cfggen -d -t /usr/share/sonic/templates/asic_table.j2 > /etc/sonic/asic_table.json @@ -415,7 +412,7 @@ start() { {%- endif %} {%- endif %} {%- if docker_container_name == "swss" %} - -e ASIC_VENDOR=$ASIC_VENDOR \ + -e ASIC_VENDOR={{ sonic_asic_platform }} \ {%- endif -%} {%- if docker_container_name == "bgp" %} -v /etc/sonic/frr/$DEV:/etc/frr:rw \