[oe-commits] Koen Kooi : dsplink: stage into machine staging dir

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: aee65cb58f3b7ee540c78b3cd252a092a03dca4f
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=aee65cb58f3b7ee540c78b3cd252a092a03dca4f

Author: Koen Kooi <koen at openembedded.org>
Date:   Thu Oct 23 09:03:08 2008 +0200

dsplink: stage into machine staging dir
codec-engine: adjust path to dsplink staging

---

 packages/dsplink/codec-engine_2.21.bb  |    2 +-
 packages/dsplink/dsplink.inc           |    7 ++++---
 packages/dsplink/dsplink_1.60.00.04.bb |    4 +---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/dsplink/codec-engine_2.21.bb b/packages/dsplink/codec-engine_2.21.bb
index 3622a9c..b6bf673 100644
--- a/packages/dsplink/codec-engine_2.21.bb
+++ b/packages/dsplink/codec-engine_2.21.bb
@@ -54,7 +54,7 @@ do_compile() {
 	
 	sed -i -e s:/db/toolsrc/library/tools/vendors/mvl/arm/omap3/OMAP35x_SDK_0.9.7/src/linux/kernel_org/2.6_kernel:${STAGING_KERNEL_DIR}:g \
            -e s:/db/toolsrc/library/tools/vendors/cs/arm/arm-2007q3/bin/arm-none-linux-gnueabi-:${TARGET_PREFIX}:g \
-           -e s:/db/atree/library/trees/power/power-d02x/imports:${STAGING_DIR_TARGET}:g \
+           -e s:/db/atree/library/trees/power/power-d02x/imports:${STAGING_DIR}/${MULTIMACH_TARGET_SYS}:g \
         Makefile
 
 	oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR}   \
diff --git a/packages/dsplink/dsplink.inc b/packages/dsplink/dsplink.inc
index 7c8d5c8..5253f00 100644
--- a/packages/dsplink/dsplink.inc
+++ b/packages/dsplink/dsplink.inc
@@ -6,7 +6,7 @@ RRECOMMENDS_${PN} = "${PN}-module"
 
 inherit module
 
-S = "${WORKDIR}/dsplink_1_50/dsplink"
+S = "${WORKDIR}/dsplink_1_60/dsplink"
 
 # Needed for buildscripts
 export DSPLINK = "${S}"
@@ -92,9 +92,10 @@ do_install () {
 }
 
 
+# Coded Engine and friends need a complete tree, so stage it all
 do_stage() {
-	install -d ${STAGING_DIR_TARGET}/dsplink
-	cp -pPr ${S}/* ${STAGING_DIR_TARGET}/dsplink/ 
+	install -d ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/dsplink
+	cp -pPr ${S}/* ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/dsplink/ 
 }
 
 pkg_postinst_${PN}-module () {
diff --git a/packages/dsplink/dsplink_1.60.00.04.bb b/packages/dsplink/dsplink_1.60.00.04.bb
index b15e602..d5f3e97 100644
--- a/packages/dsplink/dsplink_1.60.00.04.bb
+++ b/packages/dsplink/dsplink_1.60.00.04.bb
@@ -1,9 +1,7 @@
 require dsplink.inc
 
-DEFAULT_PREFERENCE_armv7a = "1"
-
 # The tconf tool breaks if there is a '.' in your pwd
-PR = "r1"
+PR = "r2"
 PE = "1"
 PV = "160"