summaryrefslogtreecommitdiff
path: root/meta/packages
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-09-14 20:19:06 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-09-14 20:19:06 +0100
commit48a278ed71306f633091ed81d170eeff45ba3759 (patch)
tree8920b54ad135e1090af9ab9b63a6c929bfc2a61e /meta/packages
parentea5d780653a715fcefb0bd844e286dd8b3c6ce12 (diff)
downloadopenembedded-core-48a278ed71306f633091ed81d170eeff45ba3759.tar.gz
openembedded-core-48a278ed71306f633091ed81d170eeff45ba3759.tar.bz2
openembedded-core-48a278ed71306f633091ed81d170eeff45ba3759.tar.xz
openembedded-core-48a278ed71306f633091ed81d170eeff45ba3759.zip
glibc-stage.inc: Massively simplify and speedup by just copying the data generated in the do_install stage
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/glibc/glibc-stage.inc21
1 files changed, 5 insertions, 16 deletions
diff --git a/meta/packages/glibc/glibc-stage.inc b/meta/packages/glibc/glibc-stage.inc
index 2b7b303c1..e43bffa46 100644
--- a/meta/packages/glibc/glibc-stage.inc
+++ b/meta/packages/glibc/glibc-stage.inc
@@ -1,18 +1,7 @@
do_stage() {
- rm -f ${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6
- oe_runmake 'install_root=${STAGING_DIR_HOST}' \
- 'includedir=${layout_includedir}' 'libdir=${layout_libdir}' 'slibdir=${layout_base_libdir}' \
- '${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6' \
- install
-
- install -d ${STAGING_INCDIR}/gnu \
- ${STAGING_INCDIR}/bits \
- ${STAGING_INCDIR}/rpcsvc
- install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/
- install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/
- install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h
- for r in ${rpcsvc}; do
- h=`echo $r|sed -e's,\.x$,.h,'`
- install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/
- done
+ # Installing directly into staging creates some races between existing
+ # glibc-initial files and us. We could use a new DESTDIR but we may as
+ # well just copy the data installed by do_install
+ cp -pPR ${D}/* ${STAGING_DIR_HOST}/
}
+