binutils-cross.inc: Convert to use sysroot staging approach

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

diff --git a/meta/packages/binutils/binutils-cross.inc b/meta/packages/binutils/binutils-cross.inc
index 63e5cf6a62e94dcfc15a58dac14637af3ab01290..bd22c92e1660331f95b21a67a5f2bdcc738d0114 100644 (file)
--- a/meta/packages/binutils/binutils-cross.inc
+++ b/meta/packages/binutils/binutils-cross.inc
@@ -8,29 +8,22 @@ EXTRA_OECONF = "--with-sysroot=${STAGING_DIR_TARGET} \
                --enable-install-libbfd \
                 --disable-werror"
 
-do_stage () {
-       oe_runmake install
+do_install () {
+       oe_runmake 'DESTDIR=${D}' install
 
        # We don't really need these, so we'll remove them...
-       rm -rf ${CROSS_DIR}/lib/ldscripts
-       rm -rf ${CROSS_DIR}/share/info
-       rm -rf ${CROSS_DIR}/share/locale
-       rm -rf ${CROSS_DIR}/share/man
-       rmdir ${CROSS_DIR}/share || :
-       rmdir ${CROSS_DIR}/${libdir}/gcc-lib || :
-       rmdir ${CROSS_DIR}/${libdir}64/gcc-lib || :
-       rmdir ${CROSS_DIR}/${libdir} || :
-       rmdir ${CROSS_DIR}/${libdir}64 || :
-       rmdir ${CROSS_DIR}/${prefix} || :
-
-       # We want to move this into the target specific location
-       mkdir -p ${STAGING_DIR_TARGET}/lib
-       mv -f ${CROSS_DIR}/lib/libiberty.a ${STAGING_DIR_TARGET}/lib/lib || \
-               mv -f ${CROSS_DIR}/lib64/libiberty.a ${STAGING_DIR_TARGET}/lib/lib
-       rmdir ${CROSS_DIR}/lib || :
-       rmdir ${CROSS_DIR}/lib64 || :
+       rm -rf ${D}${CROSS_DIR}/lib/ldscripts
+       rm -rf ${D}${CROSS_DIR}/share/info
+       rm -rf ${D}${CROSS_DIR}/share/locale
+       rm -rf ${D}${CROSS_DIR}/share/man
+       rmdir ${D}${CROSS_DIR}/share || :
+       rmdir ${D}${CROSS_DIR}/${libdir}/gcc-lib || :
+       rmdir ${D}${CROSS_DIR}/${libdir}64/gcc-lib || :
+       rmdir ${D}${CROSS_DIR}/${libdir} || :
+       rmdir ${D}${CROSS_DIR}/${libdir}64 || :
+       rmdir ${D}${CROSS_DIR}/${prefix} || :
 }
 
-do_install () {
-       :
+do_stage () {
+       use_do_install_for_stage
 }