Skip to content

Commit aad8b47

Browse files
tirupatihemanthjasonbridges
authored andcommitted
[Mellanox] Remove Linux Kbuild dependency and Fix Component Versions
* Linux Kbuild support for signing added to all platforms through saiarcot895#62 Hence removing this dependency for Mellanox platform * Fix Actual kernel version read by component versions Before root@sonic:/home/admin# get_component_versions.py KERNEL 6.12.41+deb13-sonic 13 After root@sonic:/home/admin# get_component_versions.py KERNEL 6.12.41+deb13-sonic 6.12.41+deb13-sonic
1 parent 01fccf7 commit aad8b47

2 files changed

Lines changed: 2 additions & 3 deletions

File tree

platform/mellanox/get_component_versions/get_component_versions.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ COMMANDS_FOR_ACTUAL = {
4343
"SAI": [["docker", "exec", "-it", "syncd", "bash", "-c", 'dpkg -l | grep mlnx-sai'], ".*1\\.mlnx\\.([A-Za-z0-9.]*)"],
4444
"SAI_API_HEADERS": [["docker", "exec", "syncd", "dpkg", "-s", "mlnx-sai"], "X-Sai-Headers-Version: ([0-9.]+)"],
4545
"FW": [["mlxfwmanager", "--query"], "FW * [0-9]{2}\\.([0-9.]*)"],
46-
"KERNEL": [["uname", "-r"], "([0-9][0-9.-]*)-.*"]
46+
"KERNEL": [["uname", "-r"], "(.*)-[a-z0-9]+$"]
4747
}
4848

4949
UNAVAILABLE_COMPILED_VERSIONS = {
@@ -64,7 +64,7 @@ COMMANDS_FOR_ACTUAL = {
6464
"SDK": [["docker", "exec", "syncd", "bash", "-c", 'dpkg -l | grep sdn'], "sdn-appliance *([0-9.-]*mlnx1)"],
6565
"SAI": [["docker", "exec", "syncd", "bash", "-c", 'dpkg -l | grep mlnx-sai'], ".*1\\.mlnx\\.([A-Za-z0-9.]*)"],
6666
"FW": [["mlxfwmanager", "--query"], "FW * [0-9]{2}\\.([0-9.]*)"],
67-
"KERNEL": [["uname", "-r"], "([0-9][0-9.-]*)-.*"],
67+
"KERNEL": [["uname", "-r"], "(.*)-[a-z0-9]+$"],
6868
"BFSOC": [["dpkg", "-l"], ["grep", "mlxbf-bootimages"], "mlxbf-bootimages *([0-9.-]*)"]
6969
}
7070

platform/mellanox/one-image.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
SONIC_ONE_IMAGE = sonic-mellanox.bin
2020
$(SONIC_ONE_IMAGE)_MACHINE = mellanox
2121
$(SONIC_ONE_IMAGE)_IMAGE_TYPE = onie
22-
$(SONIC_ONE_IMAGE)_DEPENDS += $(LINUX_KBUILD)
2322
$(SONIC_ONE_IMAGE)_INSTALLS += $(SX_KERNEL) $(KERNEL_MFT) $(MFT_OEM) $(MFT) $(MFT_FWTRACE_CFG) $(MLNX_HW_MANAGEMENT) $(MLNX_RSHIM)
2423
$(SONIC_ONE_IMAGE)_INSTALLS += $(SYSTEMD_SONIC_GENERATOR)
2524
ifeq ($(INSTALL_DEBUG_TOOLS),y)

0 commit comments

Comments
 (0)