From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 28 Jan 2005 15:31:13 +0000 (+0000)
Subject: Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
X-Git-Tag: Release-2010-05/1~15272
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd8f58b3ecf7cea561fcdd08c8507fbd7b9a61f6;p=openembedded.git

Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/01/28 16:30:50+01:00 uni-frankfurt.de!mickeyl
apply the uml-x11-fb patch to 2.6.11-rc1-mm1

BKrev: 41fa5ac1umEXPJ-ZpXTq8SBtCVu7Fg
---

diff --git a/packages/linux-uml/linux-uml_2.6.11-rc1-mm1.bb b/packages/linux-uml/linux-uml_2.6.11-rc1-mm1.bb
index 332dda499f..fd2e1abe46 100644
--- a/packages/linux-uml/linux-uml_2.6.11-rc1-mm1.bb
+++ b/packages/linux-uml/linux-uml_2.6.11-rc1-mm1.bb
@@ -6,14 +6,17 @@ KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
 RCV = "${@bb.data.getVar('PV',d,True).split('-')[1]}"
 MMV = "${@bb.data.getVar('PV',d,True).split('-')[2]}"
 LV = "2.6.10"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-${LV}.tar.bz2 \
            http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-${KV}-${RCV}.bz2;patch=1 \
            http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/${KV}-${RCV}/${KV}-${RCV}-${MMV}/${KV}-${RCV}-${MMV}.gz;patch=1 \
+http://www.suse.de/~kraxel/uml/patches/2.6.10-rc3/uml-core-on-panic;patch=1 \
+http://www.suse.de/~kraxel/uml/patches/2.6.10-rc3/uml-pretend-to-be-i586;patch=1 \
+http://www.suse.de/~kraxel/uml/patches/2.6.10-rc3/uml-general-protection-fault;patch=1 \
+http://www.suse.de/~kraxel/uml/patches/2.6.10-rc3/uml-x11-fb;patch=1 \
            file://defconfig"
-#           file://compile-fix.patch;patch=1 \
-#           file://defconfig"
+
 S = "${WORKDIR}/linux-${LV}"
 
 inherit kernel