glibc: No longer need to install to cross as well as staging (from poky)

diff --git a/packages/glibc/eglibc-initial_svn.bb b/packages/glibc/eglibc-initial_svn.bb
index ae3f0d2..0b8851b 100644 (file)
--- a/packages/glibc/eglibc-initial_svn.bb
+++ b/packages/glibc/eglibc-initial_svn.bb
@@ -32,14 +32,14 @@ do_compile () {
 }
 
 do_stage () {
-       oe_runmake cross-compiling=yes install_root=${CROSS_DIR}/${TARGET_SYS} prefix="" install-headers
+       oe_runmake cross-compiling=yes install_root=${STAGING_DIR}/${HOST_SYS} includedir=/include prefix="" install-headers
 
        # 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 ${CROSS_DIR}/${TARGET_SYS}/include/gnu
-       touch ${CROSS_DIR}/${TARGET_SYS}/include/gnu/stubs.h
-       cp ${S}/include/features.h ${CROSS_DIR}/${TARGET_SYS}/include/features.h
+       mkdir -p ${STAGING_DIR}/${HOST_SYS}/include/gnu
+       touch ${STAGING_DIR}/${HOST_SYS}/include/gnu/stubs.h
+       cp ${S}/include/features.h ${STAGING_DIR}/${HOST_SYS}/include/features.h
 }
 
 do_install () {

diff --git a/packages/glibc/eglibc_svn.bb b/packages/glibc/eglibc_svn.bb
index 1fe67d4..7abac64 100644 (file)
--- a/packages/glibc/eglibc_svn.bb
+++ b/packages/glibc/eglibc_svn.bb
@@ -110,29 +110,6 @@ do_stage() {
         done
         echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
         echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
-
-        rm -f ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6
-        oe_runmake 'install_root=${CROSS_DIR}/${TARGET_SYS}' \
-                   'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-                   '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \
-                   install-headers install-lib
-
-        install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \
-                   ${CROSS_DIR}/${TARGET_SYS}/include/bits \
-                   ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc
-        install -m 0644 ${S}/include/gnu/stubs.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/
-        install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/
-        install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h
-        for r in ${rpcsvc}; do
-                h=`echo $r|sed -e's,\.x$,.h,'`
-                install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/
-        done
-
-        for i in libc.a libc_pic.a libc_nonshared.a; do
-                install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i"
-        done
-        echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libpthread.so
-        echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so
 }
 
 require eglibc-package.bbclass

diff --git a/packages/glibc/glibc_2.2.5.bb b/packages/glibc/glibc_2.2.5.bb
index 03ad02c..fd79701 100644 (file)
--- a/packages/glibc/glibc_2.2.5.bb
+++ b/packages/glibc/glibc_2.2.5.bb
@@ -190,40 +190,6 @@ do_stage() {
                install -m 0644 ${B}/$i ${STAGING_LIBDIR}/ || die "failed to install $i"
        done
        echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
-
-       rm -f ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6
-       oe_runmake 'install_root=${CROSS_DIR}/${TARGET_SYS}' \
-                  'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-                  '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \
-                  '${CROSS_DIR}/${TARGET_SYS}/include/bits/errno.h' \
-                  '${CROSS_DIR}/${TARGET_SYS}/include/bits/libc-lock.h' \
-                  '${CROSS_DIR}/${TARGET_SYS}/include/gnu/stubs.h' \
-                  install-headers install-lib
-
-       install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \
-                  ${CROSS_DIR}/${TARGET_SYS}/include/bits \
-                  ${CROSS_DIR}/${TARGET_SYS}/include/sys \
-                  ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc
-       install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/
-       install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h
-       install -m 0644 ${S}/include/bits/xopen_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/
-       install -m 0644 ${B}/gnu/lib-names.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/
-       install -m 0644 ${S}/include/limits.h ${CROSS_DIR}/${TARGET_SYS}/include/
-       install -m 0644 ${S}/include/gnu/libc-version.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/
-       install -m 0644 ${S}/include/gnu-versions.h ${CROSS_DIR}/${TARGET_SYS}/include/
-       install -m 0644 ${S}/include/values.h ${CROSS_DIR}/${TARGET_SYS}/include/
-       install -m 0644 ${S}/include/errno.h ${CROSS_DIR}/${TARGET_SYS}/include/
-       install -m 0644 ${S}/include/sys/errno.h ${CROSS_DIR}/${TARGET_SYS}/include/sys/
-       install -m 0644 ${S}/include/features.h ${CROSS_DIR}/${TARGET_SYS}/include/
-       for r in ${rpcsvc}; do
-               h=`echo $r|sed -e's,\.x$,.h,'`
-               install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/
-       done
-
-       for i in libc.a libc_pic.a libc_nonshared.a; do
-               install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i"
-       done
-       echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so
 }
 
 require glibc-package.bbclass

diff --git a/packages/glibc/glibc_2.3.2+cvs20040726.bb b/packages/glibc/glibc_2.3.2+cvs20040726.bb
index 0a8ad92..df39c65 100644 (file)
--- a/packages/glibc/glibc_2.3.2+cvs20040726.bb
+++ b/packages/glibc/glibc_2.3.2+cvs20040726.bb
@@ -92,29 +92,6 @@ do_stage() {
        done
        echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
        echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
-
-       rm -f ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6
-       oe_runmake 'install_root=${CROSS_DIR}/${TARGET_SYS}' \
-                  'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-                  '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \
-                  install-headers install-lib
-
-       install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \
-                  ${CROSS_DIR}/${TARGET_SYS}/include/bits \
-                  ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc
-       install -m 0644 ${S}/include/gnu/stubs.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/
-       install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/
-       install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h
-       for r in ${rpcsvc}; do
-               h=`echo $r|sed -e's,\.x$,.h,'`
-               install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/
-       done
-
-       for i in libc.a libc_pic.a libc_nonshared.a; do
-               install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i"
-       done
-       echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libpthread.so
-       echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so
 }
 
 require glibc-package.bbclass

diff --git a/packages/glibc/glibc_2.3.2.bb b/packages/glibc/glibc_2.3.2.bb
index 4a9edda..6022210 100644 (file)
--- a/packages/glibc/glibc_2.3.2.bb
+++ b/packages/glibc/glibc_2.3.2.bb
@@ -178,29 +178,6 @@ do_stage() {
        done
        echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
        echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
-
-       rm -f ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6
-       oe_runmake 'install_root=${CROSS_DIR}/${TARGET_SYS}' \
-                  'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-                  '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \
-                  install-headers install-lib
-
-       install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \
-                  ${CROSS_DIR}/${TARGET_SYS}/include/bits \
-                  ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc
-       install -m 0644 ${S}/include/gnu/stubs.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/
-       install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/
-       install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h
-       for r in ${rpcsvc}; do
-               h=`echo $r|sed -e's,\.x$,.h,'`
-               install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/
-       done
-
-       for i in libc.a libc_pic.a libc_nonshared.a; do
-               install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i"
-       done
-       echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libpthread.so
-       echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so
 }
 
 require glibc-package.bbclass

diff --git a/packages/glibc/glibc_2.3.3+cvs20041128.bb b/packages/glibc/glibc_2.3.3+cvs20041128.bb
index 7f188d4..9fc4bcf 100644 (file)
--- a/packages/glibc/glibc_2.3.3+cvs20041128.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20041128.bb
@@ -114,29 +114,6 @@ do_stage() {
        done
        echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
        echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
-
-       rm -f ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6
-       oe_runmake 'install_root=${CROSS_DIR}/${TARGET_SYS}' \
-                  'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-                  '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \
-                  install-headers install-lib
-
-       install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \
-                  ${CROSS_DIR}/${TARGET_SYS}/include/bits \
-                  ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc
-       install -m 0644 ${S}/include/gnu/stubs.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/
-       install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/
-       install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h
-       for r in ${rpcsvc}; do
-               h=`echo $r|sed -e's,\.x$,.h,'`
-               install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/
-       done
-
-       for i in libc.a libc_pic.a libc_nonshared.a; do
-               install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i"
-       done
-       echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libpthread.so
-       echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so
 }
 
 require glibc-package.bbclass

diff --git a/packages/glibc/glibc_2.3.3+cvs20050221.bb b/packages/glibc/glibc_2.3.3+cvs20050221.bb
index b4e0601..577e480 100644 (file)
--- a/packages/glibc/glibc_2.3.3+cvs20050221.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20050221.bb
@@ -97,29 +97,6 @@ do_stage() {
        done
        echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
        echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
-
-       rm -f ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6
-       oe_runmake 'install_root=${CROSS_DIR}/${TARGET_SYS}' \
-                  'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-                  '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \
-                  install-headers install-lib
-
-       install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \
-                  ${CROSS_DIR}/${TARGET_SYS}/include/bits \
-                  ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc
-       install -m 0644 ${S}/include/gnu/stubs.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/
-       install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/
-       install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h
-       for r in ${rpcsvc}; do
-               h=`echo $r|sed -e's,\.x$,.h,'`
-               install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/
-       done
-
-       for i in libc.a libc_pic.a libc_nonshared.a; do
-               install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i"
-       done
-       echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libpthread.so
-       echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so
 }
 
 require glibc-package.bbclass

diff --git a/packages/glibc/glibc_2.3.3+cvs20050420.bb b/packages/glibc/glibc_2.3.3+cvs20050420.bb
index 843442d..79ecd14 100644 (file)
--- a/packages/glibc/glibc_2.3.3+cvs20050420.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20050420.bb
@@ -98,29 +98,6 @@ do_stage() {
        done
        echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
        echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
-
-       rm -f ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6
-       oe_runmake 'install_root=${CROSS_DIR}/${TARGET_SYS}' \
-                  'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-                  '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \
-                  install-headers install-lib
-
-       install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \
-                  ${CROSS_DIR}/${TARGET_SYS}/include/bits \
-                  ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc
-       install -m 0644 ${S}/include/gnu/stubs.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/
-       install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/
-       install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h
-       for r in ${rpcsvc}; do
-               h=`echo $r|sed -e's,\.x$,.h,'`
-               install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/
-       done
-
-       for i in libc.a libc_pic.a libc_nonshared.a; do
-               install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i"
-       done
-       echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libpthread.so
-       echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so
 }
 
 require glibc-package.bbclass

diff --git a/packages/glibc/glibc_2.3.3.bb b/packages/glibc/glibc_2.3.3.bb
index 3f40281..5e43a07 100644 (file)
--- a/packages/glibc/glibc_2.3.3.bb
+++ b/packages/glibc/glibc_2.3.3.bb
@@ -123,29 +123,6 @@ do_stage() {
        done
        echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
        echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
-
-       rm -f ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6
-       oe_runmake 'install_root=${CROSS_DIR}/${TARGET_SYS}' \
-                  'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-                  '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \
-                  install-headers install-lib
-
-       install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \
-                  ${CROSS_DIR}/${TARGET_SYS}/include/bits \
-                  ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc
-       install -m 0644 ${S}/include/gnu/stubs.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/
-       install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/
-       install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h
-       for r in ${rpcsvc}; do
-               h=`echo $r|sed -e's,\.x$,.h,'`
-               install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/
-       done
-
-       for i in libc.a libc_pic.a libc_nonshared.a; do
-               install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i"
-       done
-       echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libpthread.so
-       echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so
 }
 
 require glibc-package.bbclass

diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb
index 4e254ed..b06acd7 100644 (file)
--- a/packages/glibc/glibc_2.3.5+cvs20050627.bb
+++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb
@@ -151,29 +151,6 @@ do_stage() {
        done
        echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
        echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
-
-       rm -f ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6
-       oe_runmake 'install_root=${CROSS_DIR}/${TARGET_SYS}' \
-                  'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-                  '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \
-                  install-headers install-lib
-
-       install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \
-                  ${CROSS_DIR}/${TARGET_SYS}/include/bits \
-                  ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc
-       install -m 0644 ${S}/include/gnu/stubs.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/
-       install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/
-       install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h
-       for r in ${rpcsvc}; do
-               h=`echo $r|sed -e's,\.x$,.h,'`
-               install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/
-       done
-
-       for i in libc.a libc_pic.a libc_nonshared.a; do
-               install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i"
-       done
-       echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libpthread.so
-       echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so
 }
 
 require glibc-package.bbclass

diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb
index b3962af..6f408d7 100644 (file)
--- a/packages/glibc/glibc_2.4.bb
+++ b/packages/glibc/glibc_2.4.bb
@@ -166,29 +166,6 @@ do_stage() {
        done
        echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
        echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
-
-       rm -f ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6
-       oe_runmake 'install_root=${CROSS_DIR}/${TARGET_SYS}' \
-                  'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-                  '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \
-                  install-headers install-lib
-
-       install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \
-                  ${CROSS_DIR}/${TARGET_SYS}/include/bits \
-                  ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc
-       install -m 0644 ${S}/include/gnu/stubs.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/
-       install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/
-       install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h
-       for r in ${rpcsvc}; do
-               h=`echo $r|sed -e's,\.x$,.h,'`
-               install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/
-       done
-
-       for i in libc.a libc_pic.a libc_nonshared.a; do
-               install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i"
-       done
-       echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libpthread.so
-       echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so
 }
 
 require glibc-package.bbclass

diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb
index ff2b653..e35e1ce 100644 (file)
--- a/packages/glibc/glibc_2.5.bb
+++ b/packages/glibc/glibc_2.5.bb
@@ -176,29 +176,6 @@ do_stage() {
        done
        echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
        echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
-
-       rm -f ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6
-       oe_runmake 'install_root=${CROSS_DIR}/${TARGET_SYS}' \
-                  'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-                  '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \
-                  install-headers install-lib
-
-       install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \
-                  ${CROSS_DIR}/${TARGET_SYS}/include/bits \
-                  ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc
-       install -m 0644 ${S}/include/gnu/stubs.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/
-       install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/
-       install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h
-       for r in ${rpcsvc}; do
-               h=`echo $r|sed -e's,\.x$,.h,'`
-               install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/
-       done
-
-       for i in libc.a libc_pic.a libc_nonshared.a; do
-               install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i"
-       done
-       echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libpthread.so
-       echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so
 }
 
 require glibc-package.bbclass

diff --git a/packages/glibc/glibc_2.6.1.bb b/packages/glibc/glibc_2.6.1.bb
index 6d4587e..7a73a03 100644 (file)
--- a/packages/glibc/glibc_2.6.1.bb
+++ b/packages/glibc/glibc_2.6.1.bb
@@ -173,29 +173,6 @@ do_stage() {
        done
        echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
        echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
-
-       rm -f ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6
-       oe_runmake 'install_root=${CROSS_DIR}/${TARGET_SYS}' \
-                  'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-                  '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \
-                  install-headers install-lib
-
-       install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \
-                  ${CROSS_DIR}/${TARGET_SYS}/include/bits \
-                  ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc
-       install -m 0644 ${S}/include/gnu/stubs.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/
-       install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/
-       install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h
-       for r in ${rpcsvc}; do
-               h=`echo $r|sed -e's,\.x$,.h,'`
-               install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/
-       done
-
-       for i in libc.a libc_pic.a libc_nonshared.a; do
-               install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i"
-       done
-       echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libpthread.so
-       echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so
 }
 
 require glibc-package.bbclass

diff --git a/packages/glibc/glibc_cvs.bb b/packages/glibc/glibc_cvs.bb
index 266e5e0..5ce25ae 100644 (file)
--- a/packages/glibc/glibc_cvs.bb
+++ b/packages/glibc/glibc_cvs.bb
@@ -121,29 +121,6 @@ do_stage() {
        done
        echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
        echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
-
-       rm -f ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6
-       oe_runmake 'install_root=${CROSS_DIR}/${TARGET_SYS}' \
-                  'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-                  '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \
-                  install-headers install-lib
-
-       install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \
-                  ${CROSS_DIR}/${TARGET_SYS}/include/bits \
-                  ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc
-       install -m 0644 ${S}/include/gnu/stubs.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/
-       install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/
-       install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h
-       for r in ${rpcsvc}; do
-               h=`echo $r|sed -e's,\.x$,.h,'`
-               install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/
-       done
-
-       for i in libc.a libc_pic.a libc_nonshared.a; do
-               install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i"
-       done
-       echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libpthread.so
-       echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so
 }
 
 require glibc-package.bbclass