matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Mellanox bullseye merge (#1)

Browse Source 
* Make neccesary changed to mellanox platform code to build on Debian 11

* Revert use of backported kernel to build mft and elect to only build kernel module under bullseye
This commit is contained in:
Alexander Allen 2021-11-01 18:59:33 -04:00 committed by Saikrishna Arcot
parent 166efeffe2
commit 857937d592
4 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform/mellanox/mft.mk
View File

@ -26,11 +26,11 @@ $(MFT)_SRC_PATH = $(PLATFORM_PATH)/mft
SONIC_MAKE_DEBS += $(MFT) SONIC_MAKE_DEBS += $(MFT)
ifeq ($(BLDENV), bullseye) ifeq ($(BLDENV), bullseye)
$(MFT)_DEPENDS = $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON) $(MFT)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
endif
KERNEL_MFT = kernel-mft-dkms-modules-$(KVERSION)_$(MFT_VERSION)_amd64.deb KERNEL_MFT = kernel-mft-dkms-modules-$(KVERSION)_$(MFT_VERSION)_amd64.deb
$(eval $(call add_derived_package,$(MFT),$(KERNEL_MFT))) $(eval $(call add_derived_package,$(MFT),$(KERNEL_MFT)))
endif
MFT_OEM = mft-oem_$(MFT_VERSION)-$(MFT_REVISION)_amd64.deb MFT_OEM = mft-oem_$(MFT_VERSION)-$(MFT_REVISION)_amd64.deb
$(eval $(call add_derived_package,$(MFT),$(MFT_OEM))) $(eval $(call add_derived_package,$(MFT),$(MFT_OEM)))

4
platform/mellanox/mft/Makefile
View File

@ -35,6 +35,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
wget -O $(MFT_TGZ) http://www.mellanox.com/downloads/MFT/$(MFT_TGZ) wget -O $(MFT_TGZ) http://www.mellanox.com/downloads/MFT/$(MFT_TGZ)
tar xzf $(MFT_TGZ) tar xzf $(MFT_TGZ)
ifeq ($(BLDENV), bullseye)
pushd $(MFT_NAME)/SDEBS pushd $(MFT_NAME)/SDEBS
# put a lock here because dpkg does not allow installing packages in parallel # put a lock here because dpkg does not allow installing packages in parallel
@ -46,7 +47,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
popd 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 sudo dkms mkbmdeb kernel-mft-dkms/$(MFT_VERSION) -k $(KVERSION) -a amd64
# w/a: remove dependencies # w/a: remove dependencies
@ -62,6 +63,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
popd popd
rm -rf $(DKMS_TMP) rm -rf $(DKMS_TMP)
endif
# fix timestamp because we do not actually build tools, only kernel # fix timestamp because we do not actually build tools, only kernel
touch $(MFT_NAME)/DEBS/*.deb touch $(MFT_NAME)/DEBS/*.deb

6
platform/mellanox/rules.mk
View File

@ -14,12 +14,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
# Set KVERSION correctly depending on build environment
ifeq ($(BLDENV), buster)
KVERSION = 5.10.0-0.bpo.9-amd64
endif
include $(PLATFORM_PATH)/sdk.mk include $(PLATFORM_PATH)/sdk.mk
include $(PLATFORM_PATH)/fw.mk include $(PLATFORM_PATH)/fw.mk
include $(PLATFORM_PATH)/mft.mk include $(PLATFORM_PATH)/mft.mk

4
sonic-slave-buster/Dockerfile.j2
View File

@ -153,10 +153,6 @@ RUN apt-get update && apt-get install -y \
# For mellanox sai build # For mellanox sai build
libtool-bin \ libtool-bin \
libxml2-dev \ libxml2-dev \
# For mellanox MFT build
linux-image-5.10.0-0.bpo.9-amd64 \
linux-headers-5.10.0-0.bpo.9-amd64 \
linux-headers-5.10.0-0.bpo.9-common \
# For BFN sdk build # For BFN sdk build
libusb-1.0-0-dev \ libusb-1.0-0-dev \
libcurl3-nss-dev \ libcurl3-nss-dev \