| Message ID | 20230215193355.9676-9-afd@ti.com |
|---|---|
| State | Accepted |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | ti-rtos-firmware and secdev | expand |
On Wed, Feb 15, 2023 at 01:33:48PM -0600, Andrew Davis via lists.yoctoproject.org wrote: > Since this directory path will not change, let's avoid use > of ti-paths.inc which is set to be removed. > > Signed-off-by: Andrew Davis <afd@ti.com> Tested-by: Denys Dmytriyenko <denys@konsulko.com> > --- > meta-ti-bsp/recipes-ti/secdev/ti-k3-secdev_git.bb | 5 ++--- > meta-ti-extras/recipes-ti/includes/ti-paths.inc | 2 -- > 2 files changed, 2 insertions(+), 5 deletions(-) > > diff --git a/meta-ti-bsp/recipes-ti/secdev/ti-k3-secdev_git.bb b/meta-ti-bsp/recipes-ti/secdev/ti-k3-secdev_git.bb > index 6a28add7..b4c26f68 100644 > --- a/meta-ti-bsp/recipes-ti/secdev/ti-k3-secdev_git.bb > +++ b/meta-ti-bsp/recipes-ti/secdev/ti-k3-secdev_git.bb > @@ -4,9 +4,8 @@ SECTION = "devel" > LICENSE = "BSD-3-Clause" > LIC_FILES_CHKSUM = "file://manifest/k3-secdev-0.2-manifest.html;md5=f632a78870cc64550078d7b3cbac0892" > > -# set a default value for TI_K3_SECDEV_INSTALL_DIR_RECIPE > -export TI_K3_SECDEV_INSTALL_DIR_RECIPE = "${datadir}/ti/ti-k3-secdev" > -include recipes-ti/includes/ti-paths.inc > +# set a default install location > +TI_K3_SECDEV_INSTALL_DIR_RECIPE = "${datadir}/ti/ti-k3-secdev" > > # Native host tool only > COMPATIBLE_MACHINE = "null" > diff --git a/meta-ti-extras/recipes-ti/includes/ti-paths.inc b/meta-ti-extras/recipes-ti/includes/ti-paths.inc > index 63c00e8c..b443d2f0 100644 > --- a/meta-ti-extras/recipes-ti/includes/ti-paths.inc > +++ b/meta-ti-extras/recipes-ti/includes/ti-paths.inc > @@ -51,7 +51,6 @@ export OMP_INSTALL_DIR_RECIPE = "${installdir}/ti-omp-tree" > export MPM_INSTALL_DIR_RECIPE = "${installdir}/ti-mpm-tree" > export TI_CGT6X_7_INSTALL_DIR_RECIPE = "${installdir}/cgt6x-7" > export TI_CGT7X_INSTALL_DIR_RECIPE = "${installdir}/cgt-c7x" > -export TI_K3_SECDEV_INSTALL_DIR_RECIPE = "${installdir}/ti-k3-secdev" > > > # This is where the tools will end up in sysroot > @@ -101,7 +100,6 @@ export TI_CGT6X_7_INSTALL_DIR = "${STAGING_DIR_NATIVE}${TI_CGT6X_7_INSTALL_DIR > export GCC_LINARO_BAREMETAL_TOOLCHAIN = "${STAGING_DIR_NATIVE}${GCC_LINARO_BAREMETAL_TOOLCHAIN_RECIPE}" > export GCC_LINARO_BAREMETAL_AARCH64_TOOLCHAIN = "${STAGING_DIR_NATIVE}${GCC_LINARO_BAREMETAL_AARCH64_TOOLCHAIN_RECIPE}" > export TI_CGT7X_INSTALL_DIR = "${STAGING_DIR_NATIVE}${TI_CGT7X_INSTALL_DIR_RECIPE}" > -export TI_K3_SECDEV_INSTALL_DIR = "${STAGING_DIR_NATIVE}${TI_K3_SECDEV_INSTALL_DIR_RECIPE}" > > > DSPSUFFIX:omapl138 = "x674" > -- > 2.39.1
diff --git a/meta-ti-bsp/recipes-ti/secdev/ti-k3-secdev_git.bb b/meta-ti-bsp/recipes-ti/secdev/ti-k3-secdev_git.bb index 6a28add7..b4c26f68 100644 --- a/meta-ti-bsp/recipes-ti/secdev/ti-k3-secdev_git.bb +++ b/meta-ti-bsp/recipes-ti/secdev/ti-k3-secdev_git.bb @@ -4,9 +4,8 @@ SECTION = "devel" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://manifest/k3-secdev-0.2-manifest.html;md5=f632a78870cc64550078d7b3cbac0892" -# set a default value for TI_K3_SECDEV_INSTALL_DIR_RECIPE -export TI_K3_SECDEV_INSTALL_DIR_RECIPE = "${datadir}/ti/ti-k3-secdev" -include recipes-ti/includes/ti-paths.inc +# set a default install location +TI_K3_SECDEV_INSTALL_DIR_RECIPE = "${datadir}/ti/ti-k3-secdev" # Native host tool only COMPATIBLE_MACHINE = "null" diff --git a/meta-ti-extras/recipes-ti/includes/ti-paths.inc b/meta-ti-extras/recipes-ti/includes/ti-paths.inc index 63c00e8c..b443d2f0 100644 --- a/meta-ti-extras/recipes-ti/includes/ti-paths.inc +++ b/meta-ti-extras/recipes-ti/includes/ti-paths.inc @@ -51,7 +51,6 @@ export OMP_INSTALL_DIR_RECIPE = "${installdir}/ti-omp-tree" export MPM_INSTALL_DIR_RECIPE = "${installdir}/ti-mpm-tree" export TI_CGT6X_7_INSTALL_DIR_RECIPE = "${installdir}/cgt6x-7" export TI_CGT7X_INSTALL_DIR_RECIPE = "${installdir}/cgt-c7x" -export TI_K3_SECDEV_INSTALL_DIR_RECIPE = "${installdir}/ti-k3-secdev" # This is where the tools will end up in sysroot @@ -101,7 +100,6 @@ export TI_CGT6X_7_INSTALL_DIR = "${STAGING_DIR_NATIVE}${TI_CGT6X_7_INSTALL_DIR export GCC_LINARO_BAREMETAL_TOOLCHAIN = "${STAGING_DIR_NATIVE}${GCC_LINARO_BAREMETAL_TOOLCHAIN_RECIPE}" export GCC_LINARO_BAREMETAL_AARCH64_TOOLCHAIN = "${STAGING_DIR_NATIVE}${GCC_LINARO_BAREMETAL_AARCH64_TOOLCHAIN_RECIPE}" export TI_CGT7X_INSTALL_DIR = "${STAGING_DIR_NATIVE}${TI_CGT7X_INSTALL_DIR_RECIPE}" -export TI_K3_SECDEV_INSTALL_DIR = "${STAGING_DIR_NATIVE}${TI_K3_SECDEV_INSTALL_DIR_RECIPE}" DSPSUFFIX:omapl138 = "x674"
Since this directory path will not change, let's avoid use of ti-paths.inc which is set to be removed. Signed-off-by: Andrew Davis <afd@ti.com> --- meta-ti-bsp/recipes-ti/secdev/ti-k3-secdev_git.bb | 5 ++--- meta-ti-extras/recipes-ti/includes/ti-paths.inc | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-)