From: hschang Date: Thu, 12 Feb 2015 11:58:57 +0000 (+0900) Subject: Merge remote-tracking branch 'oe_21/master' into vuplus-3.0 X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=commitdiff_plain;h=72a489c8029075ab8bd69b1b158a1bf877195ddb Merge remote-tracking branch 'oe_21/master' into vuplus-3.0 Conflicts: meta-bsp/common/recipes/linux/linux-vuplus_3.13.5.bb meta-openvuplus/recipes-core/meta/distro-feed-configs.bbappend meta-openvuplus/recipes-core/tasks/task-core-boot.bb meta-openvuplus/recipes-devtools/python/python-native_2.7.2.bbappend meta-openvuplus/recipes-devtools/swig/swig_2.0.4.bb meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.1.bb meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.2.bb meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-enigma2.bb meta-openvuplus/recipes-vuplus/tasks/task-vuplus-base.inc --- 72a489c8029075ab8bd69b1b158a1bf877195ddb diff --cc meta-bsp/common/conf/machine/include/vuplus.inc index e4653e6,c46dd9e..6d12c46 --- a/meta-bsp/common/conf/machine/include/vuplus.inc +++ b/meta-bsp/common/conf/machine/include/vuplus.inc @@@ -4,11 -4,9 +4,11 @@@ GLIBC_EXTRA_OECONF = "--with-tls --with MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "vuplus-bootlogo" - MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "vuplus-dvb-modules" + MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "${@base_contains("VUPLUS_FEATURES", "dvbproxy", "vuplus-dvb-proxy", "vuplus-dvb-modules", d)}" MACHINE_FEATURES += "kernel26 alsa pci wifi" +MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc" + PREFERRED_PROVIDER_virtual/kernel = "linux-vuplus" PREFERRED_VERSION_linux-vuplus = "${VUPLUS_KERNEL_VERSION}" diff --cc meta-bsp/common/recipes/linux/linux-vuplus_3.13.5.bb index f362701,f64b62b..99ff507 --- a/meta-bsp/common/recipes/linux/linux-vuplus_3.13.5.bb +++ b/meta-bsp/common/recipes/linux/linux-vuplus_3.13.5.bb @@@ -13,13 -15,15 +15,15 @@@ KERNEL_CONFIG = "${@base_contains("VUPL SRC_URI += "http://archive.vuplus.com/download/kernel/stblinux-${KV}.tar.bz2 \ file://rt2800usb_fix_warn_tx_status_timeout_to_dbg.patch \ file://linux-tcp_output.patch \ - file://${MACHINE}_defconfig \ - file://${KERNEL_CONFIG} \ ++ file://${KERNEL_CONFIG} \ " + SRC_URI += "${@base_contains("VUPLUS_FEATURES", "dvbproxy", "file://linux_dvb_adapter.patch;patch=1;pnum=1", "", d)}" + -S = "${WORKDIR}/linux" - inherit kernel +S = "${WORKDIR}/linux" + export OS = "Linux" KERNEL_IMAGETYPE = "vmlinux" KERNEL_OUTPUT = "vmlinux" @@@ -29,7 -33,8 +33,7 @@@ KERNEL_IMAGEDEST = "tmp FILES_kernel-image = "/${KERNEL_IMAGEDEST}/vmlinux.gz /${KERNEL_IMAGEDEST}/autoexec.bat" do_configure_prepend() { - oe_machinstall -m 0644 ${WORKDIR}/${MACHINE}_defconfig ${WORKDIR}/defconfig - oe_machinstall -m 0644 ${WORKDIR}/${KERNEL_CONFIG} ${S}/.config - oe_runmake oldconfig ++ oe_machinstall -m 0644 ${WORKDIR}/${KERNEL_CONFIG} ${WORKDIR}/defconfig } kernel_do_install_append() { diff --cc meta-openvuplus/recipes-core/meta/distro-feed-configs.bbappend index b117e62,6383e50..ec21862 --- a/meta-openvuplus/recipes-core/meta/distro-feed-configs.bbappend +++ b/meta-openvuplus/recipes-core/meta/distro-feed-configs.bbappend @@@ -1,2 -1,2 +1,2 @@@ - PR .= "-vuplus0" -PR .= "-vuplus3" ++PR .= "-vuplus1" diff --cc meta-openvuplus/recipes-core/packagegroup/packagegroup-core-boot.bbappend index b117e62,0000000..ec21862 mode 100644,000000..100644 --- a/meta-openvuplus/recipes-core/packagegroup/packagegroup-core-boot.bbappend +++ b/meta-openvuplus/recipes-core/packagegroup/packagegroup-core-boot.bbappend @@@ -1,2 -1,0 +1,2 @@@ - PR .= "-vuplus0" ++PR .= "-vuplus1" + diff --cc meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb index 7ba12da,2669eb0..73dee43 --- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb +++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb @@@ -194,16 -88,22 +194,19 @@@ RDEPENDS_enigma2-plugin-systemplugins-n RDEPENDS_enigma2-plugin-systemplugins-backupsuitehdd = "mtd-utils-mkfs.ubifs mtd-utils-nanddump mtd-utils-ubinize" 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 = "r98" -PR = "r95" ++PR = "r99" -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" -PV = "experimental-git${SRCDATE}" -SRCREV = "" +PV = "experimental-git${SRCPV}" +PKGV = "experimental-git${GITPKGV}" - BRANCH = "gst10" ++BRANCH = "vuplus_experimental_oe30" +SRCREV = "${AUTOREV}" #################################################### # enigma2_vuplus_mediaplayer.patch is for trick-play in media player @@@ -302,10 -191,11 +305,11 @@@ EXTRA_OECONF = " ${@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)} \ + ${@base_contains("VUPLUS_FEATURES", "uianimation", "--with-libvugles2" , "", 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() { diff --cc meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.1.bb index a430007,8af7fee..203bd2e --- a/meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.1.bb +++ b/meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.1.bb @@@ -3,7 -3,7 +3,7 @@@ PRIORITY = "required LICENSE = "CLOSED" DEPENDS = "tslib mpfr gmp" - RDEPENS_${PN} = "tslib-conf libts-1.0-0 libsysfs2 libgmp3 libmpfr1 vuplus-dvb-modules" -RDEPENS = "tslib-conf libts-1.0-0 libsysfs2 libgmp3 libmpfr1" ++RDEPENS_${PN} = "tslib-conf libts-1.0-0 libsysfs2 libgmp3 libmpfr1" SRC_DATE = "20140711_0" diff --cc meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.2.bb index d76d22d,9e85a7c..6bd72cc --- a/meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.2.bb +++ b/meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.2.bb @@@ -3,7 -3,7 +3,7 @@@ PRIORITY = "required LICENSE = "CLOSED" DEPENDS = "mpfr gmp" - RDEPENDS_${PN} = "sysfsutils vuplus-dvb-modules" -RDEPENDS = "sysfsutils" ++RDEPENDS_${PN} = "sysfsutils" SRC_DATE = "20150106_0" diff --cc meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-base.bb index 5b706e3,0000000..1cb9999 mode 100644,000000..100644 --- a/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-base.bb +++ b/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-base.bb @@@ -1,85 -1,0 +1,86 @@@ +SUMMARY = "Vuplus: Base 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 + +VUPLUS_BASE_ESSENTIAL = "\ + autofs \ + vuplus-compat \ + e2fsprogs-e2fsck \ + e2fsprogs-mke2fs \ + fakelocale \ + opkg \ + tzdata \ + tuxbox-common \ + util-linux-sfdisk \ + vsftpd \ + mtd-utils-mkfs.ubifs \ + mtd-utils-mkfs.jffs2 \ + mtd-utils-nandwrite \ + mtd-utils-nanddump \ + mtd-utils-flash-eraseall \ + mtd-utils-flash-erase \ + mtd-utils-ubinize \ + mtd-utils-ubiformat \ + mtd-utils-ubiattach \ + mtd-utils-ubidetach \ + mtd-utils-ubimkvol \ + hdparm \ + usbtunerhelper \ + killall \ + openresolv \ ++ ${@base_contains("VUPLUS_FEATURES", "dvbproxy", "libgles vuplus-platform-util", "", d)} \ +" + +VUPLUS_FIRMWARE_DVB = " \ + firmware-dvb-af9005 \ + firmware-dvb-fe-af9013 \ + firmware-dvb-usb-af9015 \ + firmware-dvb-usb-af9035 \ + firmware-dvb-usb-avertv-a800 \ + firmware-dvb-usb-dib0700 \ + firmware-dvb-usb-dibusb \ + firmware-dvb-usb-digitv \ + firmware-dvb-usb-nova-t-usb2 \ + firmware-dvb-usb-sms1xxx-nova-dvbt \ + firmware-dvb-usb-sms1xxx-hcw-dvbt \ + firmware-dvb-usb-ttusb-budget \ + firmware-dvb-usb-umt-010 \ + firmware-dvb-usb-xc5000 \ + firmware-dvb-usb-wt220u-zl0353 \ + firmware-drxd-a2 \ +" + +VUPLUS_BASE_RECOMMENDS = "\ + dropbear \ + vuplus-vucamd \ + sambaserver \ + openvpn \ + zeroconf \ + ${@base_contains("VUPLUS_FEATURES", "vuplus-fpga-update", "vuplus-fpga-update", "", d)} \ + ${@base_contains("VUPLUS_FEATURES", "wol", "vuplus-coldboot", "", d)} \ +" + +VUPLUS_BASE_OPTIONAL_RECOMMENDS = "\ + hddtemp \ + joe \ + mc \ + ncdu \ + ppp \ + smartmontools \ + avahi-daemon \ + curlftpfs \ +" + +RDEPENDS_${PN} += "\ + ${VUPLUS_BASE_ESSENTIAL} \ + ${VUPLUS_FIRMWARE_DVB} \ +" + +RRECOMMENDS_${PN} += "\ + ${VUPLUS_BASE_RECOMMENDS} \ + ${VUPLUS_BASE_OPTIONAL_RECOMMENDS} \ +" diff --cc meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-enigma2.bb index eac1aae,0000000..3a6edf0 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,75 @@@ +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 = "r2" ++PR = "r3" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +inherit packagegroup + +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)} \ ++ ${@base_contains("VUPLUS_FEATURES", "uianimation", "enigma2-plugin-systemplugins-animationsetup", "", d)} \ ++ ${@base_contains("VUPLUS_FEATURES", "xbmc", "enigma2-plugin-extensions-xbmc", "", d)} \ +" + +PACKAGE_ARCH = "${MACHINE_ARCH}" +