Skip to content

Backport PR25651: Makefile changes for arista-firmware #26367

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

Open
peterbailey-arista wants to merge 1 commit into
base: 202511
Choose a base branch
from
+22 −1
Open

Backport PR25651: Makefile changes for arista-firmware #26367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions platform/broadcom/one-aboot.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ $(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(ARISTA_PLATFORM_MODULE_PYTHON3) \
ifeq ($(INSTALL_ARISTA_FWUTIL),y)
$(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(ARISTA_FWUTIL)
endif
ifeq ($(INSTALL_ARISTA_FIRMWARE),y)
$(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(ARISTA_FIRMWARE)
endif
ifeq ($(INSTALL_DEBUG_TOOLS),y)
$(SONIC_ONE_ABOOT_IMAGE)_DOCKERS += $(SONIC_INSTALL_DOCKER_DBG_IMAGES)
$(SONIC_ONE_ABOOT_IMAGE)_DOCKERS += $(filter-out $(patsubst %-$(DBG_IMAGE_MARK).gz,%.gz, $(SONIC_INSTALL_DOCKER_DBG_IMAGES)), $(SONIC_INSTALL_DOCKER_IMAGES))
Expand Down
8 changes: 8 additions & 0 deletions platform/broadcom/one-image.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,14 @@ $(SONIC_ONE_IMAGE)_LAZY_INSTALLS += $(DELL_S6000_PLATFORM_MODULE) \
$(SMCI_SSE_T8164_PLATFORM_MODULE) \
$(SMCI_SSE_T8196_PLATFORM_MODULE)

ifeq ($(INSTALL_ARISTA_FWUTIL),y)
$(SONIC_ONE_IMAGE)_LAZY_INSTALLS += $(ARISTA_FWUTIL)
endif

ifeq ($(INSTALL_ARISTA_FIRMWARE),y)
$(SONIC_ONE_IMAGE)_LAZY_INSTALLS += $(ARISTA_FIRMWARE)
endif

$(SONIC_ONE_IMAGE)_LAZY_BUILD_INSTALLS = $(BRCM_OPENNSL_KERNEL) $(BRCM_DNX_OPENNSL_KERNEL)
ifeq ($(INSTALL_DEBUG_TOOLS),y)
$(SONIC_ONE_IMAGE)_DOCKERS += $(SONIC_INSTALL_DOCKER_DBG_IMAGES)
Expand Down
12 changes: 11 additions & 1 deletion platform/broadcom/platform-modules-arista.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export ARISTA_PLATFORM_MODULE \
ARISTA_PLATFORM_MODULE_DRIVERS \
ARISTA_PLATFORM_MODULE_LIBS

ARISTA_FWUTIL_VERSION = 1.0.3
ARISTA_FWUTIL_VERSION = 202511.4
ARISTA_FWUTIL = arista-fwutil_$(ARISTA_FWUTIL_VERSION)_amd64.deb
$(ARISTA_FWUTIL)_PATH = $(PLATFORM_PATH)/extra-debs

Expand All @@ -33,3 +33,13 @@ SONIC_COPY_DEBS += $(ARISTA_FWUTIL)
INSTALL_ARISTA_FWUTIL = y
endif

ARISTA_FIRMWARE_VERSION = 202511.1
ARISTA_FIRMWARE = arista-firmware_$(ARISTA_FIRMWARE_VERSION)_all.deb
$(ARISTA_FIRMWARE)_PATH = $(PLATFORM_PATH)/extra-debs

#Install firmware package if it exists
ifneq (,$(wildcard $($(ARISTA_FIRMWARE)_PATH)/$(ARISTA_FIRMWARE)))
SONIC_COPY_DEBS += $(ARISTA_FIRMWARE)
INSTALL_ARISTA_FIRMWARE = y
endif

Loading