From: hschang <chang@dev3>
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

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 --cc 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 --cc 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 \
  "
  
@@@ -44,20 -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", "", 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}"