Skip to content

Commit 6ce2a57

Browse files
authored
[platform/broadcom]: Makefile changes for arista-fwutil (sonic-net#582)
#### Description for the changelog Add facilities to include arista fwutil into image if deb is in repo. Arista fwutil is proprietary and will be included in private repos <!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md failure_prs.log skip_prs.log Make sure all your commits include a signature generated with `git commit -s` ** If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx" or "resolves #xxxx" Please provide the following information: --> #### Why I did it This utility is required for updating optics firmware on eos->sonic conversion for chassis ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it Add makefile entries to copy and install the deb if it exists #### How to verify it Build image with the deb in platform/broadcom/extra-debs and see if it is in the image <!-- If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012. --> #### Which release branch to backport (provide reason below if selected) <!-- - Note we only backport fixes to a release branch, *not* features! - Please also provide a reason for the backporting below. - e.g. - [x] 202006 --> - [ x] 202405 #### Tested branch (Please provide the tested image version) <!-- - Please provide tested image version - e.g. - [x] 20201231.100 -->
1 parent f153242 commit 6ce2a57

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

platform/broadcom/one-aboot.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ $(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(ARISTA_PLATFORM_MODULE_PYTHON3) \
1414
$(ARISTA_PLATFORM_MODULE_DRIVERS) \
1515
$(ARISTA_PLATFORM_MODULE_LIBS) \
1616
$(ARISTA_PLATFORM_MODULE)
17+
ifeq ($(INSTALL_ARISTA_FWUTIL),y)
18+
$(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(ARISTA_FWUTIL)
19+
endif
1720
ifeq ($(INSTALL_DEBUG_TOOLS),y)
1821
$(SONIC_ONE_ABOOT_IMAGE)_DOCKERS += $(SONIC_INSTALL_DOCKER_DBG_IMAGES)
1922
$(SONIC_ONE_ABOOT_IMAGE)_DOCKERS += $(filter-out $(patsubst %-$(DBG_IMAGE_MARK).gz,%.gz, $(SONIC_INSTALL_DOCKER_DBG_IMAGES)), $(SONIC_INSTALL_DOCKER_IMAGES))

platform/broadcom/platform-modules-arista.mk

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,14 @@ export ARISTA_PLATFORM_MODULE \
2222
ARISTA_PLATFORM_MODULE_PYTHON3 \
2323
ARISTA_PLATFORM_MODULE_DRIVERS \
2424
ARISTA_PLATFORM_MODULE_LIBS
25+
26+
ARISTA_FWUTIL_VERSION = 1.0.1
27+
ARISTA_FWUTIL = arista-fwutil_$(ARISTA_FWUTIL_VERSION)_amd64.deb
28+
$(ARISTA_FWUTIL)_PATH = $(PLATFORM_PATH)/extra-debs
29+
30+
#Install fwutil package if it exists
31+
ifneq (,$(wildcard $($(ARISTA_FWUTIL)_PATH)/$(ARISTA_FWUTIL)))
32+
SONIC_COPY_DEBS += $(ARISTA_FWUTIL)
33+
INSTALL_ARISTA_FWUTIL = y
34+
endif
35+

0 commit comments

Comments
 (0)