diff options
| author | schon <schon@dev03-server> | 2012-09-06 09:17:56 (GMT) |
|---|---|---|
| committer | schon <schon@dev03-server> | 2012-09-06 09:17:56 (GMT) |
| commit | 79991a78ee6e538b448acfba3c4cb387953cf780 (patch) | |
| tree | 1540f65f95ce8cd39610bc086928481046e56816 | |
| parent | b6bb4a486a355267f8df3998a40d4b762ee27d44 (diff) | |
| parent | 7fd5fc555c0efe5bb9a607e4acc9acb5bea9b27c (diff) | |
Merge branch 'vuplus-1.6k' of /home/shcheong/work/stb/sw/oe_1.6/bm750/openembedded into rk2637
| -rwxr-xr-x | recipes/enigma2/enigma2-defaultservices.bb | 2 | ||||
| -rwxr-xr-x | recipes/enigma2/enigma2-defaultservices/lamedb.192 | 3 | ||||
| -rw-r--r-- | recipes/enigma2/enigma2.bb | 2 | ||||
| -rw-r--r-- | recipes/opera-hbbtv/opera-hbbtv_0.1.bb | 2 |
4 files changed, 3 insertions, 6 deletions
diff --git a/recipes/enigma2/enigma2-defaultservices.bb b/recipes/enigma2/enigma2-defaultservices.bb index 796509d..7d92bd2 100755 --- a/recipes/enigma2/enigma2-defaultservices.bb +++ b/recipes/enigma2/enigma2-defaultservices.bb @@ -4,7 +4,7 @@ LICENSE = "proprietary" MAINTAINER = "tmbinc@elitedvb.net" PR = "r4" -PR_vuplus = "r7" +PR_vuplus = "r8" SRC_URI = "file://*" diff --git a/recipes/enigma2/enigma2-defaultservices/lamedb.192 b/recipes/enigma2/enigma2-defaultservices/lamedb.192 index 8362d17..096a943 100755 --- a/recipes/enigma2/enigma2-defaultservices/lamedb.192 +++ b/recipes/enigma2/enigma2-defaultservices/lamedb.192 @@ -815,9 +815,6 @@ p:DIGITAL+ 002b:00c00000:0002:0085:1:0 Sky Cinema +24 p:SKY,C:1861 -4e2b:00c00000:043a:0001:1:0 -Deutsches Wetterfernsehen -p:ProSiebenSat.1 772b:00c00000:0416:0001:1:0 CAZA Y PESCA p:CAZPES diff --git a/recipes/enigma2/enigma2.bb b/recipes/enigma2/enigma2.bb index 07aa924..132d49f 100644 --- a/recipes/enigma2/enigma2.bb +++ b/recipes/enigma2/enigma2.bb @@ -78,7 +78,7 @@ RDEPENDS_enigma2-plugin-extensions-hbbtv = "tslib-conf libts-1.0-0 libsysfs2 lib RDEPENDS_enigma2-plugin-systemplugins-devicemanager = "util-linux-ng-blkid ntfs-3g dosfstools" PN = "enigma2" -PR = "r42" +PR = "r44" SRCDATE = "20110922" SRCREV = "5e19a3f8a5e8ce8a4e2cb2b601a1b8ef3554e4be" diff --git a/recipes/opera-hbbtv/opera-hbbtv_0.1.bb b/recipes/opera-hbbtv/opera-hbbtv_0.1.bb index 60012da..7a827ba 100644 --- a/recipes/opera-hbbtv/opera-hbbtv_0.1.bb +++ b/recipes/opera-hbbtv/opera-hbbtv_0.1.bb @@ -1,7 +1,7 @@ DESCRIPTION = "opera-hbbtv" PRIORITY = "required" -SRC_DATE = 20120824 +SRC_DATE = 20120831 PR = "r0_${SRC_DATE}" SRC_URI = "http://code.vuplus.com/download/build.fc3abf29fb03f797e78f907928125638/embedded/opera-sdk-build-package/opera-hbbtv_${SRC_DATE}.tar.gz" |