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

Conflicts:
	recipes/enigma2/enigma2.bb
	recipes/linux/linux-vu7425-3.1.1/fix_cpu_proc.patch
	recipes/linux/linux-vu7425-3.1.1/vu7425_defconfig
	recipes/tuxbox/libdvbsi++.bb
	recipes/vuplus/vuplus-dvb-modules.bb

diff --cc conf/distro/vuplus.conf
Simple merge

diff --cc recipes/enigma2/enigma2.bb
index 286b485,ec65a2e..bdd93d2
--- 1/recipes/enigma2/enigma2.bb
--- 2/recipes/enigma2/enigma2.bb
+++ b/recipes/enigma2/enigma2.bb
@@@ -3,11 -3,11 +3,13 @@@ MAINTAINER = "Felix Domke <tmbinc@elite
  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 \
 +      directfb mpfr gmp tslib opera-hbbtv"
+       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 "
  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 \
+       python-pickle gst-plugin-app gst-plugin-fragmented \
        gst-plugin-id3demux gst-plugin-mad gst-plugin-ogg gst-plugin-playbin \
        gst-plugin-typefindfunctions gst-plugin-audioconvert gst-plugin-audioresample \
        gst-plugin-wavparse python-netclient gst-plugin-mpegstream \

diff --cc recipes/tasks/task-vuplus-enigma2.bb
index 9f93b70,d3da6a6..734d6bf
--- 1/recipes/tasks/task-vuplus-enigma2.bb
--- 2/recipes/tasks/task-vuplus-enigma2.bb
+++ b/recipes/tasks/task-vuplus-enigma2.bb
@@@ -29,9 -30,17 +29,18 @@@ RDEPENDS_task-vuplus-enigma2 = "
    enigma2-meta \
    enigma2-plugins-meta \
    enigma2-skins-meta \   
+   enigma2-plugin-systemplugins-crashreport \
+   enigma2-plugin-systemplugins-3gmodemmanager \
+   enigma2-plugin-extensions-streamtv \
+   enigma2-plugin-extensions-dlnaserver \
+   enigma2-plugin-extensions-dlnabrowser \
+   enigma2-plugin-extensions-remotestreamconvert \
+   enigma2-plugin-systemplugins-zappingmodeselection \
+   enigma2-plugin-extensions-addstreamurl \
+   enigma2-plugin-systemplugins-devicemanager \
  "
  
 +
  RRECOMMENDS_task-vuplus-enigma2 = "\
    aio-grab \
    python-crypt \
@@@ -40,8 -49,8 +49,9 @@@
    python-twisted-protocols \
    python-twisted-web \
    enigma2-plugin-extensions-mediaplayer \
 +  enigma2-plugin-extensions-hbbtv \
    enigma2-plugin-extensions-pictureplayer \
+   enigma2-plugin-extensions-vuplusevent \
    enigma2-plugin-systemplugins-skinselector \
    enigma2-plugin-systemplugins-ui3dsetup \
    enigma2-plugin-systemplugins-uipositionsetup \
@@@ -51,33 -61,17 +62,31 @@@
  
  RDEPENDS_task-vuplus-enigma2_append_bm750 = "\
    enigma2-plugin-systemplugins-fancontrol \
-   vuplus-webbrowser-utils \
-   enigma2-plugin-extensions-webbrowser \
+   enigma2-plugin-extensions-hbbtv \
  "
 +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 \
    enigma2-plugin-systemplugins-fpgaupgrade \
    enigma2-plugin-systemplugins-blindscan \
    enigma2-plugin-systemplugins-manualfancontrol \
    enigma2-plugin-systemplugins-remotecontrolcode \
-   vuplus-webbrowser-utils \
-   enigma2-plugin-extensions-webbrowser \
+   enigma2-plugin-extensions-hbbtv \
  "
  RDEPENDS_task-vuplus-enigma2_append_vuultimo = "\
 +  vuplus-blindscan-utils \
    enigma2-plugin-systemplugins-firmwareupgrade \
    enigma2-plugin-systemplugins-blindscan \
    enigma2-plugin-systemplugins-manualfancontrol \

diff --cc recipes/tasks/task-vuplus-wlan.bb
Simple merge

diff --cc recipes/tuxbox/libdvbsi++.bb
index 8502318,542383a..71ff5fd
--- 1/recipes/tuxbox/libdvbsi++.bb
--- 2/recipes/tuxbox/libdvbsi++.bb
+++ b/recipes/tuxbox/libdvbsi++.bb
@@@ -5,10 -5,10 +5,9 @@@ MAINTAINER = "Felix Domke <tmbinc@elitd
  SRC_URI = "git://git.opendreambox.org/git/obi/libdvbsi++.git;protocol=git"
  
  SRCREV = "49b0c78a0b0db3efd0a49c4cf2fc1c7f4bf21c15"
--
  PV = "1.0+git${SRCPV}"
  PKGV = "1.0+git${GITPKGV}"
- PR = "r0"
+ PR = "r1"
  
  S = "${WORKDIR}/git"
  

diff --cc recipes/udev/udev_124.bb
Simple merge

diff --cc recipes/vuplus/vuplus-dvb-modules.bb
index effc821,1d27651..a71fb1b
--- 1/recipes/vuplus/vuplus-dvb-modules.bb
--- 2/recipes/vuplus/vuplus-dvb-modules.bb
+++ b/recipes/vuplus/vuplus-dvb-modules.bb
@@@ -3,18 -3,14 +3,17 @@@ SECTION = "base
  PRIORITY = "required"
  LICENSE = "proprietary"
  
- 
  KV = "${@base_contains('PREFERRED_VERSION_linux-${MACHINE}', '2.6.18', '2.6.18', '3.1.1', d)}"
 +KV_vusolo2 = "${@base_contains('PREFERRED_VERSION_linux-${MACHINE}', '2.6.18', '2.6.18', '2.6.37', d)}"
  
  PV = "${KV}"
  
- SRCDATE_bm750 = "20111213"
- SRCDATE_vusolo = "20111213"
- SRCDATE_vuuno = "20111213"
- SRCDATE_vuultimo = "20111213"
+ SRCDATE_bm750 = "20120824"
+ SRCDATE_vusolo = "20120824"
+ SRCDATE_vuuno = "20120824"
+ SRCDATE_vuultimo = "20120824"
 +SRCDATE_vuduo2 = "20120829"
 +SRCDATE_vusolo2 = "20120829"
  
  MODULES_NAME_bm750 = "procmk\ndvb-bcm7335\nbrcmfb"
  MODULES_NAME_vusolo = "procmk\ndvb-bcm7325\nbrcmfb"