Attachment #216609 for bug #242038





PORTNAME=	mstflint
DISTVERSIONPREFIX=	v
DISTVERSION=	4.14.0-3
CATEGORIES=	sysutils

MAINTAINER=	slavash@FreeBSD.org

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/LICENSE

USES=		autoreconf libtool gmake

OPTIONS_DEFINE=	FWMANAGER ADAB STATIC
OPTIONS_SUB=	yes

.if defined(LITE)
OPTIONS_SLAVE=	FWMANAGER ADAB STATIC
.endif

FWMANAGER_DESC=	Build with mstfwmanager and mstarchive
ADAB_DESC=	Build with mstreg and mstlink
STATIC_DESC=	Static binary (disable curl support)
STATIC_CONFIGURE_ON=	--enable-all-static --disable-dc \
			--disable-openssl --disable-inband

LDFLAGS+=	-L${LOCALBASE}/lib
CPPFLAGS+=	-I${LOCALBASE}/include

GNU_CONFIGURE=	yes

USE_GITHUB=	yes
GH_ACCOUNT=	Mellanox

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MSTATIC}
.else
USES+=	ssl
.endif

.if ${PORT_OPTIONS:MADAB}
CONFIGURE_ARGS+=	--enable-adb-generic-tools
.if ${PORT_OPTIONS:MSTATIC}
BUILD_DEPENDS+=	xmlwf:textproc/expat2 \
		boost-libs>0:devel/boost-libs
.else
LIB_DEPENDS+=	libexpat.so:textproc/expat2 \
		libboost_regex.so:devel/boost-libs
.endif
.endif

.if ${PORT_OPTIONS:MFWMANAGER}
CONFIGURE_ARGS+=	--enable-fw-mgr
.if ${PORT_OPTIONS:MSTATIC}
BUILD_DEPENDS+=	xmllint:textproc/libxml2 \
		${LOCALBASE}/include/boost/algorithm/string/detail/formatter_regex.hpp:devel/boost-libs
EXTRA_PATCHES+=	${PATCHDIR}/extrat-patch-configure.ac \
		${PATCHDIR}/extrat-patch-mlxarchive_Makefile.am \
		${PATCHDIR}/extrat-patch-mlxarchive_mlxarchive_mfa2.cpp \
		${PATCHDIR}/extrat-patch-mlxfwupdate_Makefile.am \
		${PATCHDIR}/extrat-patch-mlxfwupdate_server_request.cpp
.else
LIB_DEPENDS+=	libxml2.so:textproc/libxml2 \
		libboost_regex.so:devel/boost-libs \
		libcurl.so:ftp/curl
RUN_DEPENDS+=	ca_root_nss>=0:security/ca_root_nss
.endif
.endif

.if defined(LITE)
EXTRA_PATCHES+=	${PATCHDIR}/extrat-LITE-patch-Makefile.am \
		${PATCHDIR}/extrat-LITE-patch-mlxconfig_Makefile.am \
		${PATCHDIR}/extrat-LITE-patch-mlxreg_Makefile.am \
		${PATCHDIR}/extrat-LITE-patch-cmdif_Makefile.am \
		${PATCHDIR}/extrat-LITE-patch-mtcr_freebsd_Makefile.am \
		${PATCHDIR}/extrat-LITE-patch-tools_layouts_Makefile.am \
		${PATCHDIR}/extrat-LITE-patch-common_Makefile.am \
		${PATCHDIR}/extrat-LITE-patch-dev_mgt_Makefile.am \
		${PATCHDIR}/extrat-LITE-patch-reg_access_Makefile.am
post-install:
	${RM} ${STAGEDIR}${PREFIX}/lib/libadb_parser.a \
	${STAGEDIR}${PREFIX}/lib/libcmdif.a \
	${STAGEDIR}${PREFIX}/lib/libdev_mgt.a \
	${STAGEDIR}${PREFIX}/lib/libmodules_lib.a \
	${STAGEDIR}${PREFIX}/lib/libmstreg_lib.a \
	${STAGEDIR}${PREFIX}/lib/libprint_util_lib.a \
	${STAGEDIR}${PREFIX}/lib/libreg_access.a \
	${STAGEDIR}${PREFIX}/lib/libtools_layouts.a \
	${STAGEDIR}${PREFIX}/lib/libmstarchive.a \
	${STAGEDIR}${PREFIX}/lib/mstflint/libmtcr_ul.a \
	${STAGEDIR}${PREFIX}/bin/mstarchive
	${RMDIR} ${STAGEDIR}${PREFIX}/lib/mstflint
.else
post-install:
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mstflint/python_tools/rreg_access.so
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mstflint/python_tools/ccmdif.so
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mstflint/python_tools/cmtcr.so
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mstflint/python_tools/c_dev_mgt.so
.endif
.include <bsd.port.mk>

Lines 1-3 Link Here

(-)sysutils/mstflint/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1562536530	1	TIMESTAMP = 1595260779
2	SHA256 (Mellanox-mstflint-v4.12.0-1_GH0.tar.gz) = 5cbf8924f33f813dd636bc25681b07d8940aa7803ff1f995266ac86ff30cbf35	2	SHA256 (Mellanox-mstflint-v4.14.0-3_GH0.tar.gz) = d74231e555aaa0c967022c0b75eeec82ebca62a6e1d109cc56aa3ffaf9936ca2
3	SIZE (Mellanox-mstflint-v4.12.0-1_GH0.tar.gz) = 3716706	3	SIZE (Mellanox-mstflint-v4.14.0-3_GH0.tar.gz) = 4012564




--- Makefile.am.orig	2020-01-05 16:50:06.000000000 +0100
+++ Makefile.am	2020-01-10 20:11:11.228348000 +0100
@@ -30,11 +30,11 @@
 # SOFTWARE.
 #--
 
-SUBDIRS = common mft_utils ext_libs $(TOOLS_CRYPTO) tools_layouts ${MTCR_CONF_DIR} mtcr_py $(MAD_IFC) reg_access cmdif $(XZ_UTILS_DIR) dev_mgt tools_res_mgmt mvpd mflash fw_comps_mgr libmfa pldmlib mlxconfig mlxfwops cmdparser $(FW_MGR_TOOLS) flint small_utils mstdump ${ADABE_TOOLS} tracers resourcedump
+SUBDIRS = mft_utils ext_libs $(TOOLS_CRYPTO) tools_layouts ${MTCR_CONF_DIR} $(MAD_IFC) reg_access cmdif $(XZ_UTILS_DIR) dev_mgt tools_res_mgmt mvpd mflash fw_comps_mgr libmfa pldmlib mlxconfig mlxfwops cmdparser $(FW_MGR_TOOLS) flint ${ADABE_TOOLS}
 
 DIST_SUBDIRS = tracers
 
-man_MANS = man/mstflint.1 man/mstconfig.1 man/mstmcra.1 man/mstmread.1 man/mstmwrite.1 man/mstmtserver.1 man/mstregdump.1 man/mstvpd.1 man/mstprivhost.1 man/mstarchive.1 man/mstreg.1 man/mstfwtrace.1 man/mstlink.1 man/mstcongestion.1 man/mstfwmanager.1 man/mstfwreset.1 man/mstresourcedump.1
+man_MANS = man/mstflint.1 man/mstconfig.1 man/mstlink.1 man/mstfwmanager.1
 
 EXTRA_DIST = \
 	mstflint.spec \




--- cmdif/Makefile.am.orig	2020-01-10 21:59:19.228661000 +0100
+++ cmdif/Makefile.am	2020-01-10 22:51:51.467764000 +0100
@@ -35,7 +35,6 @@ USER_DIR = $(top_srcdir)
 MTCR_DIR = $(USER_DIR)/include/mtcr_ul
 TOOLS_LAYOUTS_DIR = $(USER_DIR)/tools_layouts
 AM_CPPFLAGS = -I. -I../common -I../tools_layouts  -I${MTCR_DIR} -I.. -I$(USER_DIR)/${MTCR_CONF_DIR}
-CCMDIF_SO = ccmdif.so
 
 AM_CFLAGS = -W -Wall -g -MP -MD $(COMPILER_FPIC) -DCMDIF_EXPORTS
 CMDIF_VERSION = 1
@@ -43,12 +42,8 @@ lib_LTLIBRARIES = libcmdif.a
 
 cmdifincludedir = $(includedir)/mstflint/cmdif/
 
-cmdifinclude_HEADERS = icmd_cif_common.h icmd_cif_open.h
-
 libcmdif_a_SOURCES = tools_cif.c tools_cif.h icmd_cif_common.c icmd_cif_common.h icmd_cif_open.c icmd_cif_open.h
 
-cmdif_pylibdir = $(libdir)/mstflint/python_tools/
-cmdif_pylib_DATA = ${CCMDIF_SO} cmdif.py
 ${CCMDIF_SO}: libcmdif.a
 	$(CC) -g -Wall -pthread -shared ${CFLAGS} *.o -o ${CCMDIF_SO} \
 	-L$(USER_DIR)/tools_layouts -ltools_layouts -L$(USER_DIR)/${MTCR_CONF_DIR} -lmtcr_ul

Line 0 Link Here

(-)sysutils/mstflint/files/extrat-LITE-patch-common_Makefile.am (+11 lines)
	1	--- common/Makefile.am.orig 2020-01-10 22:31:52.576485000 +0100
	2	+++ common/Makefile.am 2020-01-10 22:32:24.068225000 +0100
	3	@@ -36,8 +36,6 @@ noinst_HEADERS=compatibility.h bit_slice.h tools_utils
	4
	5	commonincludedir = $(includedir)/mstflint/common/
	6
	7	-commoninclude_HEADERS = compatibility.h
	8	-
	9	update_prefix = sed -e 's,[@]MST_LIB_DIR[@]${CONF_DISABLE_PATH_UPDATE},$(libdir),g'\
	10	-e 's,[@]MST_BIN_DIR[@]${CONF_DISABLE_PATH_UPDATE},$(bindir),g'\
	11	-e 's,[@]MFTCONF_PREFIX[@],$(prefix),g'




*** dev_mgt/Makefile.am.orig	Fri Jan 10 23:00:25 2020
--- dev_mgt/Makefile.am	Fri Jan 10 23:18:29 2020
*************** libdev_mgt_a_SOURCES = \
*** 44,54 ****
  						$(top_srcdir)/common/compatibility.h   \
  						$(top_srcdir)/common/tools_version.h
  
- dev_mgt_pylibdir = $(libdir)/mstflint/python_tools/
- 
- dev_mgt_pylib_DATA = c_dev_mgt.so dev_mgt.py
- dist_dev_mgt_pylib_DATA = dev_mgt.py
- 
  c_dev_mgt.so: libdev_mgt.a
  	$(CC) -g -Wall -pthread -shared ${CFLAGS} tools_dev_types.o -o c_dev_mgt.so \
  	-L$(USER_DIR)/reg_access -lreg_access \
--- 44,49 ----




--- mlxconfig/Makefile.am.orig	2020-01-10 20:19:15.456616000 +0100
+++ mlxconfig/Makefile.am	2020-01-10 20:19:48.307817000 +0100
@@ -55,13 +55,6 @@ AM_CPPFLAGS = -I. -I$(USER_DIR) -I$(top_srcdir)/includ
 
 AM_CXXFLAGS = -pthread -Wall -W -g -MP -MD -pipe  -Wno-deprecated-declarations  $(COMPILER_FPIC) -DDATA_PATH=\"$(pkgdatadir)\"
 bin_PROGRAMS = mstconfig
-MLXPRIVHOST_PYTHON_WRAPPER=mstprivhost
-bin_SCRIPTS = ${MLXPRIVHOST_PYTHON_WRAPPER}
-${MLXPRIVHOST_PYTHON_WRAPPER}: $(PYTHON_WRAPPER_SCRIPT)
-	cp $(PYTHON_WRAPPER_SCRIPT) $@
-
-mlxprivhostlibdir=$(libdir)/mstflint/python_tools/$(MLXPRIVHOST_PYTHON_WRAPPER)
-mlxprivhostlib_SCRIPTS = $(MLXPRIVHOST_PYTHON_WRAPPER).py
 
 noinst_LTLIBRARIES = libmlxcfg.a
 

Line 0 Link Here

(-)sysutils/mstflint/files/extrat-LITE-patch-mlxreg_Makefile.am (+11 lines)
	1	--- mlxreg/Makefile.am.orig 2020-01-10 20:34:08.906577000 +0100
	2	+++ mlxreg/Makefile.am 2020-01-10 20:34:18.747595000 +0100
	3	@@ -58,8 +58,6 @@ libmstreg_lib_a_SOURCES = mlxreg_exception.h \
	4
	5	mstreg_SOURCES = mlxreg_ui.cpp mlxreg_ui.h
	6
	7	-bin_PROGRAMS = mstreg
	8	-
	9	mstreg_LDADD = libmstreg_lib.a \
	10	$(USER_DIR)/cmdparser/libcmdparser.a \
	11	$(MFT_UTILS_DIR)/libmftutils.a \

Line 0 Link Here

(-)sysutils/mstflint/files/extrat-LITE-patch-mtcr_freebsd_Makefile.am (+8 lines)
	1	--- mtcr_freebsd/Makefile.am.orig 2020-01-10 22:04:45.957050000 +0100
	2	+++ mtcr_freebsd/Makefile.am 2020-01-10 22:04:59.716184000 +0100
	3	@@ -50,5 +50,3 @@ libmtcr_ul_a_SOURCES += ../mtcr_ul/mtcr_ib_ofed.c
	4	endif
	5
	6	libraryincludedir=$(includedir)/mstflint
	7	-libraryinclude_HEADERS = $(top_srcdir)/include/mtcr_ul/mtcr.h $(top_srcdir)/include/mtcr_ul/mtcr_com_defs.h
	8	-




--- reg_access/Makefile.am.orig	2020-01-05 16:50:06.000000000 +0100
+++ reg_access/Makefile.am	2020-01-10 23:33:56.588295000 +0100
@@ -49,9 +49,6 @@ libreg_access_a_LIBADD = $(libreg_access_a_DEPENDENCIE
 RREG_ACCESS_SO = rreg_access.so
 reg_access_pylibdir = $(libdir)/mstflint/python_tools/
 
-reg_access_pylib_DATA = ${RREG_ACCESS_SO} regaccess.py
-dist_reg_access_pylib_DATA = regaccess.py
-
 ${RREG_ACCESS_SO}: libreg_access.a
 	$(CC) -g -Wall -pthread -shared ${CFLAGS} *.o -o ${RREG_ACCESS_SO} \
 	-L$(USER_DIR)/tools_layouts -ltools_layouts -L$(MTCR_DIR) -lmtcr_ul

Line 0 Link Here

(-)sysutils/mstflint/files/extrat-LITE-patch-tools_layouts_Makefile.am (+11 lines)
	1	--- tools_layouts/Makefile.am.orig 2020-01-10 22:06:24.040554000 +0100
	2	+++ tools_layouts/Makefile.am 2020-01-10 22:06:44.128071000 +0100
	3	@@ -41,8 +41,6 @@ lib_LTLIBRARIES = libtools_layouts.a
	4
	5	toolslayoutsincludedir = $(includedir)/mstflint/tools_layouts/
	6
	7	-toolslayoutsinclude_HEADERS = icmd_layouts.h adb_to_c_utils.h
	8	-
	9	libtools_layouts_a_SOURCES = prm_adb_db.cpp prm_adb_db.h \
	10	adb_to_c_utils.c adb_to_c_utils.h\
	11	cibfw_layouts.c cibfw_layouts.h \




--- configure.ac.orig	2020-01-05 16:50:06.000000000 +0100
+++ configure.ac	2020-01-09 00:15:46.179518000 +0100
@@ -104,12 +104,10 @@ AC_ARG_ENABLE(fw-mgr,
              [enable_fw_mgr="no"])
 AC_MSG_RESULT($enable_fw_mgr)
 if test "x$enable_fw_mgr" = "xyes"; then
-    AC_CHECK_HEADER(curl/curl.h,,AC_MSG_ERROR([cannot find curl/curl.h . this header is needed for compiling fw manager tool]))
     AC_CHECK_HEADER(zlib.h,,AC_MSG_ERROR([cannot find zlib.h . this header is needed for compiling fw manager tool]))
     AC_CHECK_LIB(z, uncompress,, AC_MSG_ERROR([cannot find zlib uncompress() function.]))
     AC_CHECK_HEADER(lzma.h,,AC_MSG_ERROR([Cannot find lzma.h.]))
     AC_CHECK_LIB(boost_regex, regcompA,, AC_MSG_ERROR([cannot find boost_regex regcompA() function. Try re-installing the library...]))
-    CURL_INC_DIR=/usr/include/curl/
 fi
 
 # Adabe
@@ -133,8 +131,6 @@ if test "x$enable_adb_generic_tools" = "xyes"; then
     AC_LANG_POP([C++])
 fi
 
-AC_SUBST(CURL_INC_DIR)
-
 AM_CONDITIONAL(ENABLE_FWMGR, [test "x$enable_fw_mgr" = "xyes" ])
 AC_SUBST(ENABLE_FWMGR)
 
@@ -352,11 +348,6 @@ AS_IF([test "x$enable_cs" = "xyes" || test "x$enable_o
 AS_IF([test "x$enable_openssl" = "xyes"], [
         AC_CONFIG_FILES(mlxsign_lib/Makefile)
     ])
-
-if [ test "x$enable_openssl" = "xno" ] && \
-    [ test "x$enable_fw_mgr" = "xyes" ] ; then
-    AC_MSG_ERROR([--enable-fw-mgr cannot be used with --disabled-openssl.])
-fi
 
 AS_IF([test "x$enable_fw_mgr" = "xyes"], [
         AC_CONFIG_FILES(mlxfwupdate/Makefile)




--- mlxarchive/Makefile.am.orig	2020-01-05 16:50:06.000000000 +0100
+++ mlxarchive/Makefile.am	2020-01-09 14:15:21.405697000 +0100
@@ -20,8 +20,6 @@ DEV_MGT_DIR = $(USER_DIR)/dev_mgt
 TOOLS_CRYPTO_DIR = $(USER_DIR)/tools_crypto
 CMDIF_DIR = $(USER_DIR)/cmdif
 
-CURL_LIBS = -lcurl  -lssl -lcrypto -lrt
-
 INCLUDES = $(JSON_CFLAGS) -I. \
            -I$(USER_DIR) -I$(USER_DIR)/libmfa \
            -I$(MTCR_DIR) -I$(USER_DIR)/include/mtcr_ul \
@@ -64,13 +62,13 @@ mstarchive_LDADD = libmstarchive.a\
                    $(USER_DIR)/xz_utils/libxz_utils.a\
                    $(USER_DIR)/ext_libs/minixz/libminixz.a\
 		   $(USER_DIR)/xz_utils/libxz_utils.a \
-                   $(CURL_LIBS)\
                    -lboost_regex -lboost_filesystem -lboost_system \
                    -llzma -lm $(LIBSTD_CPP) ${LDL}
 
 if ENABLE_OPENSSL
 mstarchive_LDADD += $(top_srcdir)/mlxsign_lib/libmlxsign.a -lcrypto
 else
+AM_CXXFLAGS += -DNO_OPEN_SSL
 endif
 
 if ENABLE_CS




--- mlxarchive/mlxarchive_mfa2.cpp.orig	2020-01-05 16:50:06.000000000 +0100
+++ mlxarchive/mlxarchive_mfa2.cpp	2020-01-09 14:20:54.186228000 +0100
@@ -39,7 +39,9 @@
  */
 
 #include <xz_utils/xz_utils.h>
+#ifndef NO_OPEN_SSL
 #include <mlxsign_lib/mlxsign_lib.h>
+#endif
 #include "mlxarchive_mfa2.h"
 #include "mlxarchive_mfa2_utils.h"
 
@@ -120,6 +122,7 @@ void MFA2::pack(vector<u_int8_t>& buff)
     xz_compress_crc32(9, componentsBlockBuff.data(), componentsBlockBuff.size(),
             zippedComponentBlockBuff.data(), zippedSize);
 
+#ifndef NO_OPEN_SSL
     //compute descriptors SHA256
     vector<u_int8_t> descriptorsBuff;
     packDescriptors(descriptorsBuff);
@@ -136,7 +139,7 @@ void MFA2::pack(vector<u_int8_t>& buff)
     mlxSignSHA256 << zippedComponentBlockBuff;
     mlxSignSHA256.getDigest(digest);
     _packageDescriptor.setSHA256(digest);
-
+#endif
 }
 
 /*void MFA2::update(vector<u_int8_t>& buff)




--- mlxfwupdate/Makefile.am.orig	2020-01-09 18:28:23.591163000 +0100
+++ mlxfwupdate/Makefile.am	2020-01-09 18:35:23.551040000 +0100
@@ -45,10 +45,6 @@ MTCR_UL_LIB = $(MTCR_UL_DIR)/libmtcr_ul.a
 XML_FLAGS = -DUSE_XML -DLIBXML_STATIC
 XML_LIBS = -lxml2 $(ZLIB_LIB)
 
-CURL_LIBS = -lcurl  -lssl -lcrypto -lrt
-
-CURL_FLAGS = -DCURL_STATICLIB
-
 common_INCLUDES =  -I$(USER_DIR)/common\
             -I$(USER_DIR)/\
             -I$(USER_DIR)/include/mtcr_ul\
@@ -59,7 +55,6 @@ common_INCLUDES =  -I$(USER_DIR)/common\
             $(JSON_CFLAGS)\
             -I$(USER_DIR)/mlxfwops/lib\
             -I$(USER_DIR)/pldmlib\
-            -I$(CURL_INC_DIR)\
             -I$(USER_DIR)/mft_utils\
             -I$(USER_DIR)/dev_mgt
 
@@ -100,7 +95,6 @@ common_LDADD  = $(USER_DIR)/dev_mgt/libdev_mgt.a\
                         $(USER_DIR)/tools_layouts/libtools_layouts.a\
                         $(USER_DIR)/fw_comps_mgr/libfw_comps_mgr.a\
                         $(XML_LIBS)\
-                        $(CURL_LIBS)\
                         -lm $(LIBSTD_CPP) ${LDL}
                         
 if ENABLE_OPENSSL
@@ -118,6 +112,6 @@ common_LDADD += $(top_srcdir)/mad_ifc/libmad_ifc.a
 else
 endif
 
-mstfwmanager_CXXFLAGS =  -DMSTFLINT -DUSE_CURL $(AM_CXXFLAGS) $(CURL_FLAGS) $(XML_FLAGS) -I$(MTCR_UL_DIR) $(common_INCLUDES) 
+mstfwmanager_CXXFLAGS =  -DMSTFLINT $(AM_CXXFLAGS) $(XML_FLAGS) -I$(MTCR_UL_DIR) $(common_INCLUDES) 
 mstfwmanager_SOURCES  = $(common_SOURCEES)
-mstfwmanager_LDADD    = $(common_LDADD) $(MTCR_UL_LIB) -lz
+mstfwmanager_LDADD    = $(common_LDADD) $(MTCR_UL_LIB) -lz -llzma




--- mlxfwupdate/server_request.cpp.orig	2020-01-09 00:45:10.200149000 +0100
+++ mlxfwupdate/server_request.cpp	2020-01-09 00:46:56.459627000 +0100
@@ -43,9 +43,7 @@
 
 
 using namespace std;
-#ifndef USE_CURL
-#define USE_CURL
-#endif
+#undef USE_CURL
 
 extern int abort_request;
 
@@ -62,7 +60,9 @@ ServerRequest::ServerRequest(const char *url, const ch
     _show_progress = show_progress;
     _ceritifcate   = certificate;
     _numberOfRetrials = numberOfRetrials;
+#ifdef USE_CURL
     _headers       = NULL;
+#endif
     if (proxy != NULL) {
         if (proxy[0] != 0) {
             _UseProxy = 1;




--- configure.ac.orig	2020-01-05 16:50:06.000000000 +0100
+++ configure.ac	2020-01-09 00:28:38.419054000 +0100
@@ -100,7 +100,7 @@ fi
 AC_MSG_CHECKING(--enable-fw-mgr argument)
 AC_ARG_ENABLE(fw-mgr,
              [  --enable-fw-mgr        Enable compiling mstfwmanager tool and features],
-             [enable_fw_mgr="yes"],
+             [enable_fw_mgr=$enableval],
              [enable_fw_mgr="no"])
 AC_MSG_RESULT($enable_fw_mgr)
 if test "x$enable_fw_mgr" = "xyes"; then
@@ -116,7 +116,7 @@ fi
 AC_MSG_CHECKING(--enable-adb-generic-tools argument)
 AC_ARG_ENABLE(adb-generic-tools,
              [  --enable-adb-generic-tools        Enable compiling the following tools which depends on ADABE: mstreg and mstlink],
-             [enable_adb_generic_tools="yes"],
+             [enable_adb_generic_tools=$enableval],
              [enable_adb_generic_tools="no"])
 AC_MSG_RESULT($enable_adb_generic_tools)
 if test "x$enable_adb_generic_tools" = "xyes"; then
@@ -143,7 +143,7 @@ AC_SUBST(ENABLE_FWMGR)
 AC_MSG_CHECKING(--enable-xml2 argument)
 AC_ARG_ENABLE(xml2,
             [  --enable-xml2           Enable mstflint libxml2 dependent features],
-            [enable_xml2="yes"],
+            [enable_xml2=$enableval],
             [enable_xml2="no"])
 AC_MSG_RESULT($enable_xml2)
 if test [ "x$enable_xml2" = "xyes" ] || [ test "x$enable_fw_mgr" = "xyes" ]; then
@@ -185,7 +185,7 @@ AM_CONDITIONAL(ENABLE_INBAND, [test  "x$enable_inband"
 AC_MSG_CHECKING(--enable-cs argument)
 AC_ARG_ENABLE(cs,
             [  --enable-cs             Enable mstflint "checksum" command, dependant of openssl library],
-            [enable_cs="yes"],
+            [enable_cs=$enableval],
             [enable_cs="no"])
 AC_MSG_RESULT($enable_cs)
 if test "x$enable_cs" = "xyes"; then
@@ -211,7 +211,7 @@ fi
 AC_MSG_CHECKING(--enable-all-static argument)
 AC_ARG_ENABLE([all_static],
     AS_HELP_STRING([--enable-all-static], [Enable creating none dynamic executables]),
-    [enable_all_static="yes"],
+    [enable_all_static=$enableval],
     [enable_all_static="no"])
 AC_MSG_RESULT($enable_all_static)
 
@@ -237,7 +237,7 @@ AC_ARG_ENABLE([static_libstdcpp],
     AS_HELP_STRING([--enable-static-libstdcpp], [Enable link static to libstdc++]))
 
 AS_IF([test "x$enable_static_libstdcpp" = "xyes" -o "x$enable_all_static" = "xyes" ], [
-  CXXFLAGS="$CXXFLAGS -static-libstdc++ -static-libgcc"
+  CXXFLAGS="$CXXFLAGS -static"
 ])
 
 AC_ARG_ENABLE([dynamic_ld],
@@ -267,7 +267,7 @@ AS_IF([test "x$INIPARSER_SYSTEM_AVAILABLE" = "xyes" ],
     CXXFLAGS="$CXXFLAGS -DHAVE_INI_PARSER"
 ])
 
-AC_SEARCH_LIBS([json_object_get], [json-c jason], [JSON_SYSTEM_AVAILABLE="yes"],[
+AC_SEARCH_LIBS([json_object_get], [jsoncpp], [JSON_SYSTEM_AVAILABLE="yes"],[
     JSON_SYSTEM_AVAILABLE="no"
     JSON_CFLAGS='-I$(top_srcdir)/ext_libs/json'
     AC_SUBST(JSON_CFLAGS)

Line 0 Link Here

(-)sysutils/mstflint/files/patch-mlxfwupdate_Makefile.am (+11 lines)
	1	--- mlxfwupdate/Makefile.am.orig 2019-11-15 19:39:03 UTC
	2	+++ mlxfwupdate/Makefile.am
	3	@@ -37,7 +37,7 @@ MTCR_DIR = $(USER_DIR)/${MTCR_CONFIG_DIR}
	4	bin_PROGRAMS = mstfwmanager
	5
	6	docdir=$(INSTALL_BASEDIR)/etc/mstflint
	7	-dist_doc_DATA=certificate/ca-bundle.crt
	8	+#dist_doc_DATA=certificate/ca-bundle.crt
	9
	10	MTCR_UL_DIR = $(USER_DIR)/${MTCR_CONF_DIR}
	11	MTCR_UL_LIB = $(MTCR_UL_DIR)/libmtcr_ul.a




--- mlxfwupdate/cmd_line_params.cpp.orig	2019-11-16 07:49:07 UTC
+++ mlxfwupdate/cmd_line_params.cpp
@@ -97,9 +97,9 @@ CmdLineParams::CmdLineParams()
 
 #else
     #ifdef MSTFLINT
-    certificate = (string)ROOT_PATH + "etc/mstflint/ca-bundle.crt";
+    certificate = (string)ROOT_PATH + "/etc/ssl/cert.pem";
     #else
-    certificate = (string)ROOT_PATH + "etc/mft/ca-bundle.crt";
+    certificate = (string)ROOT_PATH + "/etc/ssl/cert.pem";
     #endif
 #endif
 }




%%FWMANAGER%%bin/mstarchive
bin/mstconfig
bin/mstcongestion
bin/mstflint
%%FWMANAGER%%bin/mstfwmanager
bin/mstfwreset
bin/mstfwtrace
%%ADAB%%bin/mstlink
bin/mstmcra
bin/mstmread
bin/mstmtserver
bin/mstmwrite
bin/mstprivhost
%%ADAB%%bin/mstreg
bin/mstregdump
bin/mstresourcedump
bin/mstvpd
include/mstflint/cmdif/icmd_cif_common.h
include/mstflint/cmdif/icmd_cif_open.h

include/mstflint/mtcr_com_defs.h
include/mstflint/tools_layouts/adb_to_c_utils.h
include/mstflint/tools_layouts/icmd_layouts.h
%%ADAB%%lib/libadb_parser.a
lib/libcmdif.a
lib/libdev_mgt.a
%%ADAB%%lib/libmodules_lib.a
%%FWMANAGER%%lib/libmstarchive.a
%%ADAB%%lib/libmstreg_lib.a
%%ADAB%%lib/libprint_util_lib.a
lib/libreg_access.a
lib/libtools_layouts.a
lib/mstflint/libmtcr_ul.a

lib/mstflint/python_tools/mlxpci/binary_file.py
lib/mstflint/python_tools/mlxpci/mlxpci_lib.py
lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/__init__.py
lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/cmd_reg_mfrl.py
lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/cmd_reg_mpcir.py
lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/logger.py
lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/mcra.py
lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/mlnx_peripheral_components.py

lib/mstflint/python_tools/mstfwtrace/mstfwtrace.py
lib/mstflint/python_tools/mstfwtrace/secure_fw_trace.py
lib/mstflint/python_tools/mstprivhost/mstprivhost.py
lib/mstflint/python_tools/mstresourcedump/__init__.py
lib/mstflint/python_tools/mstresourcedump/commands/CommandFactory.py
lib/mstflint/python_tools/mstresourcedump/commands/DumpCommand.py
lib/mstflint/python_tools/mstresourcedump/commands/QueryCommand.py
lib/mstflint/python_tools/mstresourcedump/commands/ResDumpCommand.py
lib/mstflint/python_tools/mstresourcedump/commands/__init__.py
lib/mstflint/python_tools/mstresourcedump/fetchers/CapabilityFetcher.py
lib/mstflint/python_tools/mstresourcedump/fetchers/ResourceDumpFetcher.py
lib/mstflint/python_tools/mstresourcedump/fetchers/__init__.py
lib/mstflint/python_tools/mstresourcedump/filters/SegmentsFilter.py
lib/mstflint/python_tools/mstresourcedump/filters/__init__.py
lib/mstflint/python_tools/mstresourcedump/mstresourcedump.py
lib/mstflint/python_tools/mstresourcedump/resource_data/DataPrinter.py
lib/mstflint/python_tools/mstresourcedump/resource_data/DumpData.py
lib/mstflint/python_tools/mstresourcedump/resource_data/QueryData.py
lib/mstflint/python_tools/mstresourcedump/resource_data/__init__.py
lib/mstflint/python_tools/mstresourcedump/segments/CommandSegment.py
lib/mstflint/python_tools/mstresourcedump/segments/ErrorSegment.py
lib/mstflint/python_tools/mstresourcedump/segments/InfoSegment.py
lib/mstflint/python_tools/mstresourcedump/segments/MenuRecord.py
lib/mstflint/python_tools/mstresourcedump/segments/MenuSegment.py
lib/mstflint/python_tools/mstresourcedump/segments/NoticeSegment.py
lib/mstflint/python_tools/mstresourcedump/segments/RefSegment.py
lib/mstflint/python_tools/mstresourcedump/segments/ResourceSegment.py
lib/mstflint/python_tools/mstresourcedump/segments/Segment.py
lib/mstflint/python_tools/mstresourcedump/segments/SegmentCreator.py
lib/mstflint/python_tools/mstresourcedump/segments/SegmentFactory.py
lib/mstflint/python_tools/mstresourcedump/segments/TerminateSegment.py
lib/mstflint/python_tools/mstresourcedump/segments/__init__.py
lib/mstflint/python_tools/mstresourcedump/utils/__init__.py
lib/mstflint/python_tools/mstresourcedump/utils/Exceptions.py
lib/mstflint/python_tools/mstresourcedump/utils/constants.py
lib/mstflint/python_tools/mstresourcedump/validation/ArgToMenuVerifier.py
lib/mstflint/python_tools/mstresourcedump/validation/CapabilityValidator.py
lib/mstflint/python_tools/mstresourcedump/validation/__init__.py
lib/mstflint/python_tools/mtcr.py
lib/mstflint/python_tools/regaccess.py
lib/mstflint/python_tools/rreg_access.so
lib/mstflint/python_tools/tools_version.py
man/man1/mstarchive.1.gz
man/man1/mstcongestion.1.gz
man/man1/mstconfig.1.gz
man/man1/mstflint.1.gz
man/man1/mstfwmanager.1.gz
man/man1/mstfwreset.1.gz
man/man1/mstfwtrace.1.gz
man/man1/mstlink.1.gz
man/man1/mstmcra.1.gz

man/man1/mstprivhost.1.gz
man/man1/mstreg.1.gz
man/man1/mstregdump.1.gz
man/man1/mstresourcedump.1.gz
man/man1/mstvpd.1.gz
%%DATADIR%%/BlueField.csv
%%DATADIR%%/BlueField2.csv
%%DATADIR%%/ConnectIB.csv
%%DATADIR%%/ConnectX2.csv
%%DATADIR%%/ConnectX3.csv

%%DATADIR%%/ConnectX4LX.csv
%%DATADIR%%/ConnectX5.csv
%%DATADIR%%/ConnectX6.csv
%%DATADIR%%/ConnectX6DX.csv
%%DATADIR%%/ConnectX6LX.csv
%%DATADIR%%/InfiniScaleIV.csv
%%DATADIR%%/Quantum.csv
%%DATADIR%%/Spectrum.csv
%%DATADIR%%/Spectrum3.csv
%%DATADIR%%/SwitchIB.csv
%%DATADIR%%/SwitchIB2.csv
%%DATADIR%%/SwitchX.csv
%%DATADIR%%/mlxconfig_dbs/mlxconfig_host.db
%%DATADIR%%/mlxconfig_dbs/mlxconfig_switch.db
%%ADAB%%%%DATADIR%%/prm_dbs/hca/ext/register_access_table.adb
%%ADAB%%%%DATADIR%%/prm_dbs/switch/ext/register_access_table.adb

Return to bug 242038

Lines 2-8 Link Here

(-)sysutils/mstflint/Makefile (-2 / +84 lines)
2		2
3	PORTNAME= mstflint	3	PORTNAME= mstflint
4	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
5	DISTVERSION= 4.12.0-1	5	DISTVERSION= 4.14.0-3
6	CATEGORIES= sysutils	6	CATEGORIES= sysutils
7		7
8	MAINTAINER= slavash@FreeBSD.org	8	MAINTAINER= slavash@FreeBSD.org
Lines 11-21 Link Here
11	LICENSE= GPLv2	11	LICENSE= GPLv2
12	LICENSE_FILE= ${WRKSRC}/LICENSE	12	LICENSE_FILE= ${WRKSRC}/LICENSE
13		13
14	USES= autoreconf libtool	14	USES= autoreconf libtool gmake
15		15
		16	OPTIONS_DEFINE= FWMANAGER ADAB STATIC
		17	OPTIONS_SUB= yes
		18
		19	.if defined(LITE)
		20	OPTIONS_SLAVE= FWMANAGER ADAB STATIC
		21	.endif
		22
		23	FWMANAGER_DESC= Build with mstfwmanager and mstarchive
		24	ADAB_DESC= Build with mstreg and mstlink
		25	STATIC_DESC= Static binary (disable curl support)
		26	STATIC_CONFIGURE_ON= --enable-all-static --disable-dc \
		27	--disable-openssl --disable-inband
		28
		29	LDFLAGS+= -L${LOCALBASE}/lib
		30	CPPFLAGS+= -I${LOCALBASE}/include
		31
16	GNU_CONFIGURE= yes	32	GNU_CONFIGURE= yes
17		33
18	USE_GITHUB= yes	34	USE_GITHUB= yes
19	GH_ACCOUNT= Mellanox	35	GH_ACCOUNT= Mellanox
20		36
		37	.include <bsd.port.options.mk>
		38
		39	.if ${PORT_OPTIONS:MSTATIC}
		40	.else
		41	USES+= ssl
		42	.endif
		43
		44	.if ${PORT_OPTIONS:MADAB}
		45	CONFIGURE_ARGS+= --enable-adb-generic-tools
		46	.if ${PORT_OPTIONS:MSTATIC}
		47	BUILD_DEPENDS+= xmlwf:textproc/expat2 \
		48	boost-libs>0:devel/boost-libs
		49	.else
		50	LIB_DEPENDS+= libexpat.so:textproc/expat2 \
		51	libboost_regex.so:devel/boost-libs
		52	.endif
		53	.endif
		54
		55	.if ${PORT_OPTIONS:MFWMANAGER}
		56	CONFIGURE_ARGS+= --enable-fw-mgr
		57	.if ${PORT_OPTIONS:MSTATIC}
		58	BUILD_DEPENDS+= xmllint:textproc/libxml2 \
		59	${LOCALBASE}/include/boost/algorithm/string/detail/formatter_regex.hpp:devel/boost-libs
		60	EXTRA_PATCHES+= ${PATCHDIR}/extrat-patch-configure.ac \
		61	${PATCHDIR}/extrat-patch-mlxarchive_Makefile.am \
		62	${PATCHDIR}/extrat-patch-mlxarchive_mlxarchive_mfa2.cpp \
		63	${PATCHDIR}/extrat-patch-mlxfwupdate_Makefile.am \
		64	${PATCHDIR}/extrat-patch-mlxfwupdate_server_request.cpp
		65	.else
		66	LIB_DEPENDS+= libxml2.so:textproc/libxml2 \
		67	libboost_regex.so:devel/boost-libs \
		68	libcurl.so:ftp/curl
		69	RUN_DEPENDS+= ca_root_nss>=0:security/ca_root_nss
		70	.endif
		71	.endif
		72
		73	.if defined(LITE)
		74	EXTRA_PATCHES+= ${PATCHDIR}/extrat-LITE-patch-Makefile.am \
		75	${PATCHDIR}/extrat-LITE-patch-mlxconfig_Makefile.am \
		76	${PATCHDIR}/extrat-LITE-patch-mlxreg_Makefile.am \
		77	${PATCHDIR}/extrat-LITE-patch-cmdif_Makefile.am \
		78	${PATCHDIR}/extrat-LITE-patch-mtcr_freebsd_Makefile.am \
		79	${PATCHDIR}/extrat-LITE-patch-tools_layouts_Makefile.am \
		80	${PATCHDIR}/extrat-LITE-patch-common_Makefile.am \
		81	${PATCHDIR}/extrat-LITE-patch-dev_mgt_Makefile.am \
		82	${PATCHDIR}/extrat-LITE-patch-reg_access_Makefile.am
		83	post-install:
		84	${RM} ${STAGEDIR}${PREFIX}/lib/libadb_parser.a \
		85	${STAGEDIR}${PREFIX}/lib/libcmdif.a \
		86	${STAGEDIR}${PREFIX}/lib/libdev_mgt.a \
		87	${STAGEDIR}${PREFIX}/lib/libmodules_lib.a \
		88	${STAGEDIR}${PREFIX}/lib/libmstreg_lib.a \
		89	${STAGEDIR}${PREFIX}/lib/libprint_util_lib.a \
		90	${STAGEDIR}${PREFIX}/lib/libreg_access.a \
		91	${STAGEDIR}${PREFIX}/lib/libtools_layouts.a \
		92	${STAGEDIR}${PREFIX}/lib/libmstarchive.a \
		93	${STAGEDIR}${PREFIX}/lib/mstflint/libmtcr_ul.a \
		94	${STAGEDIR}${PREFIX}/bin/mstarchive
		95	${RMDIR} ${STAGEDIR}${PREFIX}/lib/mstflint
		96	.else
		97	post-install:
		98	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mstflint/python_tools/rreg_access.so
		99	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mstflint/python_tools/ccmdif.so
		100	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mstflint/python_tools/cmtcr.so
101	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mstflint/python_tools/c_dev_mgt.so
102	.endif
21	.include <bsd.port.mk>	103	.include <bsd.port.mk>

Line 0 Link Here

(-)sysutils/mstflint/files/extrat-LITE-patch-Makefile.am (+16 lines)
	1	--- Makefile.am.orig 2020-01-05 16:50:06.000000000 +0100
	2	+++ Makefile.am 2020-01-10 20:11:11.228348000 +0100
	3	@@ -30,11 +30,11 @@
	4	# SOFTWARE.
	5	#--
	6
	7	-SUBDIRS = common mft_utils ext_libs $(TOOLS_CRYPTO) tools_layouts ${MTCR_CONF_DIR} mtcr_py $(MAD_IFC) reg_access cmdif $(XZ_UTILS_DIR) dev_mgt tools_res_mgmt mvpd mflash fw_comps_mgr libmfa pldmlib mlxconfig mlxfwops cmdparser $(FW_MGR_TOOLS) flint small_utils mstdump ${ADABE_TOOLS} tracers resourcedump
	8	+SUBDIRS = mft_utils ext_libs $(TOOLS_CRYPTO) tools_layouts ${MTCR_CONF_DIR} $(MAD_IFC) reg_access cmdif $(XZ_UTILS_DIR) dev_mgt tools_res_mgmt mvpd mflash fw_comps_mgr libmfa pldmlib mlxconfig mlxfwops cmdparser $(FW_MGR_TOOLS) flint ${ADABE_TOOLS}
	9
	10	DIST_SUBDIRS = tracers
	11
	12	-man_MANS = man/mstflint.1 man/mstconfig.1 man/mstmcra.1 man/mstmread.1 man/mstmwrite.1 man/mstmtserver.1 man/mstregdump.1 man/mstvpd.1 man/mstprivhost.1 man/mstarchive.1 man/mstreg.1 man/mstfwtrace.1 man/mstlink.1 man/mstcongestion.1 man/mstfwmanager.1 man/mstfwreset.1 man/mstresourcedump.1
	13	+man_MANS = man/mstflint.1 man/mstconfig.1 man/mstlink.1 man/mstfwmanager.1
	14
	15	EXTRA_DIST = \
	16	mstflint.spec \

Line 0 Link Here

(-)sysutils/mstflint/files/extrat-LITE-patch-cmdif_Makefile.am (+23 lines)
	1	--- cmdif/Makefile.am.orig 2020-01-10 21:59:19.228661000 +0100
	2	+++ cmdif/Makefile.am 2020-01-10 22:51:51.467764000 +0100
	3	@@ -35,7 +35,6 @@ USER_DIR = $(top_srcdir)
	4	MTCR_DIR = $(USER_DIR)/include/mtcr_ul
	5	TOOLS_LAYOUTS_DIR = $(USER_DIR)/tools_layouts
	6	AM_CPPFLAGS = -I. -I../common -I../tools_layouts -I${MTCR_DIR} -I.. -I$(USER_DIR)/${MTCR_CONF_DIR}
	7	-CCMDIF_SO = ccmdif.so
	8
	9	AM_CFLAGS = -W -Wall -g -MP -MD $(COMPILER_FPIC) -DCMDIF_EXPORTS
	10	CMDIF_VERSION = 1
	11	@@ -43,12 +42,8 @@ lib_LTLIBRARIES = libcmdif.a
	12
	13	cmdifincludedir = $(includedir)/mstflint/cmdif/
	14
	15	-cmdifinclude_HEADERS = icmd_cif_common.h icmd_cif_open.h
	16	-
	17	libcmdif_a_SOURCES = tools_cif.c tools_cif.h icmd_cif_common.c icmd_cif_common.h icmd_cif_open.c icmd_cif_open.h
	18
	19	-cmdif_pylibdir = $(libdir)/mstflint/python_tools/
	20	-cmdif_pylib_DATA = ${CCMDIF_SO} cmdif.py
	21	${CCMDIF_SO}: libcmdif.a
	22	$(CC) -g -Wall -pthread -shared ${CFLAGS} *.o -o ${CCMDIF_SO} \
	23	-L$(USER_DIR)/tools_layouts -ltools_layouts -L$(USER_DIR)/${MTCR_CONF_DIR} -lmtcr_ul

Line 0 Link Here

(-)sysutils/mstflint/files/extrat-LITE-patch-dev_mgt_Makefile.am (+16 lines)
	1	*** dev_mgt/Makefile.am.orig Fri Jan 10 23:00:25 2020
	2	--- dev_mgt/Makefile.am Fri Jan 10 23:18:29 2020
	3	*************** libdev_mgt_a_SOURCES = \
	4	* 44,54 **
	5	$(top_srcdir)/common/compatibility.h \
	6	$(top_srcdir)/common/tools_version.h
	7
	8	- dev_mgt_pylibdir = $(libdir)/mstflint/python_tools/
	9	-
	10	- dev_mgt_pylib_DATA = c_dev_mgt.so dev_mgt.py
	11	- dist_dev_mgt_pylib_DATA = dev_mgt.py
	12	-
	13	c_dev_mgt.so: libdev_mgt.a
	14	$(CC) -g -Wall -pthread -shared ${CFLAGS} tools_dev_types.o -o c_dev_mgt.so \
	15	-L$(USER_DIR)/reg_access -lreg_access \
	16	--- 44,49 ----

Line 0 Link Here

(-)sysutils/mstflint/files/extrat-LITE-patch-mlxconfig_Makefile.am (+16 lines)
	1	--- mlxconfig/Makefile.am.orig 2020-01-10 20:19:15.456616000 +0100
	2	+++ mlxconfig/Makefile.am 2020-01-10 20:19:48.307817000 +0100
	3	@@ -55,13 +55,6 @@ AM_CPPFLAGS = -I. -I$(USER_DIR) -I$(top_srcdir)/includ
	4
	5	AM_CXXFLAGS = -pthread -Wall -W -g -MP -MD -pipe -Wno-deprecated-declarations $(COMPILER_FPIC) -DDATA_PATH=\"$(pkgdatadir)\"
	6	bin_PROGRAMS = mstconfig
	7	-MLXPRIVHOST_PYTHON_WRAPPER=mstprivhost
	8	-bin_SCRIPTS = ${MLXPRIVHOST_PYTHON_WRAPPER}
	9	-${MLXPRIVHOST_PYTHON_WRAPPER}: $(PYTHON_WRAPPER_SCRIPT)
	10	- cp $(PYTHON_WRAPPER_SCRIPT) $@
	11	-
	12	-mlxprivhostlibdir=$(libdir)/mstflint/python_tools/$(MLXPRIVHOST_PYTHON_WRAPPER)
	13	-mlxprivhostlib_SCRIPTS = $(MLXPRIVHOST_PYTHON_WRAPPER).py
	14
	15	noinst_LTLIBRARIES = libmlxcfg.a
	16

Line 0 Link Here

(-)sysutils/mstflint/files/extrat-LITE-patch-reg_access_Makefile.am (+12 lines)
	1	--- reg_access/Makefile.am.orig 2020-01-05 16:50:06.000000000 +0100
	2	+++ reg_access/Makefile.am 2020-01-10 23:33:56.588295000 +0100
	3	@@ -49,9 +49,6 @@ libreg_access_a_LIBADD = $(libreg_access_a_DEPENDENCIE
	4	RREG_ACCESS_SO = rreg_access.so
	5	reg_access_pylibdir = $(libdir)/mstflint/python_tools/
	6
	7	-reg_access_pylib_DATA = ${RREG_ACCESS_SO} regaccess.py
	8	-dist_reg_access_pylib_DATA = regaccess.py
	9	-
	10	${RREG_ACCESS_SO}: libreg_access.a
	11	$(CC) -g -Wall -pthread -shared ${CFLAGS} *.o -o ${RREG_ACCESS_SO} \
	12	-L$(USER_DIR)/tools_layouts -ltools_layouts -L$(MTCR_DIR) -lmtcr_ul

Line 0 Link Here

(-)sysutils/mstflint/files/extrat-patch-configure.ac (+36 lines)
	1	--- configure.ac.orig 2020-01-05 16:50:06.000000000 +0100
	2	+++ configure.ac 2020-01-09 00:15:46.179518000 +0100
	3	@@ -104,12 +104,10 @@ AC_ARG_ENABLE(fw-mgr,
	4	[enable_fw_mgr="no"])
	5	AC_MSG_RESULT($enable_fw_mgr)
	6	if test "x$enable_fw_mgr" = "xyes"; then
	7	- AC_CHECK_HEADER(curl/curl.h,,AC_MSG_ERROR([cannot find curl/curl.h . this header is needed for compiling fw manager tool]))
	8	AC_CHECK_HEADER(zlib.h,,AC_MSG_ERROR([cannot find zlib.h . this header is needed for compiling fw manager tool]))
	9	AC_CHECK_LIB(z, uncompress,, AC_MSG_ERROR([cannot find zlib uncompress() function.]))
	10	AC_CHECK_HEADER(lzma.h,,AC_MSG_ERROR([Cannot find lzma.h.]))
	11	AC_CHECK_LIB(boost_regex, regcompA,, AC_MSG_ERROR([cannot find boost_regex regcompA() function. Try re-installing the library...]))
	12	- CURL_INC_DIR=/usr/include/curl/
	13	fi
	14
	15	# Adabe
	16	@@ -133,8 +131,6 @@ if test "x$enable_adb_generic_tools" = "xyes"; then
	17	AC_LANG_POP([C++])
	18	fi
	19
	20	-AC_SUBST(CURL_INC_DIR)
	21	-
	22	AM_CONDITIONAL(ENABLE_FWMGR, [test "x$enable_fw_mgr" = "xyes" ])
	23	AC_SUBST(ENABLE_FWMGR)
	24
	25	@@ -352,11 +348,6 @@ AS_IF([test "x$enable_cs" = "xyes" \|\| test "x$enable_o
	26	AS_IF([test "x$enable_openssl" = "xyes"], [
	27	AC_CONFIG_FILES(mlxsign_lib/Makefile)
	28	])
	29	-
	30	-if [ test "x$enable_openssl" = "xno" ] && \
	31	- [ test "x$enable_fw_mgr" = "xyes" ] ; then
	32	- AC_MSG_ERROR([--enable-fw-mgr cannot be used with --disabled-openssl.])
	33	-fi
	34
	35	AS_IF([test "x$enable_fw_mgr" = "xyes"], [
	36	AC_CONFIG_FILES(mlxfwupdate/Makefile)

Line 0 Link Here

(-)sysutils/mstflint/files/extrat-patch-mlxarchive_Makefile.am (+26 lines)
	1	--- mlxarchive/Makefile.am.orig 2020-01-05 16:50:06.000000000 +0100
	2	+++ mlxarchive/Makefile.am 2020-01-09 14:15:21.405697000 +0100
	3	@@ -20,8 +20,6 @@ DEV_MGT_DIR = $(USER_DIR)/dev_mgt
	4	TOOLS_CRYPTO_DIR = $(USER_DIR)/tools_crypto
	5	CMDIF_DIR = $(USER_DIR)/cmdif
	6
	7	-CURL_LIBS = -lcurl -lssl -lcrypto -lrt
	8	-
	9	INCLUDES = $(JSON_CFLAGS) -I. \
	10	-I$(USER_DIR) -I$(USER_DIR)/libmfa \
	11	-I$(MTCR_DIR) -I$(USER_DIR)/include/mtcr_ul \
	12	@@ -64,13 +62,13 @@ mstarchive_LDADD = libmstarchive.a\
	13	$(USER_DIR)/xz_utils/libxz_utils.a\
	14	$(USER_DIR)/ext_libs/minixz/libminixz.a\
	15	$(USER_DIR)/xz_utils/libxz_utils.a \
	16	- $(CURL_LIBS)\
	17	-lboost_regex -lboost_filesystem -lboost_system \
	18	-llzma -lm $(LIBSTD_CPP) ${LDL}
	19
	20	if ENABLE_OPENSSL
	21	mstarchive_LDADD += $(top_srcdir)/mlxsign_lib/libmlxsign.a -lcrypto
	22	else
	23	+AM_CXXFLAGS += -DNO_OPEN_SSL
	24	endif
	25
	26	if ENABLE_CS

Line 0 Link Here

(-)sysutils/mstflint/files/extrat-patch-mlxarchive_mlxarchive_mfa2.cpp (+29 lines)
	1	--- mlxarchive/mlxarchive_mfa2.cpp.orig 2020-01-05 16:50:06.000000000 +0100
	2	+++ mlxarchive/mlxarchive_mfa2.cpp 2020-01-09 14:20:54.186228000 +0100
	3	@@ -39,7 +39,9 @@
	4	*/
	5
	6	#include <xz_utils/xz_utils.h>
	7	+#ifndef NO_OPEN_SSL
	8	#include <mlxsign_lib/mlxsign_lib.h>
	9	+#endif
	10	#include "mlxarchive_mfa2.h"
	11	#include "mlxarchive_mfa2_utils.h"
	12
	13	@@ -120,6 +122,7 @@ void MFA2::pack(vector<u_int8_t>& buff)
	14	xz_compress_crc32(9, componentsBlockBuff.data(), componentsBlockBuff.size(),
	15	zippedComponentBlockBuff.data(), zippedSize);
	16
	17	+#ifndef NO_OPEN_SSL
	18	//compute descriptors SHA256
	19	vector<u_int8_t> descriptorsBuff;
	20	packDescriptors(descriptorsBuff);
	21	@@ -136,7 +139,7 @@ void MFA2::pack(vector<u_int8_t>& buff)
	22	mlxSignSHA256 << zippedComponentBlockBuff;
	23	mlxSignSHA256.getDigest(digest);
	24	_packageDescriptor.setSHA256(digest);
	25	-
	26	+#endif
	27	}
	28
	29	/*void MFA2::update(vector<u_int8_t>& buff)

Line 0 Link Here

(-)sysutils/mstflint/files/extrat-patch-mlxfwupdate_Makefile.am (+38 lines)
	1	--- mlxfwupdate/Makefile.am.orig 2020-01-09 18:28:23.591163000 +0100
	2	+++ mlxfwupdate/Makefile.am 2020-01-09 18:35:23.551040000 +0100
	3	@@ -45,10 +45,6 @@ MTCR_UL_LIB = $(MTCR_UL_DIR)/libmtcr_ul.a
	4	XML_FLAGS = -DUSE_XML -DLIBXML_STATIC
	5	XML_LIBS = -lxml2 $(ZLIB_LIB)
	6
	7	-CURL_LIBS = -lcurl -lssl -lcrypto -lrt
	8	-
	9	-CURL_FLAGS = -DCURL_STATICLIB
	10	-
	11	common_INCLUDES = -I$(USER_DIR)/common\
	12	-I$(USER_DIR)/\
	13	-I$(USER_DIR)/include/mtcr_ul\
	14	@@ -59,7 +55,6 @@ common_INCLUDES = -I$(USER_DIR)/common\
	15	$(JSON_CFLAGS)\
	16	-I$(USER_DIR)/mlxfwops/lib\
	17	-I$(USER_DIR)/pldmlib\
	18	- -I$(CURL_INC_DIR)\
	19	-I$(USER_DIR)/mft_utils\
	20	-I$(USER_DIR)/dev_mgt
	21
	22	@@ -100,7 +95,6 @@ common_LDADD = $(USER_DIR)/dev_mgt/libdev_mgt.a\
	23	$(USER_DIR)/tools_layouts/libtools_layouts.a\
	24	$(USER_DIR)/fw_comps_mgr/libfw_comps_mgr.a\
	25	$(XML_LIBS)\
	26	- $(CURL_LIBS)\
	27	-lm $(LIBSTD_CPP) ${LDL}
	28
	29	if ENABLE_OPENSSL
	30	@@ -118,6 +112,6 @@ common_LDADD += $(top_srcdir)/mad_ifc/libmad_ifc.a
	31	else
	32	endif
	33
	34	-mstfwmanager_CXXFLAGS = -DMSTFLINT -DUSE_CURL $(AM_CXXFLAGS) $(CURL_FLAGS) $(XML_FLAGS) -I$(MTCR_UL_DIR) $(common_INCLUDES)
	35	+mstfwmanager_CXXFLAGS = -DMSTFLINT $(AM_CXXFLAGS) $(XML_FLAGS) -I$(MTCR_UL_DIR) $(common_INCLUDES)
	36	mstfwmanager_SOURCES = $(common_SOURCEES)
	37	-mstfwmanager_LDADD = $(common_LDADD) $(MTCR_UL_LIB) -lz
	38	+mstfwmanager_LDADD = $(common_LDADD) $(MTCR_UL_LIB) -lz -llzma

Line 0 Link Here

(-)sysutils/mstflint/files/extrat-patch-mlxfwupdate_server_request.cpp (+23 lines)
	1	--- mlxfwupdate/server_request.cpp.orig 2020-01-09 00:45:10.200149000 +0100
	2	+++ mlxfwupdate/server_request.cpp 2020-01-09 00:46:56.459627000 +0100
	3	@@ -43,9 +43,7 @@
	4
	5
	6	using namespace std;
	7	-#ifndef USE_CURL
	8	-#define USE_CURL
	9	-#endif
	10	+#undef USE_CURL
	11
	12	extern int abort_request;
	13
	14	@@ -62,7 +60,9 @@ ServerRequest::ServerRequest(const char *url, const ch
	15	_show_progress = show_progress;
	16	_ceritifcate = certificate;
	17	_numberOfRetrials = numberOfRetrials;
	18	+#ifdef USE_CURL
	19	_headers = NULL;
	20	+#endif
	21	if (proxy != NULL) {
	22	if (proxy[0] != 0) {
	23	_UseProxy = 1;

Line 0 Link Here

(-)sysutils/mstflint/files/patch-configure.ac (+65 lines)
		1	--- configure.ac.orig 2020-01-05 16:50:06.000000000 +0100
		2	+++ configure.ac 2020-01-09 00:28:38.419054000 +0100
		3	@@ -100,7 +100,7 @@ fi
		4	AC_MSG_CHECKING(--enable-fw-mgr argument)
		5	AC_ARG_ENABLE(fw-mgr,
		6	[ --enable-fw-mgr Enable compiling mstfwmanager tool and features],
		7	- [enable_fw_mgr="yes"],
		8	+ [enable_fw_mgr=$enableval],
		9	[enable_fw_mgr="no"])
		10	AC_MSG_RESULT($enable_fw_mgr)
		11	if test "x$enable_fw_mgr" = "xyes"; then
		12	@@ -116,7 +116,7 @@ fi
		13	AC_MSG_CHECKING(--enable-adb-generic-tools argument)
		14	AC_ARG_ENABLE(adb-generic-tools,
		15	[ --enable-adb-generic-tools Enable compiling the following tools which depends on ADABE: mstreg and mstlink],
		16	- [enable_adb_generic_tools="yes"],
		17	+ [enable_adb_generic_tools=$enableval],
		18	[enable_adb_generic_tools="no"])
		19	AC_MSG_RESULT($enable_adb_generic_tools)
		20	if test "x$enable_adb_generic_tools" = "xyes"; then
		21	@@ -143,7 +143,7 @@ AC_SUBST(ENABLE_FWMGR)
		22	AC_MSG_CHECKING(--enable-xml2 argument)
		23	AC_ARG_ENABLE(xml2,
		24	[ --enable-xml2 Enable mstflint libxml2 dependent features],
		25	- [enable_xml2="yes"],
		26	+ [enable_xml2=$enableval],
		27	[enable_xml2="no"])
		28	AC_MSG_RESULT($enable_xml2)
		29	if test [ "x$enable_xml2" = "xyes" ] \|\| [ test "x$enable_fw_mgr" = "xyes" ]; then
		30	@@ -185,7 +185,7 @@ AM_CONDITIONAL(ENABLE_INBAND, [test "x$enable_inband"
		31	AC_MSG_CHECKING(--enable-cs argument)
		32	AC_ARG_ENABLE(cs,
		33	[ --enable-cs Enable mstflint "checksum" command, dependant of openssl library],
		34	- [enable_cs="yes"],
		35	+ [enable_cs=$enableval],
		36	[enable_cs="no"])
		37	AC_MSG_RESULT($enable_cs)
		38	if test "x$enable_cs" = "xyes"; then
		39	@@ -211,7 +211,7 @@ fi
		40	AC_MSG_CHECKING(--enable-all-static argument)
		41	AC_ARG_ENABLE([all_static],
		42	AS_HELP_STRING([--enable-all-static], [Enable creating none dynamic executables]),
		43	- [enable_all_static="yes"],
		44	+ [enable_all_static=$enableval],
		45	[enable_all_static="no"])
		46	AC_MSG_RESULT($enable_all_static)
		47
		48	@@ -237,7 +237,7 @@ AC_ARG_ENABLE([static_libstdcpp],
		49	AS_HELP_STRING([--enable-static-libstdcpp], [Enable link static to libstdc++]))
		50
		51	AS_IF([test "x$enable_static_libstdcpp" = "xyes" -o "x$enable_all_static" = "xyes" ], [
		52	- CXXFLAGS="$CXXFLAGS -static-libstdc++ -static-libgcc"
		53	+ CXXFLAGS="$CXXFLAGS -static"
		54	])
		55
		56	AC_ARG_ENABLE([dynamic_ld],
		57	@@ -267,7 +267,7 @@ AS_IF([test "x$INIPARSER_SYSTEM_AVAILABLE" = "xyes" ],
		58	CXXFLAGS="$CXXFLAGS -DHAVE_INI_PARSER"
		59	])
		60
		61	-AC_SEARCH_LIBS([json_object_get], [json-c jason], [JSON_SYSTEM_AVAILABLE="yes"],[
		62	+AC_SEARCH_LIBS([json_object_get], [jsoncpp], [JSON_SYSTEM_AVAILABLE="yes"],[
		63	JSON_SYSTEM_AVAILABLE="no"
		64	JSON_CFLAGS='-I$(top_srcdir)/ext_libs/json'
65	AC_SUBST(JSON_CFLAGS)

Line 0 Link Here

(-)sysutils/mstflint/files/patch-mlxfwupdate_cmd__line__params.cpp (+14 lines)
	1	--- mlxfwupdate/cmd_line_params.cpp.orig 2019-11-16 07:49:07 UTC
	2	+++ mlxfwupdate/cmd_line_params.cpp
	3	@@ -97,9 +97,9 @@ CmdLineParams::CmdLineParams()
	4
	5	#else
	6	#ifdef MSTFLINT
	7	- certificate = (string)ROOT_PATH + "etc/mstflint/ca-bundle.crt";
	8	+ certificate = (string)ROOT_PATH + "/etc/ssl/cert.pem";
	9	#else
	10	- certificate = (string)ROOT_PATH + "etc/mft/ca-bundle.crt";
	11	+ certificate = (string)ROOT_PATH + "/etc/ssl/cert.pem";
	12	#endif
	13	#endif
	14	}

Lines 1-14 Link Here

(-)sysutils/mstflint/pkg-plist (+57 lines)
		1	%%FWMANAGER%%bin/mstarchive
1	bin/mstconfig	2	bin/mstconfig
2	bin/mstcongestion	3	bin/mstcongestion
3	bin/mstflint	4	bin/mstflint
		5	%%FWMANAGER%%bin/mstfwmanager
4	bin/mstfwreset	6	bin/mstfwreset
5	bin/mstfwtrace	7	bin/mstfwtrace
		8	%%ADAB%%bin/mstlink
6	bin/mstmcra	9	bin/mstmcra
7	bin/mstmread	10	bin/mstmread
8	bin/mstmtserver	11	bin/mstmtserver
9	bin/mstmwrite	12	bin/mstmwrite
10	bin/mstprivhost	13	bin/mstprivhost
		14	%%ADAB%%bin/mstreg
11	bin/mstregdump	15	bin/mstregdump
		16	bin/mstresourcedump
12	bin/mstvpd	17	bin/mstvpd
13	include/mstflint/cmdif/icmd_cif_common.h	18	include/mstflint/cmdif/icmd_cif_common.h
14	include/mstflint/cmdif/icmd_cif_open.h	19	include/mstflint/cmdif/icmd_cif_open.h
Lines 17-24 Link Here
17	include/mstflint/mtcr_com_defs.h	22	include/mstflint/mtcr_com_defs.h
18	include/mstflint/tools_layouts/adb_to_c_utils.h	23	include/mstflint/tools_layouts/adb_to_c_utils.h
19	include/mstflint/tools_layouts/icmd_layouts.h	24	include/mstflint/tools_layouts/icmd_layouts.h
		25	%%ADAB%%lib/libadb_parser.a
20	lib/libcmdif.a	26	lib/libcmdif.a
21	lib/libdev_mgt.a	27	lib/libdev_mgt.a
		28	%%ADAB%%lib/libmodules_lib.a
		29	%%FWMANAGER%%lib/libmstarchive.a
		30	%%ADAB%%lib/libmstreg_lib.a
		31	%%ADAB%%lib/libprint_util_lib.a
22	lib/libreg_access.a	32	lib/libreg_access.a
23	lib/libtools_layouts.a	33	lib/libtools_layouts.a
24	lib/mstflint/libmtcr_ul.a	34	lib/mstflint/libmtcr_ul.a
Lines 31-36 Link Here
31	lib/mstflint/python_tools/mlxpci/binary_file.py	41	lib/mstflint/python_tools/mlxpci/binary_file.py
32	lib/mstflint/python_tools/mlxpci/mlxpci_lib.py	42	lib/mstflint/python_tools/mlxpci/mlxpci_lib.py
33	lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/__init__.py	43	lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/__init__.py
		44	lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/cmd_reg_mfrl.py
		45	lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/cmd_reg_mpcir.py
34	lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/logger.py	46	lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/logger.py
35	lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/mcra.py	47	lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/mcra.py
36	lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/mlnx_peripheral_components.py	48	lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/mlnx_peripheral_components.py
Lines 43-55 Link Here
43	lib/mstflint/python_tools/mstfwtrace/mstfwtrace.py	55	lib/mstflint/python_tools/mstfwtrace/mstfwtrace.py
44	lib/mstflint/python_tools/mstfwtrace/secure_fw_trace.py	56	lib/mstflint/python_tools/mstfwtrace/secure_fw_trace.py
45	lib/mstflint/python_tools/mstprivhost/mstprivhost.py	57	lib/mstflint/python_tools/mstprivhost/mstprivhost.py
		58	lib/mstflint/python_tools/mstresourcedump/__init__.py
		59	lib/mstflint/python_tools/mstresourcedump/commands/CommandFactory.py
		60	lib/mstflint/python_tools/mstresourcedump/commands/DumpCommand.py
		61	lib/mstflint/python_tools/mstresourcedump/commands/QueryCommand.py
		62	lib/mstflint/python_tools/mstresourcedump/commands/ResDumpCommand.py
		63	lib/mstflint/python_tools/mstresourcedump/commands/__init__.py
		64	lib/mstflint/python_tools/mstresourcedump/fetchers/CapabilityFetcher.py
		65	lib/mstflint/python_tools/mstresourcedump/fetchers/ResourceDumpFetcher.py
		66	lib/mstflint/python_tools/mstresourcedump/fetchers/__init__.py
		67	lib/mstflint/python_tools/mstresourcedump/filters/SegmentsFilter.py
		68	lib/mstflint/python_tools/mstresourcedump/filters/__init__.py
		69	lib/mstflint/python_tools/mstresourcedump/mstresourcedump.py
		70	lib/mstflint/python_tools/mstresourcedump/resource_data/DataPrinter.py
		71	lib/mstflint/python_tools/mstresourcedump/resource_data/DumpData.py
		72	lib/mstflint/python_tools/mstresourcedump/resource_data/QueryData.py
		73	lib/mstflint/python_tools/mstresourcedump/resource_data/__init__.py
		74	lib/mstflint/python_tools/mstresourcedump/segments/CommandSegment.py
		75	lib/mstflint/python_tools/mstresourcedump/segments/ErrorSegment.py
		76	lib/mstflint/python_tools/mstresourcedump/segments/InfoSegment.py
		77	lib/mstflint/python_tools/mstresourcedump/segments/MenuRecord.py
		78	lib/mstflint/python_tools/mstresourcedump/segments/MenuSegment.py
		79	lib/mstflint/python_tools/mstresourcedump/segments/NoticeSegment.py
		80	lib/mstflint/python_tools/mstresourcedump/segments/RefSegment.py
		81	lib/mstflint/python_tools/mstresourcedump/segments/ResourceSegment.py
		82	lib/mstflint/python_tools/mstresourcedump/segments/Segment.py
		83	lib/mstflint/python_tools/mstresourcedump/segments/SegmentCreator.py
		84	lib/mstflint/python_tools/mstresourcedump/segments/SegmentFactory.py
		85	lib/mstflint/python_tools/mstresourcedump/segments/TerminateSegment.py
		86	lib/mstflint/python_tools/mstresourcedump/segments/__init__.py
		87	lib/mstflint/python_tools/mstresourcedump/utils/__init__.py
		88	lib/mstflint/python_tools/mstresourcedump/utils/Exceptions.py
		89	lib/mstflint/python_tools/mstresourcedump/utils/constants.py
		90	lib/mstflint/python_tools/mstresourcedump/validation/ArgToMenuVerifier.py
		91	lib/mstflint/python_tools/mstresourcedump/validation/CapabilityValidator.py
		92	lib/mstflint/python_tools/mstresourcedump/validation/__init__.py
46	lib/mstflint/python_tools/mtcr.py	93	lib/mstflint/python_tools/mtcr.py
47	lib/mstflint/python_tools/regaccess.py	94	lib/mstflint/python_tools/regaccess.py
48	lib/mstflint/python_tools/rreg_access.so	95	lib/mstflint/python_tools/rreg_access.so
49	lib/mstflint/python_tools/tools_version.py	96	lib/mstflint/python_tools/tools_version.py
50	man/man1/mstarchive.1.gz	97	man/man1/mstarchive.1.gz
		98	man/man1/mstcongestion.1.gz
51	man/man1/mstconfig.1.gz	99	man/man1/mstconfig.1.gz
52	man/man1/mstflint.1.gz	100	man/man1/mstflint.1.gz
		101	man/man1/mstfwmanager.1.gz
		102	man/man1/mstfwreset.1.gz
53	man/man1/mstfwtrace.1.gz	103	man/man1/mstfwtrace.1.gz
54	man/man1/mstlink.1.gz	104	man/man1/mstlink.1.gz
55	man/man1/mstmcra.1.gz	105	man/man1/mstmcra.1.gz
Lines 59-66 Link Here
59	man/man1/mstprivhost.1.gz	109	man/man1/mstprivhost.1.gz
60	man/man1/mstreg.1.gz	110	man/man1/mstreg.1.gz
61	man/man1/mstregdump.1.gz	111	man/man1/mstregdump.1.gz
		112	man/man1/mstresourcedump.1.gz
62	man/man1/mstvpd.1.gz	113	man/man1/mstvpd.1.gz
63	%%DATADIR%%/BlueField.csv	114	%%DATADIR%%/BlueField.csv
		115	%%DATADIR%%/BlueField2.csv
64	%%DATADIR%%/ConnectIB.csv	116	%%DATADIR%%/ConnectIB.csv
65	%%DATADIR%%/ConnectX2.csv	117	%%DATADIR%%/ConnectX2.csv
66	%%DATADIR%%/ConnectX3.csv	118	%%DATADIR%%/ConnectX3.csv
Lines 69-79 Link Here
69	%%DATADIR%%/ConnectX4LX.csv	121	%%DATADIR%%/ConnectX4LX.csv
70	%%DATADIR%%/ConnectX5.csv	122	%%DATADIR%%/ConnectX5.csv
71	%%DATADIR%%/ConnectX6.csv	123	%%DATADIR%%/ConnectX6.csv
		124	%%DATADIR%%/ConnectX6DX.csv
		125	%%DATADIR%%/ConnectX6LX.csv
72	%%DATADIR%%/InfiniScaleIV.csv	126	%%DATADIR%%/InfiniScaleIV.csv
73	%%DATADIR%%/Quantum.csv	127	%%DATADIR%%/Quantum.csv
74	%%DATADIR%%/Spectrum.csv	128	%%DATADIR%%/Spectrum.csv
		129	%%DATADIR%%/Spectrum3.csv
75	%%DATADIR%%/SwitchIB.csv	130	%%DATADIR%%/SwitchIB.csv
76	%%DATADIR%%/SwitchIB2.csv	131	%%DATADIR%%/SwitchIB2.csv
77	%%DATADIR%%/SwitchX.csv	132	%%DATADIR%%/SwitchX.csv
78	%%DATADIR%%/mlxconfig_dbs/mlxconfig_host.db	133	%%DATADIR%%/mlxconfig_dbs/mlxconfig_host.db
79	%%DATADIR%%/mlxconfig_dbs/mlxconfig_switch.db	134	%%DATADIR%%/mlxconfig_dbs/mlxconfig_switch.db
		135	%%ADAB%%%%DATADIR%%/prm_dbs/hca/ext/register_access_table.adb
		136	%%ADAB%%%%DATADIR%%/prm_dbs/switch/ext/register_access_table.adb