From: hschang <chang@dev3>
Date: Fri, 18 Jul 2014 10:10:41 +0000 (+0900)
Subject: Merge remote-tracking branch 'OE-2.1/master' into vuplus-3.0
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=commitdiff_plain;h=7304b98fd993c35446156711e8533d6abdf6eb97

Merge remote-tracking branch 'OE-2.1/master' into vuplus-3.0
---

7304b98fd993c35446156711e8533d6abdf6eb97
diff --cc meta-bsp/vusolo/recipes/vuplus/enigma2.bbappend
index 46baf36,7bee522..24f52c0
--- a/meta-bsp/vusolo/recipes/vuplus/enigma2.bbappend
+++ b/meta-bsp/vusolo/recipes/vuplus/enigma2.bbappend
@@@ -1,3 -1,3 +1,3 @@@
- PR.= "-bsp1"
+ PR .= "-bsp1"
  
 -SRC_URI_append = " file://enigma2_vuplus_misc.patch;patch=1;pnum=1"
 +SRC_URI_append = " file://enigma2_vuplus_misc.patch"
diff --cc meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
index 7cda144,37eace3..ffaa738
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
@@@ -88,11 -89,13 +88,11 @@@ RDEPENDS_enigma2-plugin-systemplugins-b
  RDEPENDS_enigma2-plugin-systemplugins-backupsuiteusb = "enigma2-plugin-extensions-backupsuitehdd"
  
  PN = "enigma2"
- PR = "r77"
+ PR = "r78"
  
 -SRCDATE = "20121128"
 -#SRCDATE is NOT used by git to checkout a specific revision
 -#but we need it to build a ipk package version
 -#when you like to checkout a specific revision of e2 you need
 -#have to specify a commit id or a tag name in SRCREV
 +inherit gitpkgv pythonnative
 +
 +PKGV = "git${GITPKGV}"
  
  ####################################################
  BRANCH = "vuplus_experimental"
diff --cc meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.2.bb
index 40c46d5,f84b23c..3bc6dcd
--- a/meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.2.bb
+++ b/meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.2.bb
@@@ -3,9 -3,9 +3,9 @@@ PRIORITY = "required
  LICENSE = "CLOSED"
  
  DEPENDS = "mpfr gmp"
 -RDEPENDS = "sysfsutils vuplus-dvb-modules"
 +RDEPENDS_${PN} = "sysfsutils vuplus-dvb-modules"
  
- SRC_DATE = "20140717_0"
+ SRC_DATE = "20140718_0"
  
  PR = "r1_${SRC_DATE}"
  SRC_URI = ""