From: schon <schon@dev03-server>
Date: Mon, 19 Jul 2010 06:49:32 +0000 (+0900)
Subject: Merge branch 'vuplus-1.6' of ssh://192.168.102.66/~ikseong/work/repo/openembedded... 
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openembedded;a=commitdiff_plain;h=dd83ba60c962e25950a1673ee845d7e6a00d3c29;hp=-c

Merge branch 'vuplus-1.6' of ssh://192.168.102.66/~ikseong/work/repo/openembedded into vuplus-1.6

Conflicts:
	recipes/vuplus/vuplus-dvb-modules.bb
---

dd83ba60c962e25950a1673ee845d7e6a00d3c29
diff --combined recipes/vuplus/vuplus-dvb-modules.bb
index 95e1f25,af49857..3bda117
--- a/recipes/vuplus/vuplus-dvb-modules.bb
+++ b/recipes/vuplus/vuplus-dvb-modules.bb
@@@ -16,16 -16,15 +16,16 @@@ PV_bm750 = "${KV}
  PV_vusolo = "${KV}"
  
  
- SRCDATE_bm750 = "20100716"
- SRCDATE_vusolo = "20100716"
+ SRCDATE_bm750 = "20100719"
+ SRCDATE_vusolo = "20100719"
  
  
  RDEPENDS = "initscripts-vuplus kernel (${KV}) kernel-module-firmware-class kernel-module-input kernel-module-evdev kernel-module-i2c-core kernel-module-snd kernel-module-snd-pcm"
  PR = "r19-${SRCDATE}"
  
  
 -SRC_URI = "http://archive.vuplus.com/download/drivers/mbox-dvb-modules-${MACHINE}-${PV}-${SRCDATE}.tar.gz "
 +#SRC_URI = "http://archive.vuplus.com/download/drivers/mbox-dvb-modules-${MACHINE}-${PV}-${SRCDATE}.tar.gz "
 +SRC_URI = "http://archive.vuplus.com/download/drivers_test/mbox-dvb-modules-${MACHINE}-${PV}-${SRCDATE}.tar.gz "
  
  S = "${WORKDIR}"