View | Details | Raw Unified | Return to bug 242038 | Differences between
and this patch

Collapse All | Expand All

(-)sysutils/mstflint/Makefile (-2 / +40 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	mstflint
3
PORTNAME=	mstflint
4
DISTVERSIONPREFIX=	v
4
DISTVERSIONPREFIX=	v
5
DISTVERSION=	4.12.0-1
5
DISTVERSION=	4.13.1-1
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 ssl
15
15
16
OPTIONS_DEFINE=	FWMANAGER ADAB STATIC
17
OPTIONS_SUB=	yes
18
19
FWMANAGER_DESC=	Enable mstfwmanager and mstarchive (depend on boost-libs and curl)
20
ADAB_DESC=	Enable mstreg and mstlink (depend on boost-libs)
21
STATIC_DESC=	Enable static binary
22
STATIC_PREVENTS=	FWMANAGER
23
STATIC_PREVENTS_MSG=	FWMANAGER need openssl,  which STATIC disable
24
FWMANAGER_CONFIGURE_ENABLE=	fw-mgr
25
FWMANAGER_LIB_DEPENDS=	libxml2.so:textproc/libxml2 \
26
			libboost_regex.so:devel/boost-libs \
27
			libcurl.so:ftp/curl
28
FWMANAGER_RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
29
STATIC_CONFIGURE_ON=	--enable-all-static --disable-dc \
30
			--disable-openssl --disable-inband
31
32
LDFLAGS+=	-L${LOCALBASE}/lib
33
CPPFLAGS+=	-I${LOCALBASE}/include
34
16
GNU_CONFIGURE=	yes
35
GNU_CONFIGURE=	yes
17
36
18
USE_GITHUB=	yes
37
USE_GITHUB=	yes
19
GH_ACCOUNT=	Mellanox
38
GH_ACCOUNT=	Mellanox
20
39
40
.include <bsd.port.options.mk>
41
42
.if ${PORT_OPTIONS:MADAB}
43
CONFIGURE_ARGS+=	--enable-adb-generic-tools
44
.if ${PORT_OPTIONS:MSTATIC}
45
BUILD_DEPENDS+=	xmlwf:textproc/expat2 \
46
		boost-libs>0:devel/boost-libs
47
.else
48
LIB_DEPENDS+=	libexpat.so:textproc/expat2 \
49
		libboost_regex.so:devel/boost-libs
50
.endif
51
.endif
52
53
post-install:
54
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mstflint/python_tools/rreg_access.so
55
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mstflint/python_tools/ccmdif.so
56
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mstflint/python_tools/cmtcr.so
57
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mstflint/python_tools/c_dev_mgt.so
58
21
.include <bsd.port.mk>
59
.include <bsd.port.mk>
(-)sysutils/mstflint/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1562536530
1
TIMESTAMP = 1573802950
2
SHA256 (Mellanox-mstflint-v4.12.0-1_GH0.tar.gz) = 5cbf8924f33f813dd636bc25681b07d8940aa7803ff1f995266ac86ff30cbf35
2
SHA256 (Mellanox-mstflint-v4.13.1-1_GH0.tar.gz) = b643a94eef770b9c05782d5b5851ebc7e92dcd0c1212185aefa5e7543a2cd471
3
SIZE (Mellanox-mstflint-v4.12.0-1_GH0.tar.gz) = 3716706
3
SIZE (Mellanox-mstflint-v4.13.1-1_GH0.tar.gz) = 3785966
(-)sysutils/mstflint/files/patch-configure.ac (+65 lines)
Line 0 Link Here
1
--- configure.ac.orig	2019-10-10 09:33:43 UTC
2
+++ configure.ac
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)
(-)sysutils/mstflint/files/patch-mlxfwupdate_Makefile.am (+11 lines)
Line 0 Link Here
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
(-)sysutils/mstflint/files/patch-mlxfwupdate_cmd__line__params.cpp (+14 lines)
Line 0 Link Here
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
 }
(-)sysutils/mstflint/pkg-plist (+17 lines)
Lines 1-13 Link Here
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
12
bin/mstvpd
16
bin/mstvpd
13
include/mstflint/cmdif/icmd_cif_common.h
17
include/mstflint/cmdif/icmd_cif_common.h
Lines 17-24 Link Here
17
include/mstflint/mtcr_com_defs.h
21
include/mstflint/mtcr_com_defs.h
18
include/mstflint/tools_layouts/adb_to_c_utils.h
22
include/mstflint/tools_layouts/adb_to_c_utils.h
19
include/mstflint/tools_layouts/icmd_layouts.h
23
include/mstflint/tools_layouts/icmd_layouts.h
24
%%ADAB%%lib/libadb_parser.a
20
lib/libcmdif.a
25
lib/libcmdif.a
21
lib/libdev_mgt.a
26
lib/libdev_mgt.a
27
%%ADAB%%lib/libmodules_lib.a
28
%%FWMANAGER%%lib/libmstarchive.a
29
%%ADAB%%lib/libmstreg_lib.a
30
%%ADAB%%lib/libprint_util_lib.a
22
lib/libreg_access.a
31
lib/libreg_access.a
23
lib/libtools_layouts.a
32
lib/libtools_layouts.a
24
lib/mstflint/libmtcr_ul.a
33
lib/mstflint/libmtcr_ul.a
Lines 31-36 Link Here
31
lib/mstflint/python_tools/mlxpci/binary_file.py
40
lib/mstflint/python_tools/mlxpci/binary_file.py
32
lib/mstflint/python_tools/mlxpci/mlxpci_lib.py
41
lib/mstflint/python_tools/mlxpci/mlxpci_lib.py
33
lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/__init__.py
42
lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/__init__.py
43
lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/cmd_reg_mfrl.py
44
lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/cmd_reg_mpcir.py
34
lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/logger.py
45
lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/logger.py
35
lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/mcra.py
46
lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/mcra.py
36
lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/mlnx_peripheral_components.py
47
lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/mlnx_peripheral_components.py
Lines 48-55 Link Here
48
lib/mstflint/python_tools/rreg_access.so
59
lib/mstflint/python_tools/rreg_access.so
49
lib/mstflint/python_tools/tools_version.py
60
lib/mstflint/python_tools/tools_version.py
50
man/man1/mstarchive.1.gz
61
man/man1/mstarchive.1.gz
62
man/man1/mstcongestion.1.gz
51
man/man1/mstconfig.1.gz
63
man/man1/mstconfig.1.gz
52
man/man1/mstflint.1.gz
64
man/man1/mstflint.1.gz
65
man/man1/mstfwmanager.1.gz
66
man/man1/mstfwreset.1.gz
53
man/man1/mstfwtrace.1.gz
67
man/man1/mstfwtrace.1.gz
54
man/man1/mstlink.1.gz
68
man/man1/mstlink.1.gz
55
man/man1/mstmcra.1.gz
69
man/man1/mstmcra.1.gz
Lines 69-74 Link Here
69
%%DATADIR%%/ConnectX4LX.csv
83
%%DATADIR%%/ConnectX4LX.csv
70
%%DATADIR%%/ConnectX5.csv
84
%%DATADIR%%/ConnectX5.csv
71
%%DATADIR%%/ConnectX6.csv
85
%%DATADIR%%/ConnectX6.csv
86
%%DATADIR%%/ConnectX6DX.csv
72
%%DATADIR%%/InfiniScaleIV.csv
87
%%DATADIR%%/InfiniScaleIV.csv
73
%%DATADIR%%/Quantum.csv
88
%%DATADIR%%/Quantum.csv
74
%%DATADIR%%/Spectrum.csv
89
%%DATADIR%%/Spectrum.csv
Lines 77-79 Link Here
77
%%DATADIR%%/SwitchX.csv
92
%%DATADIR%%/SwitchX.csv
78
%%DATADIR%%/mlxconfig_dbs/mlxconfig_host.db
93
%%DATADIR%%/mlxconfig_dbs/mlxconfig_host.db
79
%%DATADIR%%/mlxconfig_dbs/mlxconfig_switch.db
94
%%DATADIR%%/mlxconfig_dbs/mlxconfig_switch.db
95
%%ADAB%%%%DATADIR%%/prm_dbs/hca/ext/register_access_table.adb
96
%%ADAB%%%%DATADIR%%/prm_dbs/switch/ext/register_access_table.adb

Return to bug 242038