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 \
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; \
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; \
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 \
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; \
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 = "; \
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; \
${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 \
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 \
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 \
"
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"
--- /dev/null
+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
--- /dev/null
+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
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 \
"
WLAN_USB_MODULES_LEGACY = "\
- zd1211b \
- wlan-rt73 \
- r8712u \
+# zd1211b \
+# wlan-rt73 \
+# r8712u \
rt3070 \
r8192cu \
"
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}"
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}/"
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
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"