Merge remote-tracking branch 'OE-2.1/master' into vuplus-3.0

Conflicts:
	meta-openvuplus/recipes-core/tasks/task-core-boot.inc
	meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
	meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-enigma2.bb
	meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-essential.bb

diff --cc Makefile
Simple merge

diff --cc meta-openvuplus/recipes-connectivity/packagegroups/packagegroup-vuplus-wlan.bb
index dba0e47,0000000..ecd49df
mode 100644,000000..100644
--- 1/meta-openvuplus/recipes-connectivity/packagegroups/packagegroup-vuplus-wlan.bb
--- /dev/null
+++ b/meta-openvuplus/recipes-connectivity/packagegroups/packagegroup-vuplus-wlan.bb
@@@ -1,57 -1,0 +1,57 @@@
- PR = "r15"
 +DESCRIPTION = "Vuplus: W-LAN package group for the Vuplus Distribution"
 +SECTION = "vuplus/base"
 +LICENSE = "MIT"
 +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-       ${@base_contains('VUPLUS_FEATURES', 'ralink-kmod', 'kernel-module-rt2800usb', ' ', d)} \
++PR = "r16"
 +
 +inherit packagegroup
 +
 +DEPENDS_${PN} = "enigma2"
 +RDEPENDS_${PN} = "\
 +      enigma2-plugin-systemplugins-wirelesslansetup \
 +      wireless-tools \
 +      wpa-supplicant \
 +"
 +
 +WIFI_FIRMWARES = "\
 +      rt73-firmware \
 +      zd1211-firmware \
 +      firmware-htc9271 \
 +      firmware-rt2561 \
 +      firmware-rtl8721u \
 +      firmware-rt3070 \
 +"
 +
 +KERNEL_WIFI_MODULES = " \
 +      kernel-module-ath9k-htc \
 +      kernel-module-carl9170 \
 +      kernel-module-prism2-usb \
 +      kernel-module-rt73usb \
 +      kernel-module-rt2500usb \
 +      kernel-module-rtl8187 \
 +      kernel-module-r8712u \
 +      kernel-module-w35und \
 +      kernel-module-zd1211rw \
 +      kernel-module-llc \
 +      kernel-module-stp \
 +      kernel-module-bridge \
 +      kernel-module-hostap \
-       ${@base_contains('VUPLUS_FEATURES', 'ralink-legacy', 'rt3070', ' ', d)} \
++      kernel-module-rt2800usb \
 +"
 +
 +KERNEL_WIFI_MODULES += "${@base_version_less_or_equal('VUPLUS_KERNEL_VERSION', '3.1.1', 'kernel-module-r8192u-usb', '', d)}"
 +
 +LEGACY_MODULES = " \
++      rt3070 \
 +      r8192cu \
 +"
 +
 +RDEPENDS_${PN}_append = "\
 +      ${WIFI_FIRMWARES} \
 +      ${KERNEL_WIFI_MODULES} \
 +      ${LEGACY_MODULES} \
 +      rt2870sta \
 +"
 +
 +PACKAGE_ARCH = "${MACHINE_ARCH}"
 +

diff --cc meta-openvuplus/recipes-core/packagegroup/packagegroup-core-boot.bbappend
index 0000000,0000000..b117e62
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/meta-openvuplus/recipes-core/packagegroup/packagegroup-core-boot.bbappend
@@@ -1,0 -1,0 +1,2 @@@
++PR .= "-vuplus0"
++

diff --cc meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.1.bb
Simple merge

diff --cc meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
index 65ac1c6,2c0798c..c55df2f
--- 1/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
--- 2/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
+++ b/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
@@@ -6,10 -6,10 +6,10 @@@ LIC_FILES_CHKSUM = "file://README;first
  DEPENDS = "python-cheetah-native"
  RDEPENDS_${PN} = "python-cheetah python-json python-unixadmin python-misc python-pyopenssl aio-grab"
  
 -inherit gitpkgv
 +inherit gitpkgv pythonnative
  PV = "0.1+git${SRCPV}"
  PKGV = "0.1+git${GITPKGV}"
- PR = "r0.81"
+ PR = "r0.82"
  
  require openplugins.inc
  
@@@ -26,31 -26,32 +26,32 @@@ do_install() 
  }
  
  python do_package_prepend () {
 -      boxtypes = [
 -              ('bm750', 'duo.jpg', 'vu_normal.png'),
 -              ('vuduo2', 'duo2.jpg', 'vu_normal.png'),
 -              ('vusolo', 'solo.jpg', 'vu_normal.png'),
 -              ('vusolo2', 'solo2.jpg', 'vu_normal.png'),
 -              ('vusolose', 'solose.jpg', 'vu_normal.png'),
 -              ('vuultimo', 'ultimo.jpg', 'vu_ultimo.png'),
 -              ('vuuno', 'uno.jpg', 'vu_normal.png'),
 -      ]
 -      import os
 -      top = '${D}${PLUGINPATH}/public/images/'
 -      target_box = 'unknown.jpg'
 -      target_remote = 'ow_remote.png'
 -      for x in boxtypes:
 -              if x[0] == '${MACHINE}':
 -                      target_box = x[1]
 -                      target_remote = x[2]
 -                      break
 -      for root, dirs, files in os.walk(top + 'boxes', topdown=False):
 -              for name in files:
 -                      if target_box != name and name != 'unknown.jpg':
 -                              os.remove(os.path.join(root, name))
 -      for root, dirs, files in os.walk(top + 'remotes', topdown=False):
 -              for name in files:
 -                      if target_remote != name and name != 'ow_remote.png':
 -                              os.remove(os.path.join(root, name))
 +    boxtypes = [
 +        ('bm750', 'duo.jpg', 'vu_normal.png'),
 +        ('vuduo2', 'duo2.jpg', 'vu_normal.png'),
 +        ('vusolo', 'solo.jpg', 'vu_normal.png'),
 +        ('vusolo2', 'solo2.jpg', 'vu_normal.png'),
++        ('vusolose', 'solose.jpg', 'vu_normal.png'),
 +        ('vuultimo', 'ultimo.jpg', 'vu_ultimo.png'),
 +        ('vuuno', 'uno.jpg', 'vu_normal.png'),
 +    ]
 +    import os
 +    top = '${D}${PLUGINPATH}/public/images/'
 +    target_box = 'unknown.jpg'
 +    target_remote = 'ow_remote.png'
 +    for x in boxtypes:
 +        if x[0] == '${MACHINE}':
 +            target_box = x[1]
 +            target_remote = x[2]
 +            break
 +    for root, dirs, files in os.walk(top + 'boxes', topdown=False):
 +        for name in files:
 +            if target_box != name and name != 'unknown.jpg':
 +                os.remove(os.path.join(root, name))
 +    for root, dirs, files in os.walk(top + 'remotes', topdown=False):
 +        for name in files:
 +            if target_remote != name and name != 'ow_remote.png':
 +                os.remove(os.path.join(root, name))
  }
  
  FILES_${PN} = "${PLUGINPATH}"

diff --cc meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
index 15fbbaf,44b905e..7cda144
--- 1/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
--- 2/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
@@@ -88,11 -89,13 +88,11 @@@ RDEPENDS_enigma2-plugin-systemplugins-b
  RDEPENDS_enigma2-plugin-systemplugins-backupsuiteusb = "enigma2-plugin-extensions-backupsuitehdd"
  
  PN = "enigma2"
- PR = "r72"
+ PR = "r77"
  
 -SRCDATE = "20121128"
 -#SRCDATE is NOT used by git to checkout a specific revision
 -#but we need it to build a ipk package version
 -#when you like to checkout a specific revision of e2 you need
 -#have to specify a commit id or a tag name in SRCREV
 +inherit gitpkgv pythonnative
 +
 +PKGV = "git${GITPKGV}"
  
  ####################################################
  BRANCH = "vuplus_experimental"

diff --cc meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.1.bb
Simple merge

diff --cc meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-enigma2.bb
index 7b172f1,0000000..e0b9538
mode 100644,000000..100644
--- 1/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-enigma2.bb
--- /dev/null
+++ b/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-enigma2.bb
@@@ -1,73 -1,0 +1,73 @@@
- PR = "r0"
 +SUMMARY = "Enigma2 set of packages for Vuplus"
 +SECTION = "vuplus/base"
 +LICENSE = "GPLv2"
 +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
++PR = "r1"
 +
 +inherit packagegroup
 +
 +PACKAGE_ARCH = "${MACHINE_ARCH}"
 +
 +RDEPENDS_${PN} += " \
 +  enigma2 \
 +  enigma2-defaultservices \
 +  enigma2-streamproxy \
 +  tuxbox-tuxtxt-32bpp \
 +  showiframe \
 +  enigma2-meta \
 +  enigma2-plugins-meta \
 +  enigma2-skins-meta \
 +  enigma2-plugin-extensions-mediascanner \
 +  enigma2-plugin-systemplugins-crashreport \
 +  enigma2-plugin-extensions-remotestreamconvert \
 +  enigma2-plugin-systemplugins-zappingmodeselection \
 +  enigma2-plugin-extensions-addstreamurl \
 +  enigma2-plugin-systemplugins-devicemanager \
 +  enigma2-plugin-systemplugins-videomode \
 +  enigma2-plugin-systemplugins-netdrive \
 +"
 +
 +RRECOMMENDS_${PN} += " \
 +  glib-networking \
 +  dvbsnoop \
 +"
 +
 +RDEPENDS_${PN} += " \
 +  aio-grab \
 +  python-misc python-shell python-ctypes \
 +  python-crypt \
 +  python-netserver \
 +  python-twisted-core \
 +  python-twisted-protocols \
 +  python-twisted-web \
 +  ${@base_contains("MACHINE_FEATURES", "wifi", "packagegroup-vuplus-wlan", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "webmanual", "vuplus-manual", "", d)} \
 +  enigma2-plugin-extensions-mediaplayer \
 +  enigma2-plugin-extensions-pictureplayer \
 +  enigma2-plugin-systemplugins-skinselector \
 +  enigma2-plugin-systemplugins-ui3dsetup \
 +  enigma2-plugin-systemplugins-uipositionsetup \
 +  enigma2-plugin-systemplugins-hdmicec \
 +  enigma2-plugin-extensions-openwebif \
 +  ${@base_contains("MACHINE_FEATURES", "wifi", "enigma2-plugin-systemplugins-wirelessaccesspoint", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "fan_simple", "enigma2-plugin-systemplugins-fancontrol","", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "fan_manual", "enigma2-plugin-systemplugins-manualfancontrol", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "rc_code", "enigma2-plugin-systemplugins-remotecontrolcode", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "led", "enigma2-plugin-systemplugins-ledbrightnesssetup", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "blindscan", "enigma2-plugin-systemplugins-blindscan  vuplus-blindscan-utils", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "fpgaupgrade", "enigma2-plugin-systemplugins-fpgaupgrade", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "firmwareupgrade", "enigma2-plugin-systemplugins-firmwareupgrade", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "hbbtv", "enigma2-plugin-extensions-hbbtv", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "streamtv", "enigma2-plugin-extensions-streamtv", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "dlna", "enigma2-plugin-extensions-dlnaserver enigma2-plugin-extensions-dlnabrowser", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "3gmodem", "enigma2-plugin-systemplugins-3gmodemmanager", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "autoshutdown", "enigma2-plugin-systemplugins-autoshutdown", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "transcoding", "enigma2-plugin-systemplugins-transcodingsetup enigma2-transtreamproxy", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "wol", "enigma2-plugin-systemplugins-wolsetup", "", d)} \
 +  ${@base_conditional("MACHINE", "vuduo2", "duo2lcd4linux lcd4linuxsupport", "", d)} \
 +  ${@base_conditional("MACHINE", "vuduo2", "vuplus-checkvfd", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "audioeffect", "enigma2-plugin-systemplugins-audioeffect", "", d)} \
 +"
 +
 +PACKAGE_ARCH = "${MACHINE_ARCH}"
 +

diff --cc meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-essential.bb
index d19dbaf,0000000..1625811
mode 100644,000000..100644
--- 1/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-essential.bb
--- /dev/null
+++ b/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-essential.bb
@@@ -1,227 -1,0 +1,216 @@@
- RDEPENDS_${PN} = '${ESSENTIAL_RDEPENDS}'
 +SUMMARY = "Vuplus: Essential packages"
 +SECTION = "vuplus/base"
 +LICENSE = "MIT"
 +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 +DEPENDS = "virtual/kernel"
- RDEPENDS_${PN} += "${@base_version_less_or_equal('VUPLUS_KERNEL_VERSION', '3.3.1', '${KERNEL_DVB_MODULES}', '${KERNEL_DVB_MODULES_3.3.6}', d)}"
- 
- PR = "r0"
 +
++RDEPENDS_${PN} = '${ESSENTIAL_RDEPENDS}'
 +RRECOMMENDS_${PN} = '${ESSENTIAL_RRECOMMENDS}'
++RRECOMMENDS_${PN} += '${KERNEL_DVB_MODULES}'
 +
-         kernel-module-stv0299 \
++PR = "r5"
 +
 +inherit packagegroup
 +
 +PACKAGE_ARCH = "${MACHINE_ARCH}"
 +
 +ESSENTIAL_RDEPENDS = " \
- ESSENTIAL_RRECOMMENDS = " \
 +"
 +
-         kernel-module-cdrom \
++KERNEL_FS_MODULES = " \
++        kernel-module-ext2 \
++        kernel-module-ext4 \
 +        kernel-module-autofs4 \
-         kernel-module-nls-iso8859-1 \
-         kernel-module-nls-iso8859-15 \
-         kernel-module-ntfs \
-         kernel-module-reiserfs \
 +        kernel-module-cifs \
++        kernel-module-msdos \
++        kernel-module-udf \
++        kernel-module-isofs \
 +        kernel-module-nls-cp850 \
-         kernel-module-usbhid \
-       kernel-module-ext2 \
++"
++
++ESSENTIAL_RRECOMMENDS = " \
++        kernel-module-cdrom \
 +        kernel-module-sr-mod \
-         kernel-module-em28xx-dvb \
-         kernel-module-dvb-usb-a800 \
-         kernel-module-dvb-usb-af9005 \
-         kernel-module-af9013 kernel-module-mt2060 kernel-module-qt1010 kernel-module-tda18271 kernel-module-mxl5005s kernel-module-mc44s803 kernel-module-tda18218 kernel-module-mxl5007t kernel-module-dvb-usb-af9015 \
-         kernel-module-mxl5007t kernel-module-tda18218 \
-         kernel-module-tda10021 kernel-module-tda10023 kernel-module-mt352 kernel-module-zl10353 kernel-module-tda18212 kernel-module-cx24116 kernel-module-stv0900 kernel-module-stv6110 kernel-module-stv6110x kernel-module-isl6423 kernel-module-dvb-usb-anysee \
-         kernel-module-zl10353 kernel-module-qt1010 kernel-module-dvb-usb-au6610 \
-         kernel-module-dvb-usb-az6027 \
-         kernel-module-zl10353 kernel-module-mxl5005s  kernel-module-dvb-usb-ce6230 \
-         kernel-module-lgdt330x kernel-module-mt352 kernel-module-zl10353 kernel-module-tuner-xc2028 kernel-module-tuner-simple kernel-module-mxl5005s kernel-module-max2165 kernel-module-lgs8gxx kernel-module-atbm8830 kernel-module-dvb-usb-cxusb kernel-module-drxd \
-         kernel-module-dvb-usb-cinergyt2 \
-         kernel-module-mt352 kernel-module-nxt6000 kernel-module-dvb-usb-digitv \
-         kernel-module-mt2060 kernel-module-mt2266 kernel-module-tuner-xc2028 kernel-module-xc5000 kernel-module-xc4000 kernel-module-s5h1411 kernel-module-lgdt3305 kernel-module-mxl5007t kernel-module-dvb-usb-dib0700 \
-         kernel-module-dvb-usb-dibusb-mb \
-         kernel-module-dvb-usb-dibusb-mc \
-         kernel-module-zl10353 kernel-module-qt1010 kernel-module-dvb-usb-dtv5100 \
-         kernel-module-dvb-usb-dtt200u \
-         kernel-module-si21xx kernel-module-stv0299 kernel-module-stv0288 kernel-module-stb6000 kernel-module-cx24116 \
-         kernel-module-mt312 kernel-module-zl10039 kernel-module-ds3000 kernel-module-stv0900 kernel-module-stv6110 kernel-module-dvb-usb-dw2102 \
-         kernel-module-ec100 kernel-module-mxl5005s kernel-module-dvb-usb-ec168 \
-         kernel-module-zl10353 kernel-module-qt1010 kernel-module-dvb-usb-gl861 \
-         kernel-module-dvb-usb-gp8psk \
-         kernel-module-mt352 kernel-module-qt1010 kernel-module-tda1004x kernel-module-tda827x kernel-module-dvb-usb-m920x \
-         kernel-module-stv0299 kernel-module-dvb-usb-opera \
-         kernel-module-stv090x kernel-module-dvb-usb-technisat-usb2 \
-         kernel-module-tda826x kernel-module-tda10086 kernel-module-tda827x kernel-module-lnbp21 kernel-module-dvb-usb-ttusb2 \
-         kernel-module-dvb-ttusb-budget \
-         kernel-module-dvb-usb-nova-t-usb2 \
-         kernel-module-mt352 kernel-module-dvb-usb-umt-010 \
-         kernel-module-dvb-usb-vp702x \
-       kernel-module-dvb-usb-vp7045 \
-       kernel-module-smsdvb kernel-module-smsusb \
++      ${KERNEL_FS_MODULES} \
++"
++
++DVB_USB_V1 = " \
++  kernel-module-dvb-usb \
++  kernel-module-dvb-usb-a800 \
++  kernel-module-dvb-usb-dibusb-common \
++  kernel-module-dvb-usb-dibusb-mb \
++  kernel-module-dvb-usb-dibusb-mc \
++  kernel-module-dvb-usb-dib0700 \
++  kernel-module-dvb-usb-umt-010 \
++  kernel-module-dvb-usb-cxusb \
++  kernel-module-dvb-usb-m920x \
++  kernel-module-dvb-usb-digitv \
++  kernel-module-dvb-usb-vp7045 \
++  kernel-module-dvb-usb-vp702x \
++  kernel-module-dvb-usb-gp8psk \
++  kernel-module-dvb-usb-nova-t-usb2 \
++  kernel-module-dvb-usb-ttusb2 \
++  kernel-module-dvb-usb-dtt200u \
++  kernel-module-dvb-usb-opera \
++  kernel-module-dvb-usb-af9005 \
++  kernel-module-dvb-usb-af9005-remote \
++  kernel-module-dvb-usb-pctv452e \
++  kernel-module-dvb-usb-dw2102 \
++  kernel-module-dvb-usb-cinergyt2 \
++  kernel-module-dvb-usb-dtv5100 \
++  kernel-module-dvb-usb-friio \
++  kernel-module-dvb-usb-az6027 \
++  kernel-module-dvb-usb-technisat-usb2 \
++"
++
++DVB_USB_V2 = " \
++  kernel-module-dvb-usb-v2 \
++  kernel-module-dvb-usb-af9015 \
++  kernel-module-dvb-usb-af9035 \
++  kernel-module-dvb-usb-anysee \
++  kernel-module-dvb-usb-au6610 \
++  kernel-module-dvb-usb-az6007 \
++  kernel-module-dvb-usb-ce6230 \
++  kernel-module-dvb-usb-ec168 \
++  kernel-module-dvb-usb-gl861 \
++  kernel-module-dvb-usb-it913x \
++  kernel-module-dvb-usb-lmedm04 \
++  kernel-module-dvb-usb-mxl111sf \
++  kernel-module-mxl111sf-demod \
++  kernel-module-mxl111sf-tuner \
++  kernel-module-dvb-usb-rtl28xxu \
++"
++
++KERNEL_MEDIA_USB_ADAPTERS = " \
++  kernel-module-au0828 \
++  ${DVB_USB_V1} \
++  ${DVB_USB_V2} \
++  kernel-module-dvb-ttusb-budget \
++  kernel-module-smsusb \
++  kernel-module-b2c2-flexcop-usb \
++"
++
++KERNEL_MEDIA_CUSTOMIZE_TV_TUNER = " \
++  kernel-module-tuner-simple \
++  kernel-module-tuner-types \
++  kernel-module-tda8290 \
++  kernel-module-tda827x \
++  kernel-module-tda18271 \
++  kernel-module-tda9887 \
++  kernel-module-tea5761 \
++  kernel-module-tea5767 \
++  kernel-module-mt20xx \
++  kernel-module-mt2060 \
++  kernel-module-mt2063 \
++  kernel-module-mt2266 \
++  kernel-module-mt2131 \
++  kernel-module-qt1010 \
++  kernel-module-tuner-xc2028 \
++  kernel-module-xc5000 \
++  kernel-module-xc4000 \
++  kernel-module-mxl5005s \
++  kernel-module-mxl5007t \
++  kernel-module-mc44s803 \
++  kernel-module-max2165 \
++  kernel-module-tda18218 \
++  kernel-module-fc0011 \
++  kernel-module-fc0012 \
++  kernel-module-fc0013 \
++  kernel-module-tda18212 \
++  kernel-module-e4000 \
++  kernel-module-fc2580 \
++  kernel-module-tua9001 \
++  kernel-module-tuner-it913x \
++  kernel-module-r820t \
++"
++
++KERNEL_MEDIA_CUSTOMIZE_DVB_FRONTENDS = " \
++  kernel-module-stb0899 \
++  kernel-module-stb6100 \
++  kernel-module-stv090x \
++  kernel-module-stv6110x \
++  kernel-module-drxk \
++  kernel-module-tda18271c2dd \
++  kernel-module-cx24110 \
++  kernel-module-cx24123 \
++  kernel-module-mt312 \
++  kernel-module-zl10036 \
++  kernel-module-zl10039 \
++  kernel-module-s5h1420 \
++  kernel-module-stv0288 \
++  kernel-module-stb6000 \
++  kernel-module-stv0299 \
++  kernel-module-stv6110 \
++  kernel-module-stv6110x \
++  kernel-module-stv0900 \
++  kernel-module-tda8083 \
++  kernel-module-tda10086 \
++  kernel-module-tda8261 \
++  kernel-module-ves1x93 \
++  kernel-module-itd1000 \
++  kernel-module-cx24113 \
++  kernel-module-tda826x \
++  kernel-module-tua6100 \
++  kernel-module-cx24116 \
++  kernel-module-cx24117 \
++  kernel-module-si21xx \
++  kernel-module-ts2020 \
++  kernel-module-ds3000 \
++  kernel-module-mb86a16 \
++  kernel-module-tda10071 \
++  kernel-module-sp8870 \
++  kernel-module-sp887x \
++  kernel-module-cx22700 \
++  kernel-module-cx22702 \
++  kernel-module-s5h1432 \
++  kernel-module-drxd \
++  kernel-module-l64781 \
++  kernel-module-tda1004x \
++  kernel-module-nxt6000 \
++  kernel-module-mt352 \
++  kernel-module-zl10353 \
++  kernel-module-dib3000mb \
++  kernel-module-dib3000mc \
++  kernel-module-dib7000m \
++  kernel-module-dib7000p \
++  kernel-module-dib9000 \
++  kernel-module-tda10048 \
++  kernel-module-af9013 \
++  kernel-module-ec100 \
++  kernel-module-hd29l2 \
++  kernel-module-stv0367 \
++  kernel-module-cxd2820r \
++  kernel-module-rtl2830 \
++  kernel-module-rtl2832 \
++  kernel-module-ves1820 \
++  kernel-module-tda10021 \
++  kernel-module-tda10023 \
++  kernel-module-stv0297 \
++  kernel-module-s921 \
++  kernel-module-dib8000 \
++  kernel-module-mb86a20s \
++  kernel-module-dvb-pll \
++  kernel-module-dib0070 \
++  kernel-module-dib0090 \
++  kernel-module-lnbp21 \
++  kernel-module-lnbp22 \
++  kernel-module-isl6405 \
++  kernel-module-isl6421 \
++  kernel-module-isl6423 \
++  kernel-module-a8293 \
++  kernel-module-lgs8gl5 \
++  kernel-module-lgs8gxx \
++  kernel-module-atbm8830 \
++  kernel-module-tda665x \
++  kernel-module-ix2505v \
++  kernel-module-it913x-fe \
++  kernel-module-m88rs2000 \
++  kernel-module-af9033 \
 +"
 +
 +KERNEL_DVB_MODULES = " \
- KERNEL_DVB_MODULES_3.3.6 = " \
-       kernel-module-stv0297 \
-       kernel-module-ds3000 \
-       kernel-module-stb6100 \
-       kernel-module-zl10039 \
-       kernel-module-cx22700 \
-       kernel-module-a8293 \
-       kernel-module-af9013 \
-       kernel-module-sp887x \
-       kernel-module-mb86a20s \
-       kernel-module-s5h1420 \
-       kernel-module-drxk \
-       kernel-module-mt312 \
-       kernel-module-isl6423 \
-       kernel-module-tda10023 \
-       kernel-module-stv090x \
-       kernel-module-cxd2820r \
-       kernel-module-tda8083 \
-       kernel-module-ec100 \
-       kernel-module-dib9000 \
-       kernel-module-tua6100 \
-       kernel-module-dib7000m \
-       kernel-module-stv6110x \
-       kernel-module-rtl2832 \
-       kernel-module-cx22702 \
-       kernel-module-dib0090 \
-       kernel-module-af9033 \
-       kernel-module-stv0900 \
-       kernel-module-tda10086 \
-       kernel-module-cx24113 \
-       kernel-module-it913x-fe \
-       kernel-module-nxt6000 \
-       kernel-module-lnbp22 \
-       kernel-module-ix2505v \
-       kernel-module-m88rs2000 \
-       kernel-module-isl6405 \
-       kernel-module-cx24116 \
-       kernel-module-tda8261 \
-       kernel-module-drxd \
-       kernel-module-dib3000mb \
-       kernel-module-stb0899 \
-       kernel-module-l64781 \
-       kernel-module-tda10071 \
-       kernel-module-stv0367 \
-       kernel-module-tda18271c2dd \
-       kernel-module-ves1x93 \
-       kernel-module-stv6110 \
-       kernel-module-mb86a16 \
-       kernel-module-cx24110 \
-       kernel-module-lgs8gl5 \
-       kernel-module-rtl2830 \
-       kernel-module-dib8000 \
-       kernel-module-dvb-pll \
-       kernel-module-lgs8gxx \
-       kernel-module-zl10353 \
-       kernel-module-lnbp21 \
-       kernel-module-stv0288 \
-       kernel-module-tda665x \
-       kernel-module-sp8870 \
-       kernel-module-isl6421 \
-       kernel-module-tda826x \
-       kernel-module-dib7000p \
-       kernel-module-s921 \
-       kernel-module-atbm8830 \
-       kernel-module-tda10021 \
-       kernel-module-tda1004x \
-       kernel-module-itd1000 \
-       kernel-module-si21xx \
-       kernel-module-stv0299 \
-       kernel-module-cx24123 \
-       kernel-module-stb6000 \
-       kernel-module-tda10048 \
-       kernel-module-mt352 \
-       kernel-module-s5h1432 \
-       kernel-module-dib0070 \
-       kernel-module-dib3000mc \
-       kernel-module-hd29l2 \
-       kernel-module-zl10036 \
-       kernel-module-ves1820 \
-       kernel-module-mxl5005s \
-       kernel-module-tuner-simple \
-       kernel-module-fc2580 \
-       kernel-module-tda8290 \
-       kernel-module-tda9887 \
-       kernel-module-tda18218 \
-       kernel-module-fc0013 \
-       kernel-module-fc0012 \
-       kernel-module-fc0011 \
-       kernel-module-mt20xx \
-       kernel-module-mc44s803 \
-       kernel-module-mt2131 \
-       kernel-module-tea5761 \
-       kernel-module-tuner-xc2028 \
-       kernel-module-mt2060 \
-       kernel-module-e4000 \
-       kernel-module-max2165 \
-       kernel-module-mt2063 \
-       kernel-module-xc5000 \
-       kernel-module-tuner-types \
-       kernel-module-xc4000 \
-       kernel-module-tua9001 \
-       kernel-module-mxl5007t \
-       kernel-module-tda18271 \
-       kernel-module-tda18212 \
-       kernel-module-tea5767 \
-       kernel-module-qt1010 \
-       kernel-module-mt2266 \
-       kernel-module-tda827x \
-       kernel-module-smsusb \
-       kernel-module-dvb-usb-az6027 \
-       kernel-module-dvb-usb \
-       kernel-module-dvb-usb-opera \
-       kernel-module-dvb-usb-umt-010 \
-       kernel-module-dvb-usb-gp8psk \
-       kernel-module-dvb-usb-a800 \
-       kernel-module-dvb-usb-dibusb-common \
-       kernel-module-dvb-usb-nova-t-usb2 \
-       kernel-module-dvb-usb-digitv \
-       kernel-module-dvb-usb-pctv452e \
-       kernel-module-dvb-usb-af9005-remote \
-       kernel-module-dvb-usb-dtv5100 \
-       kernel-module-dvb-usb-cxusb \
-       kernel-module-dvb-usb-dw2102 \
-       kernel-module-dvb-usb-vp702x \
-       kernel-module-dvb-usb-cinergyt2 \
-       kernel-module-dvb-usb-dib0700 \
-       kernel-module-dvb-usb-dibusb-mb \
-       kernel-module-dvb-usb-m920x \
-       kernel-module-dvb-usb-friio \
-       kernel-module-dvb-usb-dibusb-mc \
-       kernel-module-dvb-usb-ttusb2 \
-       kernel-module-dvb-usb-vp7045 \
-       kernel-module-dvb-usb-af9005 \
-       kernel-module-dvb-usb-dtt200u \
-       kernel-module-dvb-usb-technisat-usb2 \
-       kernel-module-au0828 \
-       kernel-module-dvb-usb-v2 \
-       kernel-module-dvb-usb-az6007 \
-       kernel-module-dvb-usb-anysee \
-       kernel-module-dvb-usb-mxl111sf \
-       kernel-module-dvb-usb-gl861 \
-       kernel-module-dvb-usb-ec168 \
-       kernel-module-dvb-usb-it913x \
-       kernel-module-mxl111sf-tuner \
-       kernel-module-dvb-usb-ce6230 \
-       kernel-module-dvb-usb-af9035 \
-       kernel-module-dvb-usb-af9015 \
-       kernel-module-dvb-usb-cypress-firmware \
-       kernel-module-dvb-usb-au6610 \
-       kernel-module-dvb-usb-rtl28xxu \
-       kernel-module-mxl111sf-demod \
-       kernel-module-b2c2-flexcop-usb \
-       kernel-module-smsdvb \
-       kernel-module-smsmdtv \
-       kernel-module-b2c2-flexcop \
-       kernel-module-tveeprom \
-       "
++  ${KERNEL_MEDIA_USB_ADAPTERS} \
++  ${KERNEL_MEDIA_CUSTOMIZE_TV_TUNER} \
++  ${KERNEL_MEDIA_CUSTOMIZE_DVB_FRONTENDS} \
 +"
 +

diff --cc meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper.bb
index 43c32dd,0a6a2e9..1904bd7
--- 1/meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper.bb
--- 2/meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper.bb
+++ b/meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper.bb
@@@ -1,10 -1,10 +1,10 @@@
  DESCIPTION = "helper tool to use usb dvb frontends"
  MAINTAINER = "PLi team"
  LICENSE = "GPLv2"
 -LIC_FILES_CHKSUM = "file://${THISDIR}/${PN}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
  
  PV = "1.0+git${SRCPV}"
- PR = "r2"
+ PR = "r3"
  SRC_REV = ""
  
  SRC_URI = " \