after ANGA, splash
authorschon <schon@dev03-server>
Thu, 23 Aug 2012 04:46:17 +0000 (13:46 +0900)
committerschon <schon@dev03-server>
Thu, 23 Aug 2012 04:46:17 +0000 (13:46 +0900)
14 files changed:
conf/machine/vuduo2.conf
conf/machine/vusolo2.conf
recipes/directfb/directfb.inc
recipes/duo2lcd4linux/files/LCD4linux.tar.gz
recipes/enigma2/enigma2.bb
recipes/linux/linux-vuduo2_3.1.1.bb
recipes/linux/linux-vusolo2_2.6.37.bb
recipes/opera-bb/files/opera-hbbtv.tar.gz
recipes/ralink/files/config_2.5.0.3.patch [new file with mode: 0644]
recipes/ralink/files/makefile_2.5.0.3.patch [new file with mode: 0644]
recipes/tasks/task-vuplus-enigma2.bb
recipes/tasks/task-vuplus-wlan.bb
recipes/vuplus/vuplus-bootlogo.bb
recipes/vuplus/vuplus-dvb-modules.bb

index 382dd70..c44f372 100644 (file)
@@ -82,7 +82,11 @@ MACHINE_FEATURES += "display-text-vfd"
 EXTRA_IMAGECMD_jffs2 = " --eraseblock=0x20000 -n -l "
 IMAGE_CMD_jffs2 = " \
        cp ${IMAGE_ROOTFS}/boot/vmlinux.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmlinux.gz; \
+        cp ${IMAGE_ROOTFS}/boot/initrd_cfe_auto.bin ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.initrd_cfe_auto.bin; \
+        cp ${IMAGE_ROOTFS}/boot/splash_cfe_auto.bin ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.splash_cfe_auto.bin; \
        rm -f ${IMAGE_ROOTFS}/boot/vmlinux.gz; \
+        rm -f ${IMAGE_ROOTFS}/boot/initrd_cfe_auto.bin; \
+        rm -f ${IMAGE_ROOTFS}/boot/splash_cfe_auto.bin; \
        mkfs.jffs2 --root=${IMAGE_ROOTFS}/boot --faketime \
        --disable-compressor=lzo --compression-mode=size \
        --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.boot.jffs2 \
@@ -97,6 +101,8 @@ IMAGE_CMD_jffs2 = " \
        cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${DEPLOY_DIR_IMAGE}/vuplus/duo2/root_cfe_auto.jffs2; \
        cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmlinux.gz ${DEPLOY_DIR_IMAGE}/vuplus/duo2/kernel_cfe_auto.bin; \
        cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.boot.jffs2 ${DEPLOY_DIR_IMAGE}/vuplus/duo2/boot_cfe_auto.jffs2; \
+       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; \       
@@ -114,14 +120,20 @@ EXTRA_IMAGECMD_COMPAT = " --eraseblock=0x20000 -n -l "
 
 IMAGE_CMD_ubi_prepend = " \
         cp ${IMAGE_ROOTFS}/boot/vmlinux.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmlinux.gz; \
+        cp ${IMAGE_ROOTFS}/boot/initrd_cfe_auto.bin ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.initrd_cfe_auto.bin; \
+        cp ${IMAGE_ROOTFS}/boot/splash_cfe_auto.bin ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.splash_cfe_auto.bin; \
         rm -f ${IMAGE_ROOTFS}/boot/vmlinux.gz; \
+        rm -f ${IMAGE_ROOTFS}/boot/initrd_cfe_auto.bin; \
+        rm -f ${IMAGE_ROOTFS}/boot/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.jffs2; \
+        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; \ 
index aed3933..c43bcf8 100644 (file)
@@ -80,7 +80,11 @@ MACHINE_FEATURES += "display-text-vfd"
 EXTRA_IMAGECMD_jffs2 = " --eraseblock=0x20000 -n -l "
 IMAGE_CMD_jffs2 = " \
        cp ${IMAGE_ROOTFS}/boot/vmlinux.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmlinux.gz; \
+        cp ${IMAGE_ROOTFS}/boot/initrd_cfe_auto.bin ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.initrd_cfe_auto.bin; \
+        cp ${IMAGE_ROOTFS}/boot/splash_cfe_auto.bin ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.splash_cfe_auto.bin; \
        rm -f ${IMAGE_ROOTFS}/boot/vmlinux.gz; \
+        rm -f ${IMAGE_ROOTFS}/boot/initrd_cfe_auto.bin; \
+        rm -f ${IMAGE_ROOTFS}/boot/splash_cfe_auto.bin; \
        mkfs.jffs2 --root=${IMAGE_ROOTFS}/boot --faketime \
        --disable-compressor=lzo --compression-mode=size \
        --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.boot.jffs2 \
@@ -95,6 +99,8 @@ IMAGE_CMD_jffs2 = " \
        cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${DEPLOY_DIR_IMAGE}/vuplus/solo2/root_cfe_auto.jffs2; \
        cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmlinux.gz ${DEPLOY_DIR_IMAGE}/vuplus/solo2/kernel_cfe_auto.bin; \
        cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.boot.jffs2 ${DEPLOY_DIR_IMAGE}/vuplus/solo2/boot_cfe_auto.jffs2; \
+       cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.initrd_cfe_auto.bin ${DEPLOY_DIR_IMAGE}/vuplus/solo2/initrd_cfe_auto.bin; \
+       cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.splash_cfe_auto.bin ${DEPLOY_DIR_IMAGE}/vuplus/solo2/splash_cfe_auto.bin; \
        cd ${DEPLOY_DIR_IMAGE}; \
        zip ${IMAGE_NAME}_usb.zip vuplus/solo2/*; \
        rm -rf vuplus; \       
@@ -111,7 +117,11 @@ EXTRA_IMAGECMD_COMPAT = " --eraseblock=0x20000 -n -l "
 
 IMAGE_CMD_ubi_prepend = " \
         cp ${IMAGE_ROOTFS}/boot/vmlinux.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmlinux.gz; \
+        cp ${IMAGE_ROOTFS}/boot/initrd_cfe_auto.bin ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.initrd_cfe_auto.bin; \
+        cp ${IMAGE_ROOTFS}/boot/splash_cfe_auto.bin ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.splash_cfe_auto.bin; \
         rm -f ${IMAGE_ROOTFS}/boot/vmlinux.gz; \
+        rm -f ${IMAGE_ROOTFS}/boot/initrd_cfe_auto.bin; \
+        rm -f ${IMAGE_ROOTFS}/boot/splash_cfe_auto.bin; \
         "
 
 IMAGE_CMD_ubi_append = "; \
@@ -119,6 +129,8 @@ IMAGE_CMD_ubi_append = "; \
         mkdir -p ${DEPLOY_DIR_IMAGE}/vuplus/solo2; \
         cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi ${DEPLOY_DIR_IMAGE}/vuplus/solo2/root_cfe_auto.jffs2; \
        cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmlinux.gz ${DEPLOY_DIR_IMAGE}/vuplus/solo2/kernel_cfe_auto.bin; \
+       cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.initrd_cfe_auto.bin ${DEPLOY_DIR_IMAGE}/vuplus/solo2/initrd_cfe_auto.bin; \
+       cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.splash_cfe_auto.bin ${DEPLOY_DIR_IMAGE}/vuplus/solo2/splash_cfe_auto.bin; \
         cd ${DEPLOY_DIR_IMAGE}; \
        zip ${IMAGE_NAME}_usb.zip vuplus/solo2/*; \
        rm -rf vuplus; \ 
index 1af76d3..e05aba7 100644 (file)
@@ -65,11 +65,13 @@ FILES_${PN}-dev += "\
   ${libdir}/directfb-${RV}/systems/*.la \
   ${libdir}/directfb-${RV}/inputdrivers/*.la \
   ${libdir}/directfb-${RV}/interfaces/*/*.la \
+  ${libdir}/directfb-${RV}/gfxdrivers/*.la \
   ${libdir}/directfb-${RV}/wm/*.la \
 "
 
 FILES_${PN} += "\
   ${libdir}/directfb-${RV}/systems/*.so \
+  ${libdir}/directfb-${RV}/gfxdrivers/*.so \
   ${libdir}/directfb-${RV}/inputdrivers/*.so \
   ${libdir}/directfb-${RV}/interfaces/*/*.so \
   ${libdir}/directfb-${RV}/wm/*.so \
index 862a8e0..8ef430a 100644 (file)
Binary files a/recipes/duo2lcd4linux/files/LCD4linux.tar.gz and b/recipes/duo2lcd4linux/files/LCD4linux.tar.gz differ
index 6034493..286b485 100644 (file)
@@ -120,7 +120,7 @@ SRC_URI = "git://code.vuplus.com/git/dvbapp.git;protocol=http;branch=${BRANCH};t
           file://enigma2_vuplus_mediaplayer_subtitle.patch;patch=1;pnum=1 \
            file://enigma2_vuplus_remove_dreambox_enigma.patch;patch=1;pnum=1 \
            file://enigma2_vuplus_vfd_mode.patch;patch=1;pnum=1 \
-          file://enigma2-hbbtv_20120604.patch;patch=1;pnum=1 \
+          file://enigma2-hbbtv_20120610.patch;patch=1;pnum=1 \
            file://MyriadPro-Regular.otf \
            file://MyriadPro-Semibold.otf \
            file://MyriadPro-SemiboldIt.otf \
index efc2a9b..c299c68 100644 (file)
@@ -12,6 +12,7 @@ SRC_URI += "file://stblinux-2.6.37-2.8.tar.bz2 \
        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_nand_timing.patch;patch=1;pnum=1 \
        file://${MACHINE}_defconfig \
         "
 
index fd0fecf..9d73d28 100644 (file)
@@ -13,10 +13,12 @@ MODULE = "linux-2.6.37"
 SRC_URI += "file://stblinux-2.6.37-2.8.tar.bz2 \
         file://dvb-core.patch;patch=1;pnum=1 \
        file://fix_cpu_proc.patch;patch=1;pnum=1 \
-       file://brcm_disable_enet1.patch;patch=1;pnum=1 \
         file://${MACHINE}_defconfig \
        "
 
+#      file://brcm_disable_enet1.patch;patch=1;pnum=1 \
+#      file://brcm_nand_timing.patch;patch=1;pnum=1 \
+
 
 #S = "${WORKDIR}/git"
 S = "${WORKDIR}/stblinux-2.6.37"
index 412679a..e357f2f 100644 (file)
Binary files a/recipes/opera-bb/files/opera-hbbtv.tar.gz and b/recipes/opera-bb/files/opera-hbbtv.tar.gz differ
diff --git a/recipes/ralink/files/config_2.5.0.3.patch b/recipes/ralink/files/config_2.5.0.3.patch
new file mode 100644 (file)
index 0000000..5f21468
--- /dev/null
@@ -0,0 +1,18 @@
+diff --git a/os/linux/config.mk b/os/linux/config.mk
+index 6b34eae..4943e38 100644
+--- a/os/linux/config.mk
++++ b/os/linux/config.mk
+@@ -53,11 +53,11 @@ HAS_LLTD=n
+ HAS_APCLI=n
+ # Support Wpa_Supplicant
+-HAS_WPA_SUPPLICANT=n
++HAS_WPA_SUPPLICANT=y
+ # Support Native WpaSupplicant for Network Maganger
+-HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=n
++HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=y
+ #Support Net interface block while Tx-Sw queue full
+ HAS_BLOCK_NET_IF=n
diff --git a/recipes/ralink/files/makefile_2.5.0.3.patch b/recipes/ralink/files/makefile_2.5.0.3.patch
new file mode 100644 (file)
index 0000000..b74c249
--- /dev/null
@@ -0,0 +1,22 @@
+diff --git a/Makefile b/Makefile
+index 0afe867..9e1511a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -339,7 +339,7 @@ ifeq ($(OSABL),YES)
+       cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.o /tftpboot
+ endif
+ else
+-      cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot
++      cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o $(RT28xx_DIR)
+ ifeq ($(OSABL),YES)
+       cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.o /tftpboot
+       cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.o /tftpboot
+@@ -385,7 +385,7 @@ ifeq ($(OSABL),YES)
+       cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.ko /tftpboot
+ endif
+ else
+-      cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot
++      cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko $(RT28xx_DIR)
+ ifeq ($(OSABL),YES)
+       cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.ko /tftpboot
+       cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.ko /tftpboot
index ff76713..9f93b70 100644 (file)
@@ -54,6 +54,18 @@ RDEPENDS_task-vuplus-enigma2_append_bm750 = "\
   vuplus-webbrowser-utils \
   enigma2-plugin-extensions-webbrowser \
 "
+RDEPENDS_task-vuplus-enigma2_append_vuduo2 = "\
+  duo2lcd4linux \
+  enigma2-plugin-systemplugins-remotecontrolcode \
+  enigma2-plugin-systemplugins-hdmicec \
+  enigma2-plugin-extensions-openwebif \
+"
+
+RDEPENDS_task-vuplus-enigma2_append_vusolo2 = "\
+  enigma2-plugin-extensions-openwebif \
+  enigma2-plugin-systemplugins-remotecontrolcode \
+  enigma2-plugin-systemplugins-hdmicec \
+"
 
 RDEPENDS_task-vuplus-enigma2_append_vuuno = "\
   vuplus-blindscan-utils \
index 4142fa2..d3abb51 100644 (file)
@@ -33,9 +33,9 @@ WLAN_USB_MODULES = "\
 "
 
 WLAN_USB_MODULES_LEGACY = "\
-  zd1211b \
-  wlan-rt73 \
-  r8712u \
+#  zd1211b \
+#  wlan-rt73 \
+#  r8712u \
   rt3070 \
   r8192cu \
 "
@@ -58,12 +58,13 @@ RDEPENDS_${PN}_append_vuultimo = "\
 RDEPENDS_${PN}_append_vu7425 = "\
   ${@base_contains('PREFERRED_VERSION_linux-vuvu7425', '2.6.18', '${WLAN_USB_MODULES_LEGACY}', '${WLAN_CRYPTO_MODULES} ${WLAN_USB_MODULES}', d)} \
 "
-RDEPENDS_${PN}_append_vuduo2 = "\
-  ${@base_contains('PREFERRED_VERSION_linux-vuduo2', '2.6.18', '${WLAN_USB_MODULES_LEGACY}', '${WLAN_CRYPTO_MODULES} ${WLAN_USB_MODULES}', d)} \
-"
-RDEPENDS_${PN}_append_vusolo2 = "\
-  ${@base_contains('PREFERRED_VERSION_linux-vusolo2', '2.6.18', '${WLAN_USB_MODULES_LEGACY}', '${WLAN_CRYPTO_MODULES} ${WLAN_USB_MODULES}', d)} \
-"
+#RDEPENDS_${PN}_append_vuduo2 = "\
+#  ${@base_contains('PREFERRED_VERSION_linux-vuduo2', '2.6.18', '${WLAN_USB_MODULES_LEGACY}', '${WLAN_CRYPTO_MODULES} ${WLAN_USB_MODULES}', d)} \
+#"
+
+RDEPENDS_${PN}_append_vuduo2 = '${WLAN_USB_MODULES_LEGACY}'
+RDEPENDS_${PN}_append_vusolo2 = '${WLAN_USB_MODULES_LEGACY}'
+
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
index 4216219..8d9fe66 100644 (file)
@@ -7,13 +7,15 @@ IMAGES_VERSION = "1"
 BINARY_VERSION = "7"
 
 PV = "${BINARY_VERSION}.${IMAGES_VERSION}"
-PR = "r5"
+PR = "r6"
 
 KERNEL_VERSION = "${@base_contains('PREFERRED_VERSION_linux-${MACHINE}', '2.6.18', '2.6.18', '3.1.1', d)}"
 
 SRC_URI = "file://bootlogo.mvi file://backdrop.mvi file://bootlogo_wait.mvi file://switchoff.mvi"
 SRC_URI_append_vuuno = " file://splash_cfe_auto.bin"
 SRC_URI_append_vuultimo = " file://splash_cfe_auto.bin"
+SRC_URI_append_vuduo2 = " file://initrd_cfe_auto.bin file://splash_cfe_auto.bin"
+SRC_URI_append_vusolo2 = " file://initrd_cfe_auto.bin file://splash_cfe_auto.bin"
 
 S = "${WORKDIR}/"
 
@@ -44,8 +46,28 @@ do_install_vuultimo() {
                 install -m 0755 ${S}/$i.mvi ${D}/usr/share/$i.mvi;
                 ln -sf /usr/share/$i.mvi ${D}/boot/$i.mvi;
         done;
+        install -m 0755 ${S}/vmlinuz.initrd ${D}/boot/vmlinuz.initrd
         install -m 0755 ${S}/splash_cfe_auto.bin ${D}/boot/splash_cfe_auto.bin
 }
+do_install_vuduo2() {
+       install -d ${D}/boot
+        install -d ${D}/usr/share
+        for i in ${MVI}; do
+                install -m 0755 ${S}/$i.mvi ${D}/usr/share/$i.mvi;
+                ln -sf /usr/share/$i.mvi ${D}/boot/$i.mvi;
+        done;
+        install -m 0755 ${S}/initrd_cfe_auto.bin ${D}/boot/initrd_cfe_auto.bin
+        install -m 0755 ${S}/splash_cfe_auto.bin ${D}/boot/splash_cfe_auto.bin
+}
+do_install_vusolo2() {
+       install -d ${D}/boot
+        install -d ${D}/usr/share
+        for i in ${MVI}; do
+                install -m 0755 ${S}/$i.mvi ${D}/usr/share/$i.mvi;
+                ln -sf /usr/share/$i.mvi ${D}/boot/$i.mvi;
+        done;
+        install -m 0755 ${S}/initrd_cfe_auto.bin ${D}/boot/initrd_cfe_auto.bin
+}
 
 pkg_preinst() {
        if [ "${KERNEL_VERSION}" = "2.6.18" ]; then
index ebb4648..d8ad451 100755 (executable)
@@ -13,8 +13,8 @@ SRCDATE_bm750 = "20111213"
 SRCDATE_vusolo = "20111213"
 SRCDATE_vuuno = "20111213"
 SRCDATE_vuultimo = "20111213"
-SRCDATE_vuduo2 = "20120605"
-SRCDATE_vusolo2 = "20120523"
+SRCDATE_vuduo2 = "20120719"
+SRCDATE_vusolo2 = "20120817"
 
 MODULES_NAME_bm750 = "procmk\ndvb-bcm7335\nbrcmfb"
 MODULES_NAME_vusolo = "procmk\ndvb-bcm7325\nbrcmfb"