Index: head/sysutils/mstflint/Makefile =================================================================== --- head/sysutils/mstflint/Makefile (revision 550879) +++ head/sysutils/mstflint/Makefile (revision 550880) @@ -1,106 +1,106 @@ # $FreeBSD$ PORTNAME= mstflint DISTVERSIONPREFIX= v -DISTVERSION= 4.14.0-3 +DISTVERSION= 4.15.0-1 CATEGORIES= sysutils MAINTAINER= hselasky@FreeBSD.org COMMENT= Firmware Burning and Diagnostics Tools for Mellanox devices LICENSE= BSD2CLAUSE GPLv2 LICENSE_COMB= dual -LICENSE_FILE_BSD2CLAUSE= ${WRKSRC}/LICENSE -LICENSE_FILE_GPLv2= ${WRKSRC}/LICENSE +LICENSE_FILE_BSD2CLAUSE= ${WRKSRC}/LICENSE +LICENSE_FILE_GPLv2= ${WRKSRC}/LICENSE -USES= autoreconf libtool gmake +USES= autoreconf libtool gmake pkgconfig 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 .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) LDFLAGS+= -lmd 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 Index: head/sysutils/mstflint/distinfo =================================================================== --- head/sysutils/mstflint/distinfo (revision 550879) +++ head/sysutils/mstflint/distinfo (revision 550880) @@ -1,3 +1,3 @@ -TIMESTAMP = 1595260779 -SHA256 (Mellanox-mstflint-v4.14.0-3_GH0.tar.gz) = d74231e555aaa0c967022c0b75eeec82ebca62a6e1d109cc56aa3ffaf9936ca2 -SIZE (Mellanox-mstflint-v4.14.0-3_GH0.tar.gz) = 4012564 +TIMESTAMP = 1601554141 +SHA256 (Mellanox-mstflint-v4.15.0-1_GH0.tar.gz) = c90174b22f31a238365528cdb3ed1354d4983ec02bc9cdc87ca219e299d76683 +SIZE (Mellanox-mstflint-v4.15.0-1_GH0.tar.gz) = 4270839 Index: head/sysutils/mstflint/files/extrat-LITE-patch-Makefile.am =================================================================== --- head/sysutils/mstflint/files/extrat-LITE-patch-Makefile.am (revision 550879) +++ head/sysutils/mstflint/files/extrat-LITE-patch-Makefile.am (revision 550880) @@ -1,16 +1,16 @@ ---- Makefile.am.orig 2020-01-05 16:50:06.000000000 +0100 -+++ Makefile.am 2020-01-10 20:11:11.228348000 +0100 +--- Makefile.am.orig 2020-10-01 18:10:47.137747000 +0200 ++++ Makefile.am 2020-10-01 18:13:35.608941000 +0200 @@ -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} +-SUBDIRS = common mft_utils mft_utils/hsmclient 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 resourceparse ++SUBDIRS = mft_utils mft_utils/hsmclient 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 \ Index: head/sysutils/mstflint/files/patch-configure.ac =================================================================== --- head/sysutils/mstflint/files/patch-configure.ac (revision 550879) +++ head/sysutils/mstflint/files/patch-configure.ac (revision 550880) @@ -1,65 +1,11 @@ ---- 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], +--- configure.ac.orig 2020-10-02 01:05:50.612135000 +0200 ++++ configure.ac 2020-10-02 01:06:26.890856000 +0200 +@@ -233,7 +233,7 @@ 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) Index: head/sysutils/mstflint/pkg-plist =================================================================== --- head/sysutils/mstflint/pkg-plist (revision 550879) +++ head/sysutils/mstflint/pkg-plist (revision 550880) @@ -1,136 +1,164 @@ %%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/mstresourceparse bin/mstvpd include/mstflint/cmdif/icmd_cif_common.h include/mstflint/cmdif/icmd_cif_open.h include/mstflint/common/compatibility.h include/mstflint/mtcr.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/c_dev_mgt.so lib/mstflint/python_tools/ccmdif.so lib/mstflint/python_tools/cmdif.py lib/mstflint/python_tools/cmtcr.so lib/mstflint/python_tools/dev_mgt.py lib/mstflint/python_tools/mft_logger.py 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_mcam.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/mstfwreset/mlxfwresetlib/mlxfwreset_mlnxdriver.py lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/mlxfwreset_status_checker.py lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/mlxfwreset_utils.py lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/pci_device.py lib/mstflint/python_tools/mstfwreset/mstfwreset.py lib/mstflint/python_tools/mstfwtrace/fw_trace_utilities.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/mstresourceparse/__init__.py +lib/mstflint/python_tools/mstresourceparse/mstresourceparse.py +lib/mstflint/python_tools/mstresourceparse/parsers/AdbParser.py +lib/mstflint/python_tools/mstresourceparse/parsers/Parser.py +lib/mstflint/python_tools/mstresourceparse/parsers/__init__.py +lib/mstflint/python_tools/mstresourceparse/resource_data/AdbData.py +lib/mstflint/python_tools/mstresourceparse/resource_data/DataPrinter.py +lib/mstflint/python_tools/mstresourceparse/resource_data/RawData.py +lib/mstflint/python_tools/mstresourceparse/resource_data/__init__.py +lib/mstflint/python_tools/mstresourceparse/segments/CommandSegment.py +lib/mstflint/python_tools/mstresourceparse/segments/ErrorSegment.py +lib/mstflint/python_tools/mstresourceparse/segments/InfoSegment.py +lib/mstflint/python_tools/mstresourceparse/segments/MenuRecord.py +lib/mstflint/python_tools/mstresourceparse/segments/MenuSegment.py +lib/mstflint/python_tools/mstresourceparse/segments/NoticeSegment.py +lib/mstflint/python_tools/mstresourceparse/segments/RefSegment.py +lib/mstflint/python_tools/mstresourceparse/segments/ResourceSegment.py +lib/mstflint/python_tools/mstresourceparse/segments/Segment.py +lib/mstflint/python_tools/mstresourceparse/segments/SegmentCreator.py +lib/mstflint/python_tools/mstresourceparse/segments/SegmentFactory.py +lib/mstflint/python_tools/mstresourceparse/segments/TerminateSegment.py +lib/mstflint/python_tools/mstresourceparse/segments/__init__.py +lib/mstflint/python_tools/mstresourceparse/utils/Exceptions.py +lib/mstflint/python_tools/mstresourceparse/utils/__init__.py +lib/mstflint/python_tools/mstresourceparse/utils/constants.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/mstmread.1.gz man/man1/mstmtserver.1.gz man/man1/mstmwrite.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%%/ConnectX3Pro.csv %%DATADIR%%/ConnectX4.csv %%DATADIR%%/ConnectX4LX.csv %%DATADIR%%/ConnectX5.csv %%DATADIR%%/ConnectX6.csv %%DATADIR%%/ConnectX6DX.csv %%DATADIR%%/ConnectX6LX.csv +%%DATADIR%%/ConnectX7.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