diff options
| author | Ricardo Salveti <ricardo@foundries.io> | 2020-08-14 11:58:45 -0300 |
|---|---|---|
| committer | Ricardo Salveti <44008055+ricardosalveti@users.noreply.github.com> | 2020-08-19 16:25:20 -0300 |
| commit | 2376c87ea4d85c8ee4a4395deaf0253902648146 (patch) | |
| tree | 09ec17ca7307a67591c1bd3ef8f59d2f5f5cc237 | |
| parent | 7055db0b1bac1cd58b8ef69b6900277d1d118597 (diff) | |
base/bsp: optee-os: rename fio forked recipe to optee-os-fio
Follow same pattern as used by linux and u-boot, to make it clear that
this is a forked tree and recipe and also avoid clash with other layers.
Signed-off-by: Ricardo Salveti <ricardo@foundries.io>
| -rw-r--r-- | meta-lmp-base/conf/distro/include/lmp.inc | 2 | ||||
| -rw-r--r-- | meta-lmp-base/conf/distro/lmp-mfgtool.conf | 2 | ||||
| -rw-r--r-- | meta-lmp-base/recipes-samples/images/lmp-feature-optee.inc | 2 | ||||
| -rw-r--r-- | meta-lmp-base/recipes-security/optee/optee-os-fio-mfgtool_3.6.0.bb | 3 | ||||
| -rw-r--r-- | meta-lmp-base/recipes-security/optee/optee-os-fio/0001-arm64-Disable-outline-atomics-when-compiling.patch (renamed from meta-lmp-base/recipes-security/optee/optee-os/0001-arm64-Disable-outline-atomics-when-compiling.patch) | 0 | ||||
| -rw-r--r-- | meta-lmp-base/recipes-security/optee/optee-os-fio_3.6.0.bb (renamed from meta-lmp-base/recipes-security/optee/optee-os_git.bb) | 0 | ||||
| -rw-r--r-- | meta-lmp-base/recipes-security/optee/optee-os-mfgtool_git.bb | 3 | ||||
| -rw-r--r-- | meta-lmp-bsp/recipes-security/optee/optee-os-fio-mfgtool_%.bbappend (renamed from meta-lmp-bsp/recipes-security/optee/optee-os-mfgtool_%.bbappend) | 0 | ||||
| -rw-r--r-- | meta-lmp-bsp/recipes-security/optee/optee-os-fio_%.bbappend (renamed from meta-lmp-bsp/recipes-security/optee/optee-os_%.bbappend) | 0 |
9 files changed, 6 insertions, 6 deletions
diff --git a/meta-lmp-base/conf/distro/include/lmp.inc b/meta-lmp-base/conf/distro/include/lmp.inc index 00c3083..cbb1d70 100644 --- a/meta-lmp-base/conf/distro/include/lmp.inc +++ b/meta-lmp-base/conf/distro/include/lmp.inc @@ -14,7 +14,7 @@ require conf/distro/include/arm-defaults.inc require conf/distro/include/security_flags.inc PREFERRED_PROVIDER_virtual/kernel ?= "linux-lmp" -PREFERRED_PROVIDER_virtual/optee-os ?= "optee-os" +PREFERRED_PROVIDER_virtual/optee-os ?= "optee-os-fio" PREFERRED_PROVIDER_u-boot-fw-utils ?= "libubootenv" PREFERRED_RPROVIDER_u-boot-fw-utils ?= "libubootenv" PREFERRED_PROVIDER_zlib ?= "zlib" diff --git a/meta-lmp-base/conf/distro/lmp-mfgtool.conf b/meta-lmp-base/conf/distro/lmp-mfgtool.conf index 2941966..c7ed166 100644 --- a/meta-lmp-base/conf/distro/lmp-mfgtool.conf +++ b/meta-lmp-base/conf/distro/lmp-mfgtool.conf @@ -16,7 +16,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "" # Common settings across imx devices INITRAMFS_IMAGE ?= "fsl-image-mfgtool-initramfs" -PREFERRED_PROVIDER_virtual/optee-os ?= "optee-os-mfgtool" +PREFERRED_PROVIDER_virtual/optee-os ?= "optee-os-fio-mfgtool" # Base settings from LMP require conf/distro/include/lmp.inc diff --git a/meta-lmp-base/recipes-samples/images/lmp-feature-optee.inc b/meta-lmp-base/recipes-samples/images/lmp-feature-optee.inc index 0df5c78..57c0567 100644 --- a/meta-lmp-base/recipes-samples/images/lmp-feature-optee.inc +++ b/meta-lmp-base/recipes-samples/images/lmp-feature-optee.inc @@ -3,7 +3,7 @@ CORE_IMAGE_BASE_INSTALL += " \ optee-client \ optee-examples \ optee-fiovb \ - optee-os-ta \ + optee-os-fio-ta \ optee-sks \ optee-test \ pkcs11test \ diff --git a/meta-lmp-base/recipes-security/optee/optee-os-fio-mfgtool_3.6.0.bb b/meta-lmp-base/recipes-security/optee/optee-os-fio-mfgtool_3.6.0.bb new file mode 100644 index 0000000..d372e29 --- /dev/null +++ b/meta-lmp-base/recipes-security/optee/optee-os-fio-mfgtool_3.6.0.bb @@ -0,0 +1,3 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/optee-os-fio:" + +require optee-os-fio_${PV}.bb diff --git a/meta-lmp-base/recipes-security/optee/optee-os/0001-arm64-Disable-outline-atomics-when-compiling.patch b/meta-lmp-base/recipes-security/optee/optee-os-fio/0001-arm64-Disable-outline-atomics-when-compiling.patch index 605dacc..605dacc 100644 --- a/meta-lmp-base/recipes-security/optee/optee-os/0001-arm64-Disable-outline-atomics-when-compiling.patch +++ b/meta-lmp-base/recipes-security/optee/optee-os-fio/0001-arm64-Disable-outline-atomics-when-compiling.patch diff --git a/meta-lmp-base/recipes-security/optee/optee-os_git.bb b/meta-lmp-base/recipes-security/optee/optee-os-fio_3.6.0.bb index 4f1ed4b..4f1ed4b 100644 --- a/meta-lmp-base/recipes-security/optee/optee-os_git.bb +++ b/meta-lmp-base/recipes-security/optee/optee-os-fio_3.6.0.bb diff --git a/meta-lmp-base/recipes-security/optee/optee-os-mfgtool_git.bb b/meta-lmp-base/recipes-security/optee/optee-os-mfgtool_git.bb deleted file mode 100644 index 80d8862..0000000 --- a/meta-lmp-base/recipes-security/optee/optee-os-mfgtool_git.bb +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/optee-os:" - -require optee-os_${PV}.bb diff --git a/meta-lmp-bsp/recipes-security/optee/optee-os-mfgtool_%.bbappend b/meta-lmp-bsp/recipes-security/optee/optee-os-fio-mfgtool_%.bbappend index 69fb91c..69fb91c 100644 --- a/meta-lmp-bsp/recipes-security/optee/optee-os-mfgtool_%.bbappend +++ b/meta-lmp-bsp/recipes-security/optee/optee-os-fio-mfgtool_%.bbappend diff --git a/meta-lmp-bsp/recipes-security/optee/optee-os_%.bbappend b/meta-lmp-bsp/recipes-security/optee/optee-os-fio_%.bbappend index 3177ee2..3177ee2 100644 --- a/meta-lmp-bsp/recipes-security/optee/optee-os_%.bbappend +++ b/meta-lmp-bsp/recipes-security/optee/optee-os-fio_%.bbappend |