matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
* Add libteamdctl dependency to VS docker
* Reorder dependencies and rename libteamctl

Signed-off-by: Danny Allen <daall@microsoft.com>
This commit is contained in:
Danny Allen 2020-06-24 14:07:22 -07:00 committed by GitHub
parent 5cacc2004c
commit c50b431747
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/p4/docker-sonic-p4.mk
View File

@ -8,7 +8,7 @@ $(DOCKER_SONIC_P4)_DEPENDS += $(SWSS) \
$(REDIS_TOOLS) \ $(REDIS_TOOLS) \
$(REDIS_SERVER) \ $(REDIS_SERVER) \
$(PYTHON_SWSSCOMMON) \ $(PYTHON_SWSSCOMMON) \
$(LIBTEAMDCT) \ $(LIBTEAMDCTL) \
$(LIBTEAM_UTILS) \ $(LIBTEAM_UTILS) \
$(SONIC_DEVICE_DATA) \ $(SONIC_DEVICE_DATA) \
$(SONIC_UTILS) \ $(SONIC_UTILS) \

2
platform/vs/docker-sonic-vs.mk
View File

@ -7,7 +7,7 @@ $(DOCKER_SONIC_VS)_DEPENDS += $(SWSS) \
$(REDIS_TOOLS) \ $(REDIS_TOOLS) \
$(REDIS_SERVER) \ $(REDIS_SERVER) \
$(PYTHON_SWSSCOMMON) \ $(PYTHON_SWSSCOMMON) \
$(LIBTEAMDCT) \ $(LIBTEAMDCTL) \
$(LIBTEAM_UTILS) \ $(LIBTEAM_UTILS) \
$(SONIC_DEVICE_DATA) $(SONIC_DEVICE_DATA)

4
rules/docker-teamd.mk
View File

@ -6,10 +6,10 @@ DOCKER_TEAMD_DBG = $(DOCKER_TEAMD_STEM)-$(DBG_IMAGE_MARK).gz
$(DOCKER_TEAMD)_PATH = $(DOCKERS_PATH)/$(DOCKER_TEAMD_STEM) $(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 = $($(DOCKER_CONFIG_ENGINE_STRETCH)_DBG_DEPENDS)
$(DOCKER_TEAMD)_DBG_DEPENDS += $(SWSS_DBG) $(LIBSWSSCOMMON_DBG) $(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) $(DOCKER_TEAMD)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_STRETCH)_DBG_IMAGE_PACKAGES)

12
rules/libteam.mk
View File

@ -13,17 +13,17 @@ LIBTEAM_DBG = libteam5-dbgsym_$(LIBTEAM_VERSION)_$(CONFIGURED_ARCH).deb
$(eval $(call add_derived_package,$(LIBTEAM),$(LIBTEAM_DBG))) $(eval $(call add_derived_package,$(LIBTEAM),$(LIBTEAM_DBG)))
LIBTEAM_DEV = libteam-dev_$(LIBTEAM_VERSION)_$(CONFIGURED_ARCH).deb 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))) $(eval $(call add_derived_package,$(LIBTEAM),$(LIBTEAM_DEV)))
LIBTEAMDCT = libteamdctl0_$(LIBTEAM_VERSION)_$(CONFIGURED_ARCH).deb LIBTEAMDCTL = libteamdctl0_$(LIBTEAM_VERSION)_$(CONFIGURED_ARCH).deb
$(eval $(call add_derived_package,$(LIBTEAM),$(LIBTEAMDCT))) $(eval $(call add_derived_package,$(LIBTEAM),$(LIBTEAMDCTL)))
LIBTEAMDCT_DBG = libteamdctl0-dbgsym_$(LIBTEAM_VERSION)_$(CONFIGURED_ARCH).deb LIBTEAMDCTL_DBG = libteamdctl0-dbgsym_$(LIBTEAM_VERSION)_$(CONFIGURED_ARCH).deb
$(eval $(call add_derived_package,$(LIBTEAM),$(LIBTEAMDCT_DBG))) $(eval $(call add_derived_package,$(LIBTEAM),$(LIBTEAMDCTL_DBG)))
LIBTEAM_UTILS = libteam-utils_$(LIBTEAM_VERSION)_$(CONFIGURED_ARCH).deb 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))) $(eval $(call add_derived_package,$(LIBTEAM),$(LIBTEAM_UTILS)))
LIBTEAM_UTILS_DBG = libteam-utils-dbgsym_$(LIBTEAM_VERSION)_$(CONFIGURED_ARCH).deb LIBTEAM_UTILS_DBG = libteam-utils-dbgsym_$(LIBTEAM_VERSION)_$(CONFIGURED_ARCH).deb

5
rules/swss.mk
View File

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