Signed-off-by: Denys Dmytriyenko <[email protected]>
---
.../conf/distro/include/toolchain-linaro.inc | 5 -----
.../recipes-core/meta/external-linaro-toolchain.bbappend | 15 ---------------
2 files changed, 20 deletions(-)
diff --git a/meta-arago-distro/conf/distro/include/toolchain-linaro.inc
b/meta-arago-distro/conf/distro/include/toolchain-linaro.inc
index b888be2..81cf1f7 100644
--- a/meta-arago-distro/conf/distro/include/toolchain-linaro.inc
+++ b/meta-arago-distro/conf/distro/include/toolchain-linaro.inc
@@ -26,11 +26,6 @@ TOOLCHAIN_PREFIX := "${TOOLCHAIN_SYS}-"
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate =
"external-linaro-toolchain"
-# Use specific libc headers instead of ones provided by toolchain
-PREFERRED_PROVIDER_linux-libc-headers_forcevariable = "linux-libc-headers"
-PREFERRED_PROVIDER_linux-libc-headers-dev_forcevariable = "linux-libc-headers"
-PREFERRED_PROVIDER_virtual/linux-libc-headers_forcevariable =
"linux-libc-headers"
-
PREFERRED_PROVIDER_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ?=
"external-linaro-sdk-toolchain"
PREFERRED_PROVIDER_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} ?=
"external-linaro-sdk-toolchain"
#PREFERRED_PROVIDER_gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} =
"external-linaro-sdk-toolchain"
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 df5b5c0..65fb53a 100644
--- a/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend
+++ b/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend
@@ -9,23 +9,11 @@ ALLOW_EMPTY_libgomp = "1"
PR_append = ".arago36"
-PROVIDES := "${@oe_filter_out('virtual/linux-libc-headers', '${PROVIDES}', d)}"
-PROVIDES := "${@oe_filter_out('linux-libc-headers', '${PROVIDES}', d)}"
-
-PROVIDES += "${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers',
'external-linaro-toolchain', 'linux-libc-headers linux-libc-headers-dev', '',
d)}"
-
RPROVIDES_${PN}-staticdev += "glibc-staticdev"
-PACKAGES := "${@oe_filter_out('linux-libc-headers-dev', '${PACKAGES}', d)}"
-PACKAGES := "${@oe_filter_out('linux-libc-headers', '${PACKAGES}', d)}"
-
-PACKAGES += "${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers',
'external-linaro-toolchain', 'linux-libc-headers-dev', '', d)}"
-
PACKAGES := "${@oe_filter_out('libgcc-dev', '${PACKAGES}', d)}"
PACKAGES =+ "libgcc-dev"
-DEPENDS += "${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers',
'external-linaro-toolchain', '', 'linux-libc-headers', d)}"
-
RDEPENDS_${PN}-utils = ""
PKGV = "${ELT_VER_LIBC}"
@@ -157,7 +145,4 @@ do_install_append() {
cp -a
${TOOLCHAIN_PATH}/${base_libdir}/gcc/${ELT_TARGET_SYS}/${ELT_VER_GCC}/libgcc.a
${D}${libdir}
cp -a
${TOOLCHAIN_PATH}/${base_libdir}/gcc/${ELT_TARGET_SYS}/${ELT_VER_GCC}/crt*.o
${D}${libdir}
-
- ${@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}/uapi/.install; rm
-rf ${D}${includedir}/misc/.install; rm -rf ${D}${includedir}/misc/cxl.h; 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/cxlflash_ioctl.h; rm -rf
${D}${includedir}/scsi/fc; rm -rf ${D}${includedir}/xen', d)}
}
--
2.7.4
_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
