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 2 commits
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
5 changes: 5 additions & 0 deletions platform/mellanox/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,9 @@ $(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

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

export SONIC_BUFFER_MODEL=dynamic
export MLNX_PATCH_LOC
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
4 changes: 3 additions & 1 deletion slave.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ BULLSEYE_DEBS_PATH = $(TARGET_PATH)/debs/bullseye
BULLSEYE_FILES_PATH = $(TARGET_PATH)/files/bullseye
DBG_IMAGE_MARK = dbg
DBG_SRC_ARCHIVE_FILE = $(TARGET_PATH)/sonic_src.tar.gz
DPKG_ADMINDIR_PATH = /sonic/dpkg
BUILD_WORKDIR = /sonic
DPKG_ADMINDIR_PATH = $(BUILD_WORKDIR)/dpkg

CONFIGURED_PLATFORM := $(shell [ -f .platform ] && cat .platform || echo generic)
PLATFORM_PATH = platform/$(CONFIGURED_PLATFORM)
Expand Down Expand Up @@ -84,6 +85,7 @@ export MULTIARCH_QEMU_ENVIRON
export DOCKER_BASE_ARCH
export CROSS_BUILD_ENVIRON
export BLDENV
export BUILD_WORKDIR

###############################################################################
## Utility rules
Expand Down