diff options
3 files changed, 6 insertions, 46 deletions
diff --git a/meta/packages/meta/external-csl-toolchain_2006q3-27.bb b/meta/packages/meta/external-csl-toolchain_2006q3-27.bb index 0017f38cd..973dad78b 100644 --- a/meta/packages/meta/external-csl-toolchain_2006q3-27.bb +++ b/meta/packages/meta/external-csl-toolchain_2006q3-27.bb @@ -31,17 +31,6 @@ do_install() { cp -a ${S}/arm-none-linux-gnueabi/libc/usr/* ${D}/usr } -do_stage() { - install -d ${STAGING_INCDIR} - cp -a ${S}/arm-none-linux-gnueabi/libc/usr/include/* ${STAGING_INCDIR} - - install -d ${STAGING_LIBDIR} - cp -a ${S}/arm-none-linux-gnueabi/libc/usr/lib/* ${STAGING_LIBDIR} - - install -d ${STAGING_DIR_TARGET}${base_libdir} - cp -a ${S}/arm-none-linux-gnueabi/libc/lib/* ${STAGING_DIR_TARGET}${base_libdir} -} - PACKAGES = "libgcc libgcc-dev libstdc++ libstdc++-dev linux-libc-headers" FILES_libgcc = "${base_libdir}/libgcc_s.so.1" FILES_libgcc-dev = "${base_libdir}/libgcc_s.so" diff --git a/meta/packages/meta/external-csl-toolchain_2007q3-51.bb b/meta/packages/meta/external-csl-toolchain_2007q3-51.bb index a8f987b7e..8ef891114 100644 --- a/meta/packages/meta/external-csl-toolchain_2007q3-51.bb +++ b/meta/packages/meta/external-csl-toolchain_2007q3-51.bb @@ -31,17 +31,6 @@ do_install() { cp -a ${S}/arm-none-linux-gnueabi/libc/usr/* ${D}/usr } -do_stage() { - install -d ${STAGING_INCDIR} - cp -a ${S}/arm-none-linux-gnueabi/libc/usr/include/* ${STAGING_INCDIR} - - install -d ${STAGING_LIBDIR} - cp -a ${S}/arm-none-linux-gnueabi/libc/usr/lib/* ${STAGING_LIBDIR} - - install -d ${STAGING_DIR_TARGET}${base_libdir} - cp -a ${S}/arm-none-linux-gnueabi/libc/lib/* ${STAGING_DIR_TARGET}${base_libdir} -} - PACKAGES = "libgcc libgcc-dev libstdc++ libstdc++-dev linux-libc-headers" FILES_libgcc = "${base_libdir}/libgcc_s.so.1" FILES_libgcc-dev = "${base_libdir}/libgcc_s.so" diff --git a/meta/packages/meta/external-csl-toolchain_2008q3-72.bb b/meta/packages/meta/external-csl-toolchain_2008q3-72.bb index f02128dac..d5230bf3d 100644 --- a/meta/packages/meta/external-csl-toolchain_2008q3-72.bb +++ b/meta/packages/meta/external-csl-toolchain_2008q3-72.bb @@ -27,30 +27,12 @@ do_install() { install -d ${D}${base_libdir} ${D}${base_sbindir} ${D}${datadir} cp -a ${EXTERNAL_TOOLCHAIN}/arm-none-linux-gnueabi/libc/lib/* ${D}${base_libdir} - cp -a ${EXTERNAL_TOOLCHAIN}/arm-none-linux-gnueabi/libc/etc/* ${D}${sysconfdir} - cp -a ${EXTERNAL_TOOLCHAIN}/arm-none-linux-gnueabi/libc/sbin/* ${D}${base_sbindir} - cp -a ${EXTERNAL_TOOLCHAIN}/arm-none-linux-gnueabi/libc/usr/* ${D}/usr - } - -do_stage() { - install -d ${STAGING_INCDIR} - cp -a ${EXTERNAL_TOOLCHAIN}/arm-none-linux-gnueabi/libc/usr/include/* ${STAGING_INCDIR} - - install -d ${STAGING_LIBDIR} - cp -a ${EXTERNAL_TOOLCHAIN}/arm-none-linux-gnueabi/libc/usr/lib/* ${STAGING_LIBDIR} - - install -d ${STAGING_DIR_TARGET}${base_libdir} - cp -a ${EXTERNAL_TOOLCHAIN}/arm-none-linux-gnueabi/libc/lib/* ${STAGING_DIR_TARGET}${base_libdir} - - sed -e "s# /lib# ../../lib#g" \ - -e "s# /usr/lib# .#g" \ - ${STAGING_LIBDIR}/libc.so > ${STAGING_LIBDIR}/temp - mv ${STAGING_LIBDIR}/temp ${STAGING_LIBDIR}/libc.so - - sed -e "s# /lib# ../../lib#" \ - -e "s# /usr/lib# .#g" \ - ${STAGING_LIBDIR}/libpthread.so > ${STAGING_LIBDIR}/temp - mv ${STAGING_LIBDIR}/temp ${STAGING_LIBDIR}/libpthread.so + cp -a ${EXTERNAL_TOOLCHAIN}/arm-none-linux-gnueabi/libc/etc/* ${D}${sysconfdir} + cp -a ${EXTERNAL_TOOLCHAIN}/arm-none-linux-gnueabi/libc/sbin/* ${D}${base_sbindir} + cp -a ${EXTERNAL_TOOLCHAIN}/arm-none-linux-gnueabi/libc/usr/* ${D}/usr + + sed -i -e "s# /lib# ../../lib#g" -e "s# /usr/lib# .#g" ${D}${libdir}/libc.so + sed -i -e "s# /lib# ../../lib#g" -e "s# /usr/lib# .#g" ${D}${libdir}/libpthread.so } PACKAGES = "libgcc libgcc-dev libstdc++ libstdc++-dev linux-libc-headers" |