From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Oleksij Rempel <o.rempel@pengutronix.de>
Subject: Re: [ptxdist] [PATCH] update berlios-can-utils to the latest git version
Date: Wed, 13 Mar 2019 09:13:23 +0100 [thread overview]
Message-ID: <20190313081323.a4e3zuaxebjapjjr@pengutronix.de> (raw)
In-Reply-To: <20190312090358.18517-1-o.rempel@pengutronix.de>
On Tue, Mar 12, 2019 at 10:03:58AM +0100, Oleksij Rempel wrote:
> it will also add support for j1939 utils
>
> Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
> ---
> rules/berlios-can-utils.in | 81 ++++++++++++++++--------------------
> rules/berlios-can-utils.make | 30 ++++++++++---
> 2 files changed, 62 insertions(+), 49 deletions(-)
>
> diff --git a/rules/berlios-can-utils.in b/rules/berlios-can-utils.in
> index 914d91707..cbf5ebb3f 100644
> --- a/rules/berlios-can-utils.in
> +++ b/rules/berlios-can-utils.in
> @@ -10,91 +10,84 @@ menuconfig BERLIOS_CAN_UTILS
> if BERLIOS_CAN_UTILS
>
> config BERLIOS_CAN_UTILS_ASC2LOG
> - bool
> - prompt "asc2log"
> + bool asc2log
Please don't change this back. I just fixed that.
>
> config BERLIOS_CAN_UTILS_BCMSERVER
> - bool
> - prompt "bcmserver"
> + bool bcmserver
>
> config BERLIOS_CAN_UTILS_CANBUSLOAD
> - bool
> - prompt "canbusload"
> + bool canbusload
>
> config BERLIOS_CAN_UTILS_CANDUMP
> - bool
> - prompt "candump"
> + bool candump
>
> config BERLIOS_CAN_UTILS_CANFDTEST
> - bool
> - prompt "canfdtest"
> + bool canfdtest
>
> config BERLIOS_CAN_UTILS_CANGEN
> - bool
> - prompt "cangen"
> + bool cangen
>
> config BERLIOS_CAN_UTILS_CANGW
> - bool
> - prompt "cangw"
> + bool cangw
>
> config BERLIOS_CAN_UTILS_CANLOGSERVER
> - bool
> - prompt "canlogserver"
> + bool canlogserver
>
> config BERLIOS_CAN_UTILS_CANPLAYER
> - bool
> - prompt "canplayer"
> + bool canplayer
>
> config BERLIOS_CAN_UTILS_CANSEND
> - bool
> - prompt "cansend"
> + bool cansend
>
> config BERLIOS_CAN_UTILS_CANSNIFFER
> - bool
> - prompt "cansniffer"
> + bool cansniffer
>
> config BERLIOS_CAN_UTILS_ISOTPDUMP
> - bool
> - prompt "isotpdump"
> + bool isotpdump
>
> config BERLIOS_CAN_UTILS_ISOTPRECV
> - bool
> - prompt "isotprecv"
> + bool isotprecv
>
> config BERLIOS_CAN_UTILS_ISOTPSEND
> - bool
> - prompt "isotpsend"
> + bool isotpsend
>
> config BERLIOS_CAN_UTILS_ISOTPSERVER
> - bool
> - prompt "isotpserver"
> + bool isotpserver
>
> config BERLIOS_CAN_UTILS_ISOTPSNIFFER
> - bool
> - prompt "isotpsniffer"
> + bool isotpsniffer
>
> config BERLIOS_CAN_UTILS_ISOTPTUN
> - bool
> - prompt "isotptun"
> + bool isotptun
>
> config BERLIOS_CAN_UTILS_LOG2ASC
> - bool
> - prompt "log2asc"
> + bool log2asc
>
> config BERLIOS_CAN_UTILS_LOG2LONG
> - bool
> - prompt "log2long"
> + bool log2long
>
> config BERLIOS_CAN_UTILS_SLCAN_ATTACH
> - bool
> - prompt "slcan_attach"
> + bool slcan_attach
>
> config BERLIOS_CAN_UTILS_SLCAND
> - bool
> - prompt "slcand"
> + bool slcand
>
> config BERLIOS_CAN_UTILS_SLCANPTY
> - bool
> - prompt "slcanpty"
> + bool slcanpty
> +
> +config BERLIOS_CAN_UTILS_JSPY
> + bool jspy
> +
> +config BERLIOS_CAN_UTILS_JSR
> + bool jsr
> +
> +config BERLIOS_CAN_UTILS_JACD
> + bool jacd
> +
> +config BERLIOS_CAN_UTILS_JCAT
> + bool jcat
> +
> +config BERLIOS_CAN_UTILS_TESTJ1939
> + bool testj1939
>
> endif
> diff --git a/rules/berlios-can-utils.make b/rules/berlios-can-utils.make
> index d8a7cff35..794235231 100644
> --- a/rules/berlios-can-utils.make
> +++ b/rules/berlios-can-utils.make
> @@ -16,20 +16,35 @@ PACKAGES-$(PTXCONF_BERLIOS_CAN_UTILS) += berlios-can-utils
> #
> # Paths and names
> #
> -BERLIOS_CAN_UTILS_VERSION := 2014.01.0
> -BERLIOS_CAN_UTILS_MD5 := f643449f6607688a9f4662a48bc91aa0
> -BERLIOS_CAN_UTILS := can-utils-$(BERLIOS_CAN_UTILS_VERSION)
> +BERLIOS_CAN_UTILS_VERSION := b6cb9a04e5
> +BERLIOS_CAN_UTILS_MD5 := f1eef88eaad92e3c3ab4c08ef827ba84
> +BERLIOS_CAN_UTILS := canutils-$(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_URL := https://github.com/linux-can/can-utils.git;tag=$(BERLIOS_CAN_UTILS_VERSION)
> BERLIOS_CAN_UTILS_SOURCE := $(SRCDIR)/$(BERLIOS_CAN_UTILS).$(BERLIOS_CAN_UTILS_SUFFIX)
> BERLIOS_CAN_UTILS_DIR := $(BUILDDIR)/$(BERLIOS_CAN_UTILS)
> -BERLIOS_CAN_UTILS_LICENSE := unknown
> +BERLIOS_CAN_UTILS_LICENSE := GPL-2.0
> +
> +# ----------------------------------------------------------------------------
> +# Extract (just create the 'configure' script on demand)
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/berlios-can-utils.extract.post: $(STATEDIR)/autogen-tools
> + @$(call targetinfo)
> + @cd $(BERLIOS_CAN_UTILS_DIR) && [ -f configure ] || sh autogen.sh
> + @$(call world/patchin/post, BERLIOS_CAN_UTILS)
> + @$(call touch)
>
> # ----------------------------------------------------------------------------
> # Prepare
> # ----------------------------------------------------------------------------
>
> +BERLIOS_CAN_UTILS_CONF_ENV := \
> + $(CROSS_ENV) \
> + CPPFLAGS="-I$(KERNEL_HEADERS_INCLUDE_DIR) $(CROSS_CPPFLAGS)"
As Marc noted, this should not be necessary. I'm not aware of any new CAN
API. If it is needed then check how other packages handle this.
> +
> BERLIOS_CAN_UTILS_CONF_TOOL := autoconf
> +BERLIOS_CAN_UTILS_CONF_OPT := $(CROSS_AUTOCONF_USR)
>
Don't add this unless there are more options.
Michael
> # ----------------------------------------------------------------------------
> # Target-Install
> @@ -59,6 +74,11 @@ BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_LOG2LONG) += /usr/bin/log2lon
> BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_SLCAN_ATTACH) += /usr/bin/slcan_attach
> BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_SLCAND) += /usr/bin/slcand
> BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_SLCANPTY) += /usr/bin/slcanpty
> +BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_JSPY) += /usr/bin/jspy
> +BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_JSR) += /usr/bin/jsr
> +BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_JACD) += /usr/bin/jacd
> +BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_JCAT) += /usr/bin/jcat
> +BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_TESTJ1939) += /usr/bin/testj1939
>
> $(STATEDIR)/berlios-can-utils.targetinstall:
> @$(call targetinfo)
> --
> 2.20.1
>
>
> _______________________________________________
> 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:[~2019-03-13 8:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-12 9:03 Oleksij Rempel
2019-03-12 14:47 ` Marc Kleine-Budde
2019-03-13 8:13 ` 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=20190313081323.a4e3zuaxebjapjjr@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=o.rempel@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