it will also add support for j1939 utils
Signed-off-by: Oleksij Rempel <[email protected]>
---
patches/canutils-b6cb9a04e5/autogen.sh | 1 +
rules/berlios-can-utils.in | 20 ++++++++++++++++++++
rules/berlios-can-utils.make | 15 ++++++++++-----
3 files changed, 31 insertions(+), 5 deletions(-)
create mode 120000 patches/canutils-b6cb9a04e5/autogen.sh
diff --git a/patches/canutils-b6cb9a04e5/autogen.sh
b/patches/canutils-b6cb9a04e5/autogen.sh
new file mode 120000
index 000000000..9f8a4cb7d
--- /dev/null
+++ b/patches/canutils-b6cb9a04e5/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/rules/berlios-can-utils.in b/rules/berlios-can-utils.in
index 914d91707..fa15c3636 100644
--- a/rules/berlios-can-utils.in
+++ b/rules/berlios-can-utils.in
@@ -97,4 +97,24 @@ config BERLIOS_CAN_UTILS_SLCANPTY
bool
prompt "slcanpty"
+config BERLIOS_CAN_UTILS_JSPY
+ bool
+ prompt "jspy"
+
+config BERLIOS_CAN_UTILS_JSR
+ bool
+ prompt "jsr"
+
+config BERLIOS_CAN_UTILS_JACD
+ bool
+ prompt "jacd"
+
+config BERLIOS_CAN_UTILS_JCAT
+ bool
+ prompt "jcat"
+
+config BERLIOS_CAN_UTILS_TESTJ1939
+ bool
+ prompt "testj1939"
+
endif
diff --git a/rules/berlios-can-utils.make b/rules/berlios-can-utils.make
index d8a7cff35..3b833893d 100644
--- a/rules/berlios-can-utils.make
+++ b/rules/berlios-can-utils.make
@@ -16,14 +16,14 @@ 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 := b6cb9a04e5
+BERLIOS_CAN_UTILS_MD5 := f1eef88eaad92e3c3ab4c08ef827ba84
+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
# ----------------------------------------------------------------------------
# Prepare
@@ -59,6 +59,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.20.1
_______________________________________________
ptxdist mailing list
[email protected]
