Merge bk://openembedded@openembedded.bkbits.net/packages-devel
authorPhil Blundell <philb@gnu.org>
Sun, 14 Nov 2004 11:25:34 +0000 (11:25 +0000)
committerPhil Blundell <philb@gnu.org>
Sun, 14 Nov 2004 11:25:34 +0000 (11:25 +0000)
into stealth.nexus.co.uk:/home/pb/oe/oe-packages

2004/11/14 06:25:33-05:00 handhelds.org!kergoth
Merge openembedded@openembedded.bkbits.net:packages
into handhelds.org:/home/kergoth/code/packages

2004/11/14 06:25:20-05:00 handhelds.org!kergoth
Apply patch # 1764/1 from the arm linux patch tracking system to the openzaurus sa and pxa kernels (needed this symbol exported for unionfs).

BKrev: 419740aeF5sDrLFbV-wTCgAr1ouleA

linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/1764-1.patch [new file with mode: 0644]
linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe
linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/1764-1.patch [new file with mode: 0644]
linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe

diff --git a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/1764-1.patch b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/1764-1.patch
new file mode 100644 (file)
index 0000000..e69de29
index 29569d3..b06757c 100644 (file)
@@ -5,7 +5,7 @@ KV = "2.4.18"
 RMKV = "7"
 PXAV = "3"
 SHARPV = "20031107"
-PR = "r11"
+PR = "r12"
 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}"
@@ -38,6 +38,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
            file://deviceinfo.patch;patch=1 \
           file://corgi-fbcon-logo.patch;patch=1 \
           http://www.openswan.org/download/openswan-2.2.0-kernel-2.4-klips.patch.gz;patch=1 \
+          file://1764-1.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:
diff --git a/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/1764-1.patch b/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/1764-1.patch
new file mode 100644 (file)
index 0000000..e69de29
index f238064..ddc071a 100644 (file)
@@ -5,7 +5,7 @@ KV = "2.4.18"
 RMKV = "7"
 PXAV = "3"
 SHARPV = "20030509"
-PR = "r8"
+PR = "r9"
 DESCRIPTION = "Linux kernel for OpenZaurus StrongArm processor based devices."
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/openzaurus-sa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}"
 
@@ -25,6 +25,7 @@ SRC_URI = "http://aurach.ewu.edu/ield_software/ch5/ROM3.10_stuff/linux-sl5500-${
            file://linux-2.4.18-list_move.patch;patch=1 \
            file://defconfig-${MACHINE} \
            file://module_licence.patch;patch=1 \
+          file://1764-1.patch;patch=1 \
            file://sound-2.4.18r2.patch;patch=1  "
 
 # apply this when we have a patch that allows building with gcc 3.x: