add wifi driver and add WirelessLANSetup plugin

diff --git a/conf/machine/bm750.conf b/conf/machine/bm750.conf
index b26fb08..a2f2011 100644 (file)
--- a/conf/machine/bm750.conf
+++ b/conf/machine/bm750.conf
@@ -53,6 +53,9 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 EXTRA_IMAGEDEPENDS += "vuplus-makenfi-native"
 
 MACHINE_FEATURES += "alsa pci"
+MACHINE_FEATURES += "wifi"
+MACHINE_FEATURES += "vuwlan"
+
 
 
 EXTRA_IMAGECMD_jffs2 = " --eraseblock=0x20000 -n -l "

diff --git a/conf/machine/vusolo.conf b/conf/machine/vusolo.conf
index 61e266d..8f99128 100644 (file)
--- a/conf/machine/vusolo.conf
+++ b/conf/machine/vusolo.conf
@@ -54,6 +54,9 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 EXTRA_IMAGEDEPENDS += "vuplus-makenfi-native"
 
 MACHINE_FEATURES += "alsa pci"
+MACHINE_FEATURES += "wifi"
+MACHINE_FEATURES += "vuwlan"
+
 
 
 EXTRA_IMAGECMD_jffs2 = " --eraseblock=0x20000 -n -l "

diff --git a/conf/machine/vuultimo.conf b/conf/machine/vuultimo.conf
index 1d4d657..aaf2a0c 100644 (file)
--- a/conf/machine/vuultimo.conf
+++ b/conf/machine/vuultimo.conf
@@ -52,6 +52,9 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 EXTRA_IMAGEDEPENDS += "vuplus-makenfi-native"
 
 MACHINE_FEATURES += "alsa pci"
+MACHINE_FEATURES += "wifi"
+MACHINE_FEATURES += "vuwlan"
+
 
 
 EXTRA_IMAGECMD_jffs2 = " --eraseblock=0x20000 -n -l "

diff --git a/conf/machine/vuuno.conf b/conf/machine/vuuno.conf
index 8a13dfa..aa60968 100644 (file)
--- a/conf/machine/vuuno.conf
+++ b/conf/machine/vuuno.conf
@@ -51,6 +51,8 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 EXTRA_IMAGEDEPENDS += "vuplus-makenfi-native"
 
 MACHINE_FEATURES += "alsa pci"
+MACHINE_FEATURES += "wifi"
+MACHINE_FEATURES += "vuwlan"
 
 
 EXTRA_IMAGECMD_jffs2 = " --eraseblock=0x20000 -n -l "

diff --git a/recipes/enigma2/enigma2.bb b/recipes/enigma2/enigma2.bb
index c99d571..15205bb 100644 (file)
--- a/recipes/enigma2/enigma2.bb
+++ b/recipes/enigma2/enigma2.bb
@@ -59,6 +59,8 @@ DESCRIPTION_append_enigma2-plugin-extenstions-modem = "opens a menu to connect t
 RDEPENDS_enigma2-plugin-extensions-modem = "dreambox-modem-ppp-scripts ppp"
 DESCRIPTION_append_enigma2-plugin-systemplugins-wirelesslan = "helps you configuring your wireless lan"
 RDEPENDS_enigma2-plugin-systemplugins-wirelesslan = "wpa-supplicant wireless-tools python-wifi"
+DESCRIPTION_append_enigma2-plugin-systemplugins-wirelesslansetup = "configure wireless lan"
+RDEPENDS_enigma2-plugin-systemplugins-wirelesslansetup = "wpa-supplicant wireless-tools python-wifi"
 DESCRIPTION_append_enigma2-plugin-systemplugins-networkwizard = "provides easy step by step network configuration"
 
 PN = "enigma2"
@@ -100,14 +102,13 @@ PV_vuplus = "experimental-git${SRCDATE}"
 SRCREV_vuplus = ""
 ####################################################
 
-SRC_URI = "git://git.opendreambox.org/git/enigma2.git;protocol=git;branch=${BRANCH};tag=${SRCREV}"
-SRC_URI_append_dm7025 = " file://7025_pvr_device_compatibility.diff;patch=1;pnum=1"
+#SRC_URI = "git://git.opendreambox.org/git/enigma2.git;protocol=git;branch=${BRANCH};tag=${SRCREV}"
+#SRC_URI_append_dm7025 = " file://7025_pvr_device_compatibility.diff;patch=1;pnum=1"
 
 # enigma2_vuplus_mediaplayer.patch is for trick-play in media player
 
 
-SRC_URI_bm750 = "git://archive.vuplus.com/git/enigma2.git;protocol=http;branch=${BRANCH};tag=${SRCREV} \
-          file://enigma2_vuplus_vfd.patch;patch=1;pnum=1 \
+SRC_URI = "git://archive.vuplus.com/git/enigma2.git;protocol=http;branch=${BRANCH};tag=${SRCREV} \
            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 \
@@ -120,49 +121,13 @@ SRC_URI_bm750 = "git://archive.vuplus.com/git/enigma2.git;protocol=http;branch=$
            file://number_key \
            "
 
-SRC_URI_vusolo = "git://archive.vuplus.com/git/enigma2.git;protocol=http;branch=${BRANCH};tag=${SRCREV} \
-           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 \
-           file://enigma2_vuplus_misc.patch;patch=1;pnum=1 \
-           file://enigma2_vuplus_remove_dreambox_enigma.patch;patch=1;pnum=1 \
-           file://MyriadPro-Regular.otf \
-           file://MyriadPro-Semibold.otf \
-           file://MyriadPro-SemiboldIt.otf \
-           file://750S \
-           file://Vu_HD \
-           file://number_key \
-           "
-
+SRC_URI_append_bm750 = " file://enigma2_vuplus_vfd.patch;patch=1;pnum=1"
+SRC_URI_append_vuuno = " file://enigma2_vuplus_vfd.patch;patch=1;pnum=1"
+SRC_URI_append_vuultimo = " file://enigma2_vuplus_vfd.patch;patch=1;pnum=1"
 
+SRC_URI_append_vusolo = " file://enigma2_vuplus_misc.patch;patch=1;pnum=1"
 
-SRC_URI_vuuno = "git://archive.vuplus.com/git/enigma2.git;protocol=http;branch=${BRANCH};tag=${SRCREV} \
-          file://enigma2_vuplus_vfd.patch;patch=1;pnum=1 \
-           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 \
-           file://enigma2_vuplus_remove_dreambox_enigma.patch;patch=1;pnum=1 \
-           file://MyriadPro-Regular.otf \
-           file://MyriadPro-Semibold.otf \
-           file://MyriadPro-SemiboldIt.otf \
-           file://750S \
-           file://Vu_HD \
-           file://number_key \
-           "
-
-SRC_URI_vuultimo = "git://archive.vuplus.com/git/enigma2.git;protocol=http;branch=${BRANCH};tag=${SRCREV} \
-          file://enigma2_vuplus_vfd.patch;patch=1;pnum=1 \
-           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 \
-           file://enigma2_vuplus_remove_dreambox_enigma.patch;patch=1;pnum=1 \
-           file://MyriadPro-Regular.otf \
-           file://MyriadPro-Semibold.otf \
-           file://MyriadPro-SemiboldIt.otf \
-           file://750S \
-           file://Vu_HD \
-           file://number_key \
-           "
+SRC_URI_append = " ${@base_contains("MACHINE_FEATURES", "vuwlan", "file://enigma2_vuplus_networksetup.patch;patch=1;pnum=1", "", d)}"
 
 def change_po():
         import os

diff --git a/recipes/enigma2/enigma2/vuplus/enigma2_vuplus_networksetup.patch b/recipes/enigma2/enigma2/vuplus/enigma2_vuplus_networksetup.patch
new file mode 100644 (file)
index 0000000..54bdfe3
--- /dev/null
+++ b/recipes/enigma2/enigma2/vuplus/enigma2_vuplus_networksetup.patch
@@ -0,0 +1,45 @@
+diff --git a/lib/python/Screens/NetworkSetup.py b/lib/python/Screens/NetworkSetup.py
+index 32b9f54..b31ba3a 100755
+--- a/lib/python/Screens/NetworkSetup.py
++++ b/lib/python/Screens/NetworkSetup.py
+@@ -60,7 +60,11 @@ class NetworkAdapterSelection(Screen,HelpableScreen):
+                       "yellow": (self.setDefaultInterface, [_("Set interface as default Interface"),_("* Only available if more than one interface is active.")] ),
+                       })
+ 
+-              self.adapters = [(iNetwork.getFriendlyAdapterName(x),x) for x in iNetwork.getAdapterList()]
++              self.adapters = []
++              self.adapterList = [(iNetwork.getFriendlyAdapterName(x),x) for x in iNetwork.getAdapterList()]
++              for x in self.adapterList:
++                      if x[1].startswith('eth'):
++                              self.adapters.append(x)
+ 
+               if not self.adapters:
+                       self.adapters = [(iNetwork.getFriendlyAdapterName(x),x) for x in iNetwork.getConfiguredAdapters()]
+@@ -98,7 +102,12 @@ class NetworkAdapterSelection(Screen,HelpableScreen):
+                       else:
+                               interfacepng = LoadPixmap(resolveFilename(SCOPE_CURRENT_SKIN, "skin_default/icons/network_wireless.png"))
+ 
+-              num_configured_if = len(iNetwork.getConfiguredAdapters())
++#             num_configured_if = len(iNetwork.getConfiguredAdapters())
++              num_configured_if=0
++              for x in iNetwork.getConfiguredAdapters():
++                      if x.startswith('eth'):
++                              num_configured_if+=1
++
+               if num_configured_if >= 2:
+                       if default is True:
+                               defaultpng = LoadPixmap(cached=True, path=resolveFilename(SCOPE_CURRENT_SKIN, "skin_default/buttons/button_blue.png"))
+@@ -116,7 +125,12 @@ class NetworkAdapterSelection(Screen,HelpableScreen):
+       def updateList(self):
+               self.list = []
+               default_gw = None
+-              num_configured_if = len(iNetwork.getConfiguredAdapters())
++#             num_configured_if = len(iNetwork.getConfiguredAdapters())
++              num_configured_if=0
++              for x in iNetwork.getConfiguredAdapters():
++                      if x.startswith('eth'):
++                              num_configured_if+=1
++
+               if num_configured_if >= 2:
+                       self["key_yellow"].setText(_("Default"))
+                       self["introduction"].setText(self.defaulttext)

diff --git a/recipes/tasks/task-vuplus-enigma2.bb b/recipes/tasks/task-vuplus-enigma2.bb
index ab032aa..99c8f92 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 = "r3"
+PR = "r4"
 
 inherit task
 

diff --git a/recipes/tasks/task-vuplus-wlan.bb b/recipes/tasks/task-vuplus-wlan.bb
index fb32295..fd0364e 100644 (file)
--- a/recipes/tasks/task-vuplus-wlan.bb
+++ b/recipes/tasks/task-vuplus-wlan.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Vuplus: W-LAN Task for the Vuplus Distribution"
 SECTION = "vuplus/base"
 LICENSE = "MIT"
-PR = "r3"
+PR = "r4"
 
 inherit task
 
@@ -11,7 +11,7 @@ inherit task
 DESCRIPTION_${PN} = "Vuplus: W-LAN Support"
 DEPENDS_${PN} = "enigma2-plugins"
 RDEPENDS_${PN} = "\
-  enigma2-plugin-systemplugins-wirelesslan \
+  ${@base_contains("MACHINE_FEATURES", "vuwlan", "enigma2-plugin-systemplugins-wirelesslansetup", "enigma2-plugin-systemplugins-wirelesslan", d)} \
   wireless-tools \
   wpa-supplicant \
 "
@@ -44,6 +44,7 @@ WLAN_USB_MODULES_LEGACY = "\
   wlan-rt73 \
   r8712u \
   rt3070 \
+  r8192cu \
 "
 
 RDEPENDS_${PN}_append_bm750 = "\