mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Marc Kleine-Budde <mkl@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Subject: [ptxdist] [PATCH 2/2] canutils: hardcode version 4.0.6
Date: Tue,  6 Nov 2012 22:17:54 +0100	[thread overview]
Message-ID: <1352236674-19279-3-git-send-email-mkl@pengutronix.de> (raw)
In-Reply-To: <1352236674-19279-1-git-send-email-mkl@pengutronix.de>

Version 3.x is pre mainline socketcan, so drop it and remove complexity.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 rules/canutils.in   |   18 +-----------------
 rules/canutils.make |    4 ++--
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/rules/canutils.in b/rules/canutils.in
index b420532..a1b350d 100644
--- a/rules/canutils.in
+++ b/rules/canutils.in
@@ -4,29 +4,13 @@ menuconfig CANUTILS
 	tristate
 	prompt "canutils                      "
 	select KERNEL_HEADER
-	select LIBSOCKETCAN	if CANUTILS_4
+	select LIBSOCKETCAN
 	help
 	  The canutils package contains tools to configure
 	  and test the Socket CAN framework.
 
 if CANUTILS
 
-config CANUTILS_VERSION
-	prompt "Version"
-	string
-	default "4.0.6"
-
-config CANUTILS_MD5
-	prompt "canutils source md5sum"
-	string
-
-config CANUTILS_4
-	bool "canutils version >= 4.0"
-	help
-	  Select this if you're using a canutils version >= 4.0
-
-	  This will enable extra an extra dependency to libsocketcan.
-
 config CANUTILS_CANCONFIG
 	bool
 	prompt "canconfig"
diff --git a/rules/canutils.make b/rules/canutils.make
index 640eaf4..8a112f9 100644
--- a/rules/canutils.make
+++ b/rules/canutils.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_CANUTILS) += canutils
 #
 # Paths and names
 #
-CANUTILS_VERSION	:= $(CANUTILS_VERSION)
-CANUTILS_MD5		:= $(call remove_quotes,$(PTXCONF_CANUTILS_MD5))
+CANUTILS_VERSION	:= 4.0.6
+CANUTILS_MD5		:= e9af32bc41da85517b7bfe7de3bb9481
 CANUTILS		:= canutils-$(CANUTILS_VERSION)
 CANUTILS_SUFFIX		:= tar.bz2
 CANUTILS_URL		:= http://www.pengutronix.de/software/socket-can/download/canutils/v$(CANUTILS_VERSION_MAJOR).$(CANUTILS_VERSION_MINOR)/$(CANUTILS).$(CANUTILS_SUFFIX)
-- 
1.7.10


-- 
ptxdist mailing list
ptxdist@pengutronix.de

      parent reply	other threads:[~2012-11-06 21:17 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-06 21:17 [ptxdist] [PATCH 0/2] update CAN related programs Marc Kleine-Budde
2012-11-06 21:17 ` [ptxdist] [PATCH 1/2] libsocketcan: version bump to 0.0.9 Marc Kleine-Budde
2012-11-06 21:17 ` Marc Kleine-Budde [this message]

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=1352236674-19279-3-git-send-email-mkl@pengutronix.de \
    --to=mkl@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