Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

5 files changed, 17 insertions, 5 deletions

diff --git a/recipes/dsplink/gstreamer-ti_svn.bb b/recipes/dsplink/gstreamer-ti_svn.bb
index 6944ad59b8..f3eb7dd01b 100644
--- a/recipes/dsplink/gstreamer-ti_svn.bb
+++ b/recipes/dsplink/gstreamer-ti_svn.bb
@@ -2,7 +2,7 @@ DEPENDS = "ti-codec-engine ti-dmai gstreamer gst-plugins-base gst-plugins-good g
 
 SRC_URI = "svn://gforge.ti.com/svn/gstreamer_ti/trunk;module=gstreamer_ti;proto=https;user=anonymous;pswd='' \
           "
-SRCREV = "160"
+SRCREV = "177"
 
 PR = "${MACHINE_KERNEL_PR}"
 
diff --git a/recipes/dsplink/ti-codec-engine_2.21.bb b/recipes/dsplink/ti-codec-engine_2.21.bb
index f0b0d7e1ce..d0cd18e8e9 100644
--- a/recipes/dsplink/ti-codec-engine_2.21.bb
+++ b/recipes/dsplink/ti-codec-engine_2.21.bb
@@ -1,5 +1,9 @@
 require dsplink.inc
 
+INSANE_SKIP_ti-codec-engine-apps = True
+INSANE_SKIP_ti-dsplink-apps = True
+INSANE_SKIP_${PN} = True
+
 DESCRIPTION = "Codec Engine for TI ARM/DSP processors"
 
 DEPENDS = "virtual/kernel perl-native"
diff --git a/recipes/dsplink/ti-codec-engine_2.23.bb b/recipes/dsplink/ti-codec-engine_2.23.bb
index bbf54d4ff9..842dfa0846 100644
--- a/recipes/dsplink/ti-codec-engine_2.23.bb
+++ b/recipes/dsplink/ti-codec-engine_2.23.bb
@@ -3,6 +3,10 @@ DESCRIPTION = "Codec Engine for TI ARM/DSP processors"
 DEPENDS = "virtual/kernel perl-native"
 RDEPENDS = "update-modules"
 
+INSANE_SKIP_ti-codec-engine-apps = True
+INSANE_SKIP_ti-dsplink-apps = True
+INSANE_SKIP_${PN} = True
+
 inherit module
 
 # disable this package for now, while we're in test mode
diff --git a/recipes/dsplink/ti-dmai_svn.bb b/recipes/dsplink/ti-dmai_svn.bb
index ed9cc01a50..9b0919ef82 100644
--- a/recipes/dsplink/ti-dmai_svn.bb
+++ b/recipes/dsplink/ti-dmai_svn.bb
@@ -6,6 +6,9 @@ inherit module-base
 
 require ti-paths.inc
 
+INSANE_SKIP_${PN} = True
+INSANE_SKIP_${PN}-apps = True
+
 SRC_URI = "svn://gforge.ti.com/svn/dmai/branches;module=BRIJESH_GIT_022309;proto=https;user=anonymous;pswd='' \
 	   file://dmai-built-with-angstrom.patch;patch=1 \
            file://loadmodules-ti-dmai-apps.sh \
diff --git a/recipes/linux/linux-msm7xxxx_git.bb b/recipes/linux/linux-msm7xxxx_git.bb
index 33a0652dfb..0f65ff37df 100644
--- a/recipes/linux/linux-msm7xxxx_git.bb
+++ b/recipes/linux/linux-msm7xxxx_git.bb
@@ -3,14 +3,14 @@ require linux.inc
 PV = "2.6.25+${PR}+gitr${SRCREV}"
 PV_htcraphael = "2.6.27+${PR}+gitr${SRCREV}"
 PV_htcdiamond = "2.6.27+${PR}+gitr${SRCREV}"
-PR = "r8"
+PR = "r13"
 
 COMPATIBLE_MACHINE = "htckaiser|htcpolaris|htcvogue|htctitan|htcnike|htcraphael|htcdiamond|htcblackstone"
 
 SRCREV = "d2fc2471ba384dabad1c9a4126e2e2372349d34c"
-SRCREV_htcraphael = "1e936f767872234a9b299e209a5e33212de473fa"
-SRCREV_htcdiamond = "12008ce2c5c1ab657c46fdc6f6129ccf6730760a"
-SRCREV_htcblackstone = "12008ce2c5c1ab657c46fdc6f6129ccf6730760a"
+SRCREV_htcraphael = "905eb169a7d659c221aad5c38aac443065178c4c"
+SRCREV_htcdiamond = "905eb169a7d659c221aad5c38aac443065178c4c"
+SRCREV_htcblackstone = "905eb169a7d659c221aad5c38aac443065178c4c"
 
 SRC_BRANCH = "htc-vogue"
 SRC_BRANCH_htcraphael = "htc-msm-2.6.27"
@@ -21,4 +21,5 @@ SRC_URI = "\
   git://git.linuxtogo.org/home/groups/mobile-linux/kernel.git;branch=${SRC_BRANCH};protocol=git \
   file://defconfig \
 "
+
 S = "${WORKDIR}/git"