diff options
author | kos <kos@dev3> | 2013-01-25 10:07:51 (GMT) |
---|---|---|
committer | kos <kos@dev3> | 2013-01-25 10:07:51 (GMT) |
commit | 0761571c7ca12b7297da129697aeee583a468174 (patch) | |
tree | 096316766b19670826a598ef00343407645d1ff3 /meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc | |
parent | 6088778ef01fd47bfb61658ab266ce23dcd680ed (diff) | |
parent | a4d060a67abdd40b960df45bed6d1eff06291c7c (diff) |
Merge branch 'master' of code.vuplus.com:/opt/repository/openvuplus
Conflicts:
meta-openvuplus/recipes-core/busybox/busybox_1.19.4.bbappend
Diffstat (limited to 'meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc')
-rw-r--r-- | meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc index 6c24c53..30d14fb 100644 --- a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc +++ b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc @@ -23,7 +23,6 @@ RDEPENDS_${PN} += " \ enigma2-plugin-extensions-remotestreamconvert \ enigma2-plugin-systemplugins-zappingmodeselection \ enigma2-plugin-extensions-addstreamurl \ - enigma2-plugin-extensions-remotestreamconvert \ enigma2-plugin-systemplugins-devicemanager \ " @@ -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 +43,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 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 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}" |