From: hschang Date: Fri, 1 Feb 2013 03:01:11 +0000 (+0900) Subject: fix MACHINE_FEATURES/VUPLUS_FEATURES. X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=commitdiff_plain;h=0e2e8b8b9dc33bf9ece3eb6dc9046905dc067082 fix MACHINE_FEATURES/VUPLUS_FEATURES. --- diff --git a/meta-bsp/bm750/conf/machine/bm750.conf b/meta-bsp/bm750/conf/machine/bm750.conf index f31df23..711fde0 100644 --- a/meta-bsp/bm750/conf/machine/bm750.conf +++ b/meta-bsp/bm750/conf/machine/bm750.conf @@ -2,14 +2,13 @@ #@NAME: Vu+ Duo #@DESCRIPTION: Machine configuration for Vu+ Duo. -MACHINE_FEATURES += "display-text-vfd" -MACHINE_FEATURES = "fan_simple" - -MACHINE_FEATURES += "hbbtv" -MACHINE_FEATURES += "streamtv" -MACHINE_FEATURES += "dlna" -MACHINE_FEATURES += "3gmodem" - +VUPLUS_FEATURES += "vuwlan" +VUPLUS_FEATURES += "display-text-vfd" +VUPLUS_FEATURES += "fan_simple" +VUPLUS_FEATURES += "hbbtv" +VUPLUS_FEATURES += "streamtv" +VUPLUS_FEATURES += "dlna" +VUPLUS_FEATURES += "3gmodem" IMAGE_UNPACK_PATH = "vuplus/duo" MKFS_UBI_MAX_ERASE_BLK_COUNT = "4096" diff --git a/meta-bsp/common/conf/machine/include/vuplus.inc b/meta-bsp/common/conf/machine/include/vuplus.inc index a66dc11..4234382 100644 --- a/meta-bsp/common/conf/machine/include/vuplus.inc +++ b/meta-bsp/common/conf/machine/include/vuplus.inc @@ -5,7 +5,7 @@ GLIBC_EXTRA_OECONF = "--with-tls --with-__thread" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "vuplus-bootlogo" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "vuplus-dvb-modules" -MACHINE_FEATURES += "kernel26 alsa pci wifi vuwlan" +MACHINE_FEATURES += "kernel26 alsa pci wifi" PREFERRED_PROVIDER_virtual/kernel = "linux-vuplus" diff --git a/meta-bsp/vuduo2/conf/machine/vuduo2.conf b/meta-bsp/vuduo2/conf/machine/vuduo2.conf index d657abe..43cb360 100644 --- a/meta-bsp/vuduo2/conf/machine/vuduo2.conf +++ b/meta-bsp/vuduo2/conf/machine/vuduo2.conf @@ -2,19 +2,20 @@ #@NAME: Vu+ duo2 #@DESCRIPTION: Machine configuration for Vu+ duo2. -MACHINE_FEATURES += "display-graphic-vfd" -MACHINE_FEATURES += "enable-rc-kbd" -MACHINE_FEATURES = "fan_manual rc_code " +VUPLUS_FEATURES += "vuwlan" +VUPLUS_FEATURES += "display-graphic-vfd" +VUPLUS_FEATURES += "enable-rc-kbd" +VUPLUS_FEATURES += "fan_manual rc_code " -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" +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" IMAGE_UNPACK_PATH = "vuplus/duo2" MKFS_UBI_MAX_ERASE_BLK_COUNT = "4096" diff --git a/meta-bsp/vusolo/conf/machine/vusolo.conf b/meta-bsp/vusolo/conf/machine/vusolo.conf index 884c015..b7ab26f 100644 --- a/meta-bsp/vusolo/conf/machine/vusolo.conf +++ b/meta-bsp/vusolo/conf/machine/vusolo.conf @@ -2,10 +2,10 @@ #@NAME: Vu+ Solo #@DESCRIPTION: Machine configuration for Vu+ Solo. -MACHINE_FEATURES = "" -MACHINE_FEATURES += "streamtv" -MACHINE_FEATURES += "dlna" -MACHINE_FEATURES += "3gmodem" +VUPLUS_FEATURES += "vuwlan" +VUPLUS_FEATURES += "streamtv" +VUPLUS_FEATURES += "dlna" +VUPLUS_FEATURES += "3gmodem" IMAGE_UNPACK_PATH = "vuplus/solo" MKFS_UBI_MAX_ERASE_BLK_COUNT = "4096" diff --git a/meta-bsp/vusolo2/conf/machine/vusolo2.conf b/meta-bsp/vusolo2/conf/machine/vusolo2.conf index 8d4b1cd..ef7456b 100644 --- a/meta-bsp/vusolo2/conf/machine/vusolo2.conf +++ b/meta-bsp/vusolo2/conf/machine/vusolo2.conf @@ -2,19 +2,20 @@ #@NAME: Vu+ solo2 #@DESCRIPTION: Machine configuration for Vu+ solo2. -MACHINE_FEATURES += "display-text-vfd" -MACHINE_FEATURES += "enable-rc-kbd" -MACHINE_FEATURES = "fan_manual rc_code " +VUPLUS_FEATURES += "vuwlan" +VUPLUS_FEATURES += "display-text-vfd" +VUPLUS_FEATURES += "enable-rc-kbd" +VUPLUS_FEATURES += "fan_manual rc_code " -MACHINE_FEATURES += "firmwareupgrade" -MACHINE_FEATURES += "webmanual" -MACHINE_FEATURES += "hbbtv" -MACHINE_FEATURES += "streamtv" -MACHINE_FEATURES += "dlna" -MACHINE_FEATURES += "3gmodem" -MACHINE_FEATURES += "webif" -MACHINE_FEATURES += "autoshutdown" -MACHINE_FEATURES += "transcoding" +VUPLUS_FEATURES += "firmwareupgrade" +VUPLUS_FEATURES += "webmanual" +VUPLUS_FEATURES += "hbbtv" +VUPLUS_FEATURES += "streamtv" +VUPLUS_FEATURES += "dlna" +VUPLUS_FEATURES += "3gmodem" +VUPLUS_FEATURES += "webif" +VUPLUS_FEATURES += "autoshutdown" +VUPLUS_FEATURES += "transcoding" IMAGE_UNPACK_PATH = "vuplus/solo2" MKFS_UBI_MAX_ERASE_BLK_COUNT = "4096" diff --git a/meta-bsp/vuultimo/conf/machine/vuultimo.conf b/meta-bsp/vuultimo/conf/machine/vuultimo.conf index 4c35267..6e8bf9a 100644 --- a/meta-bsp/vuultimo/conf/machine/vuultimo.conf +++ b/meta-bsp/vuultimo/conf/machine/vuultimo.conf @@ -2,18 +2,19 @@ #@NAME: Vu+ ultimo #@DESCRIPTION: Machine configuration for Vu+ ultimo. -MACHINE_FEATURES += "display-graphic-vfd" -MACHINE_FEATURES += "right-half-vfd-skin" -MACHINE_FEATURES += "enable-rc-kbd" -MACHINE_FEATURES = "fan_manual rc_code led" +VUPLUS_FEATURES += "vuwlan" +VUPLUS_FEATURES += "display-graphic-vfd" +VUPLUS_FEATURES += "right-half-vfd-skin" +VUPLUS_FEATURES += "enable-rc-kbd" +VUPLUS_FEATURES += "fan_manual rc_code led" -MACHINE_FEATURES += "blindscan" -MACHINE_FEATURES += "firmwareupgrade" -MACHINE_FEATURES += "hbbtv" -MACHINE_FEATURES += "streamtv" -MACHINE_FEATURES += "dlna" -MACHINE_FEATURES += "3gmodem" -MACHINE_FEATURES += "vuplus-fpga-update" +VUPLUS_FEATURES += "blindscan" +VUPLUS_FEATURES += "firmwareupgrade" +VUPLUS_FEATURES += "hbbtv" +VUPLUS_FEATURES += "streamtv" +VUPLUS_FEATURES += "dlna" +VUPLUS_FEATURES += "3gmodem" +VUPLUS_FEATURES += "vuplus-fpga-update" IMAGE_UNPACK_PATH = "vuplus/ultimo" MKFS_UBI_MAX_ERASE_BLK_COUNT = "3894" diff --git a/meta-bsp/vuuno/conf/machine/vuuno.conf b/meta-bsp/vuuno/conf/machine/vuuno.conf index 9a708a3..88f2f65 100644 --- a/meta-bsp/vuuno/conf/machine/vuuno.conf +++ b/meta-bsp/vuuno/conf/machine/vuuno.conf @@ -2,16 +2,16 @@ #@NAME: Vu+ Uno #@DESCRIPTION: Machine configuration for Vu+ Uno. -MACHINE_FEATURES += "display-text-vfd" -MACHINE_FEATURES = "fan_manual rc_code" - -MACHINE_FEATURES += "blindscan" -MACHINE_FEATURES += "hbbtv" -MACHINE_FEATURES += "streamtv" -MACHINE_FEATURES += "dlna" -MACHINE_FEATURES += "3gmodem" -MACHINE_FEATURES += "fpgaupgrade" -MACHINE_FEATURES += "vuplus-fpga-update" +VUPLUS_FEATURES += "vuwlan" +VUPLUS_FEATURES += "display-text-vfd" +VUPLUS_FEATURES += "fan_manual rc_code" +VUPLUS_FEATURES += "blindscan" +VUPLUS_FEATURES += "hbbtv" +VUPLUS_FEATURES += "streamtv" +VUPLUS_FEATURES += "dlna" +VUPLUS_FEATURES += "3gmodem" +VUPLUS_FEATURES += "fpgaupgrade" +VUPLUS_FEATURES += "vuplus-fpga-update" IMAGE_UNPACK_PATH = "vuplus/uno" MKFS_UBI_MAX_ERASE_BLK_COUNT = "4096" diff --git a/meta-openvuplus/recipes-connectivity/tasks/task-vuplus-wlan.bb b/meta-openvuplus/recipes-connectivity/tasks/task-vuplus-wlan.bb index 7fc1160..720f050 100644 --- a/meta-openvuplus/recipes-connectivity/tasks/task-vuplus-wlan.bb +++ b/meta-openvuplus/recipes-connectivity/tasks/task-vuplus-wlan.bb @@ -2,13 +2,13 @@ DESCRIPTION = "Vuplus: W-LAN Task for the Vuplus Distribution" SECTION = "vuplus/base" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r9" +PR = "r10" inherit task DEPENDS_${PN} = "enigma2-plugins" RDEPENDS_${PN} = "\ - ${@base_contains("MACHINE_FEATURES", "vuwlan", "enigma2-plugin-systemplugins-wirelesslansetup", "enigma2-plugin-systemplugins-wirelesslan", d)} \ + ${@base_contains("VUPLUS_FEATURES", "vuwlan", "enigma2-plugin-systemplugins-wirelesslansetup", "enigma2-plugin-systemplugins-wirelesslan", d)} \ wireless-tools \ wpa-supplicant \ " diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb index e527f8d..c513389 100644 --- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb +++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb @@ -85,7 +85,7 @@ RDEPENDS_enigma2-plugin-systemplugins-3gmodemmanager = "ppp usb-modeswitch usb-m RDEPENDS_enigma2-plugin-systemplugins-devicemanager = "util-linux-blkid ntfs-3g dosfstools" PN = "enigma2" -PR = "r6" +PR = "r7" SRCDATE = "20121128" #SRCDATE is NOT used by git to checkout a specific revision @@ -118,7 +118,7 @@ SRC_URI = "git://code.vuplus.com/git/dvbapp.git;protocol=http;branch=${BRANCH};t file://number_key \ " -SRC_URI_append = " ${@base_contains("MACHINE_FEATURES", "vuwlan", "file://enigma2_vuplus_networksetup.patch;patch=1;pnum=1", "", d)}" +SRC_URI_append = " ${@base_contains("VUPLUS_FEATURES", "vuwlan", "file://enigma2_vuplus_networksetup.patch;patch=1;pnum=1", "", d)}" def change_po(): import os @@ -178,10 +178,10 @@ do_compile_prepend_vuplus() { } EXTRA_OECONF = " \ - ${@base_contains("MACHINE_FEATURES", "display-text-vfd", "--with-display-text-vfd" , "", d)} \ - ${@base_contains("MACHINE_FEATURES", "display-graphic-vfd", "--with-display-graphic-vfd" , "", d)} \ - ${@base_contains("MACHINE_FEATURES", "right-half-vfd-skin", "--with-set-right-half-vfd-skin" , "", d)} \ - ${@base_contains("MACHINE_FEATURES", "enable-rc-kbd", "--with-remote-keyboard" , "", d)} \ + ${@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} \ diff --git a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-base.inc b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-base.inc index a1aea11..009240c 100644 --- a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-base.inc +++ b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-base.inc @@ -2,7 +2,7 @@ SUMMARY = "Vuplus: Base Task for Vuplus." SECTION = "vuplus/base" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -INC_PR = "r3" +INC_PR = "r4" inherit task @@ -54,7 +54,7 @@ VUPLUS_BASE_RECOMMENDS = "\ sambaserver \ openvpn \ zeroconf \ - ${@base_contains("MACHINE_FEATURES", "vuplus-fpga-update", "vuplus-fpga-update", "", d)} \ + ${@base_contains("VUPLUS_FEATURES", "vuplus-fpga-update", "vuplus-fpga-update", "", d)} \ " VUPLUS_BASE_OPTIONAL_RECOMMENDS = "\ diff --git a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc index 30d14fb..97fba95 100644 --- a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc +++ b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc @@ -2,7 +2,7 @@ SUMMARY = "Enigma2 Task for Vuplus" SECTION = "vuplus/base" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -INC_PR = "r5" +INC_PR = "r6" inherit task @@ -34,7 +34,7 @@ RDEPENDS_${PN} += " \ python-twisted-protocols \ python-twisted-web \ ${@base_contains("MACHINE_FEATURES", "wifi", "task-vuplus-wlan", "", d)} \ - ${@base_contains("MACHINE_FEATURES", "webmanual", "vuplus-manual", "", d)} \ + ${@base_contains("VUPLUS_FEATURES", "webmanual", "vuplus-manual", "", d)} \ enigma2-plugin-extensions-mediaplayer \ enigma2-plugin-extensions-pictureplayer \ enigma2-plugin-extensions-vuplusevent \ @@ -43,20 +43,21 @@ RDEPENDS_${PN} += " \ enigma2-plugin-systemplugins-uipositionsetup \ enigma2-plugin-systemplugins-hdmicec \ ${@base_contains("MACHINE_FEATURES", "wifi", "enigma2-plugin-systemplugins-wirelessaccesspoint", "", 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 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)} \ + ${@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)} \ " PACKAGE_ARCH = "${MACHINE_ARCH}" +