Merge branch 'kernel31' of code.vuplus.com:/opt/repository/openembedded into kernel31

diff --git a/conf/machine/bm750.conf b/conf/machine/bm750.conf
index 547ee2c..9c71749 100644 (file)
--- a/conf/machine/bm750.conf
+++ b/conf/machine/bm750.conf
@@ -45,6 +45,7 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_3.1.1 = "\
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS = ${@base_contains('PREFERRED_VERSION_linux-bm750', '2.6.18', '${MACHINE_ESSENTIAL_EXTRA_RDEPENDS_2.6.18}', '${MACHINE_ESSENTIAL_EXTRA_RDEPENDS_3.1.1}', d)}
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = ${@base_contains('PREFERRED_VERSION_linux-bm750', '2.6.18', '${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_2.6.18}', '${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_3.1.1}', d)}
 
+#MACHINE_FEATURES += "rt3070-legacy"
 require conf/machine/include/vuplus-modules.inc
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += ${@base_contains('PREFERRED_VERSION_linux-bm750', '3.1.1', '${KERNEL_WIFI_MODULES}', '', d)}

diff --git a/conf/machine/include/vuplus-modules.inc b/conf/machine/include/vuplus-modules.inc
index f68ee82..0dcfd2a 100644 (file)
--- a/conf/machine/include/vuplus-modules.inc
+++ b/conf/machine/include/vuplus-modules.inc
@@ -9,13 +9,13 @@ KERNEL_WIFI_MODULES = " \
        kernel-module-prism2-usb \
        kernel-module-rt73usb \
        kernel-module-rt2500usb \
-       kernel-module-rt2800usb \
        kernel-module-r8192u-usb \
        kernel-module-rtl8192cu \
        kernel-module-rtl8187 \
        kernel-module-r8712u \
        kernel-module-w35und \
        kernel-module-zd1211rw \
+       ${@base_contains("MACHINE_FEATURES", "rt3070-legacy", "", "kernel-module-rt2800usb", d)} \
        "
 
 

diff --git a/conf/machine/vusolo.conf b/conf/machine/vusolo.conf
index 4bd31a7..4eb9ea9 100644 (file)
--- a/conf/machine/vusolo.conf
+++ b/conf/machine/vusolo.conf
@@ -45,6 +45,7 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_3.1.1 = "\
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS = ${@base_contains('PREFERRED_VERSION_linux-vusolo', '2.6.18', '${MACHINE_ESSENTIAL_EXTRA_RDEPENDS_2.6.18}', '${MACHINE_ESSENTIAL_EXTRA_RDEPENDS_3.1.1}', d)}
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = ${@base_contains('PREFERRED_VERSION_linux-vusolo', '2.6.18', '${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_2.6.18}', '${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_3.1.1}', d)}
 
+#MACHINE_FEATURES += "rt3070-legacy"
 require conf/machine/include/vuplus-modules.inc
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += ${@base_contains('PREFERRED_VERSION_linux-vusolo', '3.1.1', '${KERNEL_WIFI_MODULES}', '', d)}

diff --git a/conf/machine/vuultimo.conf b/conf/machine/vuultimo.conf
index a02ccd4..bece491 100644 (file)
--- a/conf/machine/vuultimo.conf
+++ b/conf/machine/vuultimo.conf
@@ -43,6 +43,7 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_3.1.1 = "\
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS = ${@base_contains('PREFERRED_VERSION_linux-vuultimo', '2.6.18', '${MACHINE_ESSENTIAL_EXTRA_RDEPENDS_2.6.18}', '${MACHINE_ESSENTIAL_EXTRA_RDEPENDS_3.1.1}', d)}
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = ${@base_contains('PREFERRED_VERSION_linux-vuultimo', '2.6.18', '${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_2.6.18}', '${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_3.1.1}', d)}
 
+#MACHINE_FEATURES += "rt3070-legacy"
 require conf/machine/include/vuplus-modules.inc
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += ${@base_contains('PREFERRED_VERSION_linux-vuultimo', '3.1.1', '${KERNEL_WIFI_MODULES}', '', d)}

diff --git a/conf/machine/vuuno.conf b/conf/machine/vuuno.conf
index a03fd05..6ba6d91 100644 (file)
--- a/conf/machine/vuuno.conf
+++ b/conf/machine/vuuno.conf
@@ -44,6 +44,7 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_3.1.1 = "\
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS = ${@base_contains('PREFERRED_VERSION_linux-vuuno', '2.6.18', '${MACHINE_ESSENTIAL_EXTRA_RDEPENDS_2.6.18}', '${MACHINE_ESSENTIAL_EXTRA_RDEPENDS_3.1.1}', d)}
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = ${@base_contains('PREFERRED_VERSION_linux-vuuno', '2.6.18', '${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_2.6.18}', '${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_3.1.1}', d)}
 
+#MACHINE_FEATURES += "rt3070-legacy"
 require conf/machine/include/vuplus-modules.inc
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += ${@base_contains('PREFERRED_VERSION_linux-vuuno', '3.1.1', '${KERNEL_WIFI_MODULES}', '', d)}

diff --git a/recipes/enigma2/enigma2.bb b/recipes/enigma2/enigma2.bb
index bdc58d1..cdaa987 100644 (file)
--- a/recipes/enigma2/enigma2.bb
+++ b/recipes/enigma2/enigma2.bb
@@ -63,9 +63,11 @@ DESCRIPTION_append_enigma2-plugin-systemplugins-wirelesslansetup = "configure wi
 RDEPENDS_enigma2-plugin-systemplugins-wirelesslansetup = "wpa-supplicant wireless-tools python-wifi"
 DESCRIPTION_append_enigma2-plugin-systemplugins-networkwizard = "provides easy step by step network configuration"
 RDEPENDS_enigma2-plugin-extensions-webbrowser = "python-gdata libqtwebkite4 vuplus-webbrowser-utils qt4-embedded-fonts qt4-embedded-plugin-imageformat-gif qt4-embedded-plugin-imageformat-ico qt4-embedded-plugin-imageformat-jpeg qt4-embedded-plugin-imageformat-mng qt4-embedded-plugin-imageformat-svg qt4-embedded-plugin-imageformat-tiff qt4-embedded-plugin-iconengine-svgicon "
+DESCRIPTION_append_enigma2-plugin-systemplugins-crashreport = "automatically send crashlogs to Vu+"
+RDEPENDS_enigma2-plugin-systemplugins-crashreport = "twisted-mail twisted-names python-compression python-mime python-email"
 
 PN = "enigma2"
-PR = "r1"
+PR = "r3"
 
 SRCDATE = "20110922"
 SRCREV = "5e19a3f8a5e8ce8a4e2cb2b601a1b8ef3554e4be"

diff --git a/recipes/ralink/files/2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO.tar.bz2 b/recipes/ralink/files/2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO.tar.bz2
new file mode 100755 (executable)
index 0000000..36be4fc
Binary files /dev/null and b/recipes/ralink/files/2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO.tar.bz2 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
+++ b/recipes/ralink/files/config_2.5.0.3.patch
@@ -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
+++ b/recipes/ralink/files/makefile_2.5.0.3.patch
@@ -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

diff --git a/recipes/ralink/rt3070_2.5.0.3.bb b/recipes/ralink/rt3070_2.5.0.3.bb
new file mode 100644 (file)
index 0000000..f95770c
--- /dev/null
+++ b/recipes/ralink/rt3070_2.5.0.3.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "Driver for Ralink RT8070/RT3070/RT3370 USB 802.11abgn WiFi sticks"
+SECTION = "kernel/modules"
+LICENSE = "GPL"
+SRCNAME = "rt3070"
+
+inherit module
+
+PR = "r0"
+
+SRC_URI = "file://2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO.tar.bz2 \
+               file://makefile_2.5.0.3.patch;patch=1 \
+               file://config_2.5.0.3.patch;patch=1 \
+       "
+
+FILES_${PN} += " /lib/firmware/rt2870.bin"
+
+S = "${WORKDIR}/2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V${PV}_DPO"
+
+EXTRA_OEMAKE = "LINUX_SRC=${STAGING_KERNEL_DIR}"
+
+do_install() {
+       install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/drivers/net/wireless
+       install -d ${D}${sysconfdir}/Wireless/RT2870STA
+       install -m 0644 ${S}/*sta${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/drivers/net/wireless
+       install -m 0644 ${S}/RT2870STA.dat ${D}${sysconfdir}/Wireless/RT2870STA/
+  install -d ${D}/lib/firmware
+  install -m 0644 ${S}/common/rt2870.bin ${D}/lib/firmware/
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"

diff --git a/recipes/tasks/task-vuplus-enigma2.bb b/recipes/tasks/task-vuplus-enigma2.bb
index 80824d3..6dc3221 100644 (file)
--- a/recipes/tasks/task-vuplus-enigma2.bb
+++ b/recipes/tasks/task-vuplus-enigma2.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Vuplus: E2 Task for the Vuplus Distribution"
 SECTION = "vuplus/base"
 LICENSE = "MIT"
-PR = "r11"
+PR = "r12"
 
 inherit task
 
@@ -30,6 +30,7 @@ RDEPENDS_task-vuplus-enigma2 = "\
   enigma2-meta \
   enigma2-plugins-meta \
   enigma2-skins-meta \   
+  enigma2-plugin-systemplugins-crashreport \
 "
 
 RRECOMMENDS_task-vuplus-enigma2 = "\

diff --git a/recipes/tasks/task-vuplus-wlan.bb b/recipes/tasks/task-vuplus-wlan.bb
index 2b5f7aa..f9e47ef 100644 (file)
--- a/recipes/tasks/task-vuplus-wlan.bb
+++ b/recipes/tasks/task-vuplus-wlan.bb
@@ -29,11 +29,10 @@ WLAN_USB_MODULES = "\
   rt73-firmware \
   zd1211-firmware \
   r8192cu \
-  rt2870sta \
-  firmware-rt3070 \
   firmware-htc9271 \
   firmware-rt2561 \
   firmware-rtl8721u \
+  ${@base_contains("MACHINE_FEATURES", "rt3070-legacy", "rt3070", "rt2870sta firmware-rt3070 ", d)} \
 "
 
 WLAN_USB_MODULES_LEGACY = "\