From: Koen Kooi <koen@openembedded.org>
Date: Thu, 15 May 2008 17:16:12 +0000 (+0000)
Subject: merge of '3b5a264cff607e4c4977e318dde1e861a664ad81'
X-Git-Tag: Release-2010-05/1~6939
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5384da8d9f6a9323eeb30b4110b1deb277f23912;p=openembedded.git

Merge ... '3b5a264cff607e4c4977e318dde1e861a664ad81'
     and '92366ccb09c8d809619c585c91fe69a2046e1396'
---

5384da8d9f6a9323eeb30b4110b1deb277f23912
diff --cc packages/dsplink/dsplink_1.50.bb
index a822cf1be4,1711fc5c29..9d0e1134d8
--- a/packages/dsplink/dsplink_1.50.bb
+++ b/packages/dsplink/dsplink_1.50.bb
@@@ -6,21 -4,24 +6,28 @@@ PR = "r0
  
  # Get dsplink tarball from TI website, place in sources and calculate
  # md5sum
- # https://www-a.ti.com/downloads/sds_support/targetcontent/link/index.html
+ # Look for tarball at https://www-a.ti.com/downloads/sds_support/targetcontent/link/index.html
+ 
  SRC_URI ="http://install.tarball.in.source.dir/dsplink_1_50.tar.gz \
+ file://CURRENTCFG.MK \
+ file://c64xx_5.xx_linux.mk \
+ file://davinci_mvlpro5.0.mk \
  "
  
 -S = "${WORKDIR}/dsplink_1_50"
 +S = "${WORKDIR}/dsplink_1_50/dsplink"
 +
 +# Needed for buildscripts
 +export DSPLINK = "${S}"
  
  do_configure () {
 -	cp ${WORKDIR}/CURRENTCFG.MK ${S}/dsplink/config
 -	cp ${WORKDIR}/davinci_mvlpro5.0.mk ${S}/dsplink/make/Linux
 -	cp ${WORKDIR}/c64xx_5.xx_linux.mk ${S}/dsplink/make/DspBios
++	cp ${WORKDIR}/CURRENTCFG.MK ${S}/config
++	cp ${WORKDIR}/davinci_mvlpro5.0.mk ${S}/make/Linux
++	cp ${WORKDIR}/c64xx_5.xx_linux.mk ${S}/make/DspBios
  }
  
  do_compile () {
- sh ${S}/etc/host/scripts/Linux/buildmodule.sh
 -	export DSPLINK=${S}/dsplink
+ 	make -C ${S}/dsplink/gpp/src
  }
  
 +PACKAGE_ARCH = "${MACHINE_ARCH}" 
 +