remove splash in duo2 for the time being.

fix various things

13 files changed, 33 insertions, 18 deletions

diff --git a/conf/machine/vuduo2.conf b/conf/machine/vuduo2.conf
index c44f372..0d77556 100644
--- a/conf/machine/vuduo2.conf
+++ b/conf/machine/vuduo2.conf
@@ -127,13 +127,14 @@ IMAGE_CMD_ubi_prepend = " \
         rm -f ${IMAGE_ROOTFS}/boot/splash_cfe_auto.bin; \
         "
 
+#	cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.splash_cfe_auto.bin ${DEPLOY_DIR_IMAGE}/vuplus/duo2/splash_cfe_auto.bin; \
+
 IMAGE_CMD_ubi_append = "; \
 	vfi3 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.boot.jffs2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmlinux.gz > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.nfi; \
         mkdir -p ${DEPLOY_DIR_IMAGE}/vuplus/duo2; \
         cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi ${DEPLOY_DIR_IMAGE}/vuplus/duo2/root_cfe_auto.bin; \
 	cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmlinux.gz ${DEPLOY_DIR_IMAGE}/vuplus/duo2/kernel_cfe_auto.bin; \
 	cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.initrd_cfe_auto.bin ${DEPLOY_DIR_IMAGE}/vuplus/duo2/initrd_cfe_auto.bin; \
-	cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.splash_cfe_auto.bin ${DEPLOY_DIR_IMAGE}/vuplus/duo2/splash_cfe_auto.bin; \
         cd ${DEPLOY_DIR_IMAGE}; \
 	zip ${IMAGE_NAME}_usb.zip vuplus/duo2/*; \
 	rm -rf vuplus; \ 
diff --git a/recipes/duo2lcd4linux/duo2lcd4linux_0.1.bb b/recipes/duo2lcd4linux/duo2lcd4linux_0.1.bb
index e95b4fc..fc57349 100644
--- a/recipes/duo2lcd4linux/duo2lcd4linux_0.1.bb
+++ b/recipes/duo2lcd4linux/duo2lcd4linux_0.1.bb
@@ -9,7 +9,7 @@ RDEPENDS = python-codecs python-datetime python-textutils python-imaging
 
 S = "${WORKDIR}/LCD4linux"
 
-PR = "r0"
+PR = "r1"
 
 do_install() {
         install -d  ${D}/usr/lib/enigma2/python/Plugins/Extensions/LCD4linux
diff --git a/recipes/enigma2/enigma2.bb b/recipes/enigma2/enigma2.bb
index 132d49f..0536358 100644
--- a/recipes/enigma2/enigma2.bb
+++ b/recipes/enigma2/enigma2.bb
@@ -121,7 +121,9 @@ SRCREV_vuplus = ""
 
 # enigma2_vuplus_mediaplayer.patch is for trick-play in media player
 
-SRC_URI = "git://code.vuplus.com/git/dvbapp.git;protocol=http;branch=${BRANCH};tag=${SRCREV} \
+#SRC_URI = "git://code.vuplus.com/git/dvbapp.git;protocol=http;branch=${BRANCH};tag=${SRCREV} \
+
+SRC_URI = "git://192.168.102.66/dvbapp_factory.git;protocol=http;branch=vuplus_experimental_factorytest \
            file://enigma2_vuplus_skin.patch;patch=1;pnum=1 \
            file://enigma2_vuplus_mediaplayer.patch;patch=1;pnum=1 \
 	   file://enigma2_vuplus_mediaplayer_subtitle.patch;patch=1;pnum=1 \
diff --git a/recipes/linux/linux-vuduo2-3.1.1/brcm_disable_enet1.patch b/recipes/linux/linux-vuduo2-3.1.1/brcm_disable_enet1.patch
index 6b9f24f..700c596 100644
--- a/recipes/linux/linux-vuduo2-3.1.1/brcm_disable_enet1.patch
+++ b/recipes/linux/linux-vuduo2-3.1.1/brcm_disable_enet1.patch
@@ -1,8 +1,8 @@
 diff --git a/arch/mips/brcmstb/Kconfig b/arch/mips/brcmstb/Kconfig
-index 6cdb475..dfe9d63 100644
+index 86ba4c6..8bde45e 100644
 --- a/arch/mips/brcmstb/Kconfig
 +++ b/arch/mips/brcmstb/Kconfig
-@@ -272,7 +272,6 @@ config BCM7425B0
+@@ -293,7 +293,6 @@ config BCM7425B0
  	select BRCM_UARTC_IS_16550
  	select BRCM_HAS_PCIE
  	select BRCM_HAS_GENET_0
@@ -10,7 +10,7 @@ index 6cdb475..dfe9d63 100644
  	select BRCM_MOCA_ON_GENET_1
  	select BRCM_GENET_V3
  	select BRCM_HAS_NOR
-@@ -987,15 +986,6 @@ config BRCM_HAS_GENET_0
+@@ -1008,15 +1007,6 @@ config BRCM_HAS_GENET_0
  	bool
  	select BRCM_HAS_GENET
  
diff --git a/recipes/linux/linux-vuduo2-3.1.1/pinmux.patch b/recipes/linux/linux-vuduo2-3.1.1/pinmux.patch
index ac9cfbb..7c564b7 100644
--- a/recipes/linux/linux-vuduo2-3.1.1/pinmux.patch
+++ b/recipes/linux/linux-vuduo2-3.1.1/pinmux.patch
@@ -1,8 +1,8 @@
 diff --git a/arch/mips/brcmstb/board.c b/arch/mips/brcmstb/board.c
-index 706c3c4..4cc0a4c 100644
+index 6825ef1..f64b8bd 100644
 --- a/arch/mips/brcmstb/board.c
 +++ b/arch/mips/brcmstb/board.c
-@@ -604,6 +604,10 @@ void board_pinmux_setup(void)
+@@ -567,6 +567,10 @@ void board_pinmux_setup(void)
  
  	PINMUX(18, sgpio_00, 1);	/* MoCA I2C */
  	PINMUX(19, sgpio_01, 1);
diff --git a/recipes/linux/linux-vuduo2-3.1.1/vuduo2_defconfig b/recipes/linux/linux-vuduo2-3.1.1/vuduo2_defconfig
index 6b76af3..ea083fe 100644
--- a/recipes/linux/linux-vuduo2-3.1.1/vuduo2_defconfig
+++ b/recipes/linux/linux-vuduo2-3.1.1/vuduo2_defconfig
@@ -1901,7 +1901,7 @@ CONFIG_INOTIFY_USER=y
 # CONFIG_FANOTIFY is not set
 # CONFIG_QUOTA is not set
 # CONFIG_QUOTACTL is not set
-# CONFIG_AUTOFS4_FS is not set
+CONFIG_AUTOFS4_FS=y
 CONFIG_FUSE_FS=m
 # CONFIG_CUSE is not set
 
diff --git a/recipes/linux/linux-vuduo2_3.1.1.bb b/recipes/linux/linux-vuduo2_3.1.1.bb
index d190b05..de48067 100644
--- a/recipes/linux/linux-vuduo2_3.1.1.bb
+++ b/recipes/linux/linux-vuduo2_3.1.1.bb
@@ -8,12 +8,13 @@ MODULE = "linux-3.1.1"
 
 #	file://brcm_nand_timing.patch;patch=1;pnum=1 \
 
-SRC_URI += "file://stblinux-2.6.37-2.8.tar.bz2 \
+SRC_URI += "file://stblinux-2.6.37-3.1.tar.bz2 \
 	file://dvb-core.patch;patch=1;pnum=1 \
 	file://pinmux.patch;patch=1;pnum=1 \
 	file://debug.patch;patch=1;pnum=1 \
 	file://fix_cpu_proc.patch;patch=1;pnum=1 \
 	file://brcm_disable_enet1.patch;patch=1;pnum=1 \
+	file://brcm_mtd_mac.patch;patch=1;pnum=1 \
 	file://${MACHINE}_defconfig \
         "
 
diff --git a/recipes/linux/linux-vusolo2-2.6.37/vusolo2_defconfig b/recipes/linux/linux-vusolo2-2.6.37/vusolo2_defconfig
index edda06c..8e93443 100644
--- a/recipes/linux/linux-vusolo2-2.6.37/vusolo2_defconfig
+++ b/recipes/linux/linux-vusolo2-2.6.37/vusolo2_defconfig
@@ -1577,7 +1577,7 @@ CONFIG_INOTIFY_USER=y
 # CONFIG_FANOTIFY is not set
 # CONFIG_QUOTA is not set
 # CONFIG_QUOTACTL is not set
-# CONFIG_AUTOFS4_FS is not set
+CONFIG_AUTOFS4_FS=y
 CONFIG_FUSE_FS=m
 # CONFIG_CUSE is not set
 
diff --git a/recipes/linux/linux-vusolo2_2.6.37.bb b/recipes/linux/linux-vusolo2_2.6.37.bb
index 979a338..681c89c 100644
--- a/recipes/linux/linux-vusolo2_2.6.37.bb
+++ b/recipes/linux/linux-vusolo2_2.6.37.bb
@@ -10,10 +10,11 @@ MODULE = "linux-2.6.37"
 #SRC_URI += "git:///home/shcheong/work/stb/sw/7356/refsw/linux/stblinux-2.6.37_org;protocol=file;branch=master;tag=${SRCREV} \
 #        file://${MACHINE}_defconfig \
 #        "
-SRC_URI += "file://stblinux-2.6.37-2.8.tar.bz2 \
+SRC_URI += "file://stblinux-2.6.37-3.1.tar.bz2 \
         file://dvb-core.patch;patch=1;pnum=1 \
 	file://fix_cpu_proc.patch;patch=1;pnum=1 \
 	file://bcmgenet_oobctrl.patch;patch=1;pnum=1 \
+        file://brcm_mtd_mac.patch;patch=1;pnum=1 \
         file://${MACHINE}_defconfig \
 	"
 
diff --git a/recipes/tasks/task-vuplus-enigma2.bb b/recipes/tasks/task-vuplus-enigma2.bb
index 07ca28b..3bf8504 100644
--- a/recipes/tasks/task-vuplus-enigma2.bb
+++ b/recipes/tasks/task-vuplus-enigma2.bb
@@ -69,6 +69,9 @@ RDEPENDS_task-vuplus-enigma2_append_vuduo2 = "\
   enigma2-plugin-extensions-openwebif \
   enigma2-plugin-extensions-hbbtv \
   duo2lcd4linux \
+  vuplus-blindscan-utils \
+  enigma2-plugin-systemplugins-firmwareupgrade \
+  enigma2-plugin-systemplugins-manualfancontrol \
 "
 
 RDEPENDS_task-vuplus-enigma2_append_vusolo2 = "\
@@ -76,6 +79,8 @@ RDEPENDS_task-vuplus-enigma2_append_vusolo2 = "\
   enigma2-plugin-systemplugins-remotecontrolcode \
   enigma2-plugin-systemplugins-hdmicec \
   enigma2-plugin-extensions-hbbtv \
+  enigma2-plugin-systemplugins-firmwareupgrade \
+  enigma2-plugin-systemplugins-manualfancontrol \
 "
 
 RDEPENDS_task-vuplus-enigma2_append_vuuno = "\
diff --git a/recipes/vuplus/vuplus-bootlogo/vuduo2/initrd_cfe_auto.bin b/recipes/vuplus/vuplus-bootlogo/vuduo2/initrd_cfe_auto.bin
index 4e4e4ee..185eb1d 100644
--- a/recipes/vuplus/vuplus-bootlogo/vuduo2/initrd_cfe_auto.bin
+++ b/recipes/vuplus/vuplus-bootlogo/vuduo2/initrd_cfe_auto.bin
diff --git a/recipes/vuplus/vuplus-bootlogo/vusolo2/initrd_cfe_auto.bin b/recipes/vuplus/vuplus-bootlogo/vusolo2/initrd_cfe_auto.bin
index c407c70..25f85e0 100644
--- a/recipes/vuplus/vuplus-bootlogo/vusolo2/initrd_cfe_auto.bin
+++ b/recipes/vuplus/vuplus-bootlogo/vusolo2/initrd_cfe_auto.bin
diff --git a/recipes/vuplus/vuplus-dvb-modules.bb b/recipes/vuplus/vuplus-dvb-modules.bb
index a71fb1b..c443803 100755
--- a/recipes/vuplus/vuplus-dvb-modules.bb
+++ b/recipes/vuplus/vuplus-dvb-modules.bb
@@ -8,12 +8,14 @@ KV_vusolo2 = "${@base_contains('PREFERRED_VERSION_linux-${MACHINE}', '2.6.18', '
 
 PV = "${KV}"
 
+inherit module
+
 SRCDATE_bm750 = "20120824"
 SRCDATE_vusolo = "20120824"
 SRCDATE_vuuno = "20120824"
 SRCDATE_vuultimo = "20120824"
-SRCDATE_vuduo2 = "20120829"
-SRCDATE_vusolo2 = "20120829"
+SRCDATE_vuduo2 = "20120913"
+SRCDATE_vusolo2 = "20120918"
 
 MODULES_NAME_bm750 = "procmk\ndvb-bcm7335\nbrcmfb"
 MODULES_NAME_vusolo = "procmk\ndvb-bcm7325\nbrcmfb"
@@ -56,9 +58,9 @@ do_install() {
 }
 
 do_install_vusolo2() {
-        install -d ${D}/lib/modules/2.6.37-2.8/extra
+        install -d ${D}/lib/modules/${KERNEL_VERSION}/extra
         for f in *.ko; do
-                install -m 0644 ${WORKDIR}/$f ${D}/lib/modules/2.6.37-2.8/extra/$f;
+                install -m 0644 ${WORKDIR}/$f ${D}/lib/modules/${KERNEL_VERSION}/extra/$f;
         done
 	install -d ${D}/etc/modutils
 	echo -e "${MODULES_NAME}" > ${D}/etc/modutils/vuplus-dvb-modules
@@ -66,9 +68,9 @@ do_install_vusolo2() {
 }
 
 do_install_vuduo2() {
-        install -d ${D}/lib/modules/2.6.37-2.8/extra
+        install -d ${D}/lib/modules/${KERNEL_VERSION}/extra
         for f in *.ko; do
-                install -m 0644 ${WORKDIR}/$f ${D}/lib/modules/2.6.37-2.8/extra/$f;
+                install -m 0644 ${WORKDIR}/$f ${D}/lib/modules/${KERNEL_VERSION}/extra/$f;
         done
 	install -d ${D}/etc/modutils
 	echo -e "${MODULES_NAME}" > ${D}/etc/modutils/vuplus-dvb-modules
@@ -82,6 +84,9 @@ pkg_postinst_vuplus-dvb-modules () {
         true
 }
 
+do_compile () {
+}
+
 
 PACKAGE_ARCH := "${MACHINE_ARCH}"
 FILES_${PN} = "/"