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

[Non Upstream Patches] Added ENV vars for non-upstream patches #36

Closed
wants to merge 4 commits into from
Closed

[Non Upstream Patches] Added ENV vars for non-upstream patches #36

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9deab98
Added ENV vars for non-upstream patches
vivekrnv Oct 7, 2022
dcffcb5
Made MLNX_PATCH_LOC an absolute path
vivekrnv Oct 13, 2022
6eaa75e
Added non-upstream-patches dir
vivekrnv Oct 17, 2022
b751662
Update README.md
vivekrnv Oct 17, 2022
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
6 changes: 5 additions & 1 deletion platform/mellanox/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,8 @@ $(DOCKER_PLATFORM_MONITOR)_DEPENDS += $(APPLIBS) $(SX_COMPLIB) $(SXD_LIBS) $(SX_
# Force the target bootloader for mellanox platforms to grub regardless of arch
TARGET_BOOTLOADER = grub

export SONIC_BUFFER_MODEL=dynamic
# Set y to include non upstream patches for mellanox
INCLUDE_MLNX_PATCHES = n
MLNX_PATCH_LOC = $(PLATFORM_PATH)/non-upstream-patches/patches.tar.gz

export MLNX_PATCH_LOC SONIC_BUFFER_MODEL=dynamic
Copy link

Choose a reason for hiding this comment

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

I suggest to split into two export statements to not change existing export SONIC_BUFFER_MODEL=dynamic line. Same comment applies for linux-kernel.mk file changes.

5 changes: 4 additions & 1 deletion rules/linux-kernel.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ ifeq ($(CONFIGURED_ARCH), armhf)
KVERSION = $(KVERSION_SHORT)-armmp
endif

export KVERSION_SHORT KVERSION KERNEL_VERSION KERNEL_SUBVERSION
# Place an URL here to .tar.gz file if you want to include those patches
EXTERNAL_KERNEL_PATCHES =

export KVERSION_SHORT KVERSION KERNEL_VERSION KERNEL_SUBVERSION EXTERNAL_KERNEL_PATCHES

LINUX_HEADERS_COMMON = linux-headers-$(KVERSION_SHORT)-common_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)_all.deb
$(LINUX_HEADERS_COMMON)_SRC_PATH = $(SRC_PATH)/sonic-linux-kernel
Expand Down