@@ -11,4 +11,4 @@ config BR2_PACKAGE_HOST_MFGTOOLS
production. The communication is done over USB using the
Freescale UTP protocol.
- https://github.com/codeauroraforum/mfgtools
+ https://github.com/NXPmicro/mfgtools
@@ -1,4 +1,3 @@
# locally computed
-sha256 055d71227d18883d6e8bc9e854c076015f9a7749820a94272e19071bf0b25c89 mfgtools-v0.02.tar.gz
-sha256 2655559a6bb1179eae514f5c7166f4ede4f2453efa9cf4dc3c045cab5d57dede LICENSE
-sha256 0963b6e5086bf454265b0f57821a02b681d1211e40ad74c310231cb4d94815c9 README.txt
+sha256 378caa930fdc1b06d49abf26811827f12103d995438b91302a7c6e34368419f9 mfgtools-uuu_1.2.91.tar.gz
+sha256 cc8d47f7b9260f6669ecd41c24554c552f17581d81ee8fc602c6d23edb8bf495 LICENSE
@@ -4,31 +4,21 @@
#
################################################################################
-MFGTOOLS_VERSION = v0.02
-MFGTOOLS_SITE = $(call github,codeauroraforum,mfgtools,$(MFGTOOLS_VERSION))
-MFGTOOLS_SUBDIR = MfgToolLib
-MFGTOOLS_LICENSE = BSD-3-Clause or CPOL
-MFGTOOLS_LICENSE_FILES = LICENSE README.txt
-HOST_MFGTOOLS_DEPENDENCIES = host-libusb
+MFGTOOLS_VERSION = uuu_1.2.91
+MFGTOOLS_SITE = $(call github,NXPmicro,mfgtools,$(MFGTOOLS_VERSION))
+MFGTOOLS_LICENSE = BSD-3-Clause
+MFGTOOLS_LICENSE_FILES = LICENSE
+HOST_MFGTOOLS_DEPENDENCIES = host-libusb host-libzip host-zlib
-HOST_MFGTOOLS_CFLAGS = \
- $(HOST_CFLAGS) $(HOST_LDFLAGS) -std=c++11 -lpthread \
- -L$(@D)/MfgToolLib -lMfgToolLib -I$(@D)/MfgToolLib \
- -lusb-1.0 -I$(HOST_DIR)/include/libusb-1.0 \
- -fpermissive -Wno-write-strings
-
-define HOST_MFGTOOLS_CLI_BUILD
- $(HOST_CONFIGURE_OPTS) $(MAKE) CC="$(HOSTCXX)" \
- CFLAGS="$(HOST_MFGTOOLS_CFLAGS)" -C $(@D)/TestPrgm
-endef
-
-HOST_MFGTOOLS_POST_BUILD_HOOKS += HOST_MFGTOOLS_CLI_BUILD
-
-define HOST_MFGTOOLS_INSTALL_CMDS
- $(INSTALL) -D -m 755 $(@D)/MfgToolLib/libMfgToolLib.so \
- $(HOST_DIR)/lib/libMfgToolLib.so
- $(INSTALL) -D -m 755 $(@D)/TestPrgm/mfgtoolcli \
- $(HOST_DIR)/bin/mfgtoolcli
+# Version string generation is broken in mfgtools as it relies on git, even
+# when building from a source tarball. The version string is used by mfgtools
+# do a runtime check to detect outdated command list scripts. We overwrite
+# gen_ver.sh with something that simply prints a define for GIT_VERSION with
+# the mfgtools version (preceeded by "lib", as done in the original gen_ver.sh).
+define HOST_MFGTOOLS_OVERWRITE_GEN_VER_SH
+ echo '#!/bin/sh' > $(@D)/libuuu/gen_ver.sh
+ echo 'echo "#define GIT_VERSION \"lib$(MFGTOOLS_VERSION)\"" > $$1' >> $(@D)/libuuu/gen_ver.sh
endef
+HOST_MFGTOOLS_POST_PATCH_HOOKS += HOST_MFGTOOLS_OVERWRITE_GEN_VER_SH
$(eval $(host-cmake-package))
The version 0.02 was a pre-release and is dated from Nov 20, 2017. Meanwhile: * the repo owner switch to NXPmicro * latest version is 1.12.91 * the build system is CMake * the license is BSD-3 only Note, that mfgtools uses git to define a version string `GIT_VERSION`. It does so even when building from a source tarball (automatically generated by github). The problem is, that git provides the version information of Buildroot and mfgtools uses this version information to do a runtime check to detect outdated command list scripts. To fix this, we overwrite gen_ver.sh with something that simply prints a define for `GIT_VERSION` with the mfgtools version string (preceeded by "lib", as done in the original gen_ver.sh). Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> --- v2: * fix URL in Config.in.host * overwrite gen_ver.sh instead of patching it and creating gitversion.h [suggested by Arnout] --- package/mfgtools/Config.in.host | 2 +- package/mfgtools/mfgtools.hash | 5 ++--- package/mfgtools/mfgtools.mk | 38 ++++++++++++--------------------- 3 files changed, 17 insertions(+), 28 deletions(-)