mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH v1] berlios-can-utils: update to the latest git with j1939 support
@ 2019-01-04 13:52 Oleksij Rempel
  2019-01-07 15:22 ` Michael Olbrich
  0 siblings, 1 reply; 2+ messages in thread
From: Oleksij Rempel @ 2019-01-04 13:52 UTC (permalink / raw)
  To: ptxdist; +Cc: Oleksij Rempel

Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
---
 rules/berlios-can-utils.in   | 15 +++++++++++++++
 rules/berlios-can-utils.make | 30 +++++++++++++++++++++++++-----
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/rules/berlios-can-utils.in b/rules/berlios-can-utils.in
index 1a175c92a..cbf5ebb3f 100644
--- a/rules/berlios-can-utils.in
+++ b/rules/berlios-can-utils.in
@@ -75,4 +75,19 @@ config BERLIOS_CAN_UTILS_SLCAND
 config BERLIOS_CAN_UTILS_SLCANPTY
 	bool slcanpty
 
+config BERLIOS_CAN_UTILS_JSPY
+	bool jspy
+
+config BERLIOS_CAN_UTILS_JSR
+	bool jsr
+
+config BERLIOS_CAN_UTILS_JACD
+	bool jacd
+
+config BERLIOS_CAN_UTILS_JCAT
+	bool jcat
+
+config BERLIOS_CAN_UTILS_TESTJ1939
+	bool testj1939
+
 endif
diff --git a/rules/berlios-can-utils.make b/rules/berlios-can-utils.make
index d8a7cff35..a65d8b7d9 100644
--- a/rules/berlios-can-utils.make
+++ b/rules/berlios-can-utils.make
@@ -16,20 +16,35 @@ PACKAGES-$(PTXCONF_BERLIOS_CAN_UTILS) += berlios-can-utils
 #
 # Paths and names
 #
-BERLIOS_CAN_UTILS_VERSION	:= 2014.01.0
-BERLIOS_CAN_UTILS_MD5		:= f643449f6607688a9f4662a48bc91aa0
-BERLIOS_CAN_UTILS		:= can-utils-$(BERLIOS_CAN_UTILS_VERSION)
+BERLIOS_CAN_UTILS_VERSION	:= 02b87eb1200
+BERLIOS_CAN_UTILS_MD5		:= 56d79b50b3ce295f4af17e0b40136185
+BERLIOS_CAN_UTILS		:= canutils-$(BERLIOS_CAN_UTILS_VERSION)
 BERLIOS_CAN_UTILS_SUFFIX	:= tar.bz2
-BERLIOS_CAN_UTILS_URL		:= http://www.pengutronix.de/software/ptxdist/temporary-src/$(BERLIOS_CAN_UTILS).$(BERLIOS_CAN_UTILS_SUFFIX)
+BERLIOS_CAN_UTILS_URL		:= https://github.com/linux-can/can-utils.git;tag=$(BERLIOS_CAN_UTILS_VERSION)
 BERLIOS_CAN_UTILS_SOURCE	:= $(SRCDIR)/$(BERLIOS_CAN_UTILS).$(BERLIOS_CAN_UTILS_SUFFIX)
 BERLIOS_CAN_UTILS_DIR		:= $(BUILDDIR)/$(BERLIOS_CAN_UTILS)
-BERLIOS_CAN_UTILS_LICENSE	:= unknown
+BERLIOS_CAN_UTILS_LICENSE	:= GPL-2.0
+
+# ----------------------------------------------------------------------------
+# Extract (just create the 'configure' script on demand)
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/berlios-can-utils.extract.post: $(STATEDIR)/autogen-tools
+	@$(call targetinfo)
+	@cd $(BERLIOS_CAN_UTILS_DIR) && [ -f configure ] || sh autogen.sh
+	@$(call world/patchin/post, BERLIOS_CAN_UTILS)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
+BERLIOS_CAN_UTILS_CONF_ENV := \
+	$(CROSS_ENV) \
+	CPPFLAGS="-I$(KERNEL_HEADERS_INCLUDE_DIR) $(CROSS_CPPFLAGS)"
+
 BERLIOS_CAN_UTILS_CONF_TOOL	:= autoconf
+BERLIOS_CAN_UTILS_CONF_OPT	:= $(CROSS_AUTOCONF_USR)
 
 # ----------------------------------------------------------------------------
 # Target-Install
@@ -59,6 +74,11 @@ BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_LOG2LONG) += /usr/bin/log2lon
 BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_SLCAN_ATTACH) += /usr/bin/slcan_attach
 BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_SLCAND) += /usr/bin/slcand
 BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_SLCANPTY) += /usr/bin/slcanpty
+BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_JSPY) += /usr/bin/jspy
+BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_JSR) += /usr/bin/jsr
+BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_JACD) += /usr/bin/jacd
+BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_JCAT) += /usr/bin/jcat
+BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_TESTJ1939) += /usr/bin/testj1939
 
 $(STATEDIR)/berlios-can-utils.targetinstall:
 	@$(call targetinfo)
-- 
2.19.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-01-07 15:22 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-04 13:52 [ptxdist] [PATCH v1] berlios-can-utils: update to the latest git with j1939 support Oleksij Rempel
2019-01-07 15:22 ` Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox