summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2012-05-04 10:32:38 +0200
committerMarc Kleine-Budde <mkl@pengutronix.de>2012-05-08 16:20:42 +0200
commita16f5b5fd6ad27d2b8abc24466154c6b229817fa (patch)
treec1cf15644b2fd05b01a020a2518bf34e43445331
parent043ad7913e4c5162bb723cf47e8ae0838bc4bea3 (diff)
downloadptxdist-a16f5b5fd6ad27d2b8abc24466154c6b229817fa.tar.gz
ptxdist-a16f5b5fd6ad27d2b8abc24466154c6b229817fa.tar.xz
berlios-can-utils: version bump to 2012.01.0
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-rw-r--r--rules/berlios-can-utils.in18
-rw-r--r--rules/berlios-can-utils.make14
2 files changed, 28 insertions, 4 deletions
diff --git a/rules/berlios-can-utils.in b/rules/berlios-can-utils.in
index 63c11cd31..371e4f37f 100644
--- a/rules/berlios-can-utils.in
+++ b/rules/berlios-can-utils.in
@@ -39,6 +39,24 @@ config BERLIOS_CAN_UTILS_CANSEND
config BERLIOS_CAN_UTILS_CANSNIFFER
bool cansniffer
+config BERLIOS_CAN_UTILS_ISOTPDUMP
+ bool isotpdump
+
+config BERLIOS_CAN_UTILS_ISOTPRECV
+ bool isotprecv
+
+config BERLIOS_CAN_UTILS_ISOTPSEND
+ bool isotpsend
+
+config BERLIOS_CAN_UTILS_ISOTPSERVER
+ bool isotpserver
+
+config BERLIOS_CAN_UTILS_ISOTPSNIFFER
+ bool isotpsniffer
+
+config BERLIOS_CAN_UTILS_ISOTPTUN
+ bool isotptun
+
config BERLIOS_CAN_UTILS_LOG2ASC
bool log2asc
diff --git a/rules/berlios-can-utils.make b/rules/berlios-can-utils.make
index 6aac7b3f4..3e083fd3e 100644
--- a/rules/berlios-can-utils.make
+++ b/rules/berlios-can-utils.make
@@ -1,6 +1,6 @@
# -*-makefile-*-
#
-# Copyright (C) 2010 by Marc Kleine-Budde <mkl@pengutronix.de>
+# Copyright (C) 2010, 2012 by Marc Kleine-Budde <mkl@pengutronix.de>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -16,9 +16,9 @@ PACKAGES-$(PTXCONF_BERLIOS_CAN_UTILS) += berlios-can-utils
#
# Paths and names
#
-BERLIOS_CAN_UTILS_VERSION := r1167
-BERLIOS_CAN_UTILS_MD5 := 291bb306470ee641529ca98b8a80eacd
-BERLIOS_CAN_UTILS := berlios-can-utils-$(BERLIOS_CAN_UTILS_VERSION)
+BERLIOS_CAN_UTILS_VERSION := 2012.01.0
+BERLIOS_CAN_UTILS_MD5 := 3e1aad4777c9318e49e56f60cdf15164
+BERLIOS_CAN_UTILS := can-utils-$(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_SOURCE := $(SRCDIR)/$(BERLIOS_CAN_UTILS).$(BERLIOS_CAN_UTILS_SUFFIX)
@@ -55,6 +55,12 @@ BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_CANLOGSERVER) += /usr/bin/can
BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_CANPLAYER) += /usr/bin/canplayer
BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_CANSEND) += /usr/bin/cansend
BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_CANSNIFFER) += /usr/bin/cansniffer
+BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_ISOTPDUMP) += /usr/bin/isotpdump
+BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_ISOTPRECV) += /usr/bin/isotprecv
+BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_ISOTPSEND) += /usr/bin/isotpsend
+BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_ISOTPSERVER) += /usr/bin/isotpserver
+BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_ISOTPSNIFFER) += /usr/bin/isotpsniffer
+BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_ISOTPTUN) += /usr/bin/isotptun
BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_LOG2ASC) += /usr/bin/log2asc
BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_LOG2LONG) += /usr/bin/log2long
BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_SLCAN_ATTACH) += /usr/bin/slcan_attach