From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH] canutils: update to the latest version
Date: Tue, 18 Sep 2018 14:45:26 +0200 [thread overview]
Message-ID: <20180918124526.fcukbvctdg5xwi5j@pengutronix.de> (raw)
In-Reply-To: <20180918123821.29344-1-o.rempel@pengutronix.de>
On Tue, Sep 18, 2018 at 02:38:21PM +0200, Oleksij Rempel wrote:
> Most of the tools are renamed or deprecated. Some new tools are
> added, for example different j1939 related tools are now mainline.
PTXdist has two different can utils packages:
canutils and berlios-can-utils. I think your new version is based on the
berlios-can-utils code, so you should update that package.
Michael
> Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
> ---
> rules/canutils.in | 53 ++++++++++++++++++++++++++++------------
> rules/canutils.make | 59 +++++++++++++++++++++++++++++++++------------
> 2 files changed, 81 insertions(+), 31 deletions(-)
>
> diff --git a/rules/canutils.in b/rules/canutils.in
> index 8340d1d1c..686501d98 100644
> --- a/rules/canutils.in
> +++ b/rules/canutils.in
> @@ -10,35 +10,58 @@ menuconfig CANUTILS
>
> if CANUTILS
>
> -config CANUTILS_CANCONFIG
> - bool
> - prompt "canconfig"
> - help
> - Configuration Tool for socket can.
> -
> config CANUTILS_CANDUMP
> bool
> prompt "candump"
> help
> A little utility to dump canbus messages
>
> -config CANUTILS_CANECHO
> +config CANUTILS_CANSEND
> + bool
> + prompt "cansend"
> + help
> + A little utility to send canbus messages from command line
> +
> +config CANUTILS_CANGEN
> bool
> - prompt "canecho"
> + prompt "cangen"
> help
> - A little utility to echo canbus messages
> + A little utility to send canbus messages from command line
>
> -config CANUTILS_CANSEND
> +config CANUTILS_CANGW
> bool
> - prompt "cansend"
> + prompt "cangw"
> help
> A little utility to send canbus messages from command line
>
> -config CANUTILS_CANSEQUENCE
> +config CANUTILS_CANFDTEST
> + bool
> + prompt "canfdtest"
> + help
> + A little utility to send and echo messages from command line
> +
> +config CANUTILS_JSPY
> + bool
> + prompt "jspy"
> + help
> + J1939 sniffer utility
> +
> +config CANUTILS_JSR
> + bool
> + prompt "jsr"
> + help
> + J1939 send/receive utility
> +
> +config CANUTILS_JACD
> + bool
> + prompt "jacd"
> + help
> + J1939 address claiming daemon
> +
> +config CANUTILS_TESTJ1939
> bool
> - prompt "cansequence"
> + prompt "testj1939"
> help
> - A little utility to send and verify canbus messages
> - from command line with sequence numbers inside
> + J1939 test utility
>
> endif
> diff --git a/rules/canutils.make b/rules/canutils.make
> index 2dc5fb8f4..a94e8d644 100644
> --- a/rules/canutils.make
> +++ b/rules/canutils.make
> @@ -2,7 +2,7 @@
> #
> # Copyright (C) 2005 by Robert Schwebel
> # 2009, 2010 by Marc Kleine-Budde <mkl@pengutroinx.de>
> -#
> +#
> # See CREDITS for details about who has contributed to this project.
> #
> # For further information about the PTXdist project and license conditions
> @@ -17,14 +17,24 @@ PACKAGES-$(PTXCONF_CANUTILS) += canutils
> #
> # Paths and names
> #
> -CANUTILS_VERSION := 4.0.6
> -CANUTILS_MD5 := e9af32bc41da85517b7bfe7de3bb9481
> +CANUTILS_VERSION := 7a4dd73
> +CANUTILS_MD5 := 30a164531d46d978205e99ed4d38838b
> CANUTILS := canutils-$(CANUTILS_VERSION)
> CANUTILS_SUFFIX := tar.bz2
> -CANUTILS_URL := http://www.pengutronix.de/software/socket-can/download/canutils/v4.0/$(CANUTILS).$(CANUTILS_SUFFIX)
> +CANUTILS_URL := https://github.com/linux-can/can-utils.git;tag=$(CANUTILS_VERSION)
> CANUTILS_SOURCE := $(SRCDIR)/$(CANUTILS).$(CANUTILS_SUFFIX)
> CANUTILS_DIR := $(BUILDDIR)/$(CANUTILS)
> -CANUTILS_LICENSE := GPL-2.0-only
> +CANUTILS_LICENSE := GPL-2.0
> +
> +# ----------------------------------------------------------------------------
> +# Extract (just create the 'configure' script on demand)
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/canutils.extract.post: $(STATEDIR)/autogen-tools
> + @$(call targetinfo)
> + @cd $(CANUTILS_DIR) && [ -f configure ] || sh autogen.sh
> + @$(call world/patchin/post, CANUTILS)
> + @$(call touch)
>
> # ----------------------------------------------------------------------------
> # Prepare
> @@ -32,7 +42,7 @@ CANUTILS_LICENSE := GPL-2.0-only
>
> CANUTILS_CONF_ENV := \
> $(CROSS_ENV) \
> - CPPFLAGS="-isystem $(KERNEL_HEADERS_INCLUDE_DIR) $(CROSS_CPPFLAGS)"
> + CPPFLAGS="-I$(KERNEL_HEADERS_INCLUDE_DIR) $(CROSS_CPPFLAGS)"
>
> #
> # autoconf
> @@ -53,14 +63,6 @@ $(STATEDIR)/canutils.targetinstall:
> @$(call install_fixup, canutils,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
> @$(call install_fixup, canutils,DESCRIPTION,missing)
>
> -ifdef PTXCONF_CANUTILS_CANCONFIG
> - @$(call install_copy, canutils, 0, 0, 0755, -, \
> - /usr/sbin/canconfig)
> -endif
> -ifdef PTXCONF_CANUTILS_CANECHO
> - @$(call install_copy, canutils, 0, 0, 0755, -, \
> - /usr/bin/canecho)
> -endif
> ifdef PTXCONF_CANUTILS_CANDUMP
> @$(call install_copy, canutils, 0, 0, 0755, -, \
> /usr/bin/candump)
> @@ -69,10 +71,35 @@ ifdef PTXCONF_CANUTILS_CANSEND
> @$(call install_copy, canutils, 0, 0, 0755, -, \
> /usr/bin/cansend)
> endif
> -ifdef PTXCONF_CANUTILS_CANSEQUENCE
> +ifdef PTXCONF_CANUTILS_CANGEN
> + @$(call install_copy, canutils, 0, 0, 0755, -, \
> + /usr/bin/cangen)
> +endif
> +ifdef PTXCONF_CANUTILS_CANGW
> + @$(call install_copy, canutils, 0, 0, 0755, -, \
> + /usr/bin/cangw)
> +endif
> +ifdef PTXCONF_CANUTILS_CANFDTEST
> + @$(call install_copy, canutils, 0, 0, 0755, -, \
> + /usr/bin/canfdtest)
> +endif
> +ifdef PTXCONF_CANUTILS_JSPY
> + @$(call install_copy, canutils, 0, 0, 0755, -, \
> + /usr/bin/jspy)
> +endif
> +ifdef PTXCONF_CANUTILS_JSR
> + @$(call install_copy, canutils, 0, 0, 0755, -, \
> + /usr/bin/jsr)
> +endif
> +ifdef PTXCONF_CANUTILS_JACD
> @$(call install_copy, canutils, 0, 0, 0755, -, \
> - /usr/bin/cansequence)
> + /usr/bin/jacd)
> endif
> +ifdef PTXCONF_CANUTILS_TESTJ1939
> + @$(call install_copy, canutils, 0, 0, 0755, -, \
> + /usr/bin/testj1939)
> +endif
> +
> @$(call install_finish, canutils)
> @$(call touch)
>
> --
> 2.19.0
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
prev parent reply other threads:[~2018-09-18 12:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-18 12:38 Oleksij Rempel
2018-09-18 12:45 ` Michael Olbrich [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=20180918124526.fcukbvctdg5xwi5j@pengutronix.de \
--to=m.olbrich@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