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() {
  }
  
  PLUGINPATH = "/usr/lib/enigma2/python/Plugins/Extensions/${MODULE}"
 -do_install() {
 +do_install_append() {
        install -d ${D}${PLUGINPATH}
        cp -rp ${S}/plugin/* ${D}${PLUGINPATH}
  }
  
 -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'),
 -              ('vuzero', 'zero.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}"
 -PACKAGES = "${PN}"
@@@ -1,36 -1,37 +1,36 @@@
  DESCRIPTION = "Enigma2 is an experimental, but useful framebuffer-based frontend for DVB functions"
 -MAINTAINER = "Felix Domke <tmbinc@elitedvb.net>"
 +MAINTAINER = "vuplus team"
  LICENSE = "GPLv2"
  LIC_FILES_CHKSUM = "file://LICENSE;md5=c9e255efa454e0155c1fd758df7dcaf3"
 -DEPENDS = "jpeg libungif libmad libpng libsigc++-1.2 gettext-native \
 +
 +DEPENDS = "jpeg giflib 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 \
 -      hostap-daemon bridge-utils ntfs-3g dosfstools util-linux \
 +      hostapd bridge-utils ntfs-3g dosfstools util-linux \
  "
  
 -RDEPENDS_GST= "gst-plugins-base-decodebin gst-plugins-base-decodebin2 gst-plugins-base-app gst-plugins-bad-fragmented \
 -              gst-plugins-good-id3demux gst-plugins-ugly-mad gst-plugins-base-ogg gst-plugins-base-playbin \
 -              gst-plugins-base-typefindfunctions gst-plugins-base-audioconvert gst-plugins-base-audioresample \
 -              gst-plugins-good-wavparse gst-plugins-ugly-mpegstream \
 -              gst-plugins-good-flac gst-plugin-dvbmediasink gst-plugins-bad-mpegdemux gst-plugins-ugly-dvdsub \
 -              gst-plugins-good-souphttpsrc gst-plugins-ugly-mpegaudioparse gst-plugins-base-subparse \
 -              gst-plugins-good-apetag gst-plugins-good-icydemux gst-plugins-good-autodetect gst-plugins-good-flv \
 -              gst-plugins-bad-mms gst-plugins-ugly-asf gst-plugins-bad-faad \
 -"
 -
 -RDEPENDS_${PN} = "python-codecs python-core python-lang python-re python-threading \
 -              python-xml python-fcntl python-stringold python-pickle python-netclient \
 -              glibc-gconv-iso8859-15 ethtool parted \
 -              ${RDEPENDS_GST} \
 +GST_RDEPENDS = "gst-plugins-base-decodebin gst-plugins-base-decodebin2 gst-plugins-base-app gst-plugins-bad-fragmented \
 +      gst-plugins-good-id3demux gst-plugins-ugly-mad gst-plugins-base-ogg gst-plugins-base-playbin \
 +      gst-plugins-base-typefindfunctions gst-plugins-base-audioconvert gst-plugins-base-audioresample \
 +      gst-plugins-good-wavparse gst-plugins-ugly-mpegstream \
 +      gst-plugins-good-flac gst-plugin-dvbmediasink gst-plugins-bad-mpegdemux gst-plugins-ugly-dvdsub \
 +      gst-plugins-good-souphttpsrc gst-plugins-ugly-mpegaudioparse gst-plugins-base-subparse \
 +      gst-plugins-good-apetag gst-plugins-good-icydemux gst-plugins-good-autodetect gst-plugins-good-flv \
 +      gst-plugins-bad-mms gst-plugins-ugly-asf gst-plugins-good-avi gst-plugins-bad-faad \
  "
  
  GST_RTSP_RDEPENDS = "gst-plugins-good-udp gst-plugins-good-rtsp gst-plugins-good-rtp gst-plugins-good-rtpmanager"
  GST_ALSA_RDEPENDS = "gst-plugins-base-alsa alsa-conf"
  GST_MISC_RDEPENDS = "gst-plugins-good-matroska gst-plugins-good-isomp4 gst-plugins-base-vorbis gst-plugins-good-audioparsers"
 -GST_DVD_RDEPENDS = "gst-plugins-bad-cdxaparse gst-plugins-ugly-cdio gst-plugins-bad-vcdsrc"
 +GST_DVD_RDEPENDS  = "gst-plugins-bad-cdxaparse gst-plugins-ugly-cdio gst-plugins-bad-vcdsrc"
  GST_BASE_RDEPENDS = "${GST_ALSA_RDEPENDS} ${GST_MISC_RDEPENDS} ${GST_RTSP_RDEPENDS}"
  
 -RDEPENDS_append_vuplus = " ${GST_BASE_RDEPENDS} ${GST_DVD_RDEPENDS} gst-plugins-good-avi"
 +RDEPENDS_${PN} = "python-codecs python-core python-lang python-re python-threading \
 +      python-xml python-fcntl python-stringold python-pickle python-netclient \
 +      glibc-gconv-iso8859-15 ethtool parted \
 +      ${GST_RDEPENDS} ${GST_BASE_RDEPENDS} ${GST_DVD_RDEPENDS} \
 +"
  
  # 'forward depends' - no two providers can have the same PACKAGES_DYNAMIC, however both
  # enigma2 and enigma2-plugins produce enigma2-plugin-*.
@@@ -65,7 -66,7 +65,7 @@@ SUMMARY_enigma2-plugin-systemplugins-ne
  RDEPENDS_enigma2-plugin-extensions-webbrowser = "python-gdata libqtwebkite4 vuplus-webbrowser-utils qt4-embedded-fonts qt4-embedded-plugin-imageformat-gif qt4-embedded-plugin-imageformat-ico qt4-embedded-plugin-imageformat-jpeg qt4-embedded-plugin-imageformat-mng qt4-embedded-plugin-imageformat-svg qt4-embedded-plugin-imageformat-tiff qt4-embedded-plugin-iconengine-svgicon "
  SUMMARY_enigma2-plugin-systemplugins-crashreport = "automatically send crashlogs to Vu+"
  RDEPENDS_enigma2-plugin-systemplugins-crashreport = "python-twisted-mail python-twisted-names python-compression python-mime python-email"
 -RDEPENDS_enigma2-plugin-systemplugins-wirelessaccesspoint = "hostap-daemon bridge-utils"
 +RDEPENDS_enigma2-plugin-systemplugins-wirelessaccesspoint = "hostapd bridge-utils"
  
  RDEPENDS_enigma2-plugin-extensions-streamtv = "librtmp0 gst-plugins-bad-rtmp "
  
@@@ -88,68 -89,67 +88,68 @@@ 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 = ""
  ####################################################
  
  # enigma2_vuplus_mediaplayer.patch is for trick-play in media player
  
  SRC_URI = "git://code.vuplus.com/git/dvbapp.git;protocol=http;branch=${BRANCH};tag=${SRCREV} \
 -           file://enigma2_vuplus_skin.patch;patch=1;pnum=1 \
 -           file://enigma2_vuplus_mediaplayer.patch;patch=1;pnum=1 \
 -         file://enigma2_vuplus_mediaplayer_subtitle.patch;patch=1;pnum=1 \
 -           file://enigma2_vuplus_remove_dreambox_enigma.patch;patch=1;pnum=1 \
 -           file://enigma2_vuplus_vfd_mode.patch;patch=1;pnum=1 \
 -           file://enigma2_vuplus_addlibpythondeps.patch;patch=1;pnum=1 \
 -         file://enigma2_vuplus_pluginbrowser.patch;striplevel=1 \
 -           file://enigma2_vuplus_proc_oom_score_adj.patch;striplevel=1 \
 -           file://enigma2_vuplus_fix_standby_name.patch \
 -           file://enigma2_vuplus_fix_standby_name_skin.patch \
 -           file://MyriadPro-Regular.otf \
 -           file://MyriadPro-Semibold.otf \
 -           file://MyriadPro-SemiboldIt.otf \
 -           file://750S \
 -           file://Vu_HD \
 -           file://number_key \
 -           "
 -
 -SRC_URI_append = " ${@base_contains("VUPLUS_FEATURES", "vuwlan", "file://enigma2_vuplus_networksetup.patch;patch=1;pnum=1", "", d)}"
 +      file://enigma2_vuplus_skin.patch \
 +      file://enigma2_vuplus_mediaplayer.patch \
 +      file://enigma2_vuplus_mediaplayer_subtitle.patch \
 +      file://enigma2_vuplus_remove_dreambox_enigma.patch \
 +      file://enigma2_vuplus_vfd_mode.patch \
 +      file://enigma2_vuplus_pluginbrowser.patch \
 +      file://enigma2_vuplus_proc_oom_score_adj.patch \
 +        file://enigma2_vuplus_fix_standby_name.patch \
 +        file://enigma2_vuplus_fix_standby_name_skin.patch \
 +      file://enigma2_vuplus_epng.patch \
 +      file://enigma2_vuplus_eptrlist_insert.patch \
 +      file://enigma2_vuplus_conversion_error.patch \
 +      file://enigma2_vuplus_default_arg_error.patch \
 +      file://enigma2_vuplus_wrong_boolean_type.patch \
 +      file://MyriadPro-Regular.otf \
 +      file://MyriadPro-Semibold.otf \
 +      file://MyriadPro-SemiboldIt.otf \
 +      file://750S \
 +      file://Vu_HD \
 +      file://number_key \
 +"
 +
 +SRC_URI_append = " ${@base_contains("VUPLUS_FEATURES", "vuwlan", "file://enigma2_vuplus_networksetup.patch", "", d)}"
  
  def change_po():
 -        import os
 -        try:
 -                os.system("find ./ -name \"*.po\" > ./po_list")
 -                os.system("find ./ -name \"*.pot\" >> ./po_list")
 -                po_list = []
 -                po_list = open('po_list','r+').readlines()
 -                for x in po_list:
 -                        changeword(x)
 -                os.system('rm po_list')
 -        except:
 -                print 'word patch error '
 -                return
 +    import os
 +    try:
 +        os.system("find ./ -name \"*.po\" > ./po_list")
 +        os.system("find ./ -name \"*.pot\" >> ./po_list")
 +        po_list = []
 +        po_list = open('po_list','r+').readlines()
 +        for x in po_list:
 +            changeword(x)
 +        os.system('rm po_list')
 +    except:
 +        print 'word patch error '
 +        return
  
  def changeword(file):
 -        fn = file[:-1]
 -        fnn = file[:-1]+'_n'
 -        cmd = "sed s/Dreambox/STB/g "+fn+" > "+fnn
 -        os.system(cmd)
 -        cmd1 = "mv "+fnn+" "+fn
 -        os.system(cmd1)
 +    fn = file[:-1]
 +    fnn = file[:-1]+'_n'
 +    cmd = "sed s/Dreambox/STB/g "+fn+" > "+fnn
 +    os.system(cmd)
 +    cmd1 = "mv "+fnn+" "+fn
 +    os.system(cmd1)
  
  do_unpack_append(){
 -        change_po()
 +    change_po()
  }
  
  S = "${WORKDIR}/git"
@@@ -159,47 -159,49 +159,47 @@@ FILES_${PN}-meta = "${datadir}/meta
  PACKAGES += "${PN}-meta"
  PACKAGE_ARCH = "${MACHINE_ARCH}"
  
 -inherit autotools pkgconfig
 +inherit autotools-brokensep pkgconfig pythonnative
  
  do_configure_prepend() {
        git checkout ${BRANCH}
  }
  
  do_compile_prepend_vuplus() {
 -        install -m 0755 ${WORKDIR}/MyriadPro-Regular.otf ${S}/data/fonts/
 -        install -m 0755 ${WORKDIR}/MyriadPro-Semibold.otf ${S}/data/fonts/
 -        install -m 0755 ${WORKDIR}/MyriadPro-SemiboldIt.otf ${S}/data/fonts/
 -        install -m 0755 ${WORKDIR}/750S/*.png ${S}/data/750S/
 -        install -m 0755 ${WORKDIR}/750S/buttons/*.png ${S}/data/750S/buttons/
 -        install -m 0755 ${WORKDIR}/750S/countries/*.png ${S}/data/750S/countries/
 -        install -m 0755 ${WORKDIR}/750S/icons/*.png ${S}/data/750S/icons/
 -        install -m 0755 ${WORKDIR}/750S/menu/*.png ${S}/data/750S/menu/
 -        install -m 0755 ${WORKDIR}/750S/spinner/*.png ${S}/data/skin_default/spinner/
 -        install -m 0755 ${WORKDIR}/Vu_HD/*.png ${S}/data/Vu_HD/
 -        install -m 0755 ${WORKDIR}/Vu_HD/buttons/*.png ${S}/data/Vu_HD/buttons/
 -        install -m 0755 ${WORKDIR}/Vu_HD/countries/*.png ${S}/data/Vu_HD/countries/
 -        install -m 0755 ${WORKDIR}/Vu_HD/icons/*.png ${S}/data/Vu_HD/icons/
 -        install -m 0755 ${WORKDIR}/Vu_HD/menu/*.png ${S}/data/Vu_HD/menu/
 -        install -m 0755 ${WORKDIR}/number_key/*.png ${S}/data/skin_default/buttons/
 +      install -m 0755 ${WORKDIR}/MyriadPro-Regular.otf ${S}/data/fonts/
 +      install -m 0755 ${WORKDIR}/MyriadPro-Semibold.otf ${S}/data/fonts/
 +      install -m 0755 ${WORKDIR}/MyriadPro-SemiboldIt.otf ${S}/data/fonts/
 +      install -m 0755 ${WORKDIR}/750S/*.png ${S}/data/750S/
 +      install -m 0755 ${WORKDIR}/750S/buttons/*.png ${S}/data/750S/buttons/
 +      install -m 0755 ${WORKDIR}/750S/countries/*.png ${S}/data/750S/countries/
 +      install -m 0755 ${WORKDIR}/750S/icons/*.png ${S}/data/750S/icons/
 +      install -m 0755 ${WORKDIR}/750S/menu/*.png ${S}/data/750S/menu/
 +      install -m 0755 ${WORKDIR}/750S/spinner/*.png ${S}/data/skin_default/spinner/
 +      install -m 0755 ${WORKDIR}/Vu_HD/*.png ${S}/data/Vu_HD/
 +      install -m 0755 ${WORKDIR}/Vu_HD/buttons/*.png ${S}/data/Vu_HD/buttons/
 +      install -m 0755 ${WORKDIR}/Vu_HD/countries/*.png ${S}/data/Vu_HD/countries/
 +      install -m 0755 ${WORKDIR}/Vu_HD/icons/*.png ${S}/data/Vu_HD/icons/
 +      install -m 0755 ${WORKDIR}/Vu_HD/menu/*.png ${S}/data/Vu_HD/menu/
 +      install -m 0755 ${WORKDIR}/number_key/*.png ${S}/data/skin_default/buttons/
  }
  
  EXTRA_OECONF = " \
 +        --enable-dependency-tracking \
        ${@base_contains("VUPLUS_FEATURES", "display-text-vfd", "--with-display-text-vfd" , "", d)} \
        ${@base_contains("VUPLUS_FEATURES", "display-graphic-vfd", "--with-display-graphic-vfd" , "", d)} \
        ${@base_contains("VUPLUS_FEATURES", "right-half-vfd-skin", "--with-set-right-half-vfd-skin" , "", d)} \
        ${@base_contains("VUPLUS_FEATURES", "enable-rc-kbd", "--with-remote-keyboard" , "", d)} \
 -        BUILD_SYS=${BUILD_SYS} \
 -        HOST_SYS=${HOST_SYS} \
 -        STAGING_INCDIR=${STAGING_INCDIR} \
 -        STAGING_LIBDIR=${STAGING_LIBDIR} \
 +      BUILD_SYS=${BUILD_SYS} \
 +      HOST_SYS=${HOST_SYS} \
 +      STAGING_INCDIR=${STAGING_INCDIR} \
 +      STAGING_LIBDIR=${STAGING_LIBDIR} \
  "
  
  python populate_packages_prepend() {
 -        enigma2_plugindir = bb.data.expand('${libdir}/enigma2/python/Plugins', d)
 -        do_split_packages(d, enigma2_plugindir, '^(\w+/\w+)/[a-zA-Z0-9_]+.*$', 'enigma2-plugin-%s', '%s', recursive=True, match_path=True, prepend=True)
 -        do_split_packages(d, enigma2_plugindir, '^(\w+/\w+)/.*\.la$', 'enigma2-plugin-%s-dev', '%s (development)', recursive=True, match_path=True, prepend=True)
 -        do_split_packages(d, enigma2_plugindir, '^(\w+/\w+)/.*\.a$', 'enigma2-plugin-%s-staticdev', '%s (static development)', recursive=True, match_path=True, prepend=True)
 -        do_split_packages(d, enigma2_plugindir, '^(\w+/\w+)/(.*/)?\.debug/.*$', 'enigma2-plugin-%s-dbg', '%s (debug)', recursive=True, match_path=True, prepend=True)
 +    enigma2_plugindir = bb.data.expand('${libdir}/enigma2/python/Plugins', d)
 +    do_split_packages(d, enigma2_plugindir, '^(\w+/\w+)/[a-zA-Z0-9_]+.*$', 'enigma2-plugin-%s', '%s', recursive=True, match_path=True, prepend=True)
 +    do_split_packages(d, enigma2_plugindir, '^(\w+/\w+)/.*\.la$', 'enigma2-plugin-%s-dev', '%s (development)', recursive=True, match_path=True, prepend=True)
 +    do_split_packages(d, enigma2_plugindir, '^(\w+/\w+)/.*\.a$', 'enigma2-plugin-%s-staticdev', '%s (static development)', recursive=True, match_path=True, prepend=True)
 +    do_split_packages(d, enigma2_plugindir, '^(\w+/\w+)/(.*/)?\.debug/.*$', 'enigma2-plugin-%s-dbg', '%s (debug)', recursive=True, match_path=True, prepend=True)
  }
  
 -RCONFLICTS_${PN} = "dreambox-keymaps"
 -RREPLACES_${PN} = "dreambox-keymaps tuxbox-tuxtxt-32bpp (<= 0.0+cvs20090130-r1)"
 -
@@@ -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 = ""
@@@ -58,10 -58,10 +58,10 @@@ do_install() 
  }
  
  package_do_shlibs_append() {
 -      deps = "${PKGDEST}/${PN}.shlibdeps"
 -      tmp = "/tmp/.${PN}.shlibdeps"
 -      os.system("sed -e '/vbrowser/d' %s > %s" % (deps, tmp))
 -      os.system("cp %s %s" % (tmp, deps))
 +    deps = "${PKGDEST}/${PN}.shlibdeps"
 +    tmp = "/tmp/.${PN}.shlibdeps"
 +    os.system("sed -e '/vbrowser/d' %s > %s" % (deps, tmp))
 +    os.system("cp %s %s" % (tmp, deps))
  }
  
  do_package_qa() {
@@@ -74,6 -74,6 +74,6 @@@ PACKAGES = "${PN}
  
  FILES_${PN} = "/"
  
- SRC_URI[md5sum] = "1ba7691c826856431c0dba1d4251f32e"
- SRC_URI[sha256sum] = "0bc932152a3eda86c3e871a87ea58e0a8693aa707b93c8cf174c29663ec00d5c"
+ SRC_URI[md5sum] = "531bb6c69f682b04b563a17160773014"
+ SRC_URI[sha256sum] = "3f8f885b3679db592acd09120dc8f29911bf34ac811df41e6abb87440e394b94"
  
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} \
 +"
 +