From: hschang <chang@dev3>
Date: Mon, 30 Mar 2015 09:08:38 +0000 (+0900)
Subject: Merge remote-tracking branch 'oe_21/master' into vuplus-3.0-next
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=commitdiff_plain;h=95e643b27e3774c6e16ada534d510de0b1b0d600;hp=-c

Merge remote-tracking branch 'oe_21/master' into vuplus-3.0-next
---

95e643b27e3774c6e16ada534d510de0b1b0d600
diff --combined meta-bsp/vuduo2/recipes/vuplus/vuplus-dvb-proxy.bbappend
index ff2530c,c3b4973..07953c1
--- a/meta-bsp/vuduo2/recipes/vuplus/vuplus-dvb-proxy.bbappend
+++ b/meta-bsp/vuduo2/recipes/vuplus/vuplus-dvb-proxy.bbappend
@@@ -1,10 -1,10 +1,10 @@@
- SRCDATE = "20150302"
+ SRCDATE = "20150317"
  SRCDATE_PR = "r0"
  
 -do_install_append(){
 -  ln -s /lib/modules/${KERNEL_VERSION}/extra/dvb-bcm7424.ko ${D}/lib/modules/${KERNEL_VERSION}/extra/dvb-bcm.ko
 +pkg_postinst_${PN}_append () {
 +  ln -s /lib/modules/${KERNEL_VERSION}/extra/dvb-bcm7424.ko $D/lib/modules/${KERNEL_VERSION}/extra/dvb-bcm.ko
  }
  
  
- SRC_URI[md5sum] = "9633342a561268a08509e636e832fd9f"
- SRC_URI[sha256sum] = "4ae626ecd7be77f913a246e550325868330725cfd5666af4755d9ea887cf9165"
+ SRC_URI[md5sum] = "630c5b0a6737e650e6ec6e049081ece2"
+ SRC_URI[sha256sum] = "aa3ac0d8bb1b4c9cf94a2da5bc98fcc592af277c846a62493661d051166a2462"
diff --combined meta-bsp/vusolo2/recipes/vuplus/vuplus-dvb-proxy.bbappend
index bf3094a,fe34595..9ee05b9
--- a/meta-bsp/vusolo2/recipes/vuplus/vuplus-dvb-proxy.bbappend
+++ b/meta-bsp/vusolo2/recipes/vuplus/vuplus-dvb-proxy.bbappend
@@@ -1,10 -1,10 +1,10 @@@
- SRCDATE = "20150302"
+ SRCDATE = "20150317"
  SRCDATE_PR = "r0"
  
 -do_install_append(){
 -  ln -s /lib/modules/${KERNEL_VERSION}/extra/dvb-bcm7356.ko ${D}/lib/modules/${KERNEL_VERSION}/extra/dvb-bcm.ko
 +pkg_postinst_${PN}_append () {
 +  ln -s /lib/modules/${KERNEL_VERSION}/extra/dvb-bcm7356.ko $D/lib/modules/${KERNEL_VERSION}/extra/dvb-bcm.ko
  }
  
  
- SRC_URI[md5sum] = "9d3c926e9452e0ed922b7cd4f3d8bdb9"
- SRC_URI[sha256sum] = "ab684371e5fdf365d19ac602e903c5f355d09fcd595814b13cb54118a4bf129e"
+ SRC_URI[md5sum] = "a91d808dfdc799011778cd997444938b"
+ SRC_URI[sha256sum] = "a588df43683f2a6bf7c1e02fc4d352734c19a6badfce3e8df61945c62e7eb8cd"
diff --combined meta-bsp/vusolose/recipes/vuplus/vuplus-dvb-proxy.bbappend
index 9392dcd,66ad901..6f0bffc
--- a/meta-bsp/vusolose/recipes/vuplus/vuplus-dvb-proxy.bbappend
+++ b/meta-bsp/vusolose/recipes/vuplus/vuplus-dvb-proxy.bbappend
@@@ -1,9 -1,9 +1,9 @@@
- SRCDATE = "20150302"
+ SRCDATE = "20150317"
  SRCDATE_PR = "r0"
  
 -do_install_append(){
 -  ln -s /lib/modules/${KERNEL_VERSION}/extra/dvb-bcm7241.ko ${D}/lib/modules/${KERNEL_VERSION}/extra/dvb-bcm.ko
 +pkg_postinst_${PN}_append () {
 +  ln -s /lib/modules/${KERNEL_VERSION}/extra/dvb-bcm7241.ko $D/lib/modules/${KERNEL_VERSION}/extra/dvb-bcm.ko
  }
  
- SRC_URI[md5sum] = "73e636c13d545a7421055adecdff0efa"
- SRC_URI[sha256sum] = "0548027af76eeda4c2b8ae4e178115b89d3188a8d19362d3f132358aa01f8cc8"
+ SRC_URI[md5sum] = "bbd29f3c5a7915cae04ffeb6cf89a6cc"
+ SRC_URI[sha256sum] = "7231bf1fa368c684127f0a031bb11d5339dc366cd8563857a5fd029b85020018"