summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Schwebel <r.schwebel@pengutronix.de>2020-12-14 07:54:35 +0100
committerRobert Schwebel <r.schwebel@pengutronix.de>2020-12-16 16:42:25 +0100
commitd2eb7170a16a330c49c3a4af984b946779714e43 (patch)
treeb1df57f1f9f474da778d24aaff1da5ac57488be1
parente3756c6d8d70404ee259f15cdb45aa00f11a013e (diff)
downloadptxdist-2020.12.1.tar.gz
ptxdist-2020.12.1.tar.xz
migrate_platform: fix migration helper for TF_A_PLATFORM(S)ptxdist-2020.12.1stable/ptxdist-2020.12.x
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>
-rwxr-xr-xscripts/migrate/migrate_platform1
1 files changed, 1 insertions, 0 deletions
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/