[ptxdist] [PATCH] canutils: update to the latest version

[Oleksij Rempel <o.rempel@pengutronix.de>]

Most of the tools are renamed or deprecated. Some new tools are
added, for example different j1939 related tools are now mainline.

Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
---
 rules/canutils.in   | 53 ++++++++++++++++++++++++++++------------
 rules/canutils.make | 59 +++++++++++++++++++++++++++++++++------------
 2 files changed, 81 insertions(+), 31 deletions(-)

diff --git a/rules/canutils.in b/rules/canutils.in
index 8340d1d1c..686501d98 100644
--- a/rules/canutils.in
+++ b/rules/canutils.in
@@ -10,35 +10,58 @@ menuconfig CANUTILS
 
 if CANUTILS
 
-config CANUTILS_CANCONFIG
-	bool
-	prompt "canconfig"
-	help
-	  Configuration Tool for socket can.
-
 config CANUTILS_CANDUMP
 	bool
 	prompt "candump"
 	help
 	  A little utility to dump canbus messages
 
-config CANUTILS_CANECHO
+config CANUTILS_CANSEND
+	bool
+	prompt "cansend"
+	help
+	  A little utility to send canbus messages from command line
+
+config CANUTILS_CANGEN
 	bool
-	prompt "canecho"
+	prompt "cangen"
 	help
-	  A little utility to echo canbus messages
+	  A little utility to send canbus messages from command line
 
-config CANUTILS_CANSEND
+config CANUTILS_CANGW
 	bool
-	prompt "cansend"
+	prompt "cangw"
 	help
 	  A little utility to send canbus messages from command line
 
-config CANUTILS_CANSEQUENCE
+config CANUTILS_CANFDTEST
+	bool
+	prompt "canfdtest"
+	help
+	  A little utility to send and echo messages from command line
+
+config CANUTILS_JSPY
+	bool
+	prompt "jspy"
+	help
+	  J1939 sniffer utility
+
+config CANUTILS_JSR
+	bool
+	prompt "jsr"
+	help
+	  J1939 send/receive utility
+
+config CANUTILS_JACD
+	bool
+	prompt "jacd"
+	help
+	  J1939 address claiming daemon
+
+config CANUTILS_TESTJ1939
 	bool
-	prompt "cansequence"
+	prompt "testj1939"
 	help
-	  A little utility to send and verify canbus messages
-	  from command line with sequence numbers inside
+	  J1939 test utility
 
 endif
diff --git a/rules/canutils.make b/rules/canutils.make
index 2dc5fb8f4..a94e8d644 100644
--- a/rules/canutils.make
+++ b/rules/canutils.make
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2005 by Robert Schwebel
 #               2009, 2010 by Marc Kleine-Budde <mkl@pengutroinx.de>
-#          
+#
 # See CREDITS for details about who has contributed to this project.
 #
 # For further information about the PTXdist project and license conditions
@@ -17,14 +17,24 @@ PACKAGES-$(PTXCONF_CANUTILS) += canutils
 #
 # Paths and names
 #
-CANUTILS_VERSION	:= 4.0.6
-CANUTILS_MD5		:= e9af32bc41da85517b7bfe7de3bb9481
+CANUTILS_VERSION	:= 7a4dd73
+CANUTILS_MD5		:= 30a164531d46d978205e99ed4d38838b
 CANUTILS		:= canutils-$(CANUTILS_VERSION)
 CANUTILS_SUFFIX		:= tar.bz2
-CANUTILS_URL		:= http://www.pengutronix.de/software/socket-can/download/canutils/v4.0/$(CANUTILS).$(CANUTILS_SUFFIX)
+CANUTILS_URL		:= https://github.com/linux-can/can-utils.git;tag=$(CANUTILS_VERSION)
 CANUTILS_SOURCE		:= $(SRCDIR)/$(CANUTILS).$(CANUTILS_SUFFIX)
 CANUTILS_DIR		:= $(BUILDDIR)/$(CANUTILS)
-CANUTILS_LICENSE	:= GPL-2.0-only
+CANUTILS_LICENSE	:= GPL-2.0
+
+# ----------------------------------------------------------------------------
+# Extract (just create the 'configure' script on demand)
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/canutils.extract.post: $(STATEDIR)/autogen-tools
+	@$(call targetinfo)
+	@cd $(CANUTILS_DIR) && [ -f configure ] || sh autogen.sh
+	@$(call world/patchin/post, CANUTILS)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Prepare
@@ -32,7 +42,7 @@ CANUTILS_LICENSE	:= GPL-2.0-only
 
 CANUTILS_CONF_ENV := \
 	$(CROSS_ENV) \
-	CPPFLAGS="-isystem $(KERNEL_HEADERS_INCLUDE_DIR) $(CROSS_CPPFLAGS)"
+	CPPFLAGS="-I$(KERNEL_HEADERS_INCLUDE_DIR) $(CROSS_CPPFLAGS)"
 
 #
 # autoconf
@@ -53,14 +63,6 @@ $(STATEDIR)/canutils.targetinstall:
 	@$(call install_fixup, canutils,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
 	@$(call install_fixup, canutils,DESCRIPTION,missing)
 
-ifdef PTXCONF_CANUTILS_CANCONFIG
-	@$(call install_copy, canutils, 0, 0, 0755, -, \
-		/usr/sbin/canconfig)
-endif
-ifdef PTXCONF_CANUTILS_CANECHO
-	@$(call install_copy, canutils, 0, 0, 0755, -, \
-		/usr/bin/canecho)
-endif
 ifdef PTXCONF_CANUTILS_CANDUMP
 	@$(call install_copy, canutils, 0, 0, 0755, -, \
 		/usr/bin/candump)
@@ -69,10 +71,35 @@ ifdef PTXCONF_CANUTILS_CANSEND
 	@$(call install_copy, canutils, 0, 0, 0755, -, \
 		/usr/bin/cansend)
 endif
-ifdef PTXCONF_CANUTILS_CANSEQUENCE
+ifdef PTXCONF_CANUTILS_CANGEN
+	@$(call install_copy, canutils, 0, 0, 0755, -, \
+		/usr/bin/cangen)
+endif
+ifdef PTXCONF_CANUTILS_CANGW
+	@$(call install_copy, canutils, 0, 0, 0755, -, \
+		/usr/bin/cangw)
+endif
+ifdef PTXCONF_CANUTILS_CANFDTEST
+	@$(call install_copy, canutils, 0, 0, 0755, -, \
+		/usr/bin/canfdtest)
+endif
+ifdef PTXCONF_CANUTILS_JSPY
+	@$(call install_copy, canutils, 0, 0, 0755, -, \
+		/usr/bin/jspy)
+endif
+ifdef PTXCONF_CANUTILS_JSR
+	@$(call install_copy, canutils, 0, 0, 0755, -, \
+		/usr/bin/jsr)
+endif
+ifdef PTXCONF_CANUTILS_JACD
 	@$(call install_copy, canutils, 0, 0, 0755, -, \
-		/usr/bin/cansequence)
+		/usr/bin/jacd)
 endif
+ifdef PTXCONF_CANUTILS_TESTJ1939
+	@$(call install_copy, canutils, 0, 0, 0755, -, \
+		/usr/bin/testj1939)
+endif
+
 	@$(call install_finish, canutils)
 	@$(call touch)
 
-- 
2.19.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de