ti: if a recipe stages its complete tree, put it in -tree

Signed-off-by: Koen Kooi <k-kooi@ti.com>

14 files changed, 18 insertions, 13 deletions

diff --git a/recipes/ti/ti-biosutils.inc b/recipes/ti/ti-biosutils.inc
index 637d8fe6a3..d474df7a2d 100644
--- a/recipes/ti/ti-biosutils.inc
+++ b/recipes/ti/ti-biosutils.inc
@@ -4,6 +4,8 @@ HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/B
 require ti-paths.inc
 require ti-staging.inc
 
+PR = "r1"
+
 S = "${WORKDIR}/biosutils_${PV}"
 
 SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/Bios_Utils/${PV}${PVsuffix}/exports/biosutils_${PV}.tar.gz;name=biosutilstarball"
diff --git a/recipes/ti/ti-cgt6x.inc b/recipes/ti/ti-cgt6x.inc
index 5438a130a1..c389573a94 100644
--- a/recipes/ti/ti-cgt6x.inc
+++ b/recipes/ti/ti-cgt6x.inc
@@ -5,6 +5,8 @@ require ti-paths.inc
 require ti-staging.inc
 require ti-eula-unpack.inc
 
+PR = "r4"
+
 S = "${WORKDIR}/cgt6x_${PV}"
 
 SRC_URI = "http://install.source.dir.local/ti_cgt_c6000_${PVwithdots}_setup_linux_x86.bin;name=cgt6xbin"
diff --git a/recipes/ti/ti-cgt6x_6.0.21.bb b/recipes/ti/ti-cgt6x_6.0.21.bb
index c557906ad8..7d7fc03858 100644
--- a/recipes/ti/ti-cgt6x_6.0.21.bb
+++ b/recipes/ti/ti-cgt6x_6.0.21.bb
@@ -3,7 +3,6 @@ require ti-cgt6x.inc
 PE = "1"
 PV = "6_0_21"
 PVwithdots = "6.0.21"
-PR = "r3"
 
 SRC_URI[cgt6xbin.md5sum] = "5bfeaacb628b56005a8865a177af01e4"
 SRC_URI[cgt6xbin.sha256sum] = "fcfa98e2c8ff18e8e6d5b2ff5e94f20b719150fe7bb4a130cfa360e02df2156a"
diff --git a/recipes/ti/ti-cgt6x_6.0.22.bb b/recipes/ti/ti-cgt6x_6.0.22.bb
index b73e9510d1..eaa27563db 100644
--- a/recipes/ti/ti-cgt6x_6.0.22.bb
+++ b/recipes/ti/ti-cgt6x_6.0.22.bb
@@ -3,7 +3,6 @@ require ti-cgt6x.inc
 PE = "1"
 PV = "6_0_22"
 PVwithdots = "6.0.22"
-PR = "r1"
 
 SRC_URI[cgt6xbin.md5sum] = "4d447ee431a46052612efd8c767321dd"
 SRC_URI[cgt6xbin.sha256sum] = "15022caee83ad27c81a57f13dab4dfc551868876475847ae7a9316ed83782f78"
diff --git a/recipes/ti/ti-cgt6x_6.0.23.bb b/recipes/ti/ti-cgt6x_6.0.23.bb
index 5b46176ccd..64be058da1 100644
--- a/recipes/ti/ti-cgt6x_6.0.23.bb
+++ b/recipes/ti/ti-cgt6x_6.0.23.bb
@@ -3,7 +3,6 @@ require ti-cgt6x.inc
 PE = "1"
 PV = "6_0_23"
 PVwithdots = "6.0.23"
-PR = "r1"
 
 SRC_URI[cgt6xbin.md5sum] = "5cf2098a6ed87997092c353e37421ad2"
 SRC_URI[cgt6xbin.sha256sum] = "146cc77fb748237672b18d51cb54897500040ba2df4f24d357f4ee10c17177c7"
diff --git a/recipes/ti/ti-cgt6x_6.1.11.bb b/recipes/ti/ti-cgt6x_6.1.11.bb
index a18a53d734..e1a6be9a77 100644
--- a/recipes/ti/ti-cgt6x_6.1.11.bb
+++ b/recipes/ti/ti-cgt6x_6.1.11.bb
@@ -3,7 +3,6 @@ require ti-cgt6x.inc
 PE = "1"
 PV = "6_1_11"
 PVwithdots = "6.1.11"
-PR = "r1"
 
 SRC_URI[cgt6xbin.md5sum] = "d6d2184b5b661eceafca779bbc3204af"
 SRC_URI[cgt6xbin.sha256sum] = "4afb632e410702410a9ef25124b34d872909747f3aba128be7b6c65c9d6bb371"
diff --git a/recipes/ti/ti-cgt6x_6.1.12.bb b/recipes/ti/ti-cgt6x_6.1.12.bb
index 3deb79f51f..5987ccf493 100644
--- a/recipes/ti/ti-cgt6x_6.1.12.bb
+++ b/recipes/ti/ti-cgt6x_6.1.12.bb
@@ -3,7 +3,6 @@ require ti-cgt6x.inc
 PE = "1"
 PV = "6_1_12"
 PVwithdots = "6.1.12"
-PR = "r1"
 
 SRC_URI[cgt6xbin.md5sum] = "c97691d0d5ced3b9deb5f643475c74c8"
 SRC_URI[cgt6xbin.sha256sum] = "5cf5e89fecfeab1b3f97dfb4ade80a333082dc59295dfb167ec4b8b90d214d6d"
diff --git a/recipes/ti/ti-cgt6x_6.1.13.bb b/recipes/ti/ti-cgt6x_6.1.13.bb
index dfb9291e54..5d889d4f98 100644
--- a/recipes/ti/ti-cgt6x_6.1.13.bb
+++ b/recipes/ti/ti-cgt6x_6.1.13.bb
@@ -3,7 +3,6 @@ require ti-cgt6x.inc
 PE = "1"
 PV = "6_1_13"
 PVwithdots = "6.1.13"
-PR = "r1"
 
 SRC_URI[cgt6xbin.md5sum] = "3556466b571cf69630a55632d0436636"
 SRC_URI[cgt6xbin.sha256sum] = "3c5d45254f99797419d5b3aeb165cf42ad6a1230cce6c8f95ddc3d124c084853"
diff --git a/recipes/ti/ti-cgt6x_6.1.9.bb b/recipes/ti/ti-cgt6x_6.1.9.bb
index 772f9b1924..bec2d6da8e 100644
--- a/recipes/ti/ti-cgt6x_6.1.9.bb
+++ b/recipes/ti/ti-cgt6x_6.1.9.bb
@@ -3,7 +3,6 @@ require ti-cgt6x.inc
 PE = "1"
 PV = "6_1_9"
 PVwithdots = "6.1.9"
-PR = "r1"
 
 SRC_URI[cgt6xbin.md5sum] = "8354845032c0ce8e3da3f250505d0e21"
 SRC_URI[cgt6xbin.sha256sum] = "da26d02c1b98b95343f19ea273b3536beddd94feb2a773a6cb66efebfdff35c0"
diff --git a/recipes/ti/ti-dspbios.inc b/recipes/ti/ti-dspbios.inc
index d31a91c90f..8213e8537d 100644
--- a/recipes/ti/ti-dspbios.inc
+++ b/recipes/ti/ti-dspbios.inc
@@ -5,6 +5,8 @@ require ti-paths.inc
 require ti-staging.inc
 require ti-eula-unpack.inc
 
+PR = "r1"
+
 S = "${WORKDIR}/bios_${PV}"
 
 SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/bios/dspbios/${PV}/exports/bios_setuplinux_${PV}.bin;name=biosbin"
diff --git a/recipes/ti/ti-framework-components.inc b/recipes/ti/ti-framework-components.inc
index cfcfe673c2..5f6be00e92 100644
--- a/recipes/ti/ti-framework-components.inc
+++ b/recipes/ti/ti-framework-components.inc
@@ -4,6 +4,8 @@ HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/f
 require ti-paths.inc
 require ti-staging.inc
 
+PR = "r1"
+
 S = "${WORKDIR}/framework_components_${PV}"
 
 SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/fc/${PV}/exports/framework_components_${PV},lite.tar.gz;name=fctarball"
diff --git a/recipes/ti/ti-multimedia-common.inc b/recipes/ti/ti-multimedia-common.inc
index 94ffcf9209..dab27a93a8 100644
--- a/recipes/ti/ti-multimedia-common.inc
+++ b/recipes/ti/ti-multimedia-common.inc
@@ -16,12 +16,12 @@ export LINUXLIBS_INSTALL_DIR  = "${STAGING_DIR_HOST}/usr"
 export LINUXKERNEL_INSTALL_DIR = "${STAGING_KERNEL_DIR}"
 
 # This is where do_install will put it
-export CODEGEN_INSTALL_DIR_RECIPE    = "${installdir}/ti-cgt6x"
-export XDC_INSTALL_DIR_RECIPE        = "${installdir}/ti-xdctools"
-export XDAIS_INSTALL_DIR_RECIPE      = "${installdir}/ti-xdais"
-export BIOS_INSTALL_DIR_RECIPE       = "${installdir}/ti-dspbios"
-export BIOSUTILS_INSTALL_DIR_RECIPE  = "${installdir}/ti-biosutils"
-export FC_INSTALL_DIR_RECIPE         = "${installdir}/ti-framework-components"
+export CODEGEN_INSTALL_DIR_RECIPE    = "${installdir}/ti-cgt6x-tree"
+export XDC_INSTALL_DIR_RECIPE        = "${installdir}/ti-xdctools-tree"
+export XDAIS_INSTALL_DIR_RECIPE      = "${installdir}/ti-xdais-tree"
+export BIOS_INSTALL_DIR_RECIPE       = "${installdir}/ti-dspbios-tree"
+export BIOSUTILS_INSTALL_DIR_RECIPE  = "${installdir}/ti-biosutils-tree"
+export FC_INSTALL_DIR_RECIPE         = "${installdir}/ti-framework-components-tree"
 
 export CE_INSTALL_DIR_RECIPE         = "${installdir}/ti-codec-engine-tree"
 export EDMA3_LLD_INSTALL_DIR_RECIPE  = "${installdir}/ti-edma3lld-tree"
diff --git a/recipes/ti/ti-xdais.inc b/recipes/ti/ti-xdais.inc
index ae0ad59529..29f0e37ff9 100644
--- a/recipes/ti/ti-xdais.inc
+++ b/recipes/ti/ti-xdais.inc
@@ -4,6 +4,8 @@ HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/x
 require ti-paths.inc
 require ti-staging.inc
 
+PR = "r1"
+
 S = "${WORKDIR}/xdais_${PV}"
 
 SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/xdais/${PV}/exports/xdais_${PV}.tar.gz;name=xdaisgz"
diff --git a/recipes/ti/ti-xdctools.inc b/recipes/ti/ti-xdctools.inc
index 2e214b4d6e..253d3b671f 100644
--- a/recipes/ti/ti-xdctools.inc
+++ b/recipes/ti/ti-xdctools.inc
@@ -1,6 +1,8 @@
 DESCRIPTION = "TI XDCtools (RTSC - Real Time Software Components - http://rtsc.eclipse.org)"
 HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc"
 
+PR = "r1"
+
 require ti-paths.inc
 require ti-staging.inc
 require ti-eula-unpack.inc