[oe-commits] org.oe.dreambox merge of '1eb23b401462a08c1a337193cdc6486f791201cf'

[tmbinc commit]

merge of '1eb23b401462a08c1a337193cdc6486f791201cf'
     and 'f7b51c2cea314b5754909a0577c74ca82fc16200'

Author: tmbinc at openembedded.org
Branch: org.openembedded.dreambox
Revision: d2b53afb8cf004dd5c83e0cc062d1f98be4f6087
ViewMTN: http://monotone.openembedded.org/revision/info/d2b53afb8cf004dd5c83e0cc062d1f98be4f6087
Files:
1
packages/initscripts/initscripts-1.0/dm800/bootup
packages/initscripts/initscripts-opendreambox_1.0.bb
packages/linux/linux-dm7025.bb
packages/linux/linux-dm800.bb
Diffs:

#
# mt diff -r1eb23b401462a08c1a337193cdc6486f791201cf -rd2b53afb8cf004dd5c83e0cc062d1f98be4f6087
#
#
#
# patch "packages/initscripts/initscripts-1.0/dm800/bootup"
#  from [328882c1a99d7656c4e1cad9d159b0e83f08c7b6]
#    to [9c9b847306dc4857e6515f4d78f67995293ebcee]
# 
# patch "packages/initscripts/initscripts-opendreambox_1.0.bb"
#  from [9efe7864f864f65815bfa1811b66a26adac60e7f]
#    to [3c9a43940f917d9c0935cf88ed9be1179bf81ba6]
#
============================================================
--- packages/initscripts/initscripts-1.0/dm800/bootup	328882c1a99d7656c4e1cad9d159b0e83f08c7b6
+++ packages/initscripts/initscripts-1.0/dm800/bootup	9c9b847306dc4857e6515f4d78f67995293ebcee
@@ -32,6 +32,8 @@ echo 19 > /proc/progress
 modprobe bcm7401
 
 echo 19 > /proc/progress
+
+cat /etc/videomode > /proc/stb/video/videomode
 modprobe dreambox_rc2
 modprobe fp
 
============================================================
--- packages/initscripts/initscripts-opendreambox_1.0.bb	9efe7864f864f65815bfa1811b66a26adac60e7f
+++ packages/initscripts/initscripts-opendreambox_1.0.bb	3c9a43940f917d9c0935cf88ed9be1179bf81ba6
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "makedevs"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r6"
+PR = "r7"
 
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 


#
# mt diff -rf7b51c2cea314b5754909a0577c74ca82fc16200 -rd2b53afb8cf004dd5c83e0cc062d1f98be4f6087
#
#
#
# patch "packages/linux/linux-dm7025.bb"
#  from [0c8ef18aee30a8e465e4982e433a2e8c49bcbd15]
#    to [e5f5ef1abac6c5413c6c055997b770d7fea779fc]
# 
# patch "packages/linux/linux-dm800.bb"
#  from [7915b122c12f94ab3a8367926adc729d897dd9c8]
#    to [470415ff9fdbefd9dba7a470dce9602ca9543806]
#
============================================================
--- packages/linux/linux-dm7025.bb	0c8ef18aee30a8e465e4982e433a2e8c49bcbd15
+++ packages/linux/linux-dm7025.bb	e5f5ef1abac6c5413c6c055997b770d7fea779fc
@@ -3,7 +3,7 @@ PV = "2.6.12.6"
 PN = "linux-dm7025"
 KV = "2.6.12"
 PV = "2.6.12.6"
-PR = "r9"
+PR = "s1"
 
 DEPENDS = "zlib-native"
 
@@ -14,6 +14,7 @@ SRC_URI += "ftp://ftp.kernel.org/pub/lin
 	http://sources.dreamboxupdate.com/download/kernel-patches/linuxmips-${KV}-dm7025-r6.conf \
 	http://dreamboxupdate.com/download/kernel-patches/linux-2.6.12-dvb-multipid-r4.patch.bz2;patch=1;pnum=1 \
 	http://dreamboxupdate.com/download/kernel-patches/linux-2.6.12-dvb-core-fix-several-locking-problems.patch.bz2;patch=1;pnum=1 \
+	http://dreamboxupdate.com/download/kernel-patches/linux-2.6.12-dvbapi-pilot-rolloff-extension-r0.patch.bz2;patch=1;pnum=1 \
 #squashfs-lzma stuff
 	http://squashfs-lzma.org/dl/sqlzma3.2-r2b.tar.bz2 \
 	http://dreamboxupdate.com/download/kernel-patches/sqlzma2k-3.2-r2-2.6.12.6.patch.bz2 \
============================================================
--- packages/linux/linux-dm800.bb	7915b122c12f94ab3a8367926adc729d897dd9c8
+++ packages/linux/linux-dm800.bb	470415ff9fdbefd9dba7a470dce9602ca9543806
@@ -3,7 +3,7 @@ PV = "2.6.12"
 PN = "linux-dm800"
 KV = "2.6.12"
 PV = "2.6.12"
-PR = "r5"
+PR = "r6"
 
 # note, the rX in the filename is *NOT* the packet revision - it's the patch revision.
 SRC_URI += "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${KV}.tar.bz2 \
@@ -12,6 +12,7 @@ SRC_URI += "ftp://ftp.kernel.org/pub/lin
 	http://sources.dreamboxupdate.com/download/kernel-patches/linux-2.6.12-update_dvbapi-r1.patch.bz2;patch=1;pnum=1 \
 	http://sources.dreamboxupdate.com/download/kernel-patches/linux-2.6.12-dvb-multipid-r4.patch.bz2;patch=1;pnum=1 \
 	http://sources.dreamboxupdate.com/download/kernel-patches/linux-2.6.12-dvb-core-fix-several-locking-problems.patch.bz2;patch=1;pnum=1 \
+	http://sources.dreamboxupdate.com/download/kernel-patches/linux-2.6.12-dvbapi-pilot-rolloff-extension-r0.patch.bz2;patch=1;pnum=1\
 	file://linux-2.6.12-dream-misc.patch;patch=1;pnum=1 \
 	file://linux-2.6.12-add-ioprio.patch;patch=1;pnum=1 \
 	file://linux-2.6.12-fix-serial.patch;patch=1;pnum=1 \