Skip to content

Commit 240596e

Browse files
authored
[gearbox] provide common gbsyncd.service.j2 to start for platform specific gbsyncd docker (#9332)
Why I did it Fix #9059. It provides common gbsyncd.service.j2 to start for platform specific gbsyncd docker, which must be named 'gbsyncd'. How I did it All of platform specific gbsyncd dockers use a common name 'gbsyncd' Use a unique systemd service template gbsyncd.service.j2 for gbsyncd docker
1 parent 7fc3470 commit 240596e

File tree

4 files changed

+4
-7
lines changed

4 files changed

+4
-7
lines changed

files/build_templates/gbsyncd-cisco.service.j2

-1
This file was deleted.

files/build_templates/gbsyncd-credo.service.j2

-1
This file was deleted.

files/scripts/gbsyncd-platform.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ PLATFORM=${PLATFORM:-`sonic-cfggen -H -v DEVICE_METADATA.localhost.platform`}
77
DEVPATH="/usr/share/sonic/device"
88
CONFIGFILE="${DEVPATH}/${PLATFORM}/gbsyncd.ini"
99

10+
# Skip checking the service for vs
11+
[ "$sonic_asic_platform" = vs ] && exit 0
12+
1013
if [ ! -f "$CONFIGFILE" ]; then
11-
if [ gbsyncd = "$SERVICE" ]; then
12-
exit 0
13-
fi
1414
exit 1
1515
fi
1616

1717
while IFS="=" read -r key value; do
1818
case "$key" in
1919
platform)
20-
if [ "$value" = "$SERVICE" ]; then
20+
if [[ "$value" = "$SERVICE"* ]]; then
2121
exit 0
2222
fi
2323
;;

platform/components/docker-gbsyncd-credo.mk

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ ifneq ($($(LIBSAI_CREDO)_URL),)
99
include $(PLATFORM_PATH)/../template/docker-gbsyncd-base.mk
1010
$(DOCKER_GBSYNCD_BASE)_VERSION = 1.0.0
1111
$(DOCKER_GBSYNCD_BASE)_PACKAGE_NAME = gbsyncd
12-
$(DOCKER_GBSYNCD_BASE)_CONTAINER_NAME = gbsyncd-$(DOCKER_GBSYNCD_PLATFORM_CODE)
1312
$(DOCKER_GBSYNCD_BASE)_PATH = $(PLATFORM_PATH)/../components/docker-gbsyncd-$(DOCKER_GBSYNCD_PLATFORM_CODE)
1413
SONIC_ONLINE_DEBS += $(LIBSAI_CREDO) $(LIBSAI_CREDO_OWL)
1514
$(DOCKER_GBSYNCD_BASE)_DEPENDS += $(SYNCD) $(LIBSAI_CREDO) $(LIBSAI_CREDO_OWL)

0 commit comments

Comments
 (0)