From f8ec2709a10b0f60d74a71aca0181c3a4fc14e6f Mon Sep 17 00:00:00 2001
From: Ross Burton <ross@burtonini.com>
Date: Mon, 20 Sep 2021 19:06:14 +0100
Subject: [PATCH] arm/fvp-common: store the mangled PV as PV_URL

FVP versions in the download URLs are expressed as 11.12_13, but ideally
we'll use a rationalised 11.12.13 form as it's more consistant.

Add a function to transform from a all-dots form to use underscore for
the final portion, and expose this version as PV_URL.

Change-Id: I632b33913baba0f0847440595ef0699d0a769166
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 meta-arm/recipes-devtools/fvp/fvp-common.inc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta-arm/recipes-devtools/fvp/fvp-common.inc b/meta-arm/recipes-devtools/fvp/fvp-common.inc
index 82b82675..83e03131 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-common.inc
+++ b/meta-arm/recipes-devtools/fvp/fvp-common.inc
@@ -9,6 +9,12 @@ LICENSE = "Proprietary & Apache-2.0 & Python-2.0 & GPL-3.0-with-GCC-exception &
 COMPATIBLE_HOST = '(x86_64|i.86).*-linux'
 FVP_ARCH = "Linux64_GCC-6.4"
 
+def get_real_pv(d):
+    # FVP versions are like 11.12_43
+    pv = d.getVar("PV")
+    return "%s.%s_%s" % tuple(pv.split("."))
+PV_URL = "${@get_real_pv(d)}"
+
 # The directory the FVP is installed into
 FVPDIR = "${libdir}/fvp/${BPN}"