Version 3.x is pre mainline socketcan, so drop it and remove complexity. Signed-off-by: Marc Kleine-Budde <m...@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