From: Denis Osterland-Heim <denis.osterland@diehl.com>
To: "ptxdist@pengutronix.de" <ptxdist@pengutronix.de>
Subject: Re: [ptxdist] [PATCH] migrate_platform: fix migration helper for TF_A_PLATFORM(S)
Date: Mon, 14 Dec 2020 08:48:59 +0000 [thread overview]
Message-ID: <83ffb400c26d4337a1b82330afc5e2c6313f0369.camel@diehl.com> (raw)
In-Reply-To: <20201214070634.1548263-1-r.schwebel@pengutronix.de>
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
next prev parent reply other threads:[~2020-12-14 11:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-14 7:06 Robert Schwebel
2020-12-14 8:48 ` Denis Osterland-Heim [this message]
2020-12-14 9:06 ` Robert Schwebel
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=83ffb400c26d4337a1b82330afc5e2c6313f0369.camel@diehl.com \
--to=denis.osterland@diehl.com \
--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