ti-codec-engine, ti-dsplink-module: convert to new style staging

* bundle complete trees into -sdk packages
* blacklist said -sdk package in the angstrom package uploader

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

6 files changed, 17 insertions, 13 deletions

diff --git a/contrib/angstrom/upload-packages.sh b/contrib/angstrom/upload-packages.sh
index 20c1187144..0225875a22 100644
--- a/contrib/angstrom/upload-packages.sh
+++ b/contrib/angstrom/upload-packages.sh
@@ -32,6 +32,7 @@ cat files-remote files-local | sort | uniq -u >files-uniq
 cat files-uniq files-local | sort | uniq -d > files-trans
 
 rm -f upload-queue/bigbuck* 
+rm -f upload-queue/ti*-sdk*
 
 # Copy over non-duplicate files
 echo "Starting rsync..."
diff --git a/recipes/ti/ti-codec-engine.inc b/recipes/ti/ti-codec-engine.inc
index bb9466419d..3134d6b5f6 100644
--- a/recipes/ti/ti-codec-engine.inc
+++ b/recipes/ti/ti-codec-engine.inc
@@ -110,15 +110,13 @@ do_install() {
 		fi
 		}
 	done
-}
-
 
-# We can't use CE_INSTALL_DIR directly since we redefined it earlier on
-do_stage() {
-    install -d ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${CE_INSTALL_DIR_RECIPE}
-    cp -pPrf ${S}/* ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${CE_INSTALL_DIR_RECIPE}
+    # Stage the complete tree as well
+    install -d ${D}${CE_INSTALL_DIR_RECIPE}
+    cp -pPrf ${S}/* ${D}${CE_INSTALL_DIR_RECIPE}
 }
 
+require ti-staging.inc
 
 RDEPENDS_ti-codec-engine-apps = "ti-cmem-module"
 RDEPENDS_append_dm6446   = " ti-dsplink-module"
@@ -126,7 +124,6 @@ RDEPENDS_append_omap3    = " ti-dsplink-module"
 RDEPENDS_append_omapl138 = " ti-dsplink-module"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-INHIBIT_PACKAGE_STRIP = "1"
 PACKAGES += "ti-codec-engine-apps"
 FILES_ti-codec-engine-apps = "${installdir}/codec-engine-apps/*"
 INSANE_SKIP_ti-codec-engine-apps = True
diff --git a/recipes/ti/ti-codec-engine_2.25.01.06.bb b/recipes/ti/ti-codec-engine_2.25.01.06.bb
index ddf18ffdc8..47a1bfa2c3 100644
--- a/recipes/ti/ti-codec-engine_2.25.01.06.bb
+++ b/recipes/ti/ti-codec-engine_2.25.01.06.bb
@@ -8,6 +8,7 @@ DEFAULT_PREFERENCE_dm6467 = "1"
 
 # tconf from xdctools dislikes '.' in pwd :/
 PV = "2_25_01_06"
+PR = "r1"
 
 # Full-CE
 #SRC_URI[cetarball.md5sum] = "729ede0fd24210d3c5439511fa859d51"
diff --git a/recipes/ti/ti-dsplink-module.inc b/recipes/ti/ti-dsplink-module.inc
index a6ce5739cf..e62174fdd7 100644
--- a/recipes/ti/ti-dsplink-module.inc
+++ b/recipes/ti/ti-dsplink-module.inc
@@ -152,14 +152,13 @@ do_install () {
     # DSPLINK test app module un/load scripts
     install ${WORKDIR}/loadmodules-ti-dsplink-apps.sh ${D}/${installdir}/dsplink/apps
     install ${WORKDIR}/unloadmodules-ti-dsplink-apps.sh ${D}/${installdir}/dsplink/apps
+    
+    # install the complete tree as well
+    install -d ${D}${LINK_INSTALL_DIR_RECIPE}
+    cp -pPrf ${S}/* ${D}${LINK_INSTALL_DIR_RECIPE}
 }
 
-do_stage () {
-    install -d ${LINK_INSTALL_DIR}
-    cp -pPrf ${S}/* ${LINK_INSTALL_DIR}
-}
-
-INHIBIT_PACKAGE_STRIP = "1"
+require ti-staging.inc
 
 PACKAGES += " ti-dsplink-apps" 
 FILES_ti-dsplink-apps = "${installdir}/dsplink/*"
diff --git a/recipes/ti/ti-dsplink-module_1.64.bb b/recipes/ti/ti-dsplink-module_1.64.bb
index 6b10b93cde..0fa92d9ed2 100644
--- a/recipes/ti/ti-dsplink-module_1.64.bb
+++ b/recipes/ti/ti-dsplink-module_1.64.bb
@@ -10,6 +10,8 @@ SRC_URI[dsplinktarball.sha256sum] = "32b6fbae2b61f5f71ab3eae9d2f5ad6b75d682ad8bd
 # tconf from xdctools dislikes '.' in pwd :/
 PE = "1"
 PV = "1_64"
+PR_append = "a"
+
 S = "${WORKDIR}/dsplink_linux_${PV}"
 
 # Cheat a bit with includes
diff --git a/recipes/ti/ti-staging.inc b/recipes/ti/ti-staging.inc
index 4e0ddfa515..726c0d455f 100644
--- a/recipes/ti/ti-staging.inc
+++ b/recipes/ti/ti-staging.inc
@@ -2,3 +2,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 BASEPKG_HOST_SYS = "${MULTIMACH_HOST_SYS}"
 INHIBIT_PACKAGE_STRIP = "1"
 
+PACKAGES =+ "${PN}-sdk"
+FILES_${PN}-sdk = "${installdir}/*-tree"
+INSANE_SKIP_${PN}-sdk = "True"
+