Merge remote-tracking branch 'oe21/master' into vuplus-3.0
authorhschang <chang@dev3>
Thu, 22 Jan 2015 07:19:04 +0000 (16:19 +0900)
committerhschang <chang@dev3>
Thu, 22 Jan 2015 07:19:04 +0000 (16:19 +0900)
1  2 
meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.2.bb
meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-essential.bb

@@@ -4,15 -4,15 +4,16 @@@ LICENSE = "GPLv2
  LIC_FILES_CHKSUM = "file://README;firstline=10;lastline=12;md5=9c14f792d0aeb54e15490a28c89087f7"
  
  DEPENDS = "python-cheetah-native"
 -RDEPENDS_${PN} = "python-cheetah python-json python-unixadmin python-misc python-pyopenssl aio-grab"
 +RDEPENDS_${PN} = "python-cheetah python-json python-unixadmin python-misc python-pyopenssl \
 +              python-shell aio-grab python-compression python-numbers python-zopeinterface \
 +"
  
+ SRCREV_pn-${PN}="c30a9aefcf87387e90f0ddbac61ef1aada8cbd6c"
  inherit gitpkgv
 -PV = "0.1+git${SRCPV}"
 -PKGV = "0.1+git${GITPKGV}"
 -PR = "r0.82"
 +PV = "1+git${SRCPV}"
 +PKGV = "1+git${GITPKGV}"
  
 -require openplugins.inc
 +require openplugins-distutils.inc
  
  # Just a quick hack to "compile" it
  do_compile() {
@@@ -88,14 -89,17 +88,14 @@@ RDEPENDS_enigma2-plugin-systemplugins-b
  RDEPENDS_enigma2-plugin-systemplugins-backupsuiteusb = "enigma2-plugin-extensions-backupsuitehdd"
  
  PN = "enigma2"
- PR = "r92"
+ PR = "r93"
  
 -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
  
  ####################################################
 +PV = "experimental-gitr${SRCPV}"
 +PKGV = "experimental-gitr${GITPKGV}"
  BRANCH = "vuplus_experimental"
 -PV = "experimental-git${SRCDATE}"
  SRCREV = ""
  ####################################################
  
@@@ -3,9 -3,9 +3,9 @@@ PRIORITY = "required
  LICENSE = "CLOSED"
  
  DEPENDS = "mpfr gmp"
 -RDEPENDS = "sysfsutils vuplus-dvb-modules"
 +RDEPENDS_${PN} = "sysfsutils vuplus-dvb-modules"
  
- SRC_DATE = "20140725_0"
+ SRC_DATE = "20150106_0"
  
  PR = "r1_${SRC_DATE}"
  SRC_URI = ""
index 3cd2631,0000000..ca6c040
mode 100644,000000..100644
--- /dev/null
@@@ -1,221 -1,0 +1,239 @@@
- PR = "r6"
 +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"
 +
 +PACKAGE_ARCH = "${MACHINE_ARCH}"
 +
 +inherit packagegroup
 +
 +ESSENTIAL_RDEPENDS = " \
 +"
 +
 +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} \
 +"
 +