Merge remote-tracking branch 'OE-2.1/master' into vuplus-3.0

[vuplus_openvuplus_3.0] / meta-openvuplus / recipes-vuplus / tuxbox / tuxbox-common.bb

diff --git a/meta-openvuplus/recipes-vuplus/tuxbox/tuxbox-common.bb b/meta-openvuplus/recipes-vuplus/tuxbox/tuxbox-common.bb
index eb45d65..e6a4f37 100644 (file)
--- a/meta-openvuplus/recipes-vuplus/tuxbox/tuxbox-common.bb
+++ b/meta-openvuplus/recipes-vuplus/tuxbox/tuxbox-common.bb
@@ -4,17 +4,15 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=80
 MAINTAINER = "Felix Domke <tmbinc@elitdvb.net>"
 
 PN = "tuxbox-common"
-PR = "r3"
-SRCDATE = "20090305"
-PV = "0.0+cvs${SRCDATE}"
+PR = "r6"
 
-SRC_URI = "cvs://anoncvs@cvs.tuxbox.org/cvs/tuxbox/;module=cdk/root/share/tuxbox;method=ext;tag=dreambox;date=${SRCDATE} \
-       http://dreamboxupdate.com/download/opendreambox/tuxbox-common-r11.tar.gz \
-       file://satellites_20120206.patch;patch=1;pnum=0"
+SRC_REV = "12436bfb31dafdc4c73bc4bb5d4cb39a0855c95e"
+
+SRC_URI = "git://code.vuplus.com/git/dvbapp-meta.git;protocol=git;tag=${SRC_REV} "
 
 FILES_${PN} = "/"
 
-S = "${WORKDIR}/tuxbox-common-r11"
+S = "${WORKDIR}/git"
 
 TRANSPONDER_LISTS = "satellites.xml terrestrial.xml"
 
@@ -27,7 +25,7 @@ do_install() {
        ln -sf /usr/share ${D}/share
 
        for i in ${TRANSPONDER_LISTS}; do
-               install -m 0644 ${WORKDIR}/tuxbox/$i ${D}/etc/tuxbox/$i
+               install -m 0644 ${S}/$i ${D}/etc/tuxbox/$i
                ln -sf /etc/tuxbox/$i ${D}/etc/;
                ln -sf /etc/tuxbox/$i ${D}/usr/share/;
                ln -sf /etc/tuxbox/$i ${D}/usr/share/tuxbox/;