Re: [ptxdist] [APPLIED] can-utils: version bump: v2020.02.04 -> v2021.06.0

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as 7cb68f8cd391592d4762c98f2fcd3241f4d4f6cf.

Michael

[sent from post-receive hook]

On Tue, 29 Jun 2021 07:09:44 +0200, Oleksij Rempel <o.rempel@pengutronix.de> wrote:
> Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
> Message-Id: <20210625115934.28670-1-o.rempel@pengutronix.de>
> [mol: fix typo in the migrage helper]
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> 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 fa15c36367a8..b1ec974b72a0 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 8cc51a40d95e..464166fea49f 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 e31a111ca4c6..68ee1a51c0fe 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\>/\1J1939SR/
> +s/^\(\(# \)\?PTXCONF_BERLIOS_CAN_UTILS_\)JACD\>/\1J1939ACD/
> +s/^\(\(# \)\?PTXCONF_BERLIOS_CAN_UTILS_\)JCAT\>/\1J1939CAT/

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de