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

Mellanox bullseye merge #1

Merged
merged 2 commits into from
Nov 1, 2021
Merged

Mellanox bullseye merge #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9e1873
oMake neccesary changed to mellanox platform code to build on Debian 11
alexrallen Aug 29, 2021
bf59659
Revert use of backported kernel to build mft and elect to only build …
alexrallen Oct 29, 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
4 changes: 2 additions & 2 deletions platform/mellanox/mft.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ $(MFT)_SRC_PATH = $(PLATFORM_PATH)/mft
SONIC_MAKE_DEBS += $(MFT)

ifeq ($(DISTRO), bullseye)
$(MFT)_DEPENDS = $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
endif
$(MFT)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)

KERNEL_MFT = kernel-mft-dkms-modules-$(KVERSION)_$(MFT_VERSION)_amd64.deb
$(eval $(call add_derived_package,$(MFT),$(KERNEL_MFT)))
endif

MFT_OEM = mft-oem_$(MFT_VERSION)-$(MFT_REVISION)_amd64.deb
$(eval $(call add_derived_package,$(MFT),$(MFT_OEM)))
4 changes: 3 additions & 1 deletion platform/mellanox/mft/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
wget -O $(MFT_TGZ) http://www.mellanox.com/downloads/MFT/$(MFT_TGZ)
tar xzf $(MFT_TGZ)

ifeq ($(DISTRO), bullseye)
pushd $(MFT_NAME)/SDEBS

# put a lock here because dpkg does not allow installing packages in parallel
Expand All @@ -46,7 +47,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :

popd

sudo dkms build kernel-mft-dkms/$(MFT_VERSION) -k $(KVERSION) -a amd64 --kernelsourcedir /usr/src/linux-headers-$(KVERSION)
sudo dkms build kernel-mft-dkms/$(MFT_VERSION) -k $(KVERSION) -a amd64
sudo dkms mkbmdeb kernel-mft-dkms/$(MFT_VERSION) -k $(KVERSION) -a amd64

# w/a: remove dependencies
Expand All @@ -62,6 +63,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
popd

rm -rf $(DKMS_TMP)
endif

# fix timestamp because we do not actually build tools, only kernel
touch $(MFT_NAME)/DEBS/*.deb
Expand Down
6 changes: 0 additions & 6 deletions platform/mellanox/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

# Set KVERSION correctly depending on build environment
ifeq ($(BLDENV), buster)
KVERSION = 5.10.0-0.bpo.8-amd64
endif

include $(PLATFORM_PATH)/sdk.mk
include $(PLATFORM_PATH)/fw.mk
include $(PLATFORM_PATH)/mft.mk
Expand Down
4 changes: 0 additions & 4 deletions sonic-slave-buster/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,6 @@ RUN apt-get update && apt-get install -y \
# For mellanox sai build
libtool-bin \
libxml2-dev \
# For mellanox MFT build
linux-image-5.10.0-0.bpo.8-amd64 \
linux-headers-5.10.0-0.bpo.8-amd64 \
linux-headers-5.10.0-0.bpo.8-common \
# For BFN sdk build
libusb-1.0-0-dev \
libcurl3-nss-dev \
Expand Down