Change FEED URI and some fixes

Update driver

diff --git a/conf/distro/vuplus.conf b/conf/distro/vuplus.conf
index 7854c87..7ef79b7 100644 (file)
--- a/conf/distro/vuplus.conf
+++ b/conf/distro/vuplus.conf
@@ -10,7 +10,7 @@ INHERIT += "package_ipk debian"
 
 DISTRO = "vuplus"
 DISTRO_NAME = "Vuplus"
-DISTRO_VERSION = "2.0.5"
+DISTRO_VERSION = "2.0.6"
 
 
 TARGET_OS = "linux"
@@ -39,7 +39,7 @@ IMAGE_FSTYPES ?= "tar.bz2 jffs2"
 
 #2.8
 #FEED_URIS += "official##http://archive.vuplus.com/openembedded/1.1/vuplus/${MACHINE}/feeds/stable"
-DISTRO_FEED_URI = "http://archive.vuplus.com/openembedded/${DISTRO_VERSION}/vuplus/${MACHINE}/feeds/stable"
+DISTRO_FEED_URI = "http://archive.vuplus.com/openembedded/${DISTRO_VERSION}/vuplus/feeds/stable"
 
 # If we're using an .ipk based rootfs, we want to have opkg-nogpg installed so postinst script can run
 IPKG_VARIANT = "opkg-nogpg"

diff --git a/recipes/enigma2/enigma2-plugins.bb b/recipes/enigma2/enigma2-plugins.bb
index 5bec9de..2f3e50b 100755 (executable)
--- a/recipes/enigma2/enigma2-plugins.bb
+++ b/recipes/enigma2/enigma2-plugins.bb
@@ -4,12 +4,13 @@ MAINTAINER = "Felix Domke <tmbinc@elitedvb.net>"
 PACKAGES_DYNAMIC = "enigma2-plugin-*"
 
 # if you want experimental, use:
-SRCREV="87fd2f1120962f553ecb1a88bbee46ed821df975"
+#SRCREV="87fd2f1120962f553ecb1a88bbee46ed821df975"
+SRCREV="c8fc96e8e51e1ef71e1709f9dd6f733007f9463e"
 SRCDATE="20110215"
 BRANCH="master"
 PV = "experimental-git${SRCDATE}"
 
-PR = "r0"
+PR = "r1"
 SRC_URI="git://schwerkraft.elitedvb.net/enigma2-plugins/enigma2-plugins.git;protocol=git;branch=${BRANCH};tag=${SRCREV}"
 
 EXTRA_OECONF = " \

diff --git a/recipes/enigma2/enigma2-plugins/vuplus/dreamboxweb.png b/recipes/enigma2/enigma2-plugins/vuplus/dreamboxweb.png
index 129934b..9a2c570 100755 (executable)
Binary files a/recipes/enigma2/enigma2-plugins/vuplus/dreamboxweb.png and b/recipes/enigma2/enigma2-plugins/vuplus/dreamboxweb.png differ

diff --git a/recipes/enigma2/enigma2-plugins/vuplus/enigma2_plugins_webinterface_tpm.patch b/recipes/enigma2/enigma2-plugins/vuplus/enigma2_plugins_webinterface_tpm.patch
index 2f70f20..918f74f 100644 (file)
--- a/recipes/enigma2/enigma2-plugins/vuplus/enigma2_plugins_webinterface_tpm.patch
+++ b/recipes/enigma2/enigma2-plugins/vuplus/enigma2_plugins_webinterface_tpm.patch
@@ -7,7 +7,7 @@ index cbf42f8..caebbb0 100644
  #===============================================================================
  def startServerInstance(session, ipaddress, port, useauth=False, l2k=None, usessl=False):
 -      if hw.get_device_name().lower() != "dm7025":
-+      if hw.get_device_name().lower() != "dm500hd":
++      if 0:
                l3k = None              
                l3c = tpm.getCert(eTPM.TPMD_DT_LEVEL3_CERT)
                
@@ -16,7 +16,7 @@ index cbf42f8..caebbb0 100644
        l2r = False
        l2k = None
 -      if hw.get_device_name().lower() != "dm7025":            
-+      if hw.get_device_name().lower() != "dm500hd":           
++      if 0:           
                l2c = tpm.getCert(eTPM.TPMD_DT_LEVEL2_CERT)
                
                if l2c is None:
@@ -25,7 +25,7 @@ index cbf42f8..caebbb0 100644
        l2r = False
        l2k = None
 -      if hw.get_device_name().lower() != "dm7025":            
-+      if hw.get_device_name().lower() != "dm500hd":           
++      if 0:           
                l2c = tpm.getCert(eTPM.TPMD_DT_LEVEL2_CERT)
                
                if l2c is None:

diff --git a/recipes/vuplus/vuplus-dvb-modules.bb b/recipes/vuplus/vuplus-dvb-modules.bb
index af5323a..c47c167 100755 (executable)
--- a/recipes/vuplus/vuplus-dvb-modules.bb
+++ b/recipes/vuplus/vuplus-dvb-modules.bb
@@ -17,15 +17,10 @@ PV_vusolo = "${KV}"
 PV_vuuno = "${KV}"
 PV_vuultimo = "${KV}"
 
-SRCDATE_bm750 = "20110321"
-SRCDATE_vusolo = "20110321"
-SRCDATE_vuuno = "20110404"
-SRCDATE_vuultimo = "20110404"
-
-CHIPSET_bm750 = "7335"
-CHIPSET_vusolo = "7325"
-CHIPSET_vuuno = "7413"
-CHIPSET_vuultimo = "7413"
+SRCDATE_bm750 = "20110421"
+SRCDATE_vusolo = "20110421"
+SRCDATE_vuuno = "20110421"
+SRCDATE_vuultimo = "20110421"
 
 
 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"
@@ -36,10 +31,10 @@ DEPENDS = " module-init-tools"
 RDEPENDS_append_vuplus = " module-init-tools-depmod"
 
 
-SRC_URI = "http://archive.vuplus.com/download/drivers/mbox-dvb-modules-${MACHINE}-${PV}-${PREFERRED_GCC_VERSION}-${SRCDATE}.tar.gz "
+SRC_URI = "http://archive.vuplus.com/download/drivers/vuplus-dvb-modules-${MACHINE}-${PV}-${PREFERRED_GCC_VERSION}-${SRCDATE}.tar.gz "
 
-SRC_URI_vuuno = "http://archive.vuplus.com/download/drivers/beta/vuplus-dvb-modules-${CHIPSET}-${PV}-${PREFERRED_GCC_VERSION}-${SRCDATE}.tar.gz "
-SRC_URI_vuultimo = "http://archive.vuplus.com/download/drivers/beta/vuplus-dvb-modules-${CHIPSET}-${PV}-${PREFERRED_GCC_VERSION}-${SRCDATE}.tar.gz "
+SRC_URI_vuuno = "http://archive.vuplus.com/download/drivers/beta/vuplus-dvb-modules-${MACHINE}-${PV}-${PREFERRED_GCC_VERSION}-${SRCDATE}.tar.gz "
+SRC_URI_vuultimo = "http://archive.vuplus.com/download/drivers/beta/vuplus-dvb-modules-${MACHINE}-${PV}-${PREFERRED_GCC_VERSION}-${SRCDATE}.tar.gz "
 
 S = "${WORKDIR}"
 

diff --git a/recipes/vuplus/vuplus-feed-configs.bb b/recipes/vuplus/vuplus-feed-configs.bb
index d1ab9f3..b05d7d6 100644 (file)
--- a/recipes/vuplus/vuplus-feed-configs.bb
+++ b/recipes/vuplus/vuplus-feed-configs.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "Configuration files for online package repositories aka feeds"
-PR = "r4"
+PR = "r5"
 
 DISTRO_FEED_PREFIX ?= "official"
-DISTRO_FEED_URI ?= "http://archive.vuplus.com/openembedded/${DISTRO_VERSION}/vuplus/${MACHINE}/feeds/stable"
+DISTRO_FEED_URI ?= "http://archive.vuplus.com/openembedded/${DISTRO_VERSION}/vuplus/feeds/stable"
 
 do_compile() {
     mkdir -p ${S}/${sysconfdir}/opkg