Merge bk://openembedded@openembedded.bkbits.net/packages-devel

into stealth.nexus.co.uk:/home/pb/oe/oe-packages

2004/11/12 20:08:39+00:00 nexus.co.uk!pb
dd patch from Chester Terry to reinstate missing fbcon logo bits on corgi

BKrev: 419522c3zLkWPG2lNy3NaNup1G7mhg

diff --git a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/corgi-fbcon-logo.patch b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/corgi-fbcon-logo.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe b/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe
index 5d9df2b..0d61450 100644 (file)
--- a/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe
+++ b/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe
@@ -5,7 +5,7 @@ KV = "2.4.18"
 RMKV = "7"
 PXAV = "3"
 SHARPV = "20031107"
-PR = "r7"
+PR = "r8"
 DESCRIPTION = "Linux kernel for OpenZaurus PXA processor based devices."
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/openzaurus-pxa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}"
@@ -34,8 +34,9 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
            file://keymap-more-sane.patch;patch=1 \
            file://mkdep.patch;patch=1 \
            file://disable-pcmcia-probe.patch;patch=1 \
-           file://linux-2.4.18-list_move.patch;patch=1 \  
-           file://deviceinfo.patch;patch=1 \  
+           file://linux-2.4.18-list_move.patch;patch=1 \
+           file://deviceinfo.patch;patch=1 \
+          file://corgi-fbcon-logo.patch;patch=1 \
            file://defconfig-${MACHINE}"
 SRC_URI_append_poodle += " file://smallfonts.diff;patch=1"
 # apply this when we have a kernel that builds with gcc 3.x: