From: Denys Dmytriyenko <[email protected]> Tested with Linaro 2014.04 release.
* Provide a hardfp version of ld-linux-armhf.so.3 symlink besides regular ld-linux.so.3 * Update absolute ld-linux* path in libc.so script with relative one to work in OE sysroot * Avoid clashing additional scsi headers when separate linux-libc-headers is used Signed-off-by: Denys Dmytriyenko <[email protected]> --- .../recipes-core/meta/external-linaro-toolchain.bbappend | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend b/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend index 34d4edd..aa7d253 100644 --- a/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend +++ b/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend @@ -2,7 +2,7 @@ INSANE_SKIP_libstdc++-dev += "staticdev" ALLOW_EMPTY_${PN}-utils = "1" -PR_append = "-arago5" +PR_append = "-arago6" PROVIDES := "${@oe_filter_out('virtual/linux-libc-headers', '${PROVIDES}', d)}" PROVIDES := "${@oe_filter_out('linux-libc-headers', '${PROVIDES}', d)}" @@ -98,8 +98,16 @@ do_install_append() { install -d ${D}/include cp -a ${TOOLCHAIN_PATH}/${ELT_TARGET_SYS}/include/* ${D}/include + ln -sf ld-${ELT_VER_LIBC}.so ${D}${base_libdir}/ld-linux-armhf.so.3 + if [ -f ${D}${libdir}/libc.so ];then + sed -i -e "s# /lib/ld-linux# ../../lib/ld-linux#g" ${D}${libdir}/libc.so + fi + if [ -f ${D}${base_libdir}/libc.so ];then + sed -i -e "s# /lib/ld-linux# ../../lib/ld-linux#g" ${D}${base_libdir}/libc.so + fi + ${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-linaro-toolchain', '', 'rm -rf ${D}${includedir}/asm*; rm -rf ${D}${includedir}/drm; rm -rf ${D}${includedir}/linux; rm -rf ${D}${includedir}/mtd; rm -rf ${D}${includedir}/rdma; rm -rf ${D}${includedir}/sound; rm -rf ${D}${includedir}/video', d)} - ${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-linaro-toolchain', '', 'rm -rf ${D}${includedir}/scsi/.install; rm -rf ${D}${includedir}/scsi/scsi_netlink*; rm -rf ${D}${includedir}/scsi/scsi_bsg*; rm -rf ${D}${includedir}/xen', d)} + ${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-linaro-toolchain', '', 'rm -rf ${D}${includedir}/scsi/.install; rm -rf ${D}${includedir}/scsi/scsi_netlink*; rm -rf ${D}${includedir}/scsi/scsi_bsg*; rm -rf ${D}${includedir}/scsi/fc; rm -rf ${D}${includedir}/xen', d)} rm -rf ${D}/lib/libgfortran* rm -rf ${D}/lib/ldscripts -- 2.0.0 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
