From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Tue,  6 Nov 2012 22:17:54 +0100
Message-Id: <1352236674-19279-3-git-send-email-mkl@pengutronix.de>
In-Reply-To: <1352236674-19279-1-git-send-email-mkl@pengutronix.de>
References: <1352236674-19279-1-git-send-email-mkl@pengutronix.de>
Subject: [ptxdist] [PATCH 2/2] canutils: hardcode version 4.0.6
Reply-To: ptxdist@pengutronix.de
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/pipermail/ptxdist>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=subscribe>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: ptxdist-bounces@pengutronix.de
Errors-To: ptxdist-bounces@pengutronix.de
To: ptxdist@pengutronix.de
Cc: Marc Kleine-Budde <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