From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Oleksij Rempel <o.rempel@pengutronix.de>
Subject: Re: [ptxdist] [PATCH v2] can-utils: version bump: v2020.02.04 -> v2021.06.0
Date: Fri, 25 Jun 2021 14:26:54 +0200 [thread overview]
Message-ID: <20210625122654.GD4015839@pengutronix.de> (raw)
In-Reply-To: <20210625115934.28670-1-o.rempel@pengutronix.de>
On Fri, Jun 25, 2021 at 01:59:34PM +0200, Oleksij Rempel wrote:
> Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
> ---
> .../autogen.sh | 0
> rules/berlios-can-utils.in | 20 +++++++++++--------
> rules/berlios-can-utils.make | 13 ++++++------
> scripts/migrate/migrate_ptx | 13 ++++++++++++
> 4 files changed, 32 insertions(+), 14 deletions(-)
> rename patches/{canutils-v2020.02.04 => canutils-v2021.06.0}/autogen.sh (100%)
>
> diff --git a/patches/canutils-v2020.02.04/autogen.sh b/patches/canutils-v2021.06.0/autogen.sh
> similarity index 100%
> rename from patches/canutils-v2020.02.04/autogen.sh
> rename to patches/canutils-v2021.06.0/autogen.sh
> diff --git a/rules/berlios-can-utils.in b/rules/berlios-can-utils.in
> index fa15c3636..b1ec974b7 100644
> --- a/rules/berlios-can-utils.in
> +++ b/rules/berlios-can-utils.in
> @@ -49,6 +49,10 @@ config BERLIOS_CAN_UTILS_CANSEND
> bool
> prompt "cansend"
>
> +config BERLIOS_CAN_UTILS_CANSEQUENCE
> + bool
> + prompt "cansequence"
> +
> config BERLIOS_CAN_UTILS_CANSNIFFER
> bool
> prompt "cansniffer"
> @@ -97,21 +101,21 @@ config BERLIOS_CAN_UTILS_SLCANPTY
> bool
> prompt "slcanpty"
>
> -config BERLIOS_CAN_UTILS_JSPY
> +config BERLIOS_CAN_UTILS_J1939SPY
> bool
> - prompt "jspy"
> + prompt "j1939spy"
>
> -config BERLIOS_CAN_UTILS_JSR
> +config BERLIOS_CAN_UTILS_J1939SR
> bool
> - prompt "jsr"
> + prompt "j1939sr"
>
> -config BERLIOS_CAN_UTILS_JACD
> +config BERLIOS_CAN_UTILS_J1939ACD
> bool
> - prompt "jacd"
> + prompt "j1939acd"
>
> -config BERLIOS_CAN_UTILS_JCAT
> +config BERLIOS_CAN_UTILS_J1939CAT
> bool
> - prompt "jcat"
> + prompt "j1939cat"
>
> config BERLIOS_CAN_UTILS_TESTJ1939
> bool
> diff --git a/rules/berlios-can-utils.make b/rules/berlios-can-utils.make
> index 8cc51a40d..464166fea 100644
> --- a/rules/berlios-can-utils.make
> +++ b/rules/berlios-can-utils.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_BERLIOS_CAN_UTILS) += berlios-can-utils
> #
> # Paths and names
> #
> -BERLIOS_CAN_UTILS_VERSION := v2020.02.04
> -BERLIOS_CAN_UTILS_MD5 := 5ca2e7b840bb5fbe8a30967e076dc16e
> +BERLIOS_CAN_UTILS_VERSION := v2021.06.0
> +BERLIOS_CAN_UTILS_MD5 := 6f4eb3739fb9179588fa2824889213bb
> BERLIOS_CAN_UTILS := canutils-$(BERLIOS_CAN_UTILS_VERSION)
> BERLIOS_CAN_UTILS_SUFFIX := tar.gz
> BERLIOS_CAN_UTILS_URL := https://github.com/linux-can/can-utils/archive/$(BERLIOS_CAN_UTILS_VERSION).$(BERLIOS_CAN_UTILS_SUFFIX)
> @@ -45,6 +45,7 @@ BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_CANGW) += /usr/bin/cangw
> BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_CANLOGSERVER) += /usr/bin/canlogserver
> BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_CANPLAYER) += /usr/bin/canplayer
> BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_CANSEND) += /usr/bin/cansend
> +BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_CANSEQUENCE) += /usr/bin/cansequence
> BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_CANSNIFFER) += /usr/bin/cansniffer
> BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_ISOTPDUMP) += /usr/bin/isotpdump
> BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_ISOTPRECV) += /usr/bin/isotprecv
> @@ -57,10 +58,10 @@ 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_J1939SPY) += /usr/bin/j1939spy
> +BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_J1939SR) += /usr/bin/j1939sr
> +BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_J1939ACD) += /usr/bin/j1939acd
> +BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_J1939CAT) += /usr/bin/j1939cat
> BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_TESTJ1939) += /usr/bin/testj1939
>
> $(STATEDIR)/berlios-can-utils.targetinstall:
> diff --git a/scripts/migrate/migrate_ptx b/scripts/migrate/migrate_ptx
> index e31a111ca..f6252926d 100755
> --- a/scripts/migrate/migrate_ptx
> +++ b/scripts/migrate/migrate_ptx
> @@ -426,3 +426,16 @@ s/^\(\(# \)\?PTXCONF_GST_\)VALIDATE1\>/\1DEVTOOLS1/
> # reason : pip is now a separate package instead of the bundled version
> #
> s/^\(\(# \)\?PTXCONF_PYTHON3_\)ENSUREPIP\>/\1PIP/
> +
> +# from : ptxdist-2021.06.0
> +# to : ptxdist-2021.07.0
> +# symbol : BERLIOS_CAN_UTILS_JSPY -> PTXCONF_BERLIOS_CAN_UTILS_J1939SPY
> +# symbol : BERLIOS_CAN_UTILS_JSR -> PTXCONF_BERLIOS_CAN_UTILS_J1939SR
> +# symbol : BERLIOS_CAN_UTILS_JACD -> PTXCONF_BERLIOS_CAN_UTILS_J1939ACD
> +# symbol : BERLIOS_CAN_UTILS_JCAT -> PTXCONF_BERLIOS_CAN_UTILS_J1939CAT
> +# reason : This utils was renamed mainline to avoid conflicts on debian
> +#
> +s/^\(\(# \)\?PTXCONF_BERLIOS_CAN_UTILS_\)JSPY\>/\1J1939SPY/
> +s/^\(\(# \)\?PTXCONF_BERLIOS_CAN_UTILS_\)JSR\>/\1J1939SSR/
^
There is an extra 's' here ------------------------------'
I'll fix it while applying the patch unless my build tests find any other
issues.
Michael
> +s/^\(\(# \)\?PTXCONF_BERLIOS_CAN_UTILS_\)JACD\>/\1J1939ACD/
> +s/^\(\(# \)\?PTXCONF_BERLIOS_CAN_UTILS_\)JCAT\>/\1J1939CAT/
> --
> 2.30.2
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
next prev parent reply other threads:[~2021-06-25 12:27 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-25 11:59 Oleksij Rempel
2021-06-25 12:26 ` Michael Olbrich [this message]
2021-06-29 5:09 ` [ptxdist] [APPLIED] " Michael Olbrich
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=20210625122654.GD4015839@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