[gearbox] provide common gbsyncd.service.j2 to start for platform spe…

…cific gbsyncd docker (#9286) 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
sonic-net · Nov 18, 2021 · 1d2a11b · 1d2a11b
1 parent 0e07725
commit 1d2a11b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/README.md b/device/virtual/x86_64-kvm_x86_64-r0/README.md
@@ -70,6 +70,12 @@ set default_sku to:
 brcm_gearbox_vs t1
 ```
 
+And create file gbsyncd.ini with:
+
+```
+platform=gbsyncd
+```
+
 To build (same as Force-10-S6000):
 
 ```

diff --git a/files/build_templates/gbsyncd-cisco.service.j2 b/files/build_templates/gbsyncd-cisco.service.j2
diff --git a/files/build_templates/gbsyncd-credo.service.j2 b/files/build_templates/gbsyncd-credo.service.j2
diff --git a/files/scripts/gbsyncd-platform.sh b/files/scripts/gbsyncd-platform.sh
@@ -8,16 +8,13 @@ DEVPATH="/usr/share/sonic/device"
 CONFIGFILE="${DEVPATH}/${PLATFORM}/gbsyncd.ini"
 
 if [ ! -f "$CONFIGFILE" ]; then
-    if [ gbsyncd = "$SERVICE" ]; then
-       exit 0
-    fi
     exit 1
 fi
 
 while IFS="=" read -r key value; do
     case "$key" in
         platform)
-            if [ "$value" = "$SERVICE" ]; then
+            if [[ "$value" = "$SERVICE"* ]]; then
                 exit 0
             fi
             ;;

diff --git a/platform/components/docker-gbsyncd-credo.mk b/platform/components/docker-gbsyncd-credo.mk
@@ -9,7 +9,6 @@ ifneq ($($(LIBSAI_CREDO)_URL),)
 include $(PLATFORM_PATH)/../template/docker-gbsyncd-base.mk
 $(DOCKER_GBSYNCD_BASE)_VERSION = 1.0.0
 $(DOCKER_GBSYNCD_BASE)_PACKAGE_NAME = gbsyncd
-$(DOCKER_GBSYNCD_BASE)_CONTAINER_NAME = gbsyncd-$(DOCKER_GBSYNCD_PLATFORM_CODE)
 $(DOCKER_GBSYNCD_BASE)_PATH = $(PLATFORM_PATH)/../components/docker-gbsyncd-$(DOCKER_GBSYNCD_PLATFORM_CODE)
 SONIC_ONLINE_DEBS += $(LIBSAI_CREDO) $(LIBSAI_CREDO_OWL)
 $(DOCKER_GBSYNCD_BASE)_DEPENDS += $(SYNCD) $(LIBSAI_CREDO) $(LIBSAI_CREDO_OWL)