Skip to content

Commit

Permalink
mlxconfig: Do not install mstprivhost by default
Browse files Browse the repository at this point in the history
"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.
  • Loading branch information
Alex Blago committed Aug 4, 2024
1 parent 06e22cf commit a21a3f7
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
2 changes: 2 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion debian/changelog
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 2 additions & 0 deletions mlxconfig/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,15 @@ 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)
cp $(PYTHON_WRAPPER_SCRIPT) $@

mlxprivhostlibdir = $(libdir)/mstflint/python_tools/$(MLXPRIVHOST_PYTHON_WRAPPER)
mlxprivhostlib_DATA = $(MLXPRIVHOST_PYTHON_WRAPPER).py
endif

noinst_LTLIBRARIES = libmlxcfg.la

Expand Down

0 comments on commit a21a3f7

Please sign in to comment.