Merge branch 'vuplus-1.6k' of code.vuplus.com:/opt/repository/openembedded into vuplu...

[vuplus_openembedded] / recipes / tuxbox / tuxbox-common.bb

diff --git a/recipes/tuxbox/tuxbox-common.bb b/recipes/tuxbox/tuxbox-common.bb
index 3e3924c..5ddf985 100644 (file)
--- a/recipes/tuxbox/tuxbox-common.bb
+++ b/recipes/tuxbox/tuxbox-common.bb
@@ -3,17 +3,19 @@ LICENSE = "GPL"
 MAINTAINER = "Felix Domke <tmbinc@elitdvb.net>"
 
 PN = "tuxbox-common"
-PR = "r3"
-SRCDATE = "20090305"
-PV = "0.0+cvs${SRCDATE}"
+PR = "r4"
 
-SRC_URI = "cvs://anoncvs@cvs.tuxbox.org/cvs/tuxbox/;module=cdk/root/share/tuxbox;method=ext;tag=dreambox;date=${SRCDATE} \
+SRC_REV = "8ef7a7f5f5df5f77197ad279e24b0dc454b8210b"
+
+SRC_URI = "git://git.code.sf.net/p/tuxbox-cvs/cdk;protocol=git;tag=${SRC_REV} \
        http://dreamboxupdate.com/download/opendreambox/tuxbox-common-r11.tar.gz \
-       file://satellites_20120206.patch;patch=1;pnum=0"
+       file://satellites_20130124.patch;patch=1;pnum=1 \
+"
 
 FILES_${PN} = "/"
 
-S = "${WORKDIR}/tuxbox-common-r11"
+#S = "${WORKDIR}/tuxbox-common-r11 "
+S = "${WORKDIR}/git/root_dream/share"
 
 TRANSPONDER_LISTS = "satellites.xml terrestrial.xml"
 
@@ -27,15 +29,16 @@ do_install() {
        install -d ${D}/etc/rcS.d
        install -d ${D}/etc/tuxbox/
        install -d ${D}/usr/share/tuxbox
-       install -m 0644 ${S}/scart.conf ${D}/etc/tuxbox/scart.conf
+       install -m 0644 ${WORKDIR}/tuxbox-common-r11/scart.conf ${D}/etc/tuxbox/scart.conf
 
-       install -m 0644 ${S}/timezone.xml ${D}/etc/tuxbox/timezone.xml
+       install -m 0644 ${WORKDIR}/tuxbox-common-r11/timezone.xml ${D}/etc/tuxbox/timezone.xml
        ln -sf /etc/tuxbox/timezone.xml ${D}/etc/
 
        ln -sf /usr/share ${D}/share
 
+#              install -m 0644 ${WORKDIR}/tuxbox/$i ${D}/etc/tuxbox/$i
        for i in ${TRANSPONDER_LISTS}; do
-               install -m 0644 ${WORKDIR}/tuxbox/$i ${D}/etc/tuxbox/$i
+               install -m 0644 ${S}/tuxbox/$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/;