From: hschang Date: Fri, 18 Jul 2014 05:00:52 +0000 (+0900) Subject: Merge remote-tracking branch 'OE-2.1/master' into vuplus-3.0 X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=commitdiff_plain;h=8205d55cd1f4f813c303e01e8bf54b5aa45ce915;hp=-c 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 --- 8205d55cd1f4f813c303e01e8bf54b5aa45ce915 diff --combined Makefile index 08ef637,95df253..5812f37 --- a/Makefile +++ b/Makefile @@@ -29,7 -29,7 +29,7 @@@ # This only sets the default value. All platforms now use a shared build # directory. Run "MACHINE=vuultimo bitbake vuplus-image" to build an image # for the vuultimo, if it is not the default. - MACHINE ?= vuultimo + MACHINE ?= vusolose MULTI_TEMPORARILY ?= YES @@@ -60,9 -60,6 +60,9 @@@ BBLAYERS ?= $(CURDIR)/meta-bsp/common \ $(CURDIR)/meta-openvuplus \ $(CURDIR)/meta-openembedded/meta-oe \ + $(CURDIR)/meta-openembedded/meta-networking \ + $(CURDIR)/meta-openembedded/meta-multimedia \ + $(CURDIR)/meta-openembedded/meta-filesystems \ $(CURDIR)/openembedded-core/meta CONFFILES = \ diff --combined meta-openvuplus/recipes-connectivity/packagegroups/packagegroup-vuplus-wlan.bb index dba0e47,0000000..ecd49df mode 100644,000000..100644 --- a/meta-openvuplus/recipes-connectivity/packagegroups/packagegroup-vuplus-wlan.bb +++ b/meta-openvuplus/recipes-connectivity/packagegroups/packagegroup-vuplus-wlan.bb @@@ -1,57 -1,0 +1,57 @@@ +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" - PR = "r15" ++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-kmod', 'kernel-module-rt2800usb', ' ', 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 = " \ - ${@base_contains('VUPLUS_FEATURES', 'ralink-legacy', 'rt3070', ' ', d)} \ ++ rt3070 \ + r8192cu \ +" + +RDEPENDS_${PN}_append = "\ + ${WIFI_FIRMWARES} \ + ${KERNEL_WIFI_MODULES} \ + ${LEGACY_MODULES} \ + rt2870sta \ +" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + diff --combined meta-openvuplus/recipes-core/packagegroup/packagegroup-core-boot.bbappend index 0000000,0000000..b117e62 new file mode 100644 --- /dev/null +++ b/meta-openvuplus/recipes-core/packagegroup/packagegroup-core-boot.bbappend @@@ -1,0 -1,0 +1,2 @@@ ++PR .= "-vuplus0" ++ diff --combined meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.1.bb index b988d14,de33221..7a9c842 --- a/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.1.bb +++ b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.1.bb @@@ -8,7 -8,7 +8,7 @@@ LIC_FILES_CHKSUM = "file://COPYING;md5= DEPENDS += "cdparanoia cairo jpeg libpng zlib libid3tag flac speex libsoup-2.4" DEPENDS += "gst-plugins-base" - PR = "r4" + PR = "r5" GIT_PV = "" SRCREV = "7768342230450559509e3e593b2ea33e81ea0ca4" @@@ -17,7 -17,7 +17,7 @@@ EXTRA_OECONF = "--enable-orc --disable- inherit autotools pkgconfig gettext git-project -SRC_URI = "git://anongit.freedesktop.org/gstreamer/${PN}" +SRC_URI = "git://anongit.freedesktop.org/gstreamer/${PN};branch=0.10" SRC_URI += " \ file://orc.m4-fix-location-of-orcc-when-cross-compiling.patch \ @@@ -27,6 -27,9 +27,9 @@@ file://rtsp-check-all-protocols.patch;apply=yes;striplevel=1 \ " + SRC_URI += "file://0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch" + + do_common_update() { cd ${S} # Make sure we have common diff --combined meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb index 65ac1c6,2c0798c..c55df2f --- a/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 --combined meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb index 15fbbaf,44b905e..7cda144 --- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb +++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb @@@ -1,36 -1,37 +1,36 @@@ DESCRIPTION = "Enigma2 is an experimental, but useful framebuffer-based frontend for DVB functions" -MAINTAINER = "Felix Domke " +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 \ " -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-*. @@@ -88,68 -89,67 +88,68 @@@ 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" -PV = "experimental-git${SRCDATE}" +PV = "experimental-git${SRCPV}" 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://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)" - diff --combined meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.1.bb index bcf14b8,d6ed14c..70bcb10 --- a/meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.1.bb +++ b/meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.1.bb @@@ -5,12 -5,32 +5,32 @@@ LICENSE = "CLOSED DEPENDS = "tslib mpfr gmp" RDEPENS = "tslib-conf libts-1.0-0 libsysfs2 libgmp3 libmpfr1 vuplus-dvb-modules" - SRC_DATE = "20140519_1" + SRC_DATE = "20140711_0" PR = "r2_${SRC_DATE}" SRC_URI = "" INHIBIT_PACKAGE_STRIP = "1" + PRIVATE_LIBS_${PN} = "libopera_hbbtv.so \ + libdsmcc.so \ + libvuplus.so \ + libdirect-1.4.so.0 \ + libfusion-1.4.so.0 \ + libdirectfb-1.4.so.0 \ + libdirectfbwm_default.so \ + libdirectfb_linux_input.so \ + libdirectfb_devmem.so \ + libdirectfb_fbdev.so \ + libidirectfbfont_dgiff.so \ + libidirectfbfont_ft2.so \ + libidirectfbvideoprovider_v4l.so \ + libidirectfbvideoprovider_gif.so \ + libidirectfbimageprovider_dfiff.so \ + libidirectfbimageprovider_gif.so \ + libidirectfbimageprovider_jpeg.so \ + libidirectfbimageprovider_png.so \ + libdirectfb_vuplus.so" + S = "${WORKDIR}/opera-hbbtv" SRC_FILE = "opera-hbbtv_${SRC_DATE}.tar.gz" @@@ -54,7 -74,5 +74,7 @@@ PACKAGES = "${PN} FILES_${PN} = "/" +PRIVATE_LIBS_${PN} = "libdirectfbwm_default.so libdirectfb_fbdev.so libdirectfb_devmem.so libidirectfbvideoprovider_gif.so libidirectfbvideoprovider_v4l.so libidirectfbfont_dgiff.so libidirectfbfont_ft2.so libidirectfbimageprovider_png.so libidirectfbimageprovider_gif.so libidirectfbimageprovider_jpeg.so libidirectfbimageprovider_dfiff.so libdirectfb_linux_input.so" + SRC_URI[md5sum] = "e2f6220403c2a946f8f9583aa084bc60" SRC_URI[sha256sum] = "f8ec235ca0368bdcaaac2b61634204e2c41558d23d8d7d43ff4f02edc00d6ddb" diff --combined meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-enigma2.bb index 7b172f1,0000000..e0b9538 mode 100644,000000..100644 --- a/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-enigma2.bb +++ b/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-enigma2.bb @@@ -1,73 -1,0 +1,73 @@@ +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 = "r0" ++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 --combined meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-essential.bb index d19dbaf,0000000..1625811 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,227 -1,0 +1,216 @@@ +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}' + ++RDEPENDS_${PN} = '${ESSENTIAL_RDEPENDS}' +RRECOMMENDS_${PN} = '${ESSENTIAL_RRECOMMENDS}' ++RRECOMMENDS_${PN} += '${KERNEL_DVB_MODULES}' + - 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" ++PR = "r5" + +inherit packagegroup + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +ESSENTIAL_RDEPENDS = " \ - kernel-module-stv0299 \ +" + - ESSENTIAL_RRECOMMENDS = " \ ++KERNEL_FS_MODULES = " \ ++ kernel-module-ext2 \ ++ kernel-module-ext4 \ + kernel-module-autofs4 \ - kernel-module-cdrom \ + kernel-module-cifs \ ++ kernel-module-msdos \ ++ kernel-module-udf \ ++ kernel-module-isofs \ + kernel-module-nls-cp850 \ - kernel-module-nls-iso8859-1 \ - kernel-module-nls-iso8859-15 \ - kernel-module-ntfs \ - kernel-module-reiserfs \ ++" ++ ++ESSENTIAL_RRECOMMENDS = " \ ++ kernel-module-cdrom \ + kernel-module-sr-mod \ - kernel-module-usbhid \ - kernel-module-ext2 \ ++ ${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-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_MEDIA_USB_ADAPTERS} \ ++ ${KERNEL_MEDIA_CUSTOMIZE_TV_TUNER} \ ++ ${KERNEL_MEDIA_CUSTOMIZE_DVB_FRONTENDS} \ +" + - 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 \ - " diff --combined meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper.bb index 43c32dd,0a6a2e9..1904bd7 --- a/meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper.bb +++ b/meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper.bb @@@ -1,14 -1,15 +1,15 @@@ 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 = " \ git://code.vuplus.com/git/vtuner.git;protocol=git;tag=${SRC_REV} \ + file://no_usb_device.patch;striplevel=1 \ file://${PN}.sh \ "