From: hschang Date: Fri, 25 Jan 2013 02:19:02 +0000 (+0900) Subject: Merge branch 'master' of code.vuplus.com:/opt/repository/openvuplus X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=commitdiff_plain;h=b63774d1c5df9933105e4259753ab90350ce4986;hp=-c Merge branch 'master' of code.vuplus.com:/opt/repository/openvuplus Conflicts: meta-bsp/vuduo2/conf/machine/vuduo2.conf meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc --- b63774d1c5df9933105e4259753ab90350ce4986 diff --combined meta-bsp/vuduo2/conf/machine/vuduo2.conf index 8519ce0,d815e29..d657abe --- a/meta-bsp/vuduo2/conf/machine/vuduo2.conf +++ b/meta-bsp/vuduo2/conf/machine/vuduo2.conf @@@ -4,16 -4,17 +4,17 @@@ MACHINE_FEATURES += "display-graphic-vfd" MACHINE_FEATURES += "enable-rc-kbd" -VUPLUS_FEATURES = "fan_manual rc_code " +MACHINE_FEATURES = "fan_manual rc_code " -VUPLUS_FEATURES += "firmwareupgrade" -VUPLUS_FEATURES += "blindscan" -VUPLUS_FEATURES += "hbbtv" -VUPLUS_FEATURES += "streamtv" -VUPLUS_FEATURES += "dlna" -VUPLUS_FEATURES += "3gmodem" -VUPLUS_FEATURES += "webif" -VUPLUS_FEATURES += "autoshutdown" -VUPLUS_FEATURES += "transcoding" +MACHINE_FEATURES += "firmwareupgrade" +MACHINE_FEATURES += "blindscan" +MACHINE_FEATURES += "hbbtv" +MACHINE_FEATURES += "streamtv" +MACHINE_FEATURES += "dlna" +MACHINE_FEATURES += "3gmodem" +MACHINE_FEATURES += "webif" ++MACHINE_FEATURES += "autoshutdown" +MACHINE_FEATURES += "transcoding" IMAGE_UNPACK_PATH = "vuplus/duo2" MKFS_UBI_MAX_ERASE_BLK_COUNT = "4096" diff --combined meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb index 4fe9248,b334561..364f033 --- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb +++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb @@@ -6,7 -6,7 +6,7 @@@ DEPENDS = "jpeg libungif libmad libpng 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 \ + 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 \ @@@ -77,7 -77,10 +77,10 @@@ DEPENDS += "opera-hbbtv RDEPENDS_enigma2-plugin-extensions-hbbtv = "opera-hbbtv" DEPENDS += "wvdial wvstreams ppp usb-modeswitch usb-modeswitch-data" - RDEPENDS_enigma2-plugin-systemplugins-3gmodemmanager = "ppp usb-modeswitch usb-modeswitch-data wvdial wvstreams kernel-module-usbserial" + RDEPENDS_enigma2-plugin-systemplugins-3gmodemmanager = "ppp usb-modeswitch usb-modeswitch-data wvdial wvstreamsa \ + kernel-module-ppp-async kernel-module-ppp-deflate kernel-module-ppp-synctty kernel-module-ppp-generic kernel-module-usbserial \ + " + RDEPENDS_enigma2-plugin-systemplugins-devicemanager = "util-linux-blkid ntfs-3g dosfstools" @@@ -195,4 -198,3 +198,4 @@@ python populate_packages_prepend() RCONFLICTS_${PN} = "dreambox-keymaps" RREPLACES_${PN} = "dreambox-keymaps tuxbox-tuxtxt-32bpp (<= 0.0+cvs20090130-r1)" + diff --combined meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc index adea4b4,6c24c53..30d14fb --- a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc +++ b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc @@@ -23,7 -23,7 +23,6 @@@ RDEPENDS_${PN} += " enigma2-plugin-extensions-remotestreamconvert \ enigma2-plugin-systemplugins-zappingmodeselection \ enigma2-plugin-extensions-addstreamurl \ - vuplus-blindscan-utils \ - enigma2-plugin-extensions-remotestreamconvert \ enigma2-plugin-systemplugins-devicemanager \ " @@@ -35,7 -35,7 +34,7 @@@ RDEPENDS_${PN} += " python-twisted-protocols \ python-twisted-web \ ${@base_contains("MACHINE_FEATURES", "wifi", "task-vuplus-wlan", "", d)} \ - ${@base_contains("VUPLUS_FEATURES", "webmanual", "vuplus-manual", "", d)} \ + ${@base_contains("MACHINE_FEATURES", "webmanual", "vuplus-manual", "", d)} \ enigma2-plugin-extensions-mediaplayer \ enigma2-plugin-extensions-pictureplayer \ enigma2-plugin-extensions-vuplusevent \ @@@ -44,20 -44,20 +43,20 @@@ enigma2-plugin-systemplugins-uipositionsetup \ enigma2-plugin-systemplugins-hdmicec \ ${@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", "webif", "enigma2-plugin-extensions-openwebif", "", 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("MACHINE_FEATURES", "fan_simple", "enigma2-plugin-systemplugins-fancontrol","", d)} \ + ${@base_contains("MACHINE_FEATURES", "fan_manual", "enigma2-plugin-systemplugins-manualfancontrol", "", d)} \ + ${@base_contains("MACHINE_FEATURES", "rc_code", "enigma2-plugin-systemplugins-remotecontrolcode", "", d)} \ + ${@base_contains("MACHINE_FEATURES", "led", "enigma2-plugin-systemplugins-ledbrightnesssetup", "", d)} \ + ${@base_contains("MACHINE_FEATURES", "webif", "enigma2-plugin-extensions-openwebif", "", d)} \ - ${@base_contains("MACHINE_FEATURES", "blindscan", "enigma2-plugin-systemplugins-blindscan", "", d)} \ ++ ${@base_contains("MACHINE_FEATURES", "blindscan", "enigma2-plugin-systemplugins-blindscan vuplus-blindscan-utils", "", d)} \ + ${@base_contains("MACHINE_FEATURES", "fpgaupgrade", "enigma2-plugin-systemplugins-fpgaupgrade", "", d)} \ + ${@base_contains("MACHINE_FEATURES", "firmwareupgrade", "enigma2-plugin-systemplugins-firmwareupgrade", "", d)} \ + ${@base_contains("MACHINE_FEATURES", "hbbtv", "enigma2-plugin-extensions-hbbtv", "", d)} \ + ${@base_contains("MACHINE_FEATURES", "streamtv", "enigma2-plugin-extensions-streamtv", "", d)} \ + ${@base_contains("MACHINE_FEATURES", "dlna", "enigma2-plugin-extensions-dlnaserver enigma2-plugin-extensions-dlnabrowser", "", d)} \ + ${@base_contains("MACHINE_FEATURES", "3gmodem", "enigma2-plugin-systemplugins-3gmodemmanager", "", d)} \ + ${@base_contains("MACHINE_FEATURES", "autoshutdown", "enigma2-plugin-systemplugins-autoshutdown", "", d)} \ + ${@base_contains("MACHINE_FEATURES", "transcoding", "enigma2-plugin-systemplugins-transcodingsetup enigma2-transtreamproxy", "", d)} \ " PACKAGE_ARCH = "${MACHINE_ARCH}" diff --combined meta-openvuplus/recipes-vuplus/tasks/task-vuplus-essential.bb index 8972e43,abc3c6b..78e5542 --- a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-essential.bb +++ b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-essential.bb @@@ -1,16 -1,14 +1,15 @@@ SUMMARY = "Vuplus: Essential packages" SECTION = "vuplus/base" -LICENSE = "CLOSED" +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}' - #RDEPENDS_${PN} += '${KERNEL_3G_MODULES}' RDEPENDS_${PN} += '${KERNEL_DVB_MODULES}' - PR = "r0" + PR = "r1" inherit task @@@ -34,15 -32,6 +33,6 @@@ ESSENTIAL_RRECOMMENDS = " kernel-module-ext2 \ " - KERNEL_3G_MODULES = " \ - kernel-module-ppp-async \ - kernel-module-ppp-deflate \ - kernel-module-ppp-synctty \ - kernel-module-ppp-generic \ - kernel-module-slhc \ - kernel-module-usbserial \ - " - KERNEL_DVB_MODULES = " \ kernel-module-em28xx-dvb \ kernel-module-dvb-usb-a800 \