Hi Oleksij,
On Thu, Jun 24, 2021 at 10:51:34AM +0200, Oleksij Rempel wrote:
> Signed-off-by: Oleksij Rempel <o.rem...@pengutronix.de>
> ---
> .../autogen.sh | 0
> rules/berlios-can-utils.in | 20 +++++++++++--------
> rules/berlios-can-utils.make | 13 ++++++------
> 3 files changed, 19 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"
Please also add matching lines to scripts/migrate/migrate_ptx to rename
these options in existing ptxconfigs on "ptxdist migrate".
- Roland
>
> 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:
> --
> 2.30.2
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to
> ptxdist-requ...@pengutronix.de
>
--
Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de |
Steuerwalder Str. 21 | https://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-requ...@pengutronix.de
