From: hschang <chang@dev3>
Date: Thu, 12 Mar 2015 04:33:39 +0000 (+0900)
Subject: Merge remote-tracking branch 'oe_21/master' into vuplus-3.0-next
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=commitdiff_plain;h=d5ed73c8eb69b1df41a91be4c5a92fd8881eade9

Merge remote-tracking branch 'oe_21/master' into vuplus-3.0-next

Conflicts:
	meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
---

d5ed73c8eb69b1df41a91be4c5a92fd8881eade9
diff --cc meta-bsp/common/recipes/vuplus/vuplus-tuner-turbo.inc
index 0000000,710c9ca..dcc6852
mode 000000,100644..100644
--- a/meta-bsp/common/recipes/vuplus/vuplus-tuner-turbo.inc
+++ b/meta-bsp/common/recipes/vuplus/vuplus-tuner-turbo.inc
@@@ -1,0 -1,45 +1,42 @@@
+ DESCRIPTION = "Hardware drivers and blindscan util for Vuplus Tuner Turbo"
+ SECTION = "base"
+ LICENSE = "CLOSED"
+ 
+ SRCDATE = "20150303"
+ FW_SRCDATE = "20150303"
+ KV = "${VUPLUS_KERNEL_VERSION}"
+ PV = "${KV}"
+ PR = "${SRCDATE}"
+ 
+ SRC_URI = " \
+     	http://archive.vuplus.com/download/usb/tuner/turbo/vuplus_tuner_turbo_driver_${PV}_${SRCDATE}.tar.gz;name=driver \
+     	http://archive.vuplus.com/download/usb/tuner/turbo/vuplus_tuner_turbo_bin_fw_${FW_SRCDATE}.tar.gz;name=binfw \
+ "
+ 
 -DEPENDS += "virtual/kernel module-init-tools"
 -RDEPENDS_${PN} += "module-init-tools-depmod"
 -
+ S = "${WORKDIR}"
+ 
+ inherit module-base
+ 
+ do_install() {
+         install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/media/usb/vuplus
+ 	install -m 0644 ${S}/vuplus_tuner_turbo_driver.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/media/usb/vuplus/vuplus_tuner_turbo_driver.ko
+ 	install -d ${D}/lib/firmware/
+ 	install -m 0644 ${S}/Vuplus_Turbo_USB_0101.fw ${D}/lib/firmware/Vuplus_Turbo_USB_0101.fw
+ 	install -d "${D}/${bindir}"
+ 	install -m 0755 "${S}/vuplus_turbo_c" "${D}/${bindir}"
+ 	install -m 0755 "${S}/vuplus_turbo_t" "${D}/${bindir}"
+ }
+ 
+ pkg_postinst_${PN} () {
+         if [ -d /proc/stb ]; then
+                 depmod -a
+         fi
+         true
+ }
+ 
+ PACKAGE_ARCH := "${MACHINE_ARCH}"
+ FILES_${PN} = "/"
+ 
+ SRC_URI[binfw.md5sum] = "517a9d54e41fae16612bcfe431ef7a3e"
+ SRC_URI[binfw.sha256sum] = "b39f0b38684c44a13dd62ac4286a4a73bcf74fd25a881ecfe97d292535163ca0"
+ 
diff --cc meta-bsp/vuduo2/recipes/vuplus/vuplus-dvb-proxy.bbappend
index dfc5fd2,67e6039..ff2530c
--- a/meta-bsp/vuduo2/recipes/vuplus/vuplus-dvb-proxy.bbappend
+++ b/meta-bsp/vuduo2/recipes/vuplus/vuplus-dvb-proxy.bbappend
@@@ -1,8 -1,8 +1,8 @@@
- SRCDATE = "20150113"
+ SRCDATE = "20150302"
  SRCDATE_PR = "r0"
  
 -do_install_append(){
 -  ln -s /lib/modules/${KERNEL_VERSION}/extra/dvb-bcm7424.ko ${D}/lib/modules/${KERNEL_VERSION}/extra/dvb-bcm.ko
 +pkg_postinst_${PN}_append () {
 +  ln -s /lib/modules/${KERNEL_VERSION}/extra/dvb-bcm7424.ko $D/lib/modules/${KERNEL_VERSION}/extra/dvb-bcm.ko
  }
  
  
diff --cc meta-bsp/vusolo2/recipes/vuplus/vuplus-dvb-proxy.bbappend
index dac3ac2,d47f2d4..bf3094a
--- a/meta-bsp/vusolo2/recipes/vuplus/vuplus-dvb-proxy.bbappend
+++ b/meta-bsp/vusolo2/recipes/vuplus/vuplus-dvb-proxy.bbappend
@@@ -1,8 -1,8 +1,8 @@@
- SRCDATE = "20150113"
+ SRCDATE = "20150302"
  SRCDATE_PR = "r0"
  
 -do_install_append(){
 -  ln -s /lib/modules/${KERNEL_VERSION}/extra/dvb-bcm7356.ko ${D}/lib/modules/${KERNEL_VERSION}/extra/dvb-bcm.ko
 +pkg_postinst_${PN}_append () {
 +  ln -s /lib/modules/${KERNEL_VERSION}/extra/dvb-bcm7356.ko $D/lib/modules/${KERNEL_VERSION}/extra/dvb-bcm.ko
  }
  
  
diff --cc meta-bsp/vusolose/recipes/vuplus/vuplus-dvb-proxy.bbappend
index d8045c4,0336754..9392dcd
--- a/meta-bsp/vusolose/recipes/vuplus/vuplus-dvb-proxy.bbappend
+++ b/meta-bsp/vusolose/recipes/vuplus/vuplus-dvb-proxy.bbappend
@@@ -1,9 -1,9 +1,9 @@@
- SRCDATE = "20150113"
+ SRCDATE = "20150302"
  SRCDATE_PR = "r0"
  
 -do_install_append(){
 -  ln -s /lib/modules/${KERNEL_VERSION}/extra/dvb-bcm7241.ko ${D}/lib/modules/${KERNEL_VERSION}/extra/dvb-bcm.ko
 +pkg_postinst_${PN}_append () {
 +  ln -s /lib/modules/${KERNEL_VERSION}/extra/dvb-bcm7241.ko $D/lib/modules/${KERNEL_VERSION}/extra/dvb-bcm.ko
  }
  
- SRC_URI[md5sum] = "af6a79ba8c1df1b6c502c5891ace8186"
- SRC_URI[sha256sum] = "fb8e7ad8d2116f8f01b36e11c60d42fcd966d76211499b8810b1784caa8f901e"
+ SRC_URI[md5sum] = "73e636c13d545a7421055adecdff0efa"
+ SRC_URI[sha256sum] = "0548027af76eeda4c2b8ae4e178115b89d3188a8d19362d3f132358aa01f8cc8"
diff --cc meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
index 71525f1,635c224..7464f06
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
@@@ -195,17 -89,20 +195,17 @@@ RDEPENDS_enigma2-plugin-systemplugins-b
  RDEPENDS_enigma2-plugin-systemplugins-backupsuiteusb = "enigma2-plugin-extensions-backupsuitehdd"
  
  DEPENDS += "${@base_contains("VUPLUS_FEATURES", "uianimation", "libgles libvugles2" , "", d)}"
 -RDEPENDS_append_vuplus += "${@base_contains("VUPLUS_FEATURES", "uianimation", "libgles libvugles2" , "", d)}"
 +RDEPENDS_${PN}_append_vuplus += "${@base_contains("VUPLUS_FEATURES", "uianimation", "libgles libvugles2" , "", d)}"
  
  PN = "enigma2"
- PR = "r100"
 -PR = "r97"
++PR = "r101"
  
 -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
  
  ####################################################
 -BRANCH = "vuplus_experimental"
 +SRCDATE = "20121128"
  PV = "experimental-git${SRCDATE}"
 +BRANCH = "vuplus_experimental_gst10"
  SRCREV = ""
  ####################################################
  
diff --cc meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-essential.bb
index ca6c040,0000000..4daa4d7
mode 100644,000000..100644
--- a/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-essential.bb
+++ b/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-essential.bb
@@@ -1,239 -1,0 +1,240 @@@
 +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} = '${ESSENTIAL_RDEPENDS}'
 +RRECOMMENDS_${PN} = '${ESSENTIAL_RRECOMMENDS}'
 +RRECOMMENDS_${PN} += '${KERNEL_DVB_MODULES}'
 +
- PR = "r7"
++PR = "r8"
 +
 +PACKAGE_ARCH = "${MACHINE_ARCH}"
 +
 +inherit packagegroup
 +
 +ESSENTIAL_RDEPENDS = " \
++	vuplus-tuner-turbo \
 +"
 +
 +KERNEL_FS_MODULES = " \
 +        kernel-module-ext2 \
 +        kernel-module-ext4 \
 +        kernel-module-autofs4 \
 +        kernel-module-cifs \
 +        kernel-module-msdos \
 +        kernel-module-udf \
 +        kernel-module-isofs \
 +        kernel-module-nls-cp850 \
 +"
 +
 +ESSENTIAL_RRECOMMENDS = " \
 +        kernel-module-cdrom \
 +        kernel-module-sr-mod \
 +	${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_ANALOG_USB_ADAPTERS = " \
 +  kernel-module-pvrusb2 \
 +  kernel-module-hdpvr \
 +  kernel-module-usbvision \
 +  kernel-module-stk1160 \
 +  kernel-module-poseidon \
 +"
 +
 +KERNEL_MEDIA_ANALOG_DIGITAL_USB_ADAPTERS = " \
 +  kernel-module-au0828 \
 +  kernel-module-cx231xx \
 +  kernel-module-tm6000 \
 +  kernel-module-em28xx \
 +"
 +
 +KERNEL_MEDIA_USB_ADAPTERS = " \
 +  kernel-module-au0828 \
 +  ${DVB_USB_V1} \
 +  ${DVB_USB_V2} \
 +  kernel-module-dvb-ttusb-budget \
 +  kernel-module-smsusb \
 +  kernel-module-smsdvb \
 +  kernel-module-smsmdtv \
 +  kernel-module-b2c2-flexcop \
 +  kernel-module-b2c2-flexcop-usb \
 +  kernel-module-tveeprom \
 +  kernel-module-cypress-firmware \
 +  kernel-module-dvb-usb-cypress-firmware \
 +  ${KERNEL_MEDIA_ANALOG_USB_ADAPTERS} \
 +  ${KERNEL_MEDIA_ANALOG_DIGITAL_USB_ADAPTERS} \
 +"
 +
 +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_MEDIA_USB_ADAPTERS} \
 +  ${KERNEL_MEDIA_CUSTOMIZE_TV_TUNER} \
 +  ${KERNEL_MEDIA_CUSTOMIZE_DVB_FRONTENDS} \
 +"
 +
diff --cc meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper.bb
index 10f4e56,7e126b5..397423e
--- a/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 = "r3"
+ PR = "r4"
  SRC_REV = ""
  
  SRC_URI = " \