Skip to content

[Arista] Update Arista submodule and remove building python2 for Arista #8890

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
prgeor merged 2 commits into from
Oct 28, 2021
Merged

[Arista] Update Arista submodule and remove building python2 for Arista #8890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8671e3f
[Arista] Remove building python2
Oct 1, 2021
b7f0563
Add Wolverine linecard
Oct 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion platform/barefoot/one-aboot.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ $(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(SYSTEMD_SONIC_GENERATOR)
$(SONIC_ONE_ABOOT_IMAGE)_LAZY_INSTALLS += $(BFN_PLATFORM_MODULE)
$(SONIC_ONE_ABOOT_IMAGE)_LAZY_INSTALLS += $(BFN_MONTARA_PLATFORM_MODULE)
$(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(ARISTA_PLATFORM_MODULE_DRIVERS) \
$(ARISTA_PLATFORM_MODULE_PYTHON2) \
$(ARISTA_PLATFORM_MODULE_PYTHON3) \
$(ARISTA_PLATFORM_MODULE)
ifeq ($(INSTALL_DEBUG_TOOLS),y)
Expand Down
5 changes: 1 addition & 4 deletions platform/barefoot/platform-modules-arista.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,12 @@ $(ARISTA_PLATFORM_MODULE)_SRC_PATH = $(PLATFORM_PATH)/sonic-platform-modules-ari
$(ARISTA_PLATFORM_MODULE)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
SONIC_DPKG_DEBS += $(ARISTA_PLATFORM_MODULE)

ARISTA_PLATFORM_MODULE_PYTHON2 = python-sonic-platform-arista_$(ARISTA_PLATFORM_MODULE_VERSION)_all.deb
$(eval $(call add_extra_package,$(ARISTA_PLATFORM_MODULE),$(ARISTA_PLATFORM_MODULE_PYTHON2)))

ARISTA_PLATFORM_MODULE_PYTHON3 = python3-sonic-platform-arista_$(ARISTA_PLATFORM_MODULE_VERSION)_all.deb
$(eval $(call add_extra_package,$(ARISTA_PLATFORM_MODULE),$(ARISTA_PLATFORM_MODULE_PYTHON3)))

ARISTA_PLATFORM_MODULE_DRIVERS = drivers-sonic-platform-arista_$(ARISTA_PLATFORM_MODULE_VERSION)_amd64.deb
$(eval $(call add_extra_package,$(ARISTA_PLATFORM_MODULE),$(ARISTA_PLATFORM_MODULE_DRIVERS)))

export ARISTA_PLATFORM_MODULE ARISTA_PLATFORM_MODULE_PYTHON2 ARISTA_PLATFORM_MODULE_PYTHON3 ARISTA_PLATFORM_MODULE_DRIVERS
export ARISTA_PLATFORM_MODULE ARISTA_PLATFORM_MODULE_PYTHON3 ARISTA_PLATFORM_MODULE_DRIVERS

export ARISTA_SCD_DRIVER_CONFIG=m
2 changes: 1 addition & 1 deletion platform/barefoot/sonic-platform-modules-arista
Open in desktop
Submodule sonic-platform-modules-arista updated 33 files
+16 −9 Makefile
+5 −0 arista/components/asic/dnx/jericho2c.py
+0 −1 arista/components/common.py
+21 −3 arista/components/denali/card.py
+20 −7 arista/components/denali/supervisor.py
+20 −8 arista/components/denali/tests/chassis.py
+2 −3 arista/components/power.py
+24 −0 arista/components/watchdog.py
+3 −0 arista/core/card.py
+3 −3 arista/core/cause.py
+6 −0 arista/core/component/unmanaged.py
+13 −1 arista/core/config.py
+6 −2 arista/core/onie.py
+4 −3 arista/core/platform.py
+5 −1 arista/core/provision.py
+3 −43 arista/core/utils.py
+6 −1 arista/drivers/dpm/adm1266.py
+15 −0 arista/libs/onie.py
+32 −0 arista/libs/pci.py
+29 −0 arista/libs/procfs.py
+1 −0 arista/platforms/blackhawktd4.py
+2 −1 arista/platforms/catalina.py
+3 −0 arista/platforms/cpu/hedgehog.py
+3 −1 arista/platforms/cpu/lorikeet.py
+4 −4 arista/platforms/fabric/brooks.py
+4 −4 arista/platforms/fabric/dragonfly.py
+12 −8 arista/platforms/fabric/eldridge.py
+190 −0 arista/platforms/linecard/wolverine.py
+1 −1 arista/platforms/smartsville.py
+2 −0 arista/utils/sonic_platform/module.py
+6 −20 debian/control
+3 −6 debian/rules
+1 −1 utils/lc-interface-config
2 changes: 1 addition & 1 deletion platform/broadcom/one-aboot.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ SONIC_ONE_ABOOT_IMAGE = sonic-aboot-broadcom.swi
$(SONIC_ONE_ABOOT_IMAGE)_MACHINE = broadcom
$(SONIC_ONE_ABOOT_IMAGE)_DEPENDENT_MACHINE = broadcom-dnx
$(SONIC_ONE_ABOOT_IMAGE)_IMAGE_TYPE = aboot
$(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(ARISTA_PLATFORM_MODULE_DRIVERS) $(ARISTA_PLATFORM_MODULE_PYTHON2) $(ARISTA_PLATFORM_MODULE_PYTHON3) $(ARISTA_PLATFORM_MODULE)
$(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(ARISTA_PLATFORM_MODULE_DRIVERS) $(ARISTA_PLATFORM_MODULE_PYTHON3) $(ARISTA_PLATFORM_MODULE)
$(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(PHY_CREDO)
$(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(FLASHROM)
$(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(SYSTEMD_SONIC_GENERATOR)
Expand Down
5 changes: 1 addition & 4 deletions platform/broadcom/platform-modules-arista.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,13 @@ $(ARISTA_PLATFORM_MODULE)_SRC_PATH = $(PLATFORM_PATH)/sonic-platform-modules-ari
$(ARISTA_PLATFORM_MODULE)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
SONIC_DPKG_DEBS += $(ARISTA_PLATFORM_MODULE)

ARISTA_PLATFORM_MODULE_PYTHON2 = python-sonic-platform-arista_$(ARISTA_PLATFORM_MODULE_VERSION)_all.deb
$(eval $(call add_extra_package,$(ARISTA_PLATFORM_MODULE),$(ARISTA_PLATFORM_MODULE_PYTHON2)))

ARISTA_PLATFORM_MODULE_PYTHON3 = python3-sonic-platform-arista_$(ARISTA_PLATFORM_MODULE_VERSION)_all.deb
$(eval $(call add_extra_package,$(ARISTA_PLATFORM_MODULE),$(ARISTA_PLATFORM_MODULE_PYTHON3)))

ARISTA_PLATFORM_MODULE_DRIVERS = drivers-sonic-platform-arista_$(ARISTA_PLATFORM_MODULE_VERSION)_amd64.deb
$(eval $(call add_extra_package,$(ARISTA_PLATFORM_MODULE),$(ARISTA_PLATFORM_MODULE_DRIVERS)))

export ARISTA_PLATFORM_MODULE ARISTA_PLATFORM_MODULE_PYTHON2 ARISTA_PLATFORM_MODULE_PYTHON3 ARISTA_PLATFORM_MODULE_DRIVERS
export ARISTA_PLATFORM_MODULE ARISTA_PLATFORM_MODULE_PYTHON3 ARISTA_PLATFORM_MODULE_DRIVERS

export ARISTA_SCD_DRIVER_CONFIG=m

2 changes: 1 addition & 1 deletion platform/broadcom/sonic-platform-modules-arista
Open in desktop
Submodule sonic-platform-modules-arista updated 33 files
+16 −9 Makefile
+5 −0 arista/components/asic/dnx/jericho2c.py
+0 −1 arista/components/common.py
+21 −3 arista/components/denali/card.py
+20 −7 arista/components/denali/supervisor.py
+20 −8 arista/components/denali/tests/chassis.py
+2 −3 arista/components/power.py
+24 −0 arista/components/watchdog.py
+3 −0 arista/core/card.py
+3 −3 arista/core/cause.py
+6 −0 arista/core/component/unmanaged.py
+13 −1 arista/core/config.py
+6 −2 arista/core/onie.py
+4 −3 arista/core/platform.py
+5 −1 arista/core/provision.py
+3 −43 arista/core/utils.py
+6 −1 arista/drivers/dpm/adm1266.py
+15 −0 arista/libs/onie.py
+32 −0 arista/libs/pci.py
+29 −0 arista/libs/procfs.py
+1 −0 arista/platforms/blackhawktd4.py
+2 −1 arista/platforms/catalina.py
+3 −0 arista/platforms/cpu/hedgehog.py
+3 −1 arista/platforms/cpu/lorikeet.py
+4 −4 arista/platforms/fabric/brooks.py
+4 −4 arista/platforms/fabric/dragonfly.py
+12 −8 arista/platforms/fabric/eldridge.py
+190 −0 arista/platforms/linecard/wolverine.py
+1 −1 arista/platforms/smartsville.py
+2 −0 arista/utils/sonic_platform/module.py
+6 −20 debian/control
+3 −6 debian/rules
+1 −1 utils/lc-interface-config
2 changes: 0 additions & 2 deletions rules/docker-platform-monitor.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,7 @@ $(DOCKER_PLATFORM_MONITOR)_RUN_OPT += -v /usr/share/sonic/device/pddf:/usr/share

# Mount Arista python library on Aboot images to be used by plugins
$(DOCKER_PLATFORM_MONITOR)_aboot_RUN_OPT += -v /usr/lib/libsfp-eeprom.so:/usr/lib/libsfp-eeprom.so:ro
$(DOCKER_PLATFORM_MONITOR)_aboot_RUN_OPT += -v /usr/lib/python2.7/dist-packages/arista:/usr/lib/python2.7/dist-packages/arista:ro
$(DOCKER_PLATFORM_MONITOR)_aboot_RUN_OPT += -v /usr/lib/python3/dist-packages/arista:/usr/lib/python3/dist-packages/arista:ro
$(DOCKER_PLATFORM_MONITOR)_aboot_RUN_OPT += -v /usr/lib/python2.7/dist-packages/sonic_platform:/usr/lib/python2.7/dist-packages/sonic_platform:ro
$(DOCKER_PLATFORM_MONITOR)_aboot_RUN_OPT += -v /usr/lib/python3/dist-packages/sonic_platform:/usr/lib/python3/dist-packages/sonic_platform:ro

$(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/bin/sensors
Expand Down