From c9eaf80eebf0e5deb0051b8784b12bf5f0f4859d Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 20 Sep 2021 19:06:12 +0100 Subject: [PATCH] arm/fvp-base-*: factor out commonality to fvp-envelope.inc The fvp-base-a-aem and fvp-base-r-aem recipes have a lot in common, so extract that into a fvp-envelope.inc file. Change-Id: I9390f05e98bec0c1a236bc3c5d55b7144da1e1fd Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- meta-arm/recipes-devtools/fvp/fvp-base-a-aem.bb | 11 +---------- meta-arm/recipes-devtools/fvp/fvp-base-r-aem.bb | 11 +---------- meta-arm/recipes-devtools/fvp/fvp-envelope.inc | 11 +++++++++++ 3 files changed, 13 insertions(+), 20 deletions(-) create mode 100644 meta-arm/recipes-devtools/fvp/fvp-envelope.inc diff --git a/meta-arm/recipes-devtools/fvp/fvp-base-a-aem.bb b/meta-arm/recipes-devtools/fvp/fvp-base-a-aem.bb index facf8215..1d4e2a39 100644 --- a/meta-arm/recipes-devtools/fvp/fvp-base-a-aem.bb +++ b/meta-arm/recipes-devtools/fvp/fvp-base-a-aem.bb @@ -1,7 +1,6 @@ -require fvp-common.inc +require fvp-envelope.inc SUMMARY = "Arm Fixed Virtual Platform - Armv-A Base RevC Architecture Envelope Model FVP" -HOMEPAGE = "https://developer.arm.com/tools-and-software/simulation-models/fixed-virtual-platforms/arm-ecosystem-models" LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=1a33828e132ba71861c11688dbb0bd16 \ file://license_terms/third_party_licenses.txt;md5=b40ecbbbd3409d48263437b782df6df9" @@ -16,11 +15,3 @@ python() { if not d.getVar("FVP_BASE_A_AEM_TARBALL_URI"): raise bb.parse.SkipRecipe("FVP_BASE_A_AEM_TARBALL_URI not set") } - -do_install() { - mkdir --parents ${D}${FVPDIR} ${D}${bindir} - - cp --archive --no-preserve=ownership ${S}/Base_RevC_AEMvA_pkg/* ${D}${FVPDIR}/ - - fvp_link_binaries -} diff --git a/meta-arm/recipes-devtools/fvp/fvp-base-r-aem.bb b/meta-arm/recipes-devtools/fvp/fvp-base-r-aem.bb index 50e6402a..67c5564e 100644 --- a/meta-arm/recipes-devtools/fvp/fvp-base-r-aem.bb +++ b/meta-arm/recipes-devtools/fvp/fvp-base-r-aem.bb @@ -1,7 +1,6 @@ -require fvp-common.inc +require fvp-envelope.inc SUMMARY = "Arm Fixed Virtual Platform - Armv8-R Base Architecture Envelope Model FVP" -HOMEPAGE = "https://developer.arm.com/tools-and-software/simulation-models/fixed-virtual-platforms/arm-ecosystem-models" LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=1a33828e132ba71861c11688dbb0bd16 \ file://license_terms/third_party_licenses.txt;md5=3db0c4947b7e3405c40b943672d8de2f" @@ -16,11 +15,3 @@ python() { if not d.getVar("FVP_BASE_R_AEM_TARBALL_URI"): raise bb.parse.SkipRecipe("FVP_BASE_R_AEM_TARBALL_URI not set") } - -do_install() { - mkdir --parents ${D}${FVPDIR} ${D}${bindir} - - cp --archive --no-preserve=ownership ${S}/AEMv8R_base_pkg//* ${D}${FVPDIR}/ - - fvp_link_binaries -} diff --git a/meta-arm/recipes-devtools/fvp/fvp-envelope.inc b/meta-arm/recipes-devtools/fvp/fvp-envelope.inc new file mode 100644 index 00000000..eda98762 --- /dev/null +++ b/meta-arm/recipes-devtools/fvp/fvp-envelope.inc @@ -0,0 +1,11 @@ +require fvp-common.inc + +HOMEPAGE = "https://developer.arm.com/tools-and-software/simulation-models/fixed-virtual-platforms/arm-ecosystem-models" + +do_install() { + mkdir --parents ${D}${FVPDIR} ${D}${bindir} + + cp --archive --no-preserve=ownership ${S}/*_pkg/* ${D}${FVPDIR}/ + + fvp_link_binaries +}