Skip to content

Commit f03f3d1

Browse files
liorghubStormLiangMS
authored andcommitted
[Mellanox] Add SDK hash calculator debian and update SDK makefile to compile it (sonic-net#12840)
- Why I did it Add SDK hash calculator Debian and update SDK makefile to compile it. - How I did it SDK hash calculator Debian will be used by ECMP calculator (PR sonic-net#12482) - How to verify it Compile sonic-buildimage and verify SDK hash calculator Debian exist in target folder.
1 parent f398cd1 commit f03f3d1

File tree

4 files changed

+59
-4
lines changed

4 files changed

+59
-4
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
.ONESHELL:
2+
SHELL = /bin/bash
3+
4+
MAIN_TARGET = sx-hash-calc_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb
5+
DERIVED_TARGETS = sx-hash-calc-dbgsym_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb
6+
PACKAGE_NAME = sx_hash_calc
7+
8+
$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
9+
# get sources
10+
rm -rf $(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION)
11+
12+
wget -c $(MLNX_SDK_SOURCE_BASE_URL)/$(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION).tar.gz -O - | tar -xz
13+
14+
# build
15+
pushd $(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION)
16+
17+
if [ -f autogen.sh ]; then
18+
./autogen.sh
19+
fi
20+
21+
debuild -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
22+
23+
popd
24+
25+
mv $(DERIVED_TARGETS) $* $(DEST)/
26+
27+
$(addprefix $(DEST)/, $(DERIVED_TARGETS)): $(DEST)/% : $(DEST)/$(MAIN_TARGET)

platform/mellanox/sdk.dep

+17
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,23 @@ $(WJH_LIBS_DBGSYM)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
216216
$(WJH_LIBS_DBGSYM)_DEP_FILES := $(DEP_FILES)
217217
endif
218218

219+
# SX_HASH_CALC
220+
221+
SPATH := $($(SX_HASH_CALC)_SRC_PATH)
222+
DEP_FILES := $(SONIC_COMMON_FILES_LIST) $(PLATFORM_PATH)/sdk.mk $(PLATFORM_PATH)/sdk.dep
223+
DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
224+
DEP_FILES += $(shell git ls-files -- $(SPATH))
225+
226+
$(SX_HASH_CALC)_CACHE_MODE := GIT_CONTENT_SHA
227+
$(SX_HASH_CALC)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
228+
$(SX_HASH_CALC)_DEP_FILES := $(DEP_FILES)
229+
230+
ifeq ($(SDK_FROM_SRC),y)
231+
$(SX_HASH_CALC_DBGSYM)_CACHE_MODE := GIT_CONTENT_SHA
232+
$(SX_HASH_CALC_DBGSYM)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
233+
$(SX_HASH_CALC_DBGSYM)_DEP_FILES := $(DEP_FILES)
234+
endif
235+
219236
# SX_KERNEL
220237

221238
SPATH := $($(SX_KERNEL)_SRC_PATH)

platform/mellanox/sdk.mk

+14-3
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,18 @@ endif
3333
export MLNX_SDK_SOURCE_BASE_URL MLNX_SDK_VERSION MLNX_SDK_ISSU_VERSION MLNX_SDK_DEB_VERSION
3434

3535
MLNX_SDK_RDEBS += $(APPLIBS) $(IPROUTE2_MLNX) $(SX_COMPLIB) $(SX_EXAMPLES) \
36-
$(SX_GEN_UTILS) $(SX_SCEW) $(SXD_LIBS) $(WJH_LIBS) $(SX_ACL_HELPER)
36+
$(SX_GEN_UTILS) $(SX_SCEW) $(SXD_LIBS) $(WJH_LIBS) $(SX_ACL_HELPER) \
37+
$(SX_HASH_CALC)
3738

3839
MLNX_SDK_DEBS += $(APPLIBS_DEV) $(IPROUTE2_MLNX_DEV) $(SX_COMPLIB_DEV) \
3940
$(SX_COMPLIB_DEV_STATIC) $(SX_EXAMPLES_DEV) $(SX_GEN_UTILS_DEV) \
4041
$(SX_SCEW_DEV) $(SX_SCEW_DEV_STATIC) $(SXD_LIBS_DEV)\
41-
$(SXD_LIBS_DEV_STATIC) $(WJH_LIBS_DEV) $(SX_ACL_HELPER_DEV)
42+
$(SXD_LIBS_DEV_STATIC) $(WJH_LIBS_DEV) $(SX_ACL_HELPER_DEV) $(SX_HASH_CALC)
4243

4344
MLNX_SDK_DBG_DEBS += $(APPLIBS_DBGSYM) $(IPROUTE2_MLNX_DBGSYM) $(SX_COMPLIB_DBGSYM) \
4445
$(SX_EXAMPLES_DBGSYM) $(SX_GEN_UTILS_DBGSYM) $(SX_SCEW_DBGSYM) \
45-
$(SXD_LIBS_DBGSYM) $(WJH_LIBS_DBGSYM) $(SX_ACL_HELPER_DBGSYM)
46+
$(SXD_LIBS_DBGSYM) $(WJH_LIBS_DBGSYM) $(SX_ACL_HELPER_DBGSYM) \
47+
$(SX_HASH_CALC_DBGSYM)
4648

4749
APPLIBS = applibs_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
4850
$(APPLIBS)_SRC_PATH = $(PLATFORM_PATH)/sdk-src/applibs
@@ -146,6 +148,15 @@ ifeq ($(SDK_FROM_SRC),y)
146148
$(eval $(call add_derived_package,$(WJH_LIBS),$(WJH_LIBS_DBGSYM)))
147149
endif
148150

151+
SX_HASH_CALC = sx-hash-calc_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb
152+
$(SX_HASH_CALC)_SRC_PATH = $(PLATFORM_PATH)/sdk-src/sx-hash-calc
153+
$(SX_HASH_CALC)_DEPENDS += $(SX_COMPLIB_DEV) $(SXD_LIBS_DEV) $(APPLIBS_DEV) $(SX_GEN_UTILS_DEV)
154+
$(SX_HASH_CALC)_RDEPENDS += $(SX_COMPLIB) $(SXD_LIBS) $(APPLIBS)
155+
SX_HASH_CALC_DBGSYM = sx-hash-calc-dbgsym_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb
156+
ifeq ($(SDK_FROM_SRC),y)
157+
$(eval $(call add_derived_package,$(SX_HASH_CALC),$(SX_HASH_CALC_DBGSYM)))
158+
endif
159+
149160
SX_KERNEL = sx-kernel_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
150161
$(SX_KERNEL)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
151162
$(SX_KERNEL)_SRC_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel

0 commit comments

Comments
 (0)