mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Oleksij Rempel <o.rempel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Oleksij Rempel <o.rempel@pengutronix.de>
Subject: [ptxdist] [PATCH] berlios-can-utils: update to the latest git version
Date: Thu, 20 Sep 2018 11:26:17 +0200	[thread overview]
Message-ID: <20180920092617.2375-1-o.rempel@pengutronix.de> (raw)

After 2014.01.0 happened lots of development, bug fixes,
new bugs and protocols are added. So, lets update to
the latest version.

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

diff --git a/rules/berlios-can-utils.in b/rules/berlios-can-utils.in
index 1a175c92a..b6b21da86 100644
--- a/rules/berlios-can-utils.in
+++ b/rules/berlios-can-utils.in
@@ -75,4 +75,16 @@ 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_TESTJ1939
+	bool testj1939
+
 endif
diff --git a/rules/berlios-can-utils.make b/rules/berlios-can-utils.make
index d8a7cff35..68e669e35 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	:= 7a4dd73
+BERLIOS_CAN_UTILS_MD5		:= 30a164531d46d978205e99ed4d38838b
+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,10 @@ 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_TESTJ1939) += /usr/bin/testj1939
 
 $(STATEDIR)/berlios-can-utils.targetinstall:
 	@$(call targetinfo)
-- 
2.19.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

             reply	other threads:[~2018-09-20  9:26 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-20  9:26 Oleksij Rempel [this message]
2018-09-27  8:02 ` Michael Olbrich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180920092617.2375-1-o.rempel@pengutronix.de \
    --to=o.rempel@pengutronix.de \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox