From 471f056b17095e73dec2a696df56085f51f3e010 Mon Sep 17 00:00:00 2001 From: hschang Date: Tue, 22 Jan 2013 16:45:12 +0900 Subject: [PATCH] fix VUPLUS_FEATURES TO MACHINE_FEATURES. --- meta-bsp/bm750/conf/machine/bm750.conf | 10 ++++---- meta-bsp/vuduo2/conf/machine/vuduo2.conf | 18 ++++++------- meta-bsp/vusolo/conf/machine/vusolo.conf | 8 +++--- meta-bsp/vusolo2/conf/machine/vusolo2.conf | 20 +++++++-------- meta-bsp/vuultimo/conf/machine/vuultimo.conf | 16 ++++++------ meta-bsp/vuuno/conf/machine/vuuno.conf | 16 ++++++------ .../recipes-vuplus/tasks/task-vuplus-base.inc | 2 +- .../recipes-vuplus/tasks/task-vuplus-enigma2.inc | 30 +++++++++++----------- 8 files changed, 60 insertions(+), 60 deletions(-) diff --git a/meta-bsp/bm750/conf/machine/bm750.conf b/meta-bsp/bm750/conf/machine/bm750.conf index 3615993..f31df23 100644 --- a/meta-bsp/bm750/conf/machine/bm750.conf +++ b/meta-bsp/bm750/conf/machine/bm750.conf @@ -3,12 +3,12 @@ #@DESCRIPTION: Machine configuration for Vu+ Duo. MACHINE_FEATURES += "display-text-vfd" -VUPLUS_FEATURES = "fan_simple" +MACHINE_FEATURES = "fan_simple" -VUPLUS_FEATURES += "hbbtv" -VUPLUS_FEATURES += "streamtv" -VUPLUS_FEATURES += "dlna" -VUPLUS_FEATURES += "3gmodem" +MACHINE_FEATURES += "hbbtv" +MACHINE_FEATURES += "streamtv" +MACHINE_FEATURES += "dlna" +MACHINE_FEATURES += "3gmodem" IMAGE_UNPACK_PATH = "vuplus/duo" diff --git a/meta-bsp/vuduo2/conf/machine/vuduo2.conf b/meta-bsp/vuduo2/conf/machine/vuduo2.conf index b5290e4..8519ce0 100644 --- a/meta-bsp/vuduo2/conf/machine/vuduo2.conf +++ b/meta-bsp/vuduo2/conf/machine/vuduo2.conf @@ -4,16 +4,16 @@ 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 += "transcoding" +MACHINE_FEATURES += "firmwareupgrade" +MACHINE_FEATURES += "blindscan" +MACHINE_FEATURES += "hbbtv" +MACHINE_FEATURES += "streamtv" +MACHINE_FEATURES += "dlna" +MACHINE_FEATURES += "3gmodem" +MACHINE_FEATURES += "webif" +MACHINE_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 ac0330b..884c015 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. -VUPLUS_FEATURES = "" -VUPLUS_FEATURES += "streamtv" -VUPLUS_FEATURES += "dlna" -VUPLUS_FEATURES += "3gmodem" +MACHINE_FEATURES = "" +MACHINE_FEATURES += "streamtv" +MACHINE_FEATURES += "dlna" +MACHINE_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 806c4fa..8d4b1cd 100644 --- a/meta-bsp/vusolo2/conf/machine/vusolo2.conf +++ b/meta-bsp/vusolo2/conf/machine/vusolo2.conf @@ -4,17 +4,17 @@ MACHINE_FEATURES += "display-text-vfd" MACHINE_FEATURES += "enable-rc-kbd" -VUPLUS_FEATURES = "fan_manual rc_code " +MACHINE_FEATURES = "fan_manual rc_code " -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" +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" 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 2540a13..4c35267 100644 --- a/meta-bsp/vuultimo/conf/machine/vuultimo.conf +++ b/meta-bsp/vuultimo/conf/machine/vuultimo.conf @@ -5,15 +5,15 @@ MACHINE_FEATURES += "display-graphic-vfd" MACHINE_FEATURES += "right-half-vfd-skin" MACHINE_FEATURES += "enable-rc-kbd" -VUPLUS_FEATURES = "fan_manual rc_code led" +MACHINE_FEATURES = "fan_manual rc_code led" -VUPLUS_FEATURES += "blindscan" -VUPLUS_FEATURES += "firmwareupgrade" -VUPLUS_FEATURES += "hbbtv" -VUPLUS_FEATURES += "streamtv" -VUPLUS_FEATURES += "dlna" -VUPLUS_FEATURES += "3gmodem" -VUPLUS_FEATURES += "vuplus-fpga-update" +MACHINE_FEATURES += "blindscan" +MACHINE_FEATURES += "firmwareupgrade" +MACHINE_FEATURES += "hbbtv" +MACHINE_FEATURES += "streamtv" +MACHINE_FEATURES += "dlna" +MACHINE_FEATURES += "3gmodem" +MACHINE_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 74f4062..9a708a3 100644 --- a/meta-bsp/vuuno/conf/machine/vuuno.conf +++ b/meta-bsp/vuuno/conf/machine/vuuno.conf @@ -3,15 +3,15 @@ #@DESCRIPTION: Machine configuration for Vu+ Uno. MACHINE_FEATURES += "display-text-vfd" -VUPLUS_FEATURES = "fan_manual rc_code" +MACHINE_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" +MACHINE_FEATURES += "blindscan" +MACHINE_FEATURES += "hbbtv" +MACHINE_FEATURES += "streamtv" +MACHINE_FEATURES += "dlna" +MACHINE_FEATURES += "3gmodem" +MACHINE_FEATURES += "fpgaupgrade" +MACHINE_FEATURES += "vuplus-fpga-update" IMAGE_UNPACK_PATH = "vuplus/uno" MKFS_UBI_MAX_ERASE_BLK_COUNT = "4096" diff --git a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-base.inc b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-base.inc index 68e0461..dabb694 100644 --- a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-base.inc +++ b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-base.inc @@ -53,7 +53,7 @@ VUPLUS_BASE_RECOMMENDS = "\ sambaserver \ openvpn \ zeroconf \ - ${@base_contains("VUPLUS_FEATURES", "vuplus-fpga-update", "vuplus-fpga-update", "", d)} \ + ${@base_contains("MACHINE_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 a1f1a61..df5ed6f 100644 --- a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc +++ b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc @@ -36,7 +36,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 \ @@ -45,20 +45,20 @@ RDEPENDS_${PN} += " \ 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", "", 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", "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}" -- 2.7.4