BUGFIXES: a bunch of build fixes to packages, and changed the patchset we're applying to glibc to match what debian is.

BKrev: 3f5d0277Uvpx3c3AkpBmSIEUKkTDYQ

61 files changed, 127 insertions, 19 deletions

diff --git a/content/busybox-1.00-pre2.oe b/content/busybox-1.00-pre2.oe
index e69de29bb2..883dceb91c 100644
--- a/content/busybox-1.00-pre2.oe
+++ b/content/busybox-1.00-pre2.oe
@@ -0,0 +1,48 @@
+LICENSE="GPL"
+SRC_URI="http://www.busybox.net/downloads/${PN}-${PV}.tar.gz"
+DEPENDS=virtual/libc
+DESCRIPTION=BusyBox version ${PV}.\
+ BusyBox combines tiny versions of many common UNIX utilities into a single\
+ small executable. It provides minimalist replacements for most of the\
+ utilities you usually find in GNU fileutils, shellutils, etc. The utilities\
+ in BusyBox generally have fewer options than their full-featured GNU\
+ cousins; however, the options that are included provide the expected\
+ functionality and behave very much like their GNU counterparts. BusyBox\
+ provides a fairly complete POSIX environment for any small or embedded\
+ system.
+	
+S="${WORKDIR}/${P}"
+export EXTRA_CFLAGS="${CFLAGS}"
+EXTRA_OEMAKE_append=' CROSS=${CROSS}'
+
+do_configure () {
+	set -e
+	install -m 0644 ${FILESDIR}/defconfig ${S}/.config
+	cml1_do_configure
+}
+
+do_compile () {
+	set -e
+	unset CFLAGS
+	base_do_compile
+}
+
+do_install () {
+	set -e
+	install -d ${D}/{bin,usr/share/udhcpc}
+	install -m 0755 busybox ${D}/bin/busybox
+	applets/busybox.mkll > ${D}/bin/busybox.links
+	install -d ${D}/usr/share/udhcpc ${D}/CONTROL ${D}/etc/init.d 
+	install -m 0755 examples/udhcp/simple.script ${D}/usr/share/udhcpc/default.script
+	install -m 0755 ${FILESDIR}/syslog ${D}/etc/init.d/syslog;
+	install -m 0755 ${FILESDIR}/hwclock.sh ${D}/etc/init.d/hwclock.sh;
+}
+
+do_package_ipk () {
+	set -e
+	install -m 0755 ${FILESDIR}/postinst ${D}/CONTROL/postinst;
+	install -m 0755 ${FILESDIR}/prerm ${D}/CONTROL/prerm;
+	package_ipk_do_package_ipk
+}
+
+inherit cml1 base
diff --git a/content/dropbear-0.36.oe b/content/dropbear-0.36.oe
index e69de29bb2..b8f04ae0a3 100644
--- a/content/dropbear-0.36.oe
+++ b/content/dropbear-0.36.oe
@@ -0,0 +1,6 @@
+DESCRIPTION="Dropbear SSH Implementation"
+LICENSE="MIT"
+SRC_URI="http://matt.ucc.asn.au/dropbear/dropbear-${PV}.tar.bz2"
+DEPENDS=virtual/libc base/zlib
+
+S="${WORKDIR}/${P}"
diff --git a/content/glibc-2.3.1.oe b/content/glibc-2.3.1.oe
index b82ef0dcf1..ac9e158879 100644
--- a/content/glibc-2.3.1.oe
+++ b/content/glibc-2.3.1.oe
@@ -1,7 +1,7 @@
 DESCRIPTION="GNU C Library"
 LICENSE="LGPL"
 SECTION="libs"
-DEPENDS="content/kernel-headers"
+DEPENDS="virtual/kernel-header"
 RDEPENDS=""
 PRIORITY=required
 MAINTAINER="Chris Larson <kergoth@handhelds.org>"
@@ -16,11 +16,13 @@ EXTRA_OEMAKE=
 PACKAGES="libc6"
 
 do_unpack() {
-	base_do_unpack $@ || die
-	test -d ${S} || die
+	set -e
+	base_do_unpack $@
+	test -d ${S}
 	mv ${WORKDIR}/linuxthreads{,_db} ${S}/
 }
 
 do_install() {
+	set -e
 	${MAKE} install_root=${D} install
 }
diff --git a/content/glibc-2.3.2-r0/10_cvs.patch b/content/glibc-2.3.2-r0/10_cvs.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/10_cvs.patch
diff --git a/content/glibc-2.3.2-r0/30_glibc232-base.patch b/content/glibc-2.3.2-r0/30_glibc232-base.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/30_glibc232-base.patch
diff --git a/content/glibc-2.3.2-r0/50_glibc23-hppa-entry.patch b/content/glibc-2.3.2-r0/50_glibc23-hppa-entry.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/50_glibc23-hppa-entry.patch
diff --git a/content/glibc-2.3.2-r0/50_glibc232-arm-dwarf2-buildfix.patch b/content/glibc-2.3.2-r0/50_glibc232-arm-dwarf2-buildfix.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/50_glibc232-arm-dwarf2-buildfix.patch
diff --git a/content/glibc-2.3.2-r0/50_glibc232-m68k-dwarf2-buildfix.patch b/content/glibc-2.3.2-r0/50_glibc232-m68k-dwarf2-buildfix.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/50_glibc232-m68k-dwarf2-buildfix.patch
diff --git a/content/glibc-2.3.2-r0/50_glibc232-mips-buildfix.patch b/content/glibc-2.3.2-r0/50_glibc232-mips-buildfix.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/50_glibc232-mips-buildfix.patch
diff --git a/content/glibc-2.3.2-r0/80_glibc232-futimes-buildfix.patch b/content/glibc-2.3.2-r0/80_glibc232-futimes-buildfix.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/80_glibc232-futimes-buildfix.patch
diff --git a/content/glibc-2.3.2-r0/80_glibc232-iconvdata-fix.patch b/content/glibc-2.3.2-r0/80_glibc232-iconvdata-fix.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/80_glibc232-iconvdata-fix.patch
diff --git a/content/glibc-2.3.2-r0/80_glibc232-locales-header.patch b/content/glibc-2.3.2-r0/80_glibc232-locales-header.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/80_glibc232-locales-header.patch
diff --git a/content/glibc-2.3.2-r0/80_glibc232-wcsmbs-fix.patch b/content/glibc-2.3.2-r0/80_glibc232-wcsmbs-fix.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/80_glibc232-wcsmbs-fix.patch
diff --git a/content/glibc-2.3.2-r0/81_glibc232-utimes-fix.patch b/content/glibc-2.3.2-r0/81_glibc232-utimes-fix.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/81_glibc232-utimes-fix.patch
diff --git a/content/glibc-2.3.2-r0/alpha-crti.patch b/content/glibc-2.3.2-r0/alpha-crti.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/alpha-crti.patch
diff --git a/content/glibc-2.3.2-r0/alpha-pic.patch b/content/glibc-2.3.2-r0/alpha-pic.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/alpha-pic.patch
diff --git a/content/glibc-2.3.2-r0/alpha-pwrite.patch b/content/glibc-2.3.2-r0/alpha-pwrite.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/alpha-pwrite.patch
diff --git a/content/glibc-2.3.2-r0/arm-no-hwcap.patch b/content/glibc-2.3.2-r0/arm-no-hwcap.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/arm-no-hwcap.patch
diff --git a/content/glibc-2.3.2-r0/arm-output-format.patch b/content/glibc-2.3.2-r0/arm-output-format.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/arm-output-format.patch
diff --git a/content/glibc-2.3.2-r0/dyn-ldconfig.diff b/content/glibc-2.3.2-r0/dyn-ldconfig.diff
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/dyn-ldconfig.diff
diff --git a/content/glibc-2.3.2-r0/fhs-linux-paths.patch b/content/glibc-2.3.2-r0/fhs-linux-paths.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/fhs-linux-paths.patch
diff --git a/content/glibc-2.3.2-r0/glibc22-eo_EO.patch b/content/glibc-2.3.2-r0/glibc22-eo_EO.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/glibc22-eo_EO.patch
diff --git a/content/glibc-2.3.2-r0/glibc22-locales.patch b/content/glibc-2.3.2-r0/glibc22-locales.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/glibc22-locales.patch
diff --git a/content/glibc-2.3.2-r0/glibc22-m68k-compat.patch b/content/glibc-2.3.2-r0/glibc22-m68k-compat.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/glibc22-m68k-compat.patch
diff --git a/content/glibc-2.3.2-r0/glibc22-m68k-fpic.patch b/content/glibc-2.3.2-r0/glibc22-m68k-fpic.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/glibc22-m68k-fpic.patch
diff --git a/content/glibc-2.3.2-r0/glibc22-nss-upgrade.patch b/content/glibc-2.3.2-r0/glibc22-nss-upgrade.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/glibc22-nss-upgrade.patch
diff --git a/content/glibc-2.3.2-r0/glibc22-ttyname-devfs.patch b/content/glibc-2.3.2-r0/glibc22-ttyname-devfs.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/glibc22-ttyname-devfs.patch
diff --git a/content/glibc-2.3.2-r0/glibc23-01-hppa-dl-machine.patch b/content/glibc-2.3.2-r0/glibc23-01-hppa-dl-machine.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/glibc23-01-hppa-dl-machine.patch
diff --git a/content/glibc-2.3.2-r0/glibc23-07-hppa-atomicity.patch b/content/glibc-2.3.2-r0/glibc23-07-hppa-atomicity.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/glibc23-07-hppa-atomicity.patch
diff --git a/content/glibc-2.3.2-r0/glibc23-asserth-decls.patch b/content/glibc-2.3.2-r0/glibc23-asserth-decls.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/glibc23-asserth-decls.patch
diff --git a/content/glibc-2.3.2-r0/glibc23-cmov.patch b/content/glibc-2.3.2-r0/glibc23-cmov.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/glibc23-cmov.patch
diff --git a/content/glibc-2.3.2-r0/glibc23-ctype-compat.patch b/content/glibc-2.3.2-r0/glibc23-ctype-compat.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/glibc23-ctype-compat.patch
diff --git a/content/glibc-2.3.2-r0/glibc23-errno.patch b/content/glibc-2.3.2-r0/glibc23-errno.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/glibc23-errno.patch
diff --git a/content/glibc-2.3.2-r0/glibc23-function-compat.patch b/content/glibc-2.3.2-r0/glibc23-function-compat.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/glibc23-function-compat.patch
diff --git a/content/glibc-2.3.2-r0/glibc23-hppa-Rminkernel.patch b/content/glibc-2.3.2-r0/glibc23-hppa-Rminkernel.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/glibc23-hppa-Rminkernel.patch
diff --git a/content/glibc-2.3.2-r0/glibc23-hppa-compat.patch b/content/glibc-2.3.2-r0/glibc23-hppa-compat.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/glibc23-hppa-compat.patch
diff --git a/content/glibc-2.3.2-r0/glibc23-hppa-malloc8.patch b/content/glibc-2.3.2-r0/glibc23-hppa-malloc8.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/glibc23-hppa-malloc8.patch
diff --git a/content/glibc-2.3.2-r0/glibcbug.patch b/content/glibc-2.3.2-r0/glibcbug.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/glibcbug.patch
diff --git a/content/glibc-2.3.2-r0/hurd-enable-ldconfig.patch b/content/glibc-2.3.2-r0/hurd-enable-ldconfig.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/hurd-enable-ldconfig.patch
diff --git a/content/glibc-2.3.2-r0/ldconfig.patch b/content/glibc-2.3.2-r0/ldconfig.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/ldconfig.patch
diff --git a/content/glibc-2.3.2-r0/ldd.patch b/content/glibc-2.3.2-r0/ldd.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/ldd.patch
diff --git a/content/glibc-2.3.2-r0/libgcc-compat-all.patch b/content/glibc-2.3.2-r0/libgcc-compat-all.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/libgcc-compat-all.patch
diff --git a/content/glibc-2.3.2-r0/libgcc-compat-other.patch b/content/glibc-2.3.2-r0/libgcc-compat-other.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/libgcc-compat-other.patch
diff --git a/content/glibc-2.3.2-r0/librt-mips.patch b/content/glibc-2.3.2-r0/librt-mips.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/librt-mips.patch
diff --git a/content/glibc-2.3.2-r0/lo_LA.UTF-8_not_supported.patch b/content/glibc-2.3.2-r0/lo_LA.UTF-8_not_supported.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/lo_LA.UTF-8_not_supported.patch
diff --git a/content/glibc-2.3.2-r0/locale-es_AR.patch b/content/glibc-2.3.2-r0/locale-es_AR.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/locale-es_AR.patch
diff --git a/content/glibc-2.3.2-r0/locales-stuff.patch b/content/glibc-2.3.2-r0/locales-stuff.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/locales-stuff.patch
diff --git a/content/glibc-2.3.2-r0/locales-supported.patch b/content/glibc-2.3.2-r0/locales-supported.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/locales-supported.patch
diff --git a/content/glibc-2.3.2-r0/makeconfig.patch b/content/glibc-2.3.2-r0/makeconfig.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/makeconfig.patch
diff --git a/content/glibc-2.3.2-r0/nss_compat-shadow.patch b/content/glibc-2.3.2-r0/nss_compat-shadow.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/nss_compat-shadow.patch
diff --git a/content/glibc-2.3.2-r0/powerpc-sysconf.patch b/content/glibc-2.3.2-r0/powerpc-sysconf.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/powerpc-sysconf.patch
diff --git a/content/glibc-2.3.2-r0/revert-old-libio.patch b/content/glibc-2.3.2-r0/revert-old-libio.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/revert-old-libio.patch
diff --git a/content/glibc-2.3.2-r0/s390-tls.patch b/content/glibc-2.3.2-r0/s390-tls.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/s390-tls.patch
diff --git a/content/glibc-2.3.2-r0/sparc64-fixups.patch b/content/glibc-2.3.2-r0/sparc64-fixups.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/sparc64-fixups.patch
diff --git a/content/glibc-2.3.2-r0/sparcv8-target.patch b/content/glibc-2.3.2-r0/sparcv8-target.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/sparcv8-target.patch
diff --git a/content/glibc-2.3.2-r0/syslog-backrev.patch b/content/glibc-2.3.2-r0/syslog-backrev.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/glibc-2.3.2-r0/syslog-backrev.patch
diff --git a/content/glibc-2.3.2.oe b/content/glibc-2.3.2.oe
index b7e9210cd7..d4273bb947 100644
--- a/content/glibc-2.3.2.oe
+++ b/content/glibc-2.3.2.oe
@@ -1,12 +1,66 @@
 DESCRIPTION="GNU C Library"
 LICENSE="LGPL"
 SECTION="libs"
-DEPENDS="content/kernel-headers"
+DEPENDS="virtual/kernel-header"
 RDEPENDS=""
 PRIORITY=required
 MAINTAINER="Chris Larson <kergoth@handhelds.org>"
 
-SRC_URI="ftp://ftp.gnu.org/gnu/glibc/${P}.tar.gz ftp://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-${PV}.tar.gz file://${FILESDIR}/${P}-200304020432.patch;patch=1 file://${FILESDIR}/sedscript.patch;patch=1 file://${FILESDIR}/noinfo.patch;patch=1"
+SRC_URI="ftp://ftp.gnu.org/gnu/glibc/${P}.tar.gz ftp://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-${PV}.tar.gz"
+SRC_URI_append=' file://${FILESDIR}/noinfo.patch;patch=1'
+SRC_URI_append=' file://${FILESDIR}/10_cvs.patch;patch=1'
+SRC_URI_append=' file://${FILESDIR}/30_glibc232-base.patch;patch=1;pnum=0'
+SRC_URI_append=' file://${FILESDIR}/50_glibc232-arm-dwarf2-buildfix.patch;patch=1'
+SRC_URI_append=' file://${FILESDIR}/50_glibc232-m68k-dwarf2-buildfix.patch;patch=1'
+SRC_URI_append=' file://${FILESDIR}/50_glibc232-mips-buildfix.patch;patch=1;pnum=0'
+SRC_URI_append=' file://${FILESDIR}/50_glibc23-hppa-entry.patch;patch=1'
+SRC_URI_append=' file://${FILESDIR}/80_glibc232-futimes-buildfix.patch;patch=1;pnum=0'
+SRC_URI_append=' file://${FILESDIR}/80_glibc232-iconvdata-fix.patch;patch=1;pnum=0'
+SRC_URI_append=' file://${FILESDIR}/80_glibc232-locales-header.patch;patch=1;pnum=0'
+SRC_URI_append=' file://${FILESDIR}/80_glibc232-wcsmbs-fix.patch;patch=1;pnum=0'
+SRC_URI_append=' file://${FILESDIR}/81_glibc232-utimes-fix.patch;patch=1'
+SRC_URI_append=' file://${FILESDIR}/alpha-crti.patch;patch=1;pnum=0'
+SRC_URI_append=' file://${FILESDIR}/alpha-pic.patch;patch=1;pnum=0'
+SRC_URI_append=' file://${FILESDIR}/alpha-pwrite.patch;patch=1;pnum=0'
+SRC_URI_append=' file://${FILESDIR}/arm-no-hwcap.patch;patch=1;pnum=0'
+SRC_URI_append=' file://${FILESDIR}/arm-output-format.patch;patch=1;pnum=0'
+SRC_URI_append=' file://${FILESDIR}/fhs-linux-paths.patch;patch=1'
+SRC_URI_append=' file://${FILESDIR}/glibc22-eo_EO.patch;patch=1'
+SRC_URI_append=' file://${FILESDIR}/glibc22-locales.patch;patch=1;pnum=0'
+SRC_URI_append=' file://${FILESDIR}/glibc22-m68k-compat.patch;patch=1'
+SRC_URI_append=' file://${FILESDIR}/glibc22-m68k-fpic.patch;patch=1'
+SRC_URI_append=' file://${FILESDIR}/glibc22-nss-upgrade.patch;patch=1'
+SRC_URI_append=' file://${FILESDIR}/glibc22-ttyname-devfs.patch;patch=1;pnum=0'
+SRC_URI_append=' file://${FILESDIR}/glibc23-01-hppa-dl-machine.patch;patch=1'
+SRC_URI_append=' file://${FILESDIR}/glibc23-07-hppa-atomicity.patch;patch=1'
+SRC_URI_append=' file://${FILESDIR}/glibc23-asserth-decls.patch;patch=1;pnum=0'
+SRC_URI_append=' file://${FILESDIR}/glibc23-cmov.patch;patch=1'
+SRC_URI_append=' file://${FILESDIR}/glibc23-ctype-compat.patch;patch=1'
+SRC_URI_append=' file://${FILESDIR}/glibc23-errno.patch;patch=1'
+SRC_URI_append=' file://${FILESDIR}/glibc23-function-compat.patch;patch=1'
+SRC_URI_append=' file://${FILESDIR}/glibc23-hppa-compat.patch;patch=1'
+SRC_URI_append=' file://${FILESDIR}/glibc23-hppa-malloc8.patch;patch=1'
+SRC_URI_append=' file://${FILESDIR}/glibc23-hppa-Rminkernel.patch;patch=1;pnum=0'
+SRC_URI_append=' file://${FILESDIR}/glibcbug.patch;patch=1;pnum=0'
+SRC_URI_append=' file://${FILESDIR}/hurd-enable-ldconfig.patch;patch=1'
+SRC_URI_append=' file://${FILESDIR}/ldconfig.patch;patch=1;pnum=0'
+SRC_URI_append=' file://${FILESDIR}/ldd.patch;patch=1;pnum=0'
+SRC_URI_append=' file://${FILESDIR}/libgcc-compat-all.patch;patch=1;pnum=0'
+SRC_URI_append=' file://${FILESDIR}/libgcc-compat-other.patch;patch=1'
+SRC_URI_append=' file://${FILESDIR}/librt-mips.patch;patch=1;pnum=0'
+SRC_URI_append=' file://${FILESDIR}/locale-es_AR.patch;patch=1;pnum=0'
+SRC_URI_append=' file://${FILESDIR}/locales-stuff.patch;patch=1'
+SRC_URI_append=' file://${FILESDIR}/locales-supported.patch;patch=1;pnum=0'
+SRC_URI_append=' file://${FILESDIR}/lo_LA.UTF-8_not_supported.patch;patch=1;pnum=0'
+SRC_URI_append=' file://${FILESDIR}/makeconfig.patch;patch=1;pnum=0'
+SRC_URI_append=' file://${FILESDIR}/nss_compat-shadow.patch;patch=1;pnum=0'
+SRC_URI_append=' file://${FILESDIR}/powerpc-sysconf.patch;patch=1'
+SRC_URI_append=' file://${FILESDIR}/revert-old-libio.patch;patch=1;pnum=0'
+SRC_URI_append=' file://${FILESDIR}/s390-tls.patch;patch=1;pnum=0'
+SRC_URI_append=' file://${FILESDIR}/sparc64-fixups.patch;patch=1'
+SRC_URI_append=' file://${FILESDIR}/sparcv8-target.patch;patch=1;pnum=0'
+SRC_URI_append=' file://${FILESDIR}/syslog-backrev.patch;patch=1;pnum=0'
+#SRC_URI_append=' file://${FILESDIR}/dyn-ldconfig.diff;patch=1;pnum=0'
 PROVIDES=virtual/libc
 
 S="${WORKDIR}/${P}"
@@ -15,6 +69,8 @@ EXTRA_OECONF="--with-elf --disable-profile --enable-add-ons=linuxthreads --with-
 EXTRA_OEMAKE=
 
 PACKAGES="libc6"
+FILES=
+FILES_libc6="*"
 
 do_unpack() {
 	set -e
@@ -25,6 +81,7 @@ do_unpack() {
 
 do_compile() {
 	set -e
+	touch sysdeps/${ARCH}/framestate.c
 	mkdir -p ${builddir}
 	cd ${builddir}
 	base_do_compile $@
@@ -32,5 +89,5 @@ do_compile() {
 
 do_install() {
 	set -e
-	${MAKE} install_root=${D} install
+	oe_runmake -C ${builddir} install_root=${D} install
 }
diff --git a/content/kernel-headers-2.4.21.oe b/content/kernel-headers-2.4.21.oe
index 4774aba6d6..51a48cef6d 100644
--- a/content/kernel-headers-2.4.21.oe
+++ b/content/kernel-headers-2.4.21.oe
@@ -9,9 +9,10 @@ PROVIDES=virtual/kernel-header
 S="${WORKDIR}/linux"
 
 do_stage() {
-	mkdir -p ${STAGING_DIR}/target/include/{linux,asm}
+	mkdir -p ${STAGING_DIR}/target/include/linux
 	cp -a include/linux/* ${STAGING_DIR}/target/include/linux/
-	cp -a include/asm-${ARCH}/* ${STAGING_DIR}/target/include/asm/
+	cp -a include/asm-${ARCH}/ ${STAGING_DIR}/target/include/
+	ln -sf asm-${ARCH} ${STAGING_DIR}/target/include/asm
 	cp -a ${FILESDIR}/{version,autoconf}.h ${STAGING_DIR}/target/include/linux/
 	chmod 644 ${STAGING_DIR}/target/include/linux/{version,autoconf}.h
 }
diff --git a/content/libpng-1.2.5.oe b/content/libpng-1.2.5.oe
index 761b7cde6c..0c9e557c79 100644
--- a/content/libpng-1.2.5.oe
+++ b/content/libpng-1.2.5.oe
@@ -2,7 +2,7 @@ DESCRIPTION="PNG Library"
 SECTION="libs"
 PRIORITY="required"
 MAINTAINER="Chris Larson <kergoth@handhelds.org>"
-DEPENDS=virtual/libc content/zlib
+DEPENDS=virtual/libc base/zlib
 RDEPENDS="libc6 zlib1g"
 RDEPENDS_append_libpng3=' libpng12'
 
@@ -10,7 +10,7 @@ SRC_URI=http://www.libpng.org/pub/png/src/${P}.tar.bz2
 DEPENDS=virtual/libc
 S=${WORKDIR}/${P}
 
-EXTRA_OEMAKE=ZLIBINC=${STAGING_DIR}/include ZLIBLIB=${STAGING_LIBDIR}
+EXTRA_OEMAKE_append=' ZLIBINC=${STAGING_DIR}/include ZLIBLIB=${STAGING_LIBDIR}'
 
 do_compile() {
 	set -e
diff --git a/content/patcher-1.0.oe b/content/patcher-1.0.oe
index 4a83191771..c9142ec9d4 100644
--- a/content/patcher-1.0.oe
+++ b/content/patcher-1.0.oe
@@ -21,4 +21,4 @@ do_install() {
 
 inherit base
 
-DEPENDS_prepend_delete="content/patcher "
+DEPENDS_prepend_delete="base/patcher "
diff --git a/content/qte-2.3.6.oe b/content/qte-2.3.6.oe
index 8405e68a46..6354716c1a 100644
--- a/content/qte-2.3.6.oe
+++ b/content/qte-2.3.6.oe
@@ -2,7 +2,7 @@ DESCRIPTION="Qt/Embedded version 2.3.6"
 LICENSE="GPL/QPL"
 SRC_URI="ftp://ftp.trolltech.com/pub/qtopia/source/qt-embedded-2.3.6.tar.gz"
 SRC_URI_append=" file://${FILESDIR}/qpe.patch;patch=1"
-DEPENDS=virtual/libc content/zlib content/libpng content/libjpeg
+DEPENDS=virtual/libc base/zlib content/libpng content/libjpeg
 PROVIDES=virtual/qte virtual/libqte2
 S="${WORKDIR}/qt-${PV}"
 
@@ -27,16 +27,10 @@ EXTRA_OECONF_ARCH_collie=-xplatform ${OS}-sharp-g++
 EXTRA_OECONF_ARCH_ramses=-xplatform ${OS}-ramses-g++
 
 do_compile() {
-	CFLAGS="${CFLAGS}"
-	LDFLAGS="${LDFLAGS}"
-	CPPFLAGS="${CPPFLAGS}"
-	CXXFLAGS="${CXXFLAGS}"
-	export CFLAGS LDFLAGS CXXFLAGS CPPFLAGS
 	if [ "$BUILD_ARCH" = "i686" ]; then
 		BUILD_ARCH=x86
 	fi
-	oenote ./configure -platform $BUILD_OS-$BUILD_ARCH-g++ $EXTRA_OECONF
-	echo yes | ./configure $EXTRA_OECONF || die "Configuring qt failed"
+	echo yes | ./configure -platform $BUILD_OS-$BUILD_ARCH-g++ $EXTRA_OECONF || die "Configuring qt failed"
 	(cd src/moc; EXTRA_OEMAKE="SYSCONF_CXX='${BUILD_CXX}' SYSCONF_CC='${BUILD_CC}'" oe_runmake)
 	oe_runmake SYSCONF_CXX='${CXX}' SYSCONF_CC="${CC}" SYSCONF_LINK="${CC}" SYSCONF_SHLIB="${CC}" SYSCONF_CFLAGS="${CFLAGS}" SYSCONF_CXXFLAGS="${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -O2 -Wall -W -DNO_DEBUG" SYSCONF_LFLAGS="${LDFLAGS}"
 }