[dvs] Install libteamdctl runtime dependency in VS docker (#4837)

* Add libteamdctl dependency to VS docker * Reorder dependencies and rename libteamctl Signed-off-by: Danny Allen <daall@microsoft.com>
sonic-net · Jun 24, 2020 · c50b431 · c50b431
1 parent 5cacc20
commit c50b431
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/platform/p4/docker-sonic-p4.mk b/platform/p4/docker-sonic-p4.mk
@@ -8,7 +8,7 @@ $(DOCKER_SONIC_P4)_DEPENDS += $(SWSS) \
                               $(REDIS_TOOLS) \
                               $(REDIS_SERVER) \
                               $(PYTHON_SWSSCOMMON) \
-                              $(LIBTEAMDCT) \
+                              $(LIBTEAMDCTL) \
                               $(LIBTEAM_UTILS) \
                               $(SONIC_DEVICE_DATA) \
                               $(SONIC_UTILS) \

diff --git a/platform/vs/docker-sonic-vs.mk b/platform/vs/docker-sonic-vs.mk
@@ -7,7 +7,7 @@ $(DOCKER_SONIC_VS)_DEPENDS += $(SWSS) \
                               $(REDIS_TOOLS) \
                               $(REDIS_SERVER) \
                               $(PYTHON_SWSSCOMMON) \
-                              $(LIBTEAMDCT) \
+                              $(LIBTEAMDCTL) \
                               $(LIBTEAM_UTILS) \
                               $(SONIC_DEVICE_DATA)
 

diff --git a/rules/docker-teamd.mk b/rules/docker-teamd.mk
@@ -6,10 +6,10 @@ DOCKER_TEAMD_DBG = $(DOCKER_TEAMD_STEM)-$(DBG_IMAGE_MARK).gz
 
 $(DOCKER_TEAMD)_PATH = $(DOCKERS_PATH)/$(DOCKER_TEAMD_STEM)
 
-$(DOCKER_TEAMD)_DEPENDS += $(SWSS) $(LIBTEAMDCT) $(LIBTEAM_UTILS) $(REDIS_TOOLS)
+$(DOCKER_TEAMD)_DEPENDS += $(SWSS) $(LIBTEAMDCTL) $(LIBTEAM_UTILS) $(REDIS_TOOLS)
 $(DOCKER_TEAMD)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_STRETCH)_DBG_DEPENDS)
 $(DOCKER_TEAMD)_DBG_DEPENDS += $(SWSS_DBG) $(LIBSWSSCOMMON_DBG)
-$(DOCKER_TEAMD)_DBG_DEPENDS += $(LIBTEAMDCT_DBG) $(LIBTEAM_UTILS_DBG)
+$(DOCKER_TEAMD)_DBG_DEPENDS += $(LIBTEAMDCTL_DBG) $(LIBTEAM_UTILS_DBG)
 
 $(DOCKER_TEAMD)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_STRETCH)_DBG_IMAGE_PACKAGES)
 

diff --git a/rules/libteam.mk b/rules/libteam.mk
@@ -13,17 +13,17 @@ LIBTEAM_DBG = libteam5-dbgsym_$(LIBTEAM_VERSION)_$(CONFIGURED_ARCH).deb
 $(eval $(call add_derived_package,$(LIBTEAM),$(LIBTEAM_DBG)))
 
 LIBTEAM_DEV = libteam-dev_$(LIBTEAM_VERSION)_$(CONFIGURED_ARCH).deb
-$(LIBTEAM_DEV)_DEPENDS += $(LIBTEAMDCT)
+$(LIBTEAM_DEV)_DEPENDS += $(LIBTEAMDCTL)
 $(eval $(call add_derived_package,$(LIBTEAM),$(LIBTEAM_DEV)))
 
-LIBTEAMDCT = libteamdctl0_$(LIBTEAM_VERSION)_$(CONFIGURED_ARCH).deb
-$(eval $(call add_derived_package,$(LIBTEAM),$(LIBTEAMDCT)))
+LIBTEAMDCTL = libteamdctl0_$(LIBTEAM_VERSION)_$(CONFIGURED_ARCH).deb
+$(eval $(call add_derived_package,$(LIBTEAM),$(LIBTEAMDCTL)))
 
-LIBTEAMDCT_DBG = libteamdctl0-dbgsym_$(LIBTEAM_VERSION)_$(CONFIGURED_ARCH).deb
-$(eval $(call add_derived_package,$(LIBTEAM),$(LIBTEAMDCT_DBG)))
+LIBTEAMDCTL_DBG = libteamdctl0-dbgsym_$(LIBTEAM_VERSION)_$(CONFIGURED_ARCH).deb
+$(eval $(call add_derived_package,$(LIBTEAM),$(LIBTEAMDCTL_DBG)))
 
 LIBTEAM_UTILS = libteam-utils_$(LIBTEAM_VERSION)_$(CONFIGURED_ARCH).deb
-$(LIBTEAM_UTILS)_DEPENDS += $(LIBTEAMDCT)
+$(LIBTEAM_UTILS)_DEPENDS += $(LIBTEAMDCTL)
 $(eval $(call add_derived_package,$(LIBTEAM),$(LIBTEAM_UTILS)))
 
 LIBTEAM_UTILS_DBG = libteam-utils-dbgsym_$(LIBTEAM_VERSION)_$(CONFIGURED_ARCH).deb

diff --git a/rules/swss.mk b/rules/swss.mk
@@ -3,8 +3,9 @@
 SWSS = swss_1.0.0_$(CONFIGURED_ARCH).deb
 $(SWSS)_SRC_PATH = $(SRC_PATH)/sonic-swss
 $(SWSS)_DEPENDS += $(LIBSAIREDIS_DEV) $(LIBSAIMETADATA_DEV) $(LIBTEAM_DEV) \
-    $(LIBTEAMDCT) $(LIBTEAM_UTILS) $(LIBSWSSCOMMON_DEV)
-$(SWSS)_RDEPENDS += $(LIBSAIREDIS) $(LIBSAIMETADATA) $(LIBTEAM) $(LIBSWSSCOMMON) $(PYTHON_SWSSCOMMON)
+    $(LIBTEAMDCTL) $(LIBTEAM_UTILS) $(LIBSWSSCOMMON_DEV)
+$(SWSS)_RDEPENDS += $(LIBSAIREDIS) $(LIBSAIMETADATA) $(LIBTEAM) \
+    $(LIBTEAMDCTL) $(LIBSWSSCOMMON) $(PYTHON_SWSSCOMMON)
 SONIC_DPKG_DEBS += $(SWSS)
 
 SWSS_DBG = swss-dbg_1.0.0_$(CONFIGURED_ARCH).deb