Dan, You might want to look into eventually removing external-arm-sdk-toolchain as well.
But I would also suggest doing lots of testing of these changes, especially when packaging the toolchain for the target and SDK/devkit. As there were some adjustments made when upstreaming these recipes to meta-arm earlier, so the code there is not 100% identical and some assumptions in meta-arago may no longer be true. Please let me know if you have any questions - I'd be happy to help where I can. Thanks. Denys On Tue, Dec 08, 2020 at 01:37:42PM -0600, Dan Murphy wrote: > The upstream branch has been updated with the contents of this recipe > and this bbappend is no longer needed. > > Commit 0078d68b46bce3197ef54d47b19bb83caf0acdb7 up to and including > commit 316d9318ee56dc1769144507e8ae529b8041ef3 in the meta-arm layer. > > See repo > https://git.yoctoproject.org/cgit/cgit.cgi/meta-arm/log/?h=dunfell > > From: Dan Murphy <[email protected]> > Signed-off-by: Dan Murphy <[email protected]> > --- > .../meta/external-arm-toolchain.bbappend | 73 ------------------- > 1 file changed, 73 deletions(-) > delete mode 100644 > meta-arago-extras/recipes-core/meta/external-arm-toolchain.bbappend > > diff --git > a/meta-arago-extras/recipes-core/meta/external-arm-toolchain.bbappend > b/meta-arago-extras/recipes-core/meta/external-arm-toolchain.bbappend > deleted file mode 100644 > index 5a51aaa07428..000000000000 > --- a/meta-arago-extras/recipes-core/meta/external-arm-toolchain.bbappend > +++ /dev/null > @@ -1,73 +0,0 @@ > -ORIG_TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + > d.getVar('TARGET_OS'), ''][d.getVar('TARGET_OS') == ('' or 'custom')]}" > - > -do_install_append() { > - install -d ${D}${base_sbindir} > - cp -a ${TOOLCHAIN_PATH}/${EAT_TARGET_SYS}/libc/${base_sbindir}/ldconfig > ${D}${base_sbindir}/ > - install -d ${D}${sysconfdir} > - echo -e "/lib\n/usr/lib" >> ${D}${sysconfdir}/ld.so.conf > - > - if [ ${EAT_TARGET_SYS} != ${ORIG_TARGET_SYS} ]; then > - ln -sf ${EAT_TARGET_SYS} ${D}${libdir}/${ORIG_TARGET_SYS} > - ln -sf ${EAT_TARGET_SYS} > ${D}${includedir}/c++/${EAT_VER_GCC}/${ORIG_TARGET_SYS} > - mv ${D}${libdir}/gcc/${EAT_TARGET_SYS} > ${D}${libdir}/gcc/${ORIG_TARGET_SYS} > - ln -sf ${ORIG_TARGET_SYS} ${D}${libdir}/gcc/${EAT_TARGET_SYS} > - fi > - > - ln -sf libatomic.so.1 ${D}${libdir}/libatomic.so > - ln -sf libgomp.so.1 ${D}${libdir}/libgomp.so > - ln -sf libitm.so.1 ${D}${libdir}/libitm.so > - ln -sf libssp.so.0 ${D}${libdir}/libssp.so > - ln -sf libstdc++.so.6 ${D}${libdir}/libstdc++.so > - ln -sf libubsan.so.1 ${D}${libdir}/libubsan.so > - ln -sf libasan.so.5 ${D}${libdir}/libasan.so > - ln -sf libgfortran.so.5 ${D}${libdir}/libgfortran.so > - > - cp ${CP_ARGS} > ${EXTERNAL_TOOLCHAIN}/lib/gcc/${EAT_TARGET_SYS}/${EAT_VER_GCC}/libgcc* > ${D}${libdir}/${EAT_TARGET_SYS}/${EAT_VER_GCC}/ > -} > - > -# Below FILES_* overrides are due to TARGET_SYS -> ORIG_TARGET_SYS move in > ${libdir}/gcc > -# to enable native compile on the target > -FILES_libgcov-staticdev = > "${libdir}/gcc/${ORIG_TARGET_SYS}/${BINV}/libgcov.a" > - > -FILES_libgfortran-dev = "\ > - ${libdir}/libgfortran*.so \ > - ${libdir}/libgfortran.spec \ > - ${libdir}/libgfortran.la \ > - ${libdir}/gcc/${ORIG_TARGET_SYS}/${BINV}/libgfortranbegin.* \ > - ${libdir}/gcc/${ORIG_TARGET_SYS}/${BINV}/libcaf_single* \ > - ${libdir}/gcc/${ORIG_TARGET_SYS}/${BINV}/finclude/ \ > -" > - > -FILES_gcc-sanitizers = "${libdir}/*.spec > ${libdir}/gcc/${ORIG_TARGET_SYS}/${BINV}/include/sanitizer/*.h" > - > -# This is provided by gcc: > -# ${libdir}/gcc/${ORIG_TARGET_SYS}/${BINV}/include > -FILES_libgcc-dev = "\ > - ${base_libdir}/libgcc*.so \ > - ${@oe.utils.conditional('BASETARGET_SYS', '${ORIG_TARGET_SYS}', '', > '${libdir}/${BASETARGET_SYS}', d)} \ > - ${libdir}/${TARGET_SYS}/${BINV}* \ > - ${libdir}/${TARGET_ARCH}${TARGET_VENDOR}* \ > - ${libdir}/gcc/${TARGET_SYS} \ > -" > - > -FILES_libssp-dev = "\ > - ${libdir}/libssp*.so \ > - ${libdir}/libssp*_nonshared.a \ > - ${libdir}/libssp*.la \ > - ${libdir}/gcc/${ORIG_TARGET_SYS}/${BINV}/include/ssp \ > -" > - > -FILES_libquadmath-dev = "\ > - ${libdir}/libquadmath*.so \ > - ${libdir}/libquadmath.la \ > - ${libdir}/gcc/${ORIG_TARGET_SYS}/${BINV}/include/quadmath* \ > -" > - > -FILES_libgomp-dev = "\ > - ${libdir}/libgomp*${SOLIBSDEV} \ > - ${libdir}/libgomp*.la \ > - ${libdir}/libgomp.spec \ > - ${libdir}/gcc/${ORIG_TARGET_SYS}/${BINV}/include/omp.h \ > -" > - > -INSANE_SKIP_libgcc-dev += "staticdev" > -- > 2.29.2 > > _______________________________________________ > meta-arago mailing list > [email protected] > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago > -- Regards, Denys Dmytriyenko <[email protected]> PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964 Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
