From c9c91860f7a46c4f0c21bf3cd5e93ff88f910f69 Mon Sep 17 00:00:00 2001
From: "xf005570@" <xf005570@>
Date: Tue, 16 Sep 2003 03:28:11 +0000
Subject: glibc-2.3.2.oe:   Adapt glibc to python base_do_unpack.
 .del-rootfs-1.0.oe~20c3030d4b550c10:   Delete: content/rootfs-1.0.oe

BKrev: 3f66834bCpeM9mc_687lY_vJHWyoZQ
---
 content/glibc-2.3.2.oe | 48 ++++++++++++++++++++++++------------------------
 content/rootfs-1.0.oe  |  0
 2 files changed, 24 insertions(+), 24 deletions(-)
 delete mode 100644 content/rootfs-1.0.oe

(limited to 'content')

diff --git a/content/glibc-2.3.2.oe b/content/glibc-2.3.2.oe
index 64f0b88e9a..9176a58987 100644
--- a/content/glibc-2.3.2.oe
+++ b/content/glibc-2.3.2.oe
@@ -6,9 +6,9 @@ RDEPENDS=""
 PRIORITY=required
 MAINTAINER="Chris Larson <kergoth@handhelds.org>"
 
-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"
+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
 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'
@@ -74,41 +74,41 @@ PACKAGES="libc6"
 FILES=
 FILES_libc6="*"
 
-do_unpack() {
-	set -e
-	base_do_unpack $@
-	test -d ${S}
-	mv ${WORKDIR}/linuxthreads{,_db} ${S}/
+glibcbuild_do_unpack () {
+	mv "${WORKDIR}/linuxthreads" "${WORKDIR}/linuxthreads_db" "${S}/"
 # kernel headers
-	cp -a ${FILESDIR}/{version,autoconf}.h ${WORKDIR}/linux/include/linux/
-	ln -sf asm-${ARCH} ${WORKDIR}/linux/include/asm
+	cp -a "${FILESDIR}/version.h" "${FILESDIR}/autoconf.h" "${WORKDIR}/linux/include/linux/"
+	ln -sf "asm-${ARCH}" "${WORKDIR}/linux/include/asm"
+}
+
+python do_unpack () {
+	oe.build.exec_func('base_do_unpack', d)
+	oe.build.exec_func('glibcbuild_do_unpack', d)
 }
 
 do_compile() {
-	set -e
+	oenote "pwd is `/bin/pwd`"
 	touch sysdeps/${ARCH}/framestate.c
-	mkdir -p ${builddir}
-	cd ${builddir}
+	mkdir -p "${builddir}"
+	cd "${builddir}"
 	base_do_compile $@
 }
 
 do_stage() {
-	set -e
-	oe_runmake -C ${builddir} install_root=${STAGING_DIR}/target \
-		includedir=/include libdir=/lib slibdir=/lib \
-		${STAGING_LIBDIR}/libc-${PV}.so ${STAGING_LIBDIR}/libc.so.6 \
+	oe_runmake -C '${builddir}' 'install_root=${STAGING_DIR}/target' \
+		'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
+		'${STAGING_LIBDIR}/libc-${PV}.so' '${STAGING_LIBDIR}/libc.so.6' \
 		install-headers install-lib
 	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > \
-		${STAGING_LIBDIR}/libc.so
-	mv ${STAGING_LIBDIR}/libpthread.so ${STAGING_LIBDIR}/libpthread-old.so
-	cat ${STAGING_LIBDIR}/libpthread-old.so | sed -e's,/lib/,,g' > ${STAGING_LIBDIR}/libpthread.so
-	cp -a ${WORKDIR}/linux/include/linux ${STAGING_DIR}/target/include/
-	cp -a ${WORKDIR}/linux/include/asm-${ARCH} ${STAGING_DIR}/target/include/
-	ln -sf asm-${ARCH} ${STAGING_DIR}/target/include/asm
+		'${STAGING_LIBDIR}/libc.so'
+	mv '${STAGING_LIBDIR}/libpthread.so' '${STAGING_LIBDIR}/libpthread-old.so'
+	cat '${STAGING_LIBDIR}/libpthread-old.so' | sed -e's,/lib/,,g' > '${STAGING_LIBDIR}/libpthread.so'
+	cp -a '${WORKDIR}/linux/include/linux' '${STAGING_DIR}/target/include/'
+	cp -a '${WORKDIR}/linux/include/asm-${ARCH}' '${STAGING_DIR}/target/include/'
+	ln -sf 'asm-${ARCH}' '${STAGING_DIR}/target/include/asm'
 }
 
 do_install() {
-	set -e
 	oe_runmake -C ${builddir} install_root=${D} install
 	cp -a ${WORKDIR}/linux/include/linux ${D}/${includedir}/
 	cp -a ${WORKDIR}/linux/include/asm-${ARCH} ${D}/${includedir}/asm
diff --git a/content/rootfs-1.0.oe b/content/rootfs-1.0.oe
deleted file mode 100644
index e69de29bb2..0000000000
-- 
cgit v1.2.3