From a21a3f7dce5ec064db8dbf5887caa42334f0c87e Mon Sep 17 00:00:00 2001 From: Alex Blago Date: Sat, 3 Aug 2024 17:51:26 -0700 Subject: [PATCH] mlxconfig: Do not install mstprivhost by default "mstprivhost" script depends on the "mstreg" tool, which is adb tools and is not installed by default. This change enables autotools to install the "mstprivhost" script only when "--enable-adb-generic-tools" is passed to the configure script. --- configure.ac | 2 ++ debian/changelog | 2 +- mlxconfig/Makefile.am | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index c83a8751..bd510607 100644 --- a/configure.ac +++ b/configure.ac @@ -460,6 +460,8 @@ AS_IF([test "x$enable_adb_generic_tools" = "xyes"], [ ADABE_DBS_EXTRA_DIST="adb/prm/hca/ext/*.adb adb/prm/switch/ext/*.adb" ]) +AM_CONDITIONAL([ADB_GENERIC_TOOLS_ENABLED], [test "x$enable_adb_generic_tools" = "xyes"]) + AS_IF([test "x$enable_fw_mgr" = "xyes" || test "x$enable_adb_generic_tools" = "xyes"], [ AC_CONFIG_FILES(xz_utils/Makefile) XZ_UTILS_DIR="xz_utils" diff --git a/debian/changelog b/debian/changelog index bc55e84f..2f8dce94 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mstflint (4.29.0-12) jammy; urgency=low +mstflint (4.29.0-1) unstable; urgency=low * Updated from MFT-4.29.0 diff --git a/mlxconfig/Makefile.am b/mlxconfig/Makefile.am index 1658921d..ac2d3459 100755 --- a/mlxconfig/Makefile.am +++ b/mlxconfig/Makefile.am @@ -51,6 +51,7 @@ AM_CXXFLAGS = -pthread -Wall -W -g -MP -MD -pipe -Wno-deprecated-declarations bin_PROGRAMS = mstconfig +if ADB_GENERIC_TOOLS_ENABLED MLXPRIVHOST_PYTHON_WRAPPER = mstprivhost bin_SCRIPTS = ${MLXPRIVHOST_PYTHON_WRAPPER} ${MLXPRIVHOST_PYTHON_WRAPPER}: $(PYTHON_WRAPPER_SCRIPT) @@ -58,6 +59,7 @@ ${MLXPRIVHOST_PYTHON_WRAPPER}: $(PYTHON_WRAPPER_SCRIPT) mlxprivhostlibdir = $(libdir)/mstflint/python_tools/$(MLXPRIVHOST_PYTHON_WRAPPER) mlxprivhostlib_DATA = $(MLXPRIVHOST_PYTHON_WRAPPER).py +endif noinst_LTLIBRARIES = libmlxcfg.la