From: Chris Larson <clarson@kergoth.com>
Date: Sat, 20 Dec 2003 04:05:14 +0000 (+0000)
Subject: Merge openembedded@openembedded.bkbits.net:packages
X-Git-Tag: Release-2010-05/1~20464
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2919aed18ecd4977afe0c115872e4cfce05cb330;p=openembedded.git

Merge openembedded@openembedded.bkbits.net:packages
into direwolf.ppp.ti.com:/home/kergoth/coding/projects/user/oe-metadata/packages

2003/12/19 22:03:11-06:00 ti.com!kergoth
Dont apply arm-ioperm.patch until we build against 2.5/2.6 kernel headers.

BKrev: 3fe3ca7aeuHdugbaJvng9d5WEMTCQQ
---

diff --git a/glibc/glibc_2.3.2.oe b/glibc/glibc_2.3.2.oe
index b2d3837183..f501389188 100644
--- a/glibc/glibc_2.3.2.oe
+++ b/glibc/glibc_2.3.2.oe
@@ -11,6 +11,8 @@ PROVIDES=virtual/libc
 #	  file://${FILESDIR}/50_glibc232-hppa-full-nptl-2003-10-22.patch;patch=1;pnum=1
 #	  file://${FILESDIR}/alpha-crti.patch;patch=1;pnum=1
 #	  file://${FILESDIR}/glibc-make-check-perms.patch;patch=1;pnum=0
+# This patch is needed for builds against recent 2.5/2.6 kernel headers:
+#	  file://${FILESDIR}/arm-ioperm.patch;patch=1;pnum=0
 SRC_URI = ftp://ftp.gnu.org/gnu/glibc/glibc-2.3.2.tar.gz \
 	  ftp://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-2.3.2.tar.gz \
 	  http://www.uclibc.org/downloads/toolchain/kernel-headers-2.4.21.tar.bz2 \
@@ -50,7 +52,6 @@ SRC_URI = ftp://ftp.gnu.org/gnu/glibc/glibc-2.3.2.tar.gz \
 	  file://${FILESDIR}/50_glibc232-arm-dwarf2-buildfix.patch;patch=1;pnum=1 \
 	  file://${FILESDIR}/50_glibc232-m68k-dwarf2-buildfix.patch;patch=1;pnum=1 \
 	  file://${FILESDIR}/arm-output-format.patch;patch=1;pnum=0 \
-	  file://${FILESDIR}/arm-ioperm.patch;patch=1;pnum=0 \
 	  file://${FILESDIR}/pthread-cleanup.patch;patch=1;pnum=0 \
 	  file://${FILESDIR}/glibc-2.3.2-ldconfig-tls.patch;patch=1;pnum=1 \
 	  file://${FILESDIR}/glibc23-mips-msq.patch;patch=1;pnum=0 \
diff --git a/glib-1.2/glib-1.2-1.2.10/glibconfig-sysdefs.h b/nonworking/glib-1.2/glib-1.2-1.2.10/glibconfig-sysdefs.h
similarity index 100%
rename from glib-1.2/glib-1.2-1.2.10/glibconfig-sysdefs.h
rename to nonworking/glib-1.2/glib-1.2-1.2.10/glibconfig-sysdefs.h