From nobody Thu Oct 5 08:45:32 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S1QB42wp9z4vvRM; Thu, 5 Oct 2023 08:45:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S1QB42V5Cz3C9M; Thu, 5 Oct 2023 08:45:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696495532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CRNfOBxDBySNTCLvELfDSe+tnMnL633ro5jyo25WiuA=; b=o4I1tXk+ufxHa4xEvKJG9JQsHxwAs9AMCi8QAQy/bIxRcEOiJQgrSEHn34Tkh6SlCMjAdS 5QAKSuUNYjCpYX0kn0POwsxdnLkSe89/2XMMmjWhYTVNW05Fc0u/dySBobCBvi2ywNJjjw U8xTj4+Cv5x0lIiDDlAHBAwRKsyi8qPYO7vD8cR6A5EsW3m5rdfEdDynmTlx88Fn6D1E21 EZLAtx7vC0ls6lVCNq8Xc1KKSUlo3+jZlj6RSettc/t6uEbnFB/c6vO25FduqlJqciqitL O2mWsViFYEERhiBuk3wv0W6UiV/imwe2fqpx/rnOCmo19qkKM/XPIAjxGTQ9qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696495532; a=rsa-sha256; cv=none; b=uV5tYT1OJ1twSuN6a9+uNhNiexbi1+6Xo137Y+cy6wxv/xyh4osXSxgdg6QV+QzDbX88lJ CcdDfc0MJXjK5VRNRKst7nK3mhP8PJ1AOxFZ+/AOYD/695DiwF2tXfhjNOXhaTukmdWdRf aQyCYRibo+UsYtd8ndHde3oqPluU6S5LLfFmi8NM67NHSh3iEs3YWSIQ1nBRbmb/f+TI/P Vy5G1zSzq3I8wSbn0ExGHLMbZjrbuCu2gqJJbiwRPC0GQ2dWIalieaxoGVMJKZ9EOBLdPq lG6fdHREPlktPetyaMlkbgrotHEGQqQGKDr9v31eFHjrUAnIQ4hTUlLsn9MnVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696495532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CRNfOBxDBySNTCLvELfDSe+tnMnL633ro5jyo25WiuA=; b=d6K5uWGEcQF/rkUjpo/Htg47dbeqJKqSld6Dec3+pyQJW0UEaHv99COONGSGpqCDT59eQr h4+krYfWYbhFRQPLbWogHD28NMU1Qpb648iIBKEEREhuXgg9R4n8DRN3t85XWpy56qs2dQ luEXwKA7ElpLPENZkaMaGZg8250lnKpRo5gMIHwMRwm7MNgpK8H8eyauNew1rWzTbRWSuT 7CtwL2rvAFIUzqaY86sj94qWpj6xx4ecWrxJsFQ7vVs+dXfowcKDB0jinybiDVhlNePDsh YOuj/zxeUNKNNPCTz2IfsgZ5FdF1E2xk8D2V473gxkjXggH3te6UIaB2w/k44w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S1QB41YJcz1Cfj; Thu, 5 Oct 2023 08:45:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3958jWUm026273; Thu, 5 Oct 2023 08:45:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3958jW2Q026270; Thu, 5 Oct 2023 08:45:32 GMT (envelope-from git) Date: Thu, 5 Oct 2023 08:45:32 GMT Message-Id: <202310050845.3958jW2Q026270@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Olivier Cochard Subject: git: 594eebaf9671 - main - sysutils/mstflint: Update to 4.25.0 and take maintainship List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olivier X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 594eebaf9671815cd42b96a19b61b35992a234c4 Auto-Submitted: auto-generated The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/ports/commit/?id=594eebaf9671815cd42b96a19b61b35992a234c4 commit 594eebaf9671815cd42b96a19b61b35992a234c4 Author: Olivier Cochard AuthorDate: 2023-10-04 15:45:43 +0000 Commit: Olivier Cochard CommitDate: 2023-10-05 08:27:31 +0000 sysutils/mstflint: Update to 4.25.0 and take maintainship Remove the -lite flavor. Event: Oslo Hackathon at Modirum --- MOVED | 1 + sysutils/Makefile | 1 - sysutils/mstflint-lite/Makefile | 15 ---- sysutils/mstflint-lite/pkg-descr | 7 -- sysutils/mstflint-lite/pkg-plist | 12 --- sysutils/mstflint/Makefile | 85 +++++----------------- sysutils/mstflint/distinfo | 6 +- .../mstflint/files/extrat-LITE-patch-Makefile.am | 16 ---- .../files/extrat-LITE-patch-cmdif_Makefile.am | 23 ------ .../files/extrat-LITE-patch-common_Makefile.am | 11 --- .../files/extrat-LITE-patch-dev_mgt_Makefile.am | 16 ---- .../files/extrat-LITE-patch-mlxconfig_Makefile.am | 16 ---- .../files/extrat-LITE-patch-mlxreg_Makefile.am | 11 --- .../extrat-LITE-patch-mtcr_freebsd_Makefile.am | 8 -- .../files/extrat-LITE-patch-reg_access_Makefile.am | 12 --- .../extrat-LITE-patch-tools_layouts_Makefile.am | 11 --- sysutils/mstflint/files/extrat-patch-configure.ac | 36 --------- .../files/extrat-patch-mlxarchive_Makefile.am | 19 ----- .../extrat-patch-mlxarchive_mlxarchive_mfa2.cpp | 28 ------- .../files/extrat-patch-mlxfwupdate_Makefile.am | 38 ---------- .../extrat-patch-mlxfwupdate_server_request.cpp | 23 ------ sysutils/mstflint/files/patch-configure.ac | 24 ++++-- sysutils/mstflint/files/patch-mflash_Makefile.am | 11 +++ .../mstflint/files/patch-mlxarchive_Makefile.am | 18 +++++ sysutils/mstflint/files/patch-mlxlink_Makefile.am | 18 +++++ sysutils/mstflint/files/patch-mlxreg_Makefile.am | 19 +++++ sysutils/mstflint/pkg-plist | 14 +++- 27 files changed, 117 insertions(+), 382 deletions(-) diff --git a/MOVED b/MOVED index 1b11c771b4a7..99321fcb0a09 100644 --- a/MOVED +++ b/MOVED @@ -7929,3 +7929,4 @@ databases/percona57-client||2023-10-01|Has expired: Upstream EOL reaches on 2023 sysutils/nfs-over-tls||2023-10-01|Has expired: All supported releases of FreeBSD include this in base x11/antimicro|x11/antimicrox|2023-10-01|Has expired: Replaced by x11/antimicrox upstream no longer maintained security/krb5-appl||2023-10-01|Has expired: Desupported by upstream, uses old ciphers +sysutils/mstflint-lite|sysutils/mstflint|2023-10-05|Parent port is now lite by default diff --git a/sysutils/Makefile b/sysutils/Makefile index 6ddd8e006e50..bedeb9a63133 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -792,7 +792,6 @@ SUBDIR += msiklm SUBDIR += msktutil SUBDIR += mstflint - SUBDIR += mstflint-lite SUBDIR += msyslog SUBDIR += mtm SUBDIR += mtpfs diff --git a/sysutils/mstflint-lite/Makefile b/sysutils/mstflint-lite/Makefile deleted file mode 100644 index 4fce8c96ef9d..000000000000 --- a/sysutils/mstflint-lite/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -PORTREVISION= 1 -PKGNAMESUFFIX= -lite - -COMMENT= Firmware Burning and Diagnostics Tools for Mellanox devices (lite version) - -CONFLICTS_INSTALL= mstflint - -LITE= yes -MASTERDIR= ${.CURDIR}/../mstflint - -PIE_UNSAFE= yes - -PLIST= ${.CURDIR}/pkg-plist - -.include "${MASTERDIR}/Makefile" diff --git a/sysutils/mstflint-lite/pkg-descr b/sysutils/mstflint-lite/pkg-descr deleted file mode 100644 index cc9c85a4f4bc..000000000000 --- a/sysutils/mstflint-lite/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -MSTFLINT Package - Firmware Burning and Diagnostics Tools -This package contains a burning tool and diagnostic tools for Mellanox -manufactured HCA/NIC cards. - -This package is the lite version (static compiled with essential tools only). - -See also: https://github.com/Mellanox/mstflint diff --git a/sysutils/mstflint-lite/pkg-plist b/sysutils/mstflint-lite/pkg-plist deleted file mode 100644 index 2daac188a1fb..000000000000 --- a/sysutils/mstflint-lite/pkg-plist +++ /dev/null @@ -1,12 +0,0 @@ -bin/mstconfig -bin/mstflint -bin/mstfwmanager -bin/mstlink -man/man1/mstconfig.1.gz -man/man1/mstflint.1.gz -man/man1/mstfwmanager.1.gz -man/man1/mstlink.1.gz -%%DATADIR%%/mlxconfig_dbs/mlxconfig_host.db -%%DATADIR%%/mlxconfig_dbs/mlxconfig_switch.db -%%DATADIR%%/prm_dbs/hca/ext/register_access_table.adb -%%DATADIR%%/prm_dbs/switch/ext/register_access_table.adb diff --git a/sysutils/mstflint/Makefile b/sysutils/mstflint/Makefile index 8e1f5573a547..37eeb5fbc4df 100644 --- a/sysutils/mstflint/Makefile +++ b/sysutils/mstflint/Makefile @@ -1,10 +1,10 @@ PORTNAME= mstflint DISTVERSIONPREFIX= v -DISTVERSION= 4.22.0-1 +DISTVERSION= 4.25.0-1 CATEGORIES= sysutils -MAINTAINER= ports@FreeBSD.org -COMMENT?= Firmware Burning and Diagnostics Tools for Mellanox devices +MAINTAINER= olivier@FreeBSD.org +COMMENT= Firmware Burning and Diagnostics Tools for Mellanox devices WWW= https://github.com/Mellanox/mstflint LICENSE= BSD2CLAUSE GPLv2 @@ -12,17 +12,14 @@ LICENSE_COMB= dual LICENSE_FILE_BSD2CLAUSE= ${WRKSRC}/LICENSE LICENSE_FILE_GPLv2= ${WRKSRC}/LICENSE -USES= autoreconf gmake libtool localbase:ldflags pkgconfig +USES= autoreconf gmake libtool localbase:ldflags pkgconfig ssl USE_CXXSTD= c++14 USE_GITHUB= yes GH_ACCOUNT= Mellanox GNU_CONFIGURE= yes -OPTIONS_DEFINE= FWMANAGER ADAB STATIC -.if defined(LITE) -OPTIONS_SLAVE= FWMANAGER ADAB STATIC -.endif +OPTIONS_DEFINE= FWMANAGER ADAB OPTIONS_SUB= yes ADAB_DESC= Build with mstreg and mstlink @@ -30,74 +27,30 @@ FWMANAGER_DESC= Build with mstfwmanager and mstarchive STATIC_DESC= Static binary (disable curl support) ADAB_CONFIGURE_ON= --enable-adb-generic-tools -FWMANAGER_CONFIGURE_ON= --enable-fw-mgr -STATIC_USES_OFF= ssl -STATIC_CONFIGURE_ON= --enable-all-static --disable-dc \ - --disable-openssl --disable-inband +ADAB_BUILD_DEPENDS= ${LOCALBASE}/lib/libboost_regex.a:devel/boost-libs +ADAB_LIB_DEPENDS= libexpat.so:textproc/expat2 -.include +FWMANAGER_CONFIGURE_ON= --enable-fw-mgr +FWMANAGER_BUILD_DEPENDS= ${LOCALBASE}/lib/libboost_regex.a:devel/boost-libs +FWMANAGER_LIB_DEPENDS= libcurl.so:ftp/curl \ + libxml2.so.2:textproc/libxml2 -pre-patch: +post-patch: @${ECHO} '#define TOOLS_GIT_SHA "N/A"' > ${WRKSRC}/common/gitversion.h @${MKDIR} ${WRKSRC}/config + # ADAB and FWMANAGER options depends of libboost, so statically link this + # lib to avoid installing 220MB of lib dependency. + ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ + ${WRKSRC}/mlxlink/Makefile.am \ + ${WRKSRC}/mlxarchive/Makefile.am \ + ${WRKSRC}/mlxreg/Makefile.am -.if ${PORT_OPTIONS:MADAB} -.if ${PORT_OPTIONS:MSTATIC} -BROKEN= does not link: expat2 no longer provides static library by default -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} -.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 diff --git a/sysutils/mstflint/distinfo b/sysutils/mstflint/distinfo index 5a704ce65ea4..6305bc0c09cd 100644 --- a/sysutils/mstflint/distinfo +++ b/sysutils/mstflint/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1671207291 -SHA256 (Mellanox-mstflint-v4.22.0-1_GH0.tar.gz) = 1403928463fe589034e0effb215bbeb18e0ffac745c197b4511782f6694fe24c -SIZE (Mellanox-mstflint-v4.22.0-1_GH0.tar.gz) = 5936816 +TIMESTAMP = 1696339879 +SHA256 (Mellanox-mstflint-v4.25.0-1_GH0.tar.gz) = 46f5fda9c8687bbcdae62145c17ad70f6b1725d738985eb3c8efd8c71604ddc3 +SIZE (Mellanox-mstflint-v4.25.0-1_GH0.tar.gz) = 6398196 diff --git a/sysutils/mstflint/files/extrat-LITE-patch-Makefile.am b/sysutils/mstflint/files/extrat-LITE-patch-Makefile.am deleted file mode 100644 index fa89d9ded43d..000000000000 --- a/sysutils/mstflint/files/extrat-LITE-patch-Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ ---- 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 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 \ diff --git a/sysutils/mstflint/files/extrat-LITE-patch-cmdif_Makefile.am b/sysutils/mstflint/files/extrat-LITE-patch-cmdif_Makefile.am deleted file mode 100644 index ad05b7e4a305..000000000000 --- a/sysutils/mstflint/files/extrat-LITE-patch-cmdif_Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ ---- 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 diff --git a/sysutils/mstflint/files/extrat-LITE-patch-common_Makefile.am b/sysutils/mstflint/files/extrat-LITE-patch-common_Makefile.am deleted file mode 100644 index e08fd3a99f29..000000000000 --- a/sysutils/mstflint/files/extrat-LITE-patch-common_Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- common/Makefile.am.orig 2020-01-10 22:31:52.576485000 +0100 -+++ common/Makefile.am 2020-01-10 22:32:24.068225000 +0100 -@@ -36,8 +36,6 @@ noinst_HEADERS=compatibility.h bit_slice.h tools_utils - - commonincludedir = $(includedir)/mstflint/common/ - --commoninclude_HEADERS = compatibility.h -- - update_prefix = sed -e 's,[@]MST_LIB_DIR[@]${CONF_DISABLE_PATH_UPDATE},$(libdir),g'\ - -e 's,[@]MST_BIN_DIR[@]${CONF_DISABLE_PATH_UPDATE},$(bindir),g'\ - -e 's,[@]MFTCONF_PREFIX[@],$(prefix),g' diff --git a/sysutils/mstflint/files/extrat-LITE-patch-dev_mgt_Makefile.am b/sysutils/mstflint/files/extrat-LITE-patch-dev_mgt_Makefile.am deleted file mode 100644 index 74fcbd2740de..000000000000 --- a/sysutils/mstflint/files/extrat-LITE-patch-dev_mgt_Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -*** 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 ---- diff --git a/sysutils/mstflint/files/extrat-LITE-patch-mlxconfig_Makefile.am b/sysutils/mstflint/files/extrat-LITE-patch-mlxconfig_Makefile.am deleted file mode 100644 index bd94fd521d74..000000000000 --- a/sysutils/mstflint/files/extrat-LITE-patch-mlxconfig_Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ ---- mlxconfig/Makefile.am.orig 2022-12-16 18:41:14.183823000 +0100 -+++ mlxconfig/Makefile.am 2022-12-16 18:41:40.798788000 +0100 -@@ -55,13 +55,6 @@ - - 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_DATA = $(MLXPRIVHOST_PYTHON_WRAPPER).py - - noinst_LTLIBRARIES = libmlxcfg.a - diff --git a/sysutils/mstflint/files/extrat-LITE-patch-mlxreg_Makefile.am b/sysutils/mstflint/files/extrat-LITE-patch-mlxreg_Makefile.am deleted file mode 100644 index 3d1190f2b54f..000000000000 --- a/sysutils/mstflint/files/extrat-LITE-patch-mlxreg_Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- mlxreg/Makefile.am.orig 2020-01-10 20:34:08.906577000 +0100 -+++ mlxreg/Makefile.am 2020-01-10 20:34:18.747595000 +0100 -@@ -58,8 +58,6 @@ libmstreg_lib_a_SOURCES = mlxreg_exception.h \ - - mstreg_SOURCES = mlxreg_ui.cpp mlxreg_ui.h - --bin_PROGRAMS = mstreg -- - mstreg_LDADD = libmstreg_lib.a \ - $(USER_DIR)/cmdparser/libcmdparser.a \ - $(MFT_UTILS_DIR)/libmftutils.a \ diff --git a/sysutils/mstflint/files/extrat-LITE-patch-mtcr_freebsd_Makefile.am b/sysutils/mstflint/files/extrat-LITE-patch-mtcr_freebsd_Makefile.am deleted file mode 100644 index 86a31e44be2b..000000000000 --- a/sysutils/mstflint/files/extrat-LITE-patch-mtcr_freebsd_Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ ---- mtcr_freebsd/Makefile.am.orig 2020-01-10 22:04:45.957050000 +0100 -+++ mtcr_freebsd/Makefile.am 2020-01-10 22:04:59.716184000 +0100 -@@ -50,5 +50,3 @@ libmtcr_ul_a_SOURCES += ../mtcr_ul/mtcr_ib_ofed.c - endif - - libraryincludedir=$(includedir)/mstflint --libraryinclude_HEADERS = $(top_srcdir)/include/mtcr_ul/mtcr.h $(top_srcdir)/include/mtcr_ul/mtcr_com_defs.h -- diff --git a/sysutils/mstflint/files/extrat-LITE-patch-reg_access_Makefile.am b/sysutils/mstflint/files/extrat-LITE-patch-reg_access_Makefile.am deleted file mode 100644 index 6993ac3bce72..000000000000 --- a/sysutils/mstflint/files/extrat-LITE-patch-reg_access_Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 diff --git a/sysutils/mstflint/files/extrat-LITE-patch-tools_layouts_Makefile.am b/sysutils/mstflint/files/extrat-LITE-patch-tools_layouts_Makefile.am deleted file mode 100644 index cf7bfead3799..000000000000 --- a/sysutils/mstflint/files/extrat-LITE-patch-tools_layouts_Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- tools_layouts/Makefile.am.orig 2020-01-10 22:06:24.040554000 +0100 -+++ tools_layouts/Makefile.am 2020-01-10 22:06:44.128071000 +0100 -@@ -41,8 +41,6 @@ lib_LTLIBRARIES = libtools_layouts.a - - toolslayoutsincludedir = $(includedir)/mstflint/tools_layouts/ - --toolslayoutsinclude_HEADERS = icmd_layouts.h adb_to_c_utils.h -- - libtools_layouts_a_SOURCES = prm_adb_db.cpp prm_adb_db.h \ - adb_to_c_utils.c adb_to_c_utils.h\ - cibfw_layouts.c cibfw_layouts.h \ diff --git a/sysutils/mstflint/files/extrat-patch-configure.ac b/sysutils/mstflint/files/extrat-patch-configure.ac deleted file mode 100644 index c7c70df677ab..000000000000 --- a/sysutils/mstflint/files/extrat-patch-configure.ac +++ /dev/null @@ -1,36 +0,0 @@ ---- configure.ac.orig 2022-02-21 15:07:33.000000000 +0100 -+++ configure.ac 2022-02-21 15:08:50.061537000 +0100 -@@ -114,12 +114,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 -@@ -143,8 +141,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) - -@@ -370,11 +366,6 @@ AS_IF([test "x$enable_openssl" = "xyes"], [ - [AC_CONFIG_FILES(mlxsign_lib/Makefile)], - [AC_MSG_ERROR([Required OpenSSL version >= $MIN_OPENSSL_VER (or use --disable-openssl)])]) - ]) -- --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) diff --git a/sysutils/mstflint/files/extrat-patch-mlxarchive_Makefile.am b/sysutils/mstflint/files/extrat-patch-mlxarchive_Makefile.am deleted file mode 100644 index 2a953c64007d..000000000000 --- a/sysutils/mstflint/files/extrat-patch-mlxarchive_Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ ---- mlxarchive/Makefile.am.orig 2021-11-30 12:55:03.000000000 +0100 -+++ mlxarchive/Makefile.am 2022-02-21 15:13:48.562527000 +0100 -@@ -40,8 +40,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 \ -@@ -91,6 +89,7 @@ mstarchive_LDADD = libmstarchive.a\ - if ENABLE_OPENSSL - mstarchive_LDADD += $(top_srcdir)/mlxsign_lib/libmlxsign.a -lcrypto -lssl - else -+AM_CXXFLAGS += -DNO_OPEN_SSL - endif - - if ENABLE_CS diff --git a/sysutils/mstflint/files/extrat-patch-mlxarchive_mlxarchive_mfa2.cpp b/sysutils/mstflint/files/extrat-patch-mlxarchive_mlxarchive_mfa2.cpp deleted file mode 100644 index 7540c09ee44a..000000000000 --- a/sysutils/mstflint/files/extrat-patch-mlxarchive_mlxarchive_mfa2.cpp +++ /dev/null @@ -1,28 +0,0 @@ ---- mlxarchive/mlxarchive_mfa2.cpp.orig 2022-12-16 18:15:27.440142000 +0100 -+++ mlxarchive/mlxarchive_mfa2.cpp 2022-12-16 18:16:25.933770000 +0100 -@@ -40,7 +40,9 @@ - */ - - #include -+#ifndef NO_OPEN_SSL - #include -+#endif - #include "mlxarchive_mfa2.h" - #include "mlxarchive_mfa2_utils.h" - -@@ -115,6 +117,7 @@ - printf("-E- zipped size not as expected\n"); - exit(1); - } -+#ifndef NO_OPEN_SSL - // compute descriptors SHA256 - vector descriptorsBuff; - packDescriptors(descriptorsBuff); -@@ -131,6 +134,7 @@ - mlxSignSHA256 << zippedComponentBlockBuff; - mlxSignSHA256.getDigest(digest); - _packageDescriptor.setSHA256(digest); -+#endif - } - - /*void MFA2::update(vector& buff) diff --git a/sysutils/mstflint/files/extrat-patch-mlxfwupdate_Makefile.am b/sysutils/mstflint/files/extrat-patch-mlxfwupdate_Makefile.am deleted file mode 100644 index 99b13ae47d05..000000000000 --- a/sysutils/mstflint/files/extrat-patch-mlxfwupdate_Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ ---- 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 diff --git a/sysutils/mstflint/files/extrat-patch-mlxfwupdate_server_request.cpp b/sysutils/mstflint/files/extrat-patch-mlxfwupdate_server_request.cpp deleted file mode 100644 index 6d8fda101e5a..000000000000 --- a/sysutils/mstflint/files/extrat-patch-mlxfwupdate_server_request.cpp +++ /dev/null @@ -1,23 +0,0 @@ ---- mlxfwupdate/server_request.cpp.orig 2022-12-16 18:34:53.974210000 +0100 -+++ mlxfwupdate/server_request.cpp 2022-12-16 18:36:46.969103000 +0100 -@@ -43,9 +43,7 @@ - #include - - using namespace std; --#ifndef USE_CURL --#define USE_CURL --#endif -+#undef USE_CURL - - extern int abort_request; - -@@ -65,7 +63,9 @@ - _show_progress = show_progress; - _ceritifcate = certificate; - _numberOfRetrials = numberOfRetrials; -+#ifdef USE_CURL - _headers = NULL; -+#endif - if (proxy != NULL) - { - if (proxy[0] != 0) diff --git a/sysutils/mstflint/files/patch-configure.ac b/sysutils/mstflint/files/patch-configure.ac index d00ebfb529b3..59cd470b1d34 100644 --- a/sysutils/mstflint/files/patch-configure.ac +++ b/sysutils/mstflint/files/patch-configure.ac @@ -1,11 +1,19 @@ ---- configure.ac.orig 2022-10-31 08:38:13 UTC +--- configure.ac.orig 2023-10-04 13:13:00 UTC +++ configure.ac -@@ -248,7 +248,7 @@ AS_IF([test "x$enable_static_libstdcpp" = "xyes" -o "x - AS_HELP_STRING([--enable-static-libstdcpp], [Enable link static to libstdc++])) +@@ -146,7 +146,6 @@ if test "x$enable_fw_mgr" = "xyes"; then + 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 - AS_IF([test "x$enable_static_libstdcpp" = "xyes" -o "x$enable_all_static" = "xyes" ], [ -- CXXFLAGS="$CXXFLAGS -static-libstdc++ -static-libgcc" -+ CXXFLAGS="$CXXFLAGS -static" - ]) +@@ -174,8 +173,6 @@ if test "x$enable_adb_generic_tools" = "xyes"; then + AC_MSG_ERROR([Expat library is missing, please install expat xml parser to continue: expat-devel.] + [http://expat.sourceforge.net/]) + fi +- AC_CHECK_HEADERS([boost/foreach.hpp], [], +- [AC_MSG_ERROR([Boost libraries are missing, please install boost to continue.])]) + AC_LANG_POP([C++]) + fi - AC_ARG_ENABLE([dynamic_ld], diff --git a/sysutils/mstflint/files/patch-mflash_Makefile.am b/sysutils/mstflint/files/patch-mflash_Makefile.am new file mode 100644 index 000000000000..e542e5fee989 --- /dev/null +++ b/sysutils/mstflint/files/patch-mflash_Makefile.am @@ -0,0 +1,11 @@ +--- mflash/Makefile.am.orig 2023-10-04 10:11:20 UTC ++++ mflash/Makefile.am +@@ -34,7 +34,7 @@ AM_CPPFLAGS = -I. -I$(top_srcdir)/include/mtcr_ul -I$( + AM_CPPFLAGS = -I. -I$(top_srcdir)/include/mtcr_ul -I$(top_srcdir)/common -I$(top_srcdir)/tools_layouts -I$(top_srcdir)/reg_access \ + -I$(top_srcdir)/cmdif -I$(top_srcdir)/tools_res_mgmt $(COMPILER_FPIC) + +-AM_CFLAGS = -MD -pipe -Wall -W -DMST_UL -g ${MFLASH_INBAND_FLAG} $(COMPILER_FPIC) ++AM_CFLAGS = -MD -pipe -Wall -W -DMST_UL -g ${MFLASH_INBAND_FLAG} $(COMPILER_FPIC) -Wno-error=int-conversion + + noinst_LTLIBRARIES = libmflash.a + diff --git a/sysutils/mstflint/files/patch-mlxarchive_Makefile.am b/sysutils/mstflint/files/patch-mlxarchive_Makefile.am new file mode 100644 index 000000000000..f869349f9cc2 --- /dev/null +++ b/sysutils/mstflint/files/patch-mlxarchive_Makefile.am @@ -0,0 +1,18 @@ +--- mlxarchive/Makefile.am.orig 2023-08-10 20:28:55 UTC ++++ mlxarchive/Makefile.am +@@ -64,6 +64,7 @@ AM_CXXFLAGS = -Wall -W -g -MP -MD -pipe $(INCLUDES) $( + mfa2_buff.h mfa2_buff.cpp + + AM_CXXFLAGS = -Wall -W -g -MP -MD -pipe $(INCLUDES) $(COMPILER_FPIC) ++AM_LDFLAGS = %%PREFIX%%/lib/libboost_regex.a %%PREFIX%%/lib/libboost_filesystem.a %%PREFIX%%/lib/libboost_system.a + bin_PROGRAMS = mstarchive + + mstarchive_SOURCES = mlxarchive.cpp mlxarchive.h +@@ -86,7 +87,6 @@ mstarchive_LDADD = libmstarchive.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 diff --git a/sysutils/mstflint/files/patch-mlxlink_Makefile.am b/sysutils/mstflint/files/patch-mlxlink_Makefile.am new file mode 100644 index 000000000000..1de20e0a5ac1 --- /dev/null +++ b/sysutils/mstflint/files/patch-mlxlink_Makefile.am @@ -0,0 +1,18 @@ +--- mlxlink/Makefile.am.orig 2023-10-04 13:58:41 UTC ++++ mlxlink/Makefile.am +@@ -49,6 +49,7 @@ AM_CPPFLAGS = $(AM_CXXFLAGS) + + AM_CXXFLAGS = -Wall -W -DMST_UL -g -MP -MD -pipe -std=c++11 + AM_CPPFLAGS = $(AM_CXXFLAGS) ++AM_LDFLAGS = %%PREFIX%%/lib/libboost_regex.a %%PREFIX%%/lib/libboost_filesystem.a %%PREFIX%%/lib/libboost_system.a + + bin_PROGRAMS = mstlink + +@@ -68,7 +69,6 @@ mstlink_DEPENDENCIES = modules/libmodules_lib.a \ + $(LAYOUTS_DIR)/libtools_layouts.a \ + $(USER_DIR)/xz_utils/libxz_utils.a \ + $(USER_DIR)/ext_libs/minixz/libminixz.a \ +- -lboost_regex -lboost_filesystem -lboost_system \ + -llzma $(LIBSTD_CPP) ${LDL} -lexpat \ + $(JSON_LIBS) + diff --git a/sysutils/mstflint/files/patch-mlxreg_Makefile.am b/sysutils/mstflint/files/patch-mlxreg_Makefile.am new file mode 100644 index 000000000000..2e50215f9406 --- /dev/null +++ b/sysutils/mstflint/files/patch-mlxreg_Makefile.am @@ -0,0 +1,19 @@ +--- mlxreg/Makefile.am.orig 2023-10-04 14:00:05 UTC ++++ mlxreg/Makefile.am +@@ -48,8 +48,8 @@ INCLUDES = -I. -I$(USER_DIR) -I$(MTCR_DIR) -I$(MFT_EXT + + INCLUDES = -I. -I$(USER_DIR) -I$(MTCR_DIR) -I$(MFT_EXT_LIBS_INC_DIR) -I$(UTILS_DIR) -I$(MTCR_INC_DIR) -I$(MLXREG_DIR) + +-AM_CXXFLAGS = -Wall -W -DMST_UL -g -MP -MD -pipe +- ++AM_CXXFLAGS = -Wall -W -DMST_UL -g -MP -MD -pipe ++AM_LDFLAGS = %%PREFIX%%/lib/libboost_regex.a %%PREFIX%%/lib/libboost_filesystem.a %%PREFIX%%/lib/libboost_system.a + mstreg_SOURCES = mlxreg_ui.cpp mlxreg_ui.h + + bin_PROGRAMS = mstreg +@@ -65,5 +65,4 @@ mstreg_LDADD = $(MLXREG_DIR)/mlxreg_lib/libmstreg_lib + $(LAYOUTS_DIR)/libtools_layouts.a \ + $(USER_DIR)/xz_utils/libxz_utils.a \ + $(USER_DIR)/ext_libs/minixz/libminixz.a \ +- -lboost_regex -lboost_filesystem -lboost_system \ + -llzma $(LIBSTD_CPP) ${LDL} -lexpat diff --git a/sysutils/mstflint/pkg-plist b/sysutils/mstflint/pkg-plist index e936dad68b03..c2688e255001 100644 --- a/sysutils/mstflint/pkg-plist +++ b/sysutils/mstflint/pkg-plist @@ -23,6 +23,7 @@ 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 +include/mstflint/tools_layouts/icmd_hca_layouts.h %%ADAB%%lib/libadb_parser.a lib/libcmdif.a lib/libdev_mgt.a @@ -32,6 +33,10 @@ lib/libdev_mgt.a %%ADAB%%lib/libprint_util_lib.a lib/libreg_access.a lib/libtools_layouts.a +lib/libadb_utils.a +lib/libmlxarchive_layouts.a +lib/libmlxconfig_4th_gen_layouts.a +lib/libmlxconfig_4th_gen_regsiters.a lib/mstflint/libmtcr_ul.a lib/mstflint/python_tools/c_dev_mgt.so lib/mstflint/python_tools/ccmdif.so @@ -92,10 +97,15 @@ 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/regaccess_structs.py +lib/mstflint/python_tools/mstresourceparse/ResourceParseManager.py +lib/mstflint/python_tools/mstresourceparse/parsers/AdbResourceParser.py +lib/mstflint/python_tools/mstresourceparse/parsers/AddressValueParser.py +lib/mstflint/python_tools/mstresourceparse/parsers/ResourceParser.py +lib/mstflint/python_tools/mstresourceparse/utils/common_functions.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 @@ -144,6 +154,7 @@ man/man1/mstvpd.1.gz %%DATADIR%%/BlueField.csv %%DATADIR%%/BlueField2.csv %%DATADIR%%/BlueField3.csv +%%DATADIR%%/BW00.csv %%DATADIR%%/Cable.csv %%DATADIR%%/CableQSFP.csv %%DATADIR%%/CableQSFPaging.csv @@ -162,7 +173,6 @@ man/man1/mstvpd.1.gz %%DATADIR%%/ConnectX6DX.csv %%DATADIR%%/ConnectX6LX.csv %%DATADIR%%/ConnectX7.csv -%%DATADIR%%/GB100.csv %%DATADIR%%/Quantum2.csv %%DATADIR%%/Quantum3.csv %%DATADIR%%/InfiniScaleIV.csv