summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BitKeeper/etc/logging_ok5
-rw-r--r--content/glibc-2.3.2.oe48
-rw-r--r--content/rootfs-1.0.oe0
3 files changed, 27 insertions, 26 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 56d5625aad..61217eb788 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -1,5 +1,6 @@
-kergoth@zelda.tuxnami.org
-xf005570@cn014xf005570l1.(none)
kergoth@direwolf.(none)
kergoth@direwolf.ppp.ti.com
+kergoth@zelda.tuxnami.org
tgall@www.rochcivictheatre.org
+xf005570@cn014xf005570l1.(none)
+xf005570@cn014xf005570w1.
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
--- a/content/rootfs-1.0.oe
+++ /dev/null