[ptxdist] [PATCH] migrate_platform: fix migration helper for TF_A_PLATFORM(S)

[ptxdist] [PATCH] migrate_platform: fix migration helper for TF_A_PLATFORM(S)

[Robert Schwebel]

The migration helper introduced in c9d48debf405ed49deffebef892990376052df09
changes PTXCONF_TF_A_PLATFORM into PTXCONF_TF_A_PLATFORMS. However, if
the platformconfig does already contain PLATFORMS, the regexp matches
anyway and converts it into PLATFORMSS.

Fixes: c9d48debf405ed49deffebef892990376052df09

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
 scripts/migrate/migrate_platform | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/migrate/migrate_platform b/scripts/migrate/migrate_platform
index b31592b88..1c701846f 100755
--- a/scripts/migrate/migrate_platform
+++ b/scripts/migrate/migrate_platform
@@ -40,4 +40,5 @@ s/^\(\(# \)\?PTXCONF\)_IMAGE_IPKG_EXTRA_ARGS\(.*$\)/\1_IMAGE_XPKG_EXTRA_ARGS\3/
 # symbol : PTXCONF_TF_A_PLATFORM -> PTXCONF_TF_A_PLATFORMS
 # reason : tf-a can be built for multiple platforms now
 #
+s/^\(\(# \)\?PTXCONF\)_TF_A_PLATFORMS\(.*$\)/\1_TF_A_PLATFORM\3/
 s/^\(\(# \)\?PTXCONF_TF_A_PLATFORM\)\(.*$\)/\1S\3/
-- 
2.27.0


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

Re: [ptxdist] [PATCH] migrate_platform: fix migration helper for TF_A_PLATFORM(S)

[Denis Osterland-Heim]

Hi,

Why not simply add `=` to the expression?

-s/^\(\(# \)\?PTXCONF_TF_A_PLATFORM\)\(.*$\)/\1S\3/
+s/^\(\(# \)\?PTXCONF_TF_A_PLATFORM\)\(\(=\|$\).*$\)/\1S\3/

(untested)

Regards, Denis

Am Montag, den 14.12.2020, 08:06 +0100 schrieb Robert Schwebel:
> The migration helper introduced in c9d48debf405ed49deffebef892990376052df09
> changes PTXCONF_TF_A_PLATFORM into PTXCONF_TF_A_PLATFORMS. However, if
> the platformconfig does already contain PLATFORMS, the regexp matches
> anyway and converts it into PLATFORMSS.
>
> Fixes: c9d48debf405ed49deffebef892990376052df09
>
> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> ---
>  scripts/migrate/migrate_platform | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/scripts/migrate/migrate_platform b/scripts/migrate/migrate_platform
> index b31592b88..1c701846f 100755
> --- a/scripts/migrate/migrate_platform
> +++ b/scripts/migrate/migrate_platform
> @@ -40,4 +40,5 @@ s/^\(\(# \)\?PTXCONF\)_IMAGE_IPKG_EXTRA_ARGS\(.*$\)/\1_IMAGE_XPKG_EXTRA_ARGS\3/
>  # symbol : PTXCONF_TF_A_PLATFORM -> PTXCONF_TF_A_PLATFORMS
>  # reason : tf-a can be built for multiple platforms now
>  #
> +s/^\(\(# \)\?PTXCONF\)_TF_A_PLATFORMS\(.*$\)/\1_TF_A_PLATFORM\3/
>  s/^\(\(# \)\?PTXCONF_TF_A_PLATFORM\)\(.*$\)/\1S\3/
Diehl Connectivity Solutions GmbH
Geschäftsführung: Horst Leonberger
Sitz der Gesellschaft: Nürnberg - Registergericht: Amtsgericht
Nürnberg: HRB 32315

________________________________

Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-Mail enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen.
Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise erhalten haben. Bitte loeschen Sie in diesem Fall die Nachricht.
Jede unerlaubte Form der Reproduktion, Bekanntgabe, Aenderung, Verteilung und/oder Publikation dieser E-Mail ist strengstens untersagt.

- Informationen zum Datenschutz, insbesondere zu Ihren Rechten, erhalten Sie unter:

https://www.diehl.com/group/de/transparenz-und-informationspflichten/

The contents of the above mentioned e-mail is not legally binding. This e-mail contains confidential and/or legally protected information. Please inform us if you have received this e-mail by
mistake and delete it in such a case. Each unauthorized reproduction, disclosure, alteration, distribution and/or publication of this e-mail is strictly prohibited.

- For general information on data protection and your respective rights please visit:

https://www.diehl.com/group/en/transparency-and-information-obligations/


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

Re: [ptxdist] [PATCH] migrate_platform: fix migration helper for TF_A_PLATFORM(S)

[Robert Schwebel]

On Mon, Dec 14, 2020 at 08:06:34AM +0100, Robert Schwebel wrote:
> The migration helper introduced in c9d48debf405ed49deffebef892990376052df09
> changes PTXCONF_TF_A_PLATFORM into PTXCONF_TF_A_PLATFORMS. However, if
> the platformconfig does already contain PLATFORMS, the regexp matches
> anyway and converts it into PLATFORMSS.
> 
> Fixes: c9d48debf405ed49deffebef892990376052df09
> 
> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> ---
>  scripts/migrate/migrate_platform | 1 +
>  1 file changed, 1 insertion(+)

Unfortunately, this is a showstopper, as migration helpers cannot be
overwritten in the BSP.

Michael, can we make a .1 release with this fix? Otherwhise I can't move
DistroKit to any newer ptxdist than 2020.10.0.

rsc
-- 
Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-9    |

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