From: Koen Kooi <koen@openembedded.org>
Date: Thu, 11 Dec 2008 11:11:09 +0000 (+0100)
Subject: dsplink: start adding tweaks to build against a post-header move kernel as well
X-Git-Tag: Release-2010-05/1~4792
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97018bfcf611bc5b4892fdb5d8b87051cb199ab1;p=openembedded.git

dsplink: start adding tweaks to build against a post-header move kernel as well
---

diff --git a/packages/dsplink/dsplink-module_1.60.bb b/packages/dsplink/dsplink-module_1.60.bb
index 4b9051a693..3cfdf308bd 100644
--- a/packages/dsplink/dsplink-module_1.60.bb
+++ b/packages/dsplink/dsplink-module_1.60.bb
@@ -26,6 +26,11 @@ do_configure() {
     
 	mkdir -p ${S}/dsplink-kbuild-test
     cp ${WORKDIR}/Makefile-dsplink-kbuild  ${S}/dsplink-kbuild-test/Makefile
+
+    if [ $(echo ${KERNEL_VERSION} | cut -c5,6) -gt 26 ] ; then
+        sed -i -e s:asm/semaphore:linux/semaphore: ${S}/gpp/src/osal/Linux/user.c
+        sed -i -e s:asm/semaphore:linux/semaphore: ${S}/gpp/src/osal/Linux/2.6.18/sync.c
+    fi
 }
 
 do_compile_prepend() {
diff --git a/packages/dsplink/dsplink.inc b/packages/dsplink/dsplink.inc
index 506b34b21a..bae948c2fd 100644
--- a/packages/dsplink/dsplink.inc
+++ b/packages/dsplink/dsplink.inc
@@ -19,6 +19,11 @@ do_configure () {
 	cd ${DSPLINK}
 	perl config/bin/dsplinkcfg.pl --platform=${DSPLINKPLATFORM} --nodsp=1 --dspcfg_0=${DSPCFG} --dspos_0=DSPBIOS5XX  --gppos=${GPPOS} --comps=ponslrm
 	)
+
+	if [ $(echo ${KERNEL_VERSION} | cut -c5,6) -gt 26 ] ; then
+		sed -i -e s:asm/semaphore:linux/semaphore: ${S}/gpp/src/osal/Linux/user.c
+		sed -i -e s:asm/semaphore:linux/semaphore: ${S}/gpp/src/osal/Linux/2.6.18/sync.c
+	fi
 }
 
 PARALLEL_MAKE = ""
diff --git a/packages/dsplink/lpm.inc b/packages/dsplink/lpm.inc
index 7938268c52..ed8d868462 100644
--- a/packages/dsplink/lpm.inc
+++ b/packages/dsplink/lpm.inc
@@ -32,6 +32,7 @@ do_compile_append() {
 do_install() {
 		install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp
 		cp ${S}/cetools/packages/ti/bios/power/${DSPPOWERSOC}/lpm/*.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp || true
+        cp ${S}/cetools/packages/ti/bios/power/modules/${DSPPOWERSOC}/lpm/*.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp || true
 }
 
 INHIBIT_PACKAGE_STRIP = "1"