Skip to contentSkip to conversation

external-arm-toolchain: drop overlay fixes for bins, libs, stubs and headers

PATCH New Denys Dmytriyenko 1 participant 2 messages Mar 29, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 external-arm-toolchain: drop overlay fixes for bins, libs, stubs and headers

This reverts commit 3a57a88ed12fd22c9f3a408edac24d13b69bcba4.

---
 .../meta/external-arm-toolchain.bbappend           | 29 ----------------------
 1 file changed, 29 deletions(-)
 delete mode 100644 meta-arago-extras/recipes-core/meta/external-arm-toolchain.bbappend
meta-arago-extras/recipes-core/meta/external-arm-toolchain.bbappend deleted +0 -29
deleted file mode 100644
index ab75476..0000000
@@ -1,29 +0,0 @@
-PKGV = "${EAT_VER_LIBC}"
-
-RDEPENDS_ldd = "bash"
-RDEPENDS_tzcode = "bash"
-
-BINV = "${EAT_VER_GCC}"
-TARGET_SYS = "${EAT_TARGET_SYS}"
-
-do_install_append() {
-	install -d ${D}${bindir}
-	install -d ${D}${sbindir}
-	install -d ${D}${libdir}/${EAT_TARGET_SYS}/${EAT_VER_GCC}
-	install -d ${D}${libdir}/gcc/${EAT_TARGET_SYS}/${EAT_VER_GCC}
-
-	cp ${CP_ARGS} -H ${EXTERNAL_TOOLCHAIN}/${EAT_TARGET_SYS}/libc/usr/bin/* ${D}${bindir}
-	cp ${CP_ARGS} -H ${EXTERNAL_TOOLCHAIN}/${EAT_TARGET_SYS}/libc/usr/sbin/* ${D}${sbindir}
-	rm -rf ${D}${bindir}/gdbserver
-	sed -i -e 's#/arm/tools/gnu/bash/4.2/rhe6-x86_64##' ${D}${bindir}/tzselect
-	sed -i -e 's#/arm/tools/gnu/bash/4.2/rhe6-x86_64##' ${D}${bindir}/ldd
-
-	cp ${CP_ARGS} -H ${EXTERNAL_TOOLCHAIN}/lib/gcc/${EAT_TARGET_SYS}/${EAT_VER_GCC}/crt*.o ${D}${libdir}/${EAT_TARGET_SYS}/${EAT_VER_GCC}/
-	cp ${CP_ARGS} -H ${EXTERNAL_TOOLCHAIN}/lib/gcc/${EAT_TARGET_SYS}/${EAT_VER_GCC}/libgcc* ${D}${libdir}/${EAT_TARGET_SYS}/${EAT_VER_GCC}/
-	cp ${CP_ARGS} -H ${EXTERNAL_TOOLCHAIN}/lib/gcc/${EAT_TARGET_SYS}/${EAT_VER_GCC}/libgcov* ${D}${libdir}/${EAT_TARGET_SYS}/${EAT_VER_GCC}/
-
-	cp ${CP_ARGS} -H ${EXTERNAL_TOOLCHAIN}/lib/gcc/${EAT_TARGET_SYS}/${EAT_VER_GCC}/include ${D}${libdir}/gcc/${EAT_TARGET_SYS}/${EAT_VER_GCC}/
-	cp ${CP_ARGS} -H ${EXTERNAL_TOOLCHAIN}/lib/gcc/${EAT_TARGET_SYS}/${EAT_VER_GCC}/finclude ${D}${libdir}/gcc/${EAT_TARGET_SYS}/${EAT_VER_GCC}/
-	cp ${CP_ARGS} -H ${EXTERNAL_TOOLCHAIN}/lib/gcc/${EAT_TARGET_SYS}/${EAT_VER_GCC}/libgfortranbegin.* ${D}${libdir}/gcc/${EAT_TARGET_SYS}/${EAT_VER_GCC}/ || true
-	cp ${CP_ARGS} -H ${EXTERNAL_TOOLCHAIN}/lib/gcc/${EAT_TARGET_SYS}/${EAT_VER_GCC}/libcaf_single* ${D}${libdir}/gcc/${EAT_TARGET_SYS}/${EAT_VER_GCC}/
-}
Signature · 1 line
2.7.4
#1 lore raw

PATCH 2/2 external-arm-toolchain: overlay libc.so linker script path fix

Overlay locally until the fix gets into meta-linaro-toolchain.

---
 meta-arago-extras/recipes-core/meta/external-arm-toolchain.bbappend | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 meta-arago-extras/recipes-core/meta/external-arm-toolchain.bbappend
meta-arago-extras/recipes-core/meta/external-arm-toolchain.bbappend new file +4 -0
new file mode 100644
index 0000000..974bc7a
@@ -0,0 +1,4 @@
+do_install_append() {
+	# libc.so linker script should use relative path to not clash with host libs
+	sed -i -e "s# /lib# ../../lib#g" -e "s# /usr/lib# .#g" ${D}${libdir}/libc.so
+}
Signature · 1 line
2.7.4