Skip to content
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

Jump to bottom

Platform/cisco-8000 module for sonic-buildimage #8172

Merged
merged 9 commits into from
Aug 6, 2021
Merged

Platform/cisco-8000 module for sonic-buildimage #8172

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
27a2838
Add platform cisco-8000 to platform path
VenkatCisco Jun 8, 2021
109cc7b
remove rules.mk.swp file
VenkatCisco Jun 9, 2021
f7be554
add ability to do check out a commit id
VenkatCisco Jun 23, 2021
4e1059e
update platform/cisco-8000/rules.mk to reflect the updated path & inc…
VenkatCisco Jul 7, 2021
0c55366
build cisco-8000 platform for sonic
VenkatCisco Jul 12, 2021
48401e7
Merge branch 'master' into VenkatCisco/cisco-8000/PR
VenkatCisco Jul 18, 2021
aaf00a4
update platform-cisco diffs with Makefile & template changes
VenkatCisco Jul 18, 2021
e4e7e5e
remove stale swp file reference
VenkatCisco Jul 18, 2021
a0ee24e
Remove stale reference to a patch file
VenkatCisco Jul 18, 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: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ platform/broadcom/sonic-platform-modules-dell/s6100/modules/dell_s6100_lpc.c
platform/broadcom/sonic-platform-modules-dell/z9100/modules/dell_ich.c
platform/broadcom/sonic-platform-modules-dell/z9100/modules/dell_mailbox.c
platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/ipmihelper.py
platform/cisco-8000

# buildinfo
files/build/buildinfo
Expand Down
29 changes: 22 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
NOJESSIE ?= 1
NOSTRETCH ?= 0

PLATFORM_PATH := platform/$(if $(PLATFORM),$(PLATFORM),$(CONFIGURED_PLATFORM))
xumia marked this conversation as resolved.
Show resolved Hide resolved
PLATFORM_CHECKOUT := platform/checkout
PLATFORM_CHECKOUT_FILE := $(PLATFORM_CHECKOUT)/$(PLATFORM).ini
PLATFORM_CHECKOUT_CMD := $(shell if [ -f $(PLATFORM_CHECKOUT_FILE) ]; then PLATFORM_PATH=$(PLATFORM_PATH) j2 $(PLATFORM_CHECKOUT)/template.j2 $(PLATFORM_CHECKOUT_FILE); fi)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To support azp, please allow the step can be skipped when the repo has already checked out.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To support azp, please allow the step can be skipped when the repo has already checked out.

@xumia would the change in platform/checkout/template.j2 be sufficient to support azp?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This step will automatically be skipped if the $(PLATFORM_PATH) directory already exists in the workspace


%::
@echo "+++ --- Making $@ --- +++"
ifeq ($(NOJESSIE), 0)
Expand All @@ -29,15 +34,25 @@ init:
@echo "+++ Making $@ +++"
make -f Makefile.work $@

clean configure reset showtag sonic-slave-build sonic-slave-bash :
#
# Function to invoke target $@ in Makefile.work with proper BLDENV
#
define make_work
@echo "+++ Making $@ +++"
ifeq ($(NOJESSIE), 0)
make -f Makefile.work $@
endif
ifeq ($(NOSTRETCH), 0)
BLDENV=stretch make -f Makefile.work $@
endif
$(if $(NOJESSIE),, make -f Makefile.work $@)
$(if $(NOSTRETCH),, BLDENV=stretch make -f Makefile.work $@)
xumia marked this conversation as resolved.
Show resolved Hide resolved
BLDENV=buster make -f Makefile.work $@
endef

$(PLATFORM_PATH):
@echo "+++ Checking out $@ +++"
$(PLATFORM_CHECKOUT_CMD)

configure : $(PLATFORM_PATH)
$(call make_work, $@)

clean reset showtag sonic-slave-build sonic-slave-bash :
$(call make_work, $@)

# Freeze the versions, see more detail options: scripts/versions_manager.py freeze -h
freeze:
Expand Down
3 changes: 3 additions & 0 deletions platform/checkout/cisco-8000.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[module]
repo=git@github.com:Cisco-8000-sonic/platform-cisco-8000.git
ref=v0.1
6 changes: 6 additions & 0 deletions platform/checkout/template.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{% set path = env('PLATFORM_PATH') %}
{% if module.ref is defined %}
xumia marked this conversation as resolved.
Show resolved Hide resolved
git clone {{ module.repo }} {{ path }} && cd {{ path }} && git checkout {{ module.ref }} && git submodule update --init --recursive
{% else %}
git clone {{ module.repo }} {{ path }} && cd {{ path }} && git submodule update --init --recursive
{% endif %}