Skip to content

Commit eb9fa45

Browse files
oleksandrivantsivoleksandrivantsiv
authored
[nvidia-bluefield] Fix the issue with the SDK compilation from the GitHub release. (#21893)
[nvidia-bluefield] Fix the issue with the SDK compilation from the GitHub release.
1 parent 7faaad1 commit eb9fa45

File tree

2 files changed

+21
-85
lines changed

2 files changed

+21
-85
lines changed

‎platform/nvidia-bluefield/recipes/sdk.dep

+1-39
Original file line numberDiff line numberDiff line change
@@ -80,24 +80,6 @@ $(IB_UMAD_DEV)_CACHE_MODE := GIT_CONTENT_SHA
8080
$(IB_UMAD_DEV)_DEP_FLAGS := $(SDK_COMMON_FLAGS_LIST)
8181
$(IB_UMAD_DEV)_DEP_FILES := $(DEP_FILES)
8282

83-
ifeq ($(SDK_FROM_SRC),y)
84-
$(RDMA_CORE_DBGSYM)_CACHE_MODE := GIT_CONTENT_SHA
85-
$(RDMA_CORE_DBGSYM)_DEP_FLAGS := $(SDK_COMMON_FLAGS_LIST)
86-
$(RDMA_CORE_DBGSYM)_DEP_FILES := $(DEP_FILES)
87-
88-
$(IB_VERBS_PROV_DBGSYM)_CACHE_MODE := GIT_CONTENT_SHA
89-
$(IB_VERBS_PROV_DBGSYM)_DEP_FLAGS := $(SDK_COMMON_FLAGS_LIST)
90-
$(IB_VERBS_PROV_DBGSYM)_DEP_FILES := $(DEP_FILES)
91-
92-
$(IB_VERBS_DBGSYM)_CACHE_MODE := GIT_CONTENT_SHA
93-
$(IB_VERBS_DBGSYM)_DEP_FLAGS := $(SDK_COMMON_FLAGS_LIST)
94-
$(IB_VERBS_DBGSYM)_DEP_FILES := $(DEP_FILES)
95-
96-
$(IB_UMAD_DBGSYM)_CACHE_MODE := GIT_CONTENT_SHA
97-
$(IB_UMAD_DBGSYM)_DEP_FLAGS := $(SDK_COMMON_FLAGS_LIST)
98-
$(IB_UMAD_DBGSYM)_DEP_FILES := $(DEP_FILES)
99-
endif
100-
10183
# DPDK packages
10284

10385
SPATH := $($(DPDK)_SRC_PATH)
@@ -138,13 +120,9 @@ $(LIBGRPC_DEV)_CACHE_MODE := GIT_CONTENT_SHA
138120
$(LIBGRPC_DEV)_DEP_FLAGS := $(SDK_COMMON_FLAGS_LIST)
139121
$(LIBGRPC_DEV)_DEP_FILES := $(DEP_FILES)
140122

141-
$(LIBGRPC_DBG)_CACHE_MODE := GIT_CONTENT_SHA
142-
$(LIBGRPC_DBG)_DEP_FLAGS := $(SDK_COMMON_FLAGS_LIST)
143-
$(LIBGRPC_DBG)_DEP_FILES := $(DEP_FILES)
144-
145123
# DOCA
146124

147-
SPATH := $($(DOCA_LIBS)_SRC_PATH)
125+
SPATH := $($(DOCA_COMMON)_SRC_PATH)
148126
DEP_FILES := $(SDK_COMMON_FILES_LIST)
149127
DEP_FILES += $(shell git ls-files -- $(SPATH))
150128

@@ -156,10 +134,6 @@ $(DOCA_COMMON_DEV)_CACHE_MODE := GIT_CONTENT_SHA
156134
$(DOCA_COMMON_DEV)_DEP_FLAGS := $(SDK_COMMON_FLAGS_LIST)
157135
$(DOCA_COMMON_DEV)_DEP_FILES := $(DEP_FILES)
158136

159-
$(DOCA_COMMON_DBG)_CACHE_MODE := GIT_CONTENT_SHA
160-
$(DOCA_COMMON_DBG)_DEP_FLAGS := $(SDK_COMMON_FLAGS_LIST)
161-
$(DOCA_COMMON_DBG)_DEP_FILES := $(DEP_FILES)
162-
163137
$(DOCA_ARGP)_CACHE_MODE := GIT_CONTENT_SHA
164138
$(DOCA_ARGP)_DEP_FLAGS := $(SDK_COMMON_FLAGS_LIST)
165139
$(DOCA_ARGP)_DEP_FILES := $(DEP_FILES)
@@ -168,10 +142,6 @@ $(DOCA_ARGP_DEV)_CACHE_MODE := GIT_CONTENT_SHA
168142
$(DOCA_ARGP_DEV)_DEP_FLAGS := $(SDK_COMMON_FLAGS_LIST)
169143
$(DOCA_ARGP_DEV)_DEP_FILES := $(DEP_FILES)
170144

171-
$(DOCA_ARGP_DBG)_CACHE_MODE := GIT_CONTENT_SHA
172-
$(DOCA_ARGP_DBG)_DEP_FLAGS := $(SDK_COMMON_FLAGS_LIST)
173-
$(DOCA_ARGP_DBG)_DEP_FILES := $(DEP_FILES)
174-
175145
$(DOCA_DPDK_BRIDGE)_CACHE_MODE := GIT_CONTENT_SHA
176146
$(DOCA_DPDK_BRIDGE)_DEP_FLAGS := $(SDK_COMMON_FLAGS_LIST)
177147
$(DOCA_DPDK_BRIDGE)_DEP_FILES := $(DEP_FILES)
@@ -180,10 +150,6 @@ $(DOCA_DPDK_BRIDGE_DEV)_CACHE_MODE := GIT_CONTENT_SHA
180150
$(DOCA_DPDK_BRIDGE_DEV)_DEP_FLAGS := $(SDK_COMMON_FLAGS_LIST)
181151
$(DOCA_DPDK_BRIDGE_DEV)_DEP_FILES := $(DEP_FILES)
182152

183-
$(DOCA_DPDK_BRIDGE_DBG)_CACHE_MODE := GIT_CONTENT_SHA
184-
$(DOCA_DPDK_BRIDGE_DBG)_DEP_FLAGS := $(SDK_COMMON_FLAGS_LIST)
185-
$(DOCA_DPDK_BRIDGE_DBG)_DEP_FILES := $(DEP_FILES)
186-
187153
$(DOCA_FLOW)_CACHE_MODE := GIT_CONTENT_SHA
188154
$(DOCA_FLOW)_DEP_FLAGS := $(SDK_COMMON_FLAGS_LIST)
189155
$(DOCA_FLOW)_DEP_FILES := $(DEP_FILES)
@@ -192,10 +158,6 @@ $(DOCA_FLOW_DEV)_CACHE_MODE := GIT_CONTENT_SHA
192158
$(DOCA_FLOW_DEV)_DEP_FLAGS := $(SDK_COMMON_FLAGS_LIST)
193159
$(DOCA_FLOW_DEV)_DEP_FILES := $(DEP_FILES)
194160

195-
$(DOCA_FLOW_DBG)_CACHE_MODE := GIT_CONTENT_SHA
196-
$(DOCA_FLOW_DBG)_DEP_FLAGS := $(SDK_COMMON_FLAGS_LIST)
197-
$(DOCA_FLOW_DBG)_DEP_FILES := $(DEP_FILES)
198-
199161
# SDN appliance
200162

201163
SPATH := $($(SDN_APPL)_SRC_PATH)

‎platform/nvidia-bluefield/recipes/sdk.mk

+20-46
Original file line numberDiff line numberDiff line change
@@ -72,20 +72,21 @@ MLNX_TOOLS = mlnx-tools_$(MLNX_TOOLS_VER)_arm64.deb
7272
$(MLNX_TOOLS)_SRC_PATH = $(PLATFORM_PATH)/sdk-src/ofed
7373

7474
OFED_KERNEL_UTILS = mlnx-ofed-kernel-utils_$(OFED_KERNEL_VER_FULL)-1_arm64.deb
75-
76-
$(eval $(call add_derived_package,$(MLNX_TOOLS),$(OFED_KERNEL_UTILS)))
77-
75+
$(OFED_KERNEL_UTILS)_DEPENDS = $(MLNX_TOOLS)
7876
OFED_KERNEL_DKMS = mlnx-ofed-kernel-dkms_$(OFED_KERNEL_VER_SHORT)-1_all.deb
7977
$(OFED_KERNEL_DKMS)_DEPENDS = $(OFED_KERNEL_UTILS)
8078

81-
$(eval $(call add_derived_package,$(MLNX_TOOLS),$(OFED_KERNEL_DKMS)))
82-
8379
OFED_KERNEL = mlnx-ofed-kernel-modules-$(KVERSION)_$(OFED_KERNEL_VER_SHORT)_$(BUILD_ARCH).deb
8480
$(OFED_KERNEL)_SRC_PATH = $(PLATFORM_PATH)/sdk-src/ofed
8581
$(OFED_KERNEL)_DEPENDS = $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
8682

8783
ifeq ($(SDK_FROM_SRC), y)
8884
$(OFED_KERNEL)_DEPENDS += $(OFED_KERNEL_DKMS)
85+
86+
$(eval $(call add_derived_package,$(MLNX_TOOLS),$(OFED_KERNEL_UTILS)))
87+
$(eval $(call add_derived_package,$(MLNX_TOOLS),$(OFED_KERNEL_DKMS)))
88+
else
89+
SDK_ONLINE_TARGETS += $(OFED_KERNEL_UTILS)
8990
endif
9091

9192
export OFED_VER_SHORT OFED_VER_FULL OFED_KERNEL OFED_KERNEL_UTILS OFED_KERNEL_VER_FULL MLNX_TOOLS OFED_KERNEL_DKMS
@@ -115,26 +116,21 @@ RDMA_CORE = rdma-core_${RDMA_CORE_VER}_${CONFIGURED_ARCH}.deb
115116
$(RDMA_CORE)_SRC_PATH = $(PLATFORM_PATH)/sdk-src/rdma
116117
$(RDMA_CORE)_RDEPENDS = $(LIBNL3)
117118
$(RDMA_CORE)_DEPENDS = $(LIBNL3_DEV) $(LIBNL_ROUTE3_DEV)
118-
RDMA_CORE_DBGSYM = rdma-core-dbgsym_${RDMA_CORE_VER}_${CONFIGURED_ARCH}.deb
119119

120120
IB_VERBS_PROV = ibverbs-providers_${RDMA_CORE_VER}_${CONFIGURED_ARCH}.deb
121121
$(IB_VERBS_PROV)_DEPENDS = $(LIBNL3_DEV) $(LIBNL_ROUTE3_DEV)
122-
IB_VERBS_PROV_DBGSYM = ibverbs-providers-dbgsym_${RDMA_CORE_VER}_${CONFIGURED_ARCH}.deb
123122

124123
IB_VERBS = libibverbs1_${RDMA_CORE_VER}_${CONFIGURED_ARCH}.deb
125124
$(IB_VERBS)_DEPENDS = $(LIBNL3_DEV) $(LIBNL_ROUTE3_DEV)
126125
IB_VERBS_DEV = libibverbs-dev_${RDMA_CORE_VER}_${CONFIGURED_ARCH}.deb
127126
$(IB_VERBS_DEV)_DEPENDS = $(IB_VERBS) $(IB_VERBS_PROV)
128-
IB_VERBS_DBGSYM = libibverbs1-dbg_${RDMA_CORE_VER}_${CONFIGURED_ARCH}.deb
129127

130128
IB_UMAD = libibumad3_${RDMA_CORE_VER}_${CONFIGURED_ARCH}.deb
131129
IB_UMAD_DEV = libibumad-dev_${RDMA_CORE_VER}_${CONFIGURED_ARCH}.deb
132-
IB_UMAD_DBGSYM = libibumad3-dbg_${RDMA_CORE_VER}_${CONFIGURED_ARCH}.deb
133130

134131
RDMACM = librdmacm1_${RDMA_CORE_VER}_${CONFIGURED_ARCH}.deb
135132
RDMACM_DEV = librdmacm-dev_${RDMA_CORE_VER}_${CONFIGURED_ARCH}.deb
136133
$(RDMACM_DEV)_DEPENDS = $(RDMACM) $(IB_VERBS_DEV)
137-
RDMACM_DBGSYM = librdmacm1-dbg_${RDMA_CORE_VER}_${CONFIGURED_ARCH}.deb
138134

139135
$(eval $(call add_derived_package,$(RDMA_CORE),$(IB_VERBS_PROV)))
140136
$(eval $(call add_derived_package,$(RDMA_CORE),$(IB_VERBS)))
@@ -144,32 +140,20 @@ $(eval $(call add_derived_package,$(RDMA_CORE),$(IB_UMAD_DEV)))
144140
$(eval $(call add_derived_package,$(RDMA_CORE),$(RDMACM)))
145141
$(eval $(call add_derived_package,$(RDMA_CORE),$(RDMACM_DEV)))
146142

147-
ifeq ($(SDK_FROM_SRC),y)
148-
$(eval $(call add_derived_package,$(RDMA_CORE),$(RDMA_CORE_DBGSYM)))
149-
$(eval $(call add_derived_package,$(RDMA_CORE),$(IB_VERBS_PROV_DBGSYM)))
150-
$(eval $(call add_derived_package,$(RDMA_CORE),$(IB_VERBS_DBGSYM)))
151-
$(eval $(call add_derived_package,$(RDMA_CORE),$(IB_UMAD_DBGSYM)))
152-
$(eval $(call add_derived_package,$(RDMA_CORE),$(RDMACM_DBGSYM)))
153-
endif
154-
155-
export RDMA_CORE RDMA_CORE_DBGSYM
156-
export IB_VERBS IB_VERBS_DEV IB_VERBS_DBGSYM
157-
export IB_VERBS_PROV IB_VERBS_PROV_DBGSYM
158-
export IB_UMAD IB_UMAD_DEV IB_UMAD_DBGSYM
159-
export RDMACM RDMACM_DEV RDMACM_DBGSYM
143+
export RDMA_CORE
144+
export IB_VERBS IB_VERBS_DEV
145+
export IB_VERBS_PROV
146+
export IB_UMAD IB_UMAD_DEV
147+
export RDMACM RDMACM_DEV
160148

161-
RDMA_CORE_DERIVED_DEBS = $(RDMA_CORE_DBGSYM) \
149+
RDMA_CORE_DERIVED_DEBS = \
162150
$(IB_VERBS) \
163151
$(IB_VERBS_DEV) \
164-
$(IB_VERBS_DBGSYM) \
165152
$(IB_VERBS_PROV) \
166-
$(IB_VERBS_PROV_DBGSYM) \
167153
$(IB_UMAD) \
168154
$(IB_UMAD_DEV) \
169-
$(IB_UMAD_DBGSYM) \
170155
$(RDMACM) \
171-
$(RDMACM_DEV) \
172-
$(RDMACM_DBGSYM)
156+
$(RDMACM_DEV)
173157

174158
export RDMA_CORE_DERIVED_DEBS
175159

@@ -222,16 +206,10 @@ LIBGRPC_VER = $(call get_sdk_package_version_full,"grpc")
222206

223207
LIBGRPC_DEV = libgrpc-dev_$(LIBGRPC_VER)_arm64.deb
224208
$(LIBGRPC_DEV)_SRC_PATH = $(PLATFORM_PATH)/sdk-src/grpc
225-
LIBGRPC_DBG = libgrpc-dev-dbgsym_$(LIBGRPC_VER)_arm64.deb
226209

227-
$(eval $(call add_derived_package,$(LIBGRPC_DEV),$(LIBGRPC_DBG)))
210+
export LIBGRPC_DEV LIBGRPC_VER
228211

229-
export LIBGRPC_DEV LIBGRPC_DBG LIBGRPC_VER
230-
231-
LIBGRPC_DERIVED_DEBS = $(LIBGRPC_DBG)
232-
export LIBGRPC_DERIVED_DEBS
233-
234-
SDK_DEBS += $(LIBGRPC_DEV) $(LIBGRPC_DERIVED_DEBS)
212+
SDK_DEBS += $(LIBGRPC_DEV)
235213
SDK_SRC_TARGETS += $(LIBGRPC_DEV)
236214

237215
# DOCA and derived packages
@@ -249,7 +227,7 @@ $(DOCA_COMMON_DEV)_DEPENDS = $(DOCA_COMMON)
249227
SDK_SRC_TARGETS += $(DOCA_COMMON)
250228

251229
DOCA_DEV_DEBS += $(DOCA_COMMON_DEV)
252-
export DOCA_COMMON DOCA_COMMON_DEV DOCA_COMMON_DBG
230+
export DOCA_COMMON DOCA_COMMON_DEV
253231

254232
DOCA_ARGP = doca-sdk-argp_${DOCA_DEB_VERSION}_${CONFIGURED_ARCH}.deb
255233
$(DOCA_ARGP)_DEPENDS += $(DOCA_COMMON)
@@ -258,7 +236,7 @@ $(DOCA_ARGP_DEV)_DEPENDS = $(DOCA_ARGP)
258236

259237
DOCA_DEBS += $(DOCA_ARGP)
260238
DOCA_DEV_DEBS += $(DOCA_ARGP_DEV)
261-
export DOCA_ARGP DOCA_ARGP_DEV DOCA_ARGP_DBG
239+
export DOCA_ARGP DOCA_ARGP_DEV
262240

263241
DOCA_DPDK_BRIDGE = doca-sdk-dpdk-bridge_${DOCA_DEB_VERSION}_${CONFIGURED_ARCH}.deb
264242
$(DOCA_DPDK_BRIDGE)_DEPENDS += $(DOCA_COMMON)
@@ -267,7 +245,7 @@ $(DOCA_DPDK_BRIDGE_DEV)_DEPENDS = $(DOCA_DPDK_BRIDGE)
267245

268246
DOCA_DEBS += $(DOCA_DPDK_BRIDGE)
269247
DOCA_DEV_DEBS += $(DOCA_DPDK_BRIDGE_DEV)
270-
export DOCA_DPDK_BRIDGE DOCA_DPDK_BRIDGE_DEV DOCA_DPDK_BRIDGE_DBG
248+
export DOCA_DPDK_BRIDGE DOCA_DPDK_BRIDGE_DEV
271249

272250
DOCA_FLOW = doca-sdk-flow_${DOCA_DEB_VERSION}_${CONFIGURED_ARCH}.deb
273251
$(DOCA_FLOW)_DEPENDS += $(DOCA_COMMON)
@@ -276,24 +254,20 @@ $(DOCA_FLOW_DEV)_DEPENDS = $(DOCA_FLOW)
276254

277255
DOCA_DEBS += $(DOCA_FLOW)
278256
DOCA_DEV_DEBS += $(DOCA_FLOW_DEV)
279-
DOCA_DBG_DEBS += $(DOCA_FLOW_DBG)
280-
export DOCA_FLOW DOCA_FLOW_DEV DOCA_FLOW_DBG
257+
258+
export DOCA_FLOW DOCA_FLOW_DEV
281259
export DOCA_DEBS DOCA_DEV_DEBS
282260

283261
SDK_DEBS += $(DOCA_DEBS) $(DOCA_DEV_DEBS)
284262

285263
ifeq ($(SDK_FROM_SRC), y)
286264
$(eval $(call add_derived_package,$(DOCA_COMMON),$(DOCA_COMMON_DEV)))
287-
$(eval $(call add_derived_package,$(DOCA_COMMON),$(DOCA_COMMON_DBG)))
288265
$(eval $(call add_derived_package,$(DOCA_COMMON),$(DOCA_ARGP)))
289266
$(eval $(call add_derived_package,$(DOCA_COMMON),$(DOCA_ARGP_DEV)))
290-
$(eval $(call add_derived_package,$(DOCA_COMMON),$(DOCA_ARGP_DBG)))
291267
$(eval $(call add_derived_package,$(DOCA_COMMON),$(DOCA_DPDK_BRIDGE)))
292268
$(eval $(call add_derived_package,$(DOCA_COMMON),$(DOCA_DPDK_BRIDGE_DEV)))
293-
$(eval $(call add_derived_package,$(DOCA_COMMON),$(DOCA_DPDK_BRIDGE_DBG)))
294269
$(eval $(call add_derived_package,$(DOCA_COMMON),$(DOCA_FLOW)))
295270
$(eval $(call add_derived_package,$(DOCA_COMMON),$(DOCA_FLOW_DEV)))
296-
$(eval $(call add_derived_package,$(DOCA_COMMON),$(DOCA_FLOW_DBG)))
297271
else
298272
SONIC_ONLINE_DEBS += $(DOCA_DEBS) $(DOCA_DEV_DEBS)
299273
endif

0 commit comments

Comments
 (0)