Merge branch 'vuplus-1.6k_dev' of /home/shcheong/work/stb/sw/oe_1.6/bm750/openembedded into solok336

Conflicts:
	recipes/vuplus/vuplus-dvb-modules.bb

10 files changed, 15 insertions, 13 deletions

diff --git a/conf/machine/bm750.conf b/conf/machine/bm750.conf
index a034479..ec2a3fc 100644
--- a/conf/machine/bm750.conf
+++ b/conf/machine/bm750.conf
@@ -45,7 +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"
+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/vusolo.conf b/conf/machine/vusolo.conf
index 14ec952..a820374 100644
--- a/conf/machine/vusolo.conf
+++ b/conf/machine/vusolo.conf
@@ -45,7 +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"
+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 9f9e606..39fd5e2 100644
--- a/conf/machine/vuultimo.conf
+++ b/conf/machine/vuultimo.conf
@@ -43,7 +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"
+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 c922a24..447f849 100644
--- a/conf/machine/vuuno.conf
+++ b/conf/machine/vuuno.conf
@@ -44,7 +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"
+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 49d9671..fcc17b8 100644
--- a/recipes/enigma2/enigma2.bb
+++ b/recipes/enigma2/enigma2.bb
@@ -4,7 +4,7 @@ DEPENDS = "jpeg libungif libmad libpng libsigc++-1.2 gettext-native \
 	dreambox-dvbincludes freetype libdvbsi++ python swig-native \
 	libfribidi libxmlccwrap libdreamdvd gstreamer gst-plugin-dvbmediasink \
 	gst-plugins-bad gst-plugins-good gst-plugins-ugly python-wifi wvdial wvstreams ppp usbmodeswitch usbmodeswitch-data \
-	hostap-daemon bridge-utils djmount minidlna mpfr gmp tslib opera-hbbtv util-linux-ng ntfs-3g dosfstools "
+	hostap-daemon bridge-utils mpfr gmp tslib opera-hbbtv util-linux-ng ntfs-3g dosfstools "
 RDEPENDS = "python-codecs python-core python-lang python-re python-threading \
 	python-xml python-fcntl gst-plugin-decodebin gst-plugin-decodebin2 python-stringold \
 	python-pickle gst-plugin-app gst-plugin-fragmented \
@@ -77,7 +77,7 @@ RDEPENDS_enigma2-plugin-extensions-hbbtv = "tslib-conf libts-1.0-0 libsysfs2 lib
 RDEPENDS_enigma2-plugin-systemplugins-devicemanager = "util-linux-ng-blkid ntfs-3g dosfstools"
 
 PN = "enigma2"
-PR = "r48"
+PR = "r54"
 
 SRCDATE = "20110922"
 SRCREV = "5e19a3f8a5e8ce8a4e2cb2b601a1b8ef3554e4be"
diff --git a/recipes/opera-hbbtv/opera-hbbtv_0.1.bb b/recipes/opera-hbbtv/opera-hbbtv_0.1.bb
index 2154a12..fc8e253 100644
--- a/recipes/opera-hbbtv/opera-hbbtv_0.1.bb
+++ b/recipes/opera-hbbtv/opera-hbbtv_0.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "opera-hbbtv"
 PRIORITY = "required"
 
-SRC_DATE = 20120924_2
+SRC_DATE = 20121029_0
 
 PR = "r0_${SRC_DATE}"
 SRC_URI = "http://code.vuplus.com/download/build.fc3abf29fb03f797e78f907928125638/embedded/opera-sdk-build-package/opera-hbbtv_${SRC_DATE}.tar.gz"
diff --git a/recipes/tasks/task-boot.bb b/recipes/tasks/task-boot.bb
index ef5e5c6..1c16df2 100644
--- a/recipes/tasks/task-boot.bb
+++ b/recipes/tasks/task-boot.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Basic task to get a device booting"
-PR = "r68"
+PR = "r69"
 
 inherit task
 
diff --git a/recipes/tasks/task-vuplus-base.bb b/recipes/tasks/task-vuplus-base.bb
index d982c58..0cefae0 100644
--- a/recipes/tasks/task-vuplus-base.bb
+++ b/recipes/tasks/task-vuplus-base.bb
@@ -67,6 +67,8 @@ VUPLUS_BASE_RECOMMENDS_append_vuultimo = " vuplus-fpga-update"
 VUPLUS_BASE_RECOMMENDS_append_vusolo2 = " vuplus-manual"
 
 VUPLUS_BASE_OPTIONAL_RECOMMENDS = "\
+  djmount \
+  minidlna \
   gdbserver \
   hddtemp \
   joe \
diff --git a/recipes/tasks/task-vuplus-wlan.bb b/recipes/tasks/task-vuplus-wlan.bb
index b012a6e..3690b4a 100644
--- 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 = "r8"
+PR = "r9"
 
 inherit task
 
diff --git a/recipes/vuplus/vuplus-dvb-modules.bb b/recipes/vuplus/vuplus-dvb-modules.bb
index a17db86..2122926 100755
--- a/recipes/vuplus/vuplus-dvb-modules.bb
+++ b/recipes/vuplus/vuplus-dvb-modules.bb
@@ -11,10 +11,10 @@ PV = "${KV}"
 
 inherit module
 
-SRCDATE_bm750 = "20120824"
-SRCDATE_vusolo = "20120824"
-SRCDATE_vuuno = "20120824"
-SRCDATE_vuultimo = "20120824"
+SRCDATE_bm750 = "20121025"
+SRCDATE_vusolo = "20121025"
+SRCDATE_vuuno = "20121025"
+SRCDATE_vuultimo = "20121025"
 SRCDATE_vuduo2 = "20121025"
 SRCDATE_vusolo2 = "20121030"