glibc: Convert to use do_install for staging

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

2 files changed, 9 insertions, 20 deletions

diff --git a/meta/packages/glibc/glibc-initial.inc b/meta/packages/glibc/glibc-initial.inc
index 127e93e9d3..8d864db91a 100644
--- a/meta/packages/glibc/glibc-initial.inc
+++ b/meta/packages/glibc/glibc-initial.inc
@@ -30,8 +30,8 @@ do_compile () {
         :
 }
 
-do_stage () {
-        oe_runmake cross-compiling=yes install_root=${STAGING_DIR_HOST} \
+do_install () {
+        oe_runmake cross-compiling=yes install_root=${D} \
         includedir='${includedir}' prefix='${prefix}' \
         install-bootstrap-headers=yes install-headers
 
@@ -39,19 +39,15 @@ do_stage () {
         # Two headers -- stubs.h and features.h -- aren't installed by install-headers,
         # so do them by hand.  We can tolerate an empty stubs.h for the moment.
         # See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html
-        mkdir -p ${STAGING_INCDIR}/gnu
-        touch ${STAGING_INCDIR}/gnu/stubs.h
-        cp ${S}/include/features.h ${STAGING_INCDIR}/features.h
+        mkdir -p ${D}${includedir}/gnu/
+        touch ${D}${includedir}/gnu/stubs.h
+        cp ${S}/include/features.h ${D}${includedir}/features.h
 
         if [ -e ${B}/bits/stdio_lim.h ]; then
-                cp ${B}/bits/stdio_lim.h  ${STAGING_INCDIR}/bits/
+                cp ${B}/bits/stdio_lim.h  ${D}${includedir}/bits/
         fi
-        mkdir -p ${STAGING_DIR_TARGET}${libdir}
-        install -m 644 csu/crt[1in].o ${STAGING_DIR_TARGET}${libdir}
+        mkdir -p ${D}${libdir}/
+        install -m 644 csu/crt[1in].o ${D}${libdir}
         ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
-                -o ${STAGING_DIR_TARGET}${libdir}/libc.so
-}
-
-do_install () {
-        :
+                -o ${D}${libdir}/libc.so
 }
diff --git a/meta/packages/glibc/glibc-stage.inc b/meta/packages/glibc/glibc-stage.inc
index e43bffa464..e69de29bb2 100644
--- a/meta/packages/glibc/glibc-stage.inc
+++ b/meta/packages/glibc/glibc-stage.inc
@@ -1,7 +0,0 @@
-do_stage() {
-        # 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}/
-}
-