* [PATCH] external-linaro-toolchain: add a way to use specific linux-libc-headers provider and version
@ 2013-09-27 6:06 Denys Dmytriyenko
2013-09-27 15:32 ` Cooper Jr., Franklin
0 siblings, 1 reply; 3+ messages in thread
From: Denys Dmytriyenko @ 2013-09-27 6:06 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Use it by default in our distro - the preferred version may need to be adjusted
based on the kernel version used by individual platforms.
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
meta-arago-distro/conf/distro/include/toolchain-linaro.inc | 7 +++++++
.../recipes-core/meta/external-linaro-toolchain.bbappend | 13 ++++++++++++-
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/meta-arago-distro/conf/distro/include/toolchain-linaro.inc b/meta-arago-distro/conf/distro/include/toolchain-linaro.inc
index 1ab13ee..cc12f08 100644
--- a/meta-arago-distro/conf/distro/include/toolchain-linaro.inc
+++ b/meta-arago-distro/conf/distro/include/toolchain-linaro.inc
@@ -15,6 +15,11 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "external-linaro-t
TOOLCHAIN_SYS := "${ELT_TARGET_SYS}"
TOOLCHAIN_PREFIX := "${TOOLCHAIN_SYS}-"
+# 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"
@@ -27,6 +32,7 @@ SDKGCCVERSION ?= "4.7%"
SDKBINUVERSION ?= "2.23%"
SDKEGLIBCVERSION ?= "2.17%"
SDKLINUXLIBCVERSION ?= "3.8%"
+LINUXLIBCVERSION ?= "3.8%"
PREFERRED_VERSION_gcc-crosssdk ?= "${SDKGCCVERSION}"
PREFERRED_VERSION_gcc-crosssdk-initial ?= "${SDKGCCVERSION}"
@@ -34,6 +40,7 @@ PREFERRED_VERSION_gcc-crosssdk-intermediate ?= "${SDKGCCVERSION}"
PREFERRED_VERSION_nativesdk-gcc-runtime ?= "${SDKGCCVERSION}"
PREFERRED_VERSION_nativesdk-libgcc ?= "${SDKGCCVERSION}"
PREFERRED_VERSION_binutils-crosssdk ?= "${SDKBINUVERSION}"
+PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}"
PREFERRED_VERSION_nativesdk-linux-libc-headers ?= "${SDKLINUXLIBCVERSION}"
PREFERRED_VERSION_nativesdk-eglibc ?= "${SDKEGLIBCVERSION}"
PREFERRED_VERSION_nativesdk-eglibc-initial ?= "${SDKEGLIBCVERSION}"
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 09f68d8..f8ad2cc 100644
--- a/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend
+++ b/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend
@@ -2,12 +2,20 @@ INSANE_SKIP_libstdc++-dev += "staticdev"
ALLOW_EMPTY_${PN}-utils = "1"
-PR_append = "-arago3"
+PR_append = "-arago4"
+PROVIDES := "${@oe_filter_out('virtual/linux-libc-headers', '${PROVIDES}', d)}"
+PROVIDES := "${@oe_filter_out('linux-libc-headers', '${PROVIDES}', d)}"
PROVIDES += "virtual/${TARGET_PREFIX}gcc-intermediate"
+PROVIDES += "${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-linaro-toolchain', 'linux-libc-headers linux-libc-headers-dev', '', d)}"
+PACKAGES := "${@oe_filter_out('linux-libc-headers', '${PACKAGES}', d)}"
+PACKAGES := "${@oe_filter_out('linux-libc-headers-dev', '${PACKAGES}', d)}"
PACKAGES := "${@oe_filter_out('libsegfault', '${PACKAGES}', d)}"
PACKAGES =+ "libsegfault"
+PACKAGES += "${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-linaro-toolchain', 'linux-libc-headers-dev', '', d)}"
+
+DEPENDS += "${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-linaro-toolchain', '', 'linux-libc-headers', d)}"
RDEPENDS_${PN}-utils = ""
@@ -90,6 +98,9 @@ do_install_append() {
install -d ${D}/include
cp -a ${TOOLCHAIN_PATH}/${ELT_TARGET_SYS}/include/* ${D}/include
+ ${@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*', d)}
+
rm -rf ${D}/lib/libgfortran*
rm -rf ${D}/lib/ldscripts
rm -rf ${D}${datadir}/lintian
--
1.8.3.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] external-linaro-toolchain: add a way to use specific linux-libc-headers provider and version
2013-09-27 6:06 [PATCH] external-linaro-toolchain: add a way to use specific linux-libc-headers provider and version Denys Dmytriyenko
@ 2013-09-27 15:32 ` Cooper Jr., Franklin
2013-09-27 16:25 ` Denys Dmytriyenko
0 siblings, 1 reply; 3+ messages in thread
From: Cooper Jr., Franklin @ 2013-09-27 15:32 UTC (permalink / raw)
To: Denys Dmytriyenko, meta-arago@arago-project.org
To change the version of linux-libc-headers used is it enough to just set the PREFERRED_PROVIDERS or should the following variables also need to be updated?
SDKLINUXLIBCVERSION ?= "3.8%"
LINUXLIBCVERSION ?= "3.8%"
> -----Original Message-----
> From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> bounces@arago-project.org] On Behalf Of Denys Dmytriyenko
> Sent: Friday, September 27, 2013 1:06 AM
> To: meta-arago@arago-project.org
> Subject: [meta-arago] [PATCH] external-linaro-toolchain: add a way to use
> specific linux-libc-headers provider and version
>
> From: Denys Dmytriyenko <denys@ti.com>
>
> Use it by default in our distro - the preferred version may need to be adjusted
> based on the kernel version used by individual platforms.
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> ---
> meta-arago-distro/conf/distro/include/toolchain-linaro.inc | 7 +++++++
> .../recipes-core/meta/external-linaro-toolchain.bbappend | 13
> ++++++++++++-
> 2 files changed, 19 insertions(+), 1 deletion(-)
>
> diff --git a/meta-arago-distro/conf/distro/include/toolchain-linaro.inc b/meta-
> arago-distro/conf/distro/include/toolchain-linaro.inc
> index 1ab13ee..cc12f08 100644
> --- a/meta-arago-distro/conf/distro/include/toolchain-linaro.inc
> +++ b/meta-arago-distro/conf/distro/include/toolchain-linaro.inc
> @@ -15,6 +15,11 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-
> intermediate = "external-linaro-t TOOLCHAIN_SYS := "${ELT_TARGET_SYS}"
> TOOLCHAIN_PREFIX := "${TOOLCHAIN_SYS}-"
>
> +# 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"
> @@ -27,6 +32,7 @@ SDKGCCVERSION ?= "4.7%"
> SDKBINUVERSION ?= "2.23%"
> SDKEGLIBCVERSION ?= "2.17%"
> SDKLINUXLIBCVERSION ?= "3.8%"
> +LINUXLIBCVERSION ?= "3.8%"
>
> PREFERRED_VERSION_gcc-crosssdk ?= "${SDKGCCVERSION}"
> PREFERRED_VERSION_gcc-crosssdk-initial ?= "${SDKGCCVERSION}"
> @@ -34,6 +40,7 @@ PREFERRED_VERSION_gcc-crosssdk-intermediate ?=
> "${SDKGCCVERSION}"
> PREFERRED_VERSION_nativesdk-gcc-runtime ?= "${SDKGCCVERSION}"
> PREFERRED_VERSION_nativesdk-libgcc ?= "${SDKGCCVERSION}"
> PREFERRED_VERSION_binutils-crosssdk ?= "${SDKBINUVERSION}"
> +PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}"
> PREFERRED_VERSION_nativesdk-linux-libc-headers ?=
> "${SDKLINUXLIBCVERSION}"
> PREFERRED_VERSION_nativesdk-eglibc ?= "${SDKEGLIBCVERSION}"
> PREFERRED_VERSION_nativesdk-eglibc-initial ?= "${SDKEGLIBCVERSION}"
> 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 09f68d8..f8ad2cc 100644
> --- a/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend
> +++ b/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbap
> +++ pend
> @@ -2,12 +2,20 @@ INSANE_SKIP_libstdc++-dev += "staticdev"
>
> ALLOW_EMPTY_${PN}-utils = "1"
>
> -PR_append = "-arago3"
> +PR_append = "-arago4"
>
> +PROVIDES := "${@oe_filter_out('virtual/linux-libc-headers', '${PROVIDES}',
> d)}"
> +PROVIDES := "${@oe_filter_out('linux-libc-headers', '${PROVIDES}', d)}"
> PROVIDES += "virtual/${TARGET_PREFIX}gcc-intermediate"
> +PROVIDES += "${@base_conditional('PREFERRED_PROVIDER_linux-libc-
> headers', 'external-linaro-toolchain', 'linux-libc-headers linux-libc-headers-dev',
> '', d)}"
>
> +PACKAGES := "${@oe_filter_out('linux-libc-headers', '${PACKAGES}', d)}"
> +PACKAGES := "${@oe_filter_out('linux-libc-headers-dev', '${PACKAGES}', d)}"
> PACKAGES := "${@oe_filter_out('libsegfault', '${PACKAGES}', d)}"
> PACKAGES =+ "libsegfault"
> +PACKAGES += "${@base_conditional('PREFERRED_PROVIDER_linux-libc-
> headers', 'external-linaro-toolchain', 'linux-libc-headers-dev', '', d)}"
> +
> +DEPENDS += "${@base_conditional('PREFERRED_PROVIDER_linux-libc-
> headers', 'external-linaro-toolchain', '', 'linux-libc-headers', d)}"
>
> RDEPENDS_${PN}-utils = ""
>
> @@ -90,6 +98,9 @@ do_install_append() {
> install -d ${D}/include
> cp -a ${TOOLCHAIN_PATH}/${ELT_TARGET_SYS}/include/* ${D}/include
>
> + ${@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*', d)}
> +
> rm -rf ${D}/lib/libgfortran*
> rm -rf ${D}/lib/ldscripts
> rm -rf ${D}${datadir}/lintian
> --
> 1.8.3.2
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] external-linaro-toolchain: add a way to use specific linux-libc-headers provider and version
2013-09-27 15:32 ` Cooper Jr., Franklin
@ 2013-09-27 16:25 ` Denys Dmytriyenko
0 siblings, 0 replies; 3+ messages in thread
From: Denys Dmytriyenko @ 2013-09-27 16:25 UTC (permalink / raw)
To: Cooper Jr., Franklin; +Cc: meta-arago@arago-project.org
On Fri, Sep 27, 2013 at 03:32:15PM +0000, Cooper Jr., Franklin wrote:
> To change the version of linux-libc-headers used is it enough to just set
> the PREFERRED_PROVIDERS or should the following variables also need to be
> updated?
>
> SDKLINUXLIBCVERSION ?= "3.8%"
> LINUXLIBCVERSION ?= "3.8%"
Everything is happening automatically already - we have all the necessary
PREFERRED_VERSION_linux-libc-headers in arago-prefs.inc and branding files.
This patch only changes the defaults, i.e. prefer separately built libc
headers and version 3.8 if not specified otherwise.
Also, you don't want to change SDK* counterpart variables - those are for
nativesdk components, i.e. x86 ones. Basically what the host tools are built
against.
The target side, the one that goes into rootfs and devkit, is already taken
care with specific versions being set in the files I mentioned above.
--
Denys
> > -----Original Message-----
> > From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> > bounces@arago-project.org] On Behalf Of Denys Dmytriyenko
> > Sent: Friday, September 27, 2013 1:06 AM
> > To: meta-arago@arago-project.org
> > Subject: [meta-arago] [PATCH] external-linaro-toolchain: add a way to use
> > specific linux-libc-headers provider and version
> >
> > From: Denys Dmytriyenko <denys@ti.com>
> >
> > Use it by default in our distro - the preferred version may need to be adjusted
> > based on the kernel version used by individual platforms.
> >
> > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > ---
> > meta-arago-distro/conf/distro/include/toolchain-linaro.inc | 7 +++++++
> > .../recipes-core/meta/external-linaro-toolchain.bbappend | 13
> > ++++++++++++-
> > 2 files changed, 19 insertions(+), 1 deletion(-)
> >
> > diff --git a/meta-arago-distro/conf/distro/include/toolchain-linaro.inc b/meta-
> > arago-distro/conf/distro/include/toolchain-linaro.inc
> > index 1ab13ee..cc12f08 100644
> > --- a/meta-arago-distro/conf/distro/include/toolchain-linaro.inc
> > +++ b/meta-arago-distro/conf/distro/include/toolchain-linaro.inc
> > @@ -15,6 +15,11 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-
> > intermediate = "external-linaro-t TOOLCHAIN_SYS := "${ELT_TARGET_SYS}"
> > TOOLCHAIN_PREFIX := "${TOOLCHAIN_SYS}-"
> >
> > +# 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"
> > @@ -27,6 +32,7 @@ SDKGCCVERSION ?= "4.7%"
> > SDKBINUVERSION ?= "2.23%"
> > SDKEGLIBCVERSION ?= "2.17%"
> > SDKLINUXLIBCVERSION ?= "3.8%"
> > +LINUXLIBCVERSION ?= "3.8%"
> >
> > PREFERRED_VERSION_gcc-crosssdk ?= "${SDKGCCVERSION}"
> > PREFERRED_VERSION_gcc-crosssdk-initial ?= "${SDKGCCVERSION}"
> > @@ -34,6 +40,7 @@ PREFERRED_VERSION_gcc-crosssdk-intermediate ?=
> > "${SDKGCCVERSION}"
> > PREFERRED_VERSION_nativesdk-gcc-runtime ?= "${SDKGCCVERSION}"
> > PREFERRED_VERSION_nativesdk-libgcc ?= "${SDKGCCVERSION}"
> > PREFERRED_VERSION_binutils-crosssdk ?= "${SDKBINUVERSION}"
> > +PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}"
> > PREFERRED_VERSION_nativesdk-linux-libc-headers ?=
> > "${SDKLINUXLIBCVERSION}"
> > PREFERRED_VERSION_nativesdk-eglibc ?= "${SDKEGLIBCVERSION}"
> > PREFERRED_VERSION_nativesdk-eglibc-initial ?= "${SDKEGLIBCVERSION}"
> > 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 09f68d8..f8ad2cc 100644
> > --- a/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend
> > +++ b/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbap
> > +++ pend
> > @@ -2,12 +2,20 @@ INSANE_SKIP_libstdc++-dev += "staticdev"
> >
> > ALLOW_EMPTY_${PN}-utils = "1"
> >
> > -PR_append = "-arago3"
> > +PR_append = "-arago4"
> >
> > +PROVIDES := "${@oe_filter_out('virtual/linux-libc-headers', '${PROVIDES}',
> > d)}"
> > +PROVIDES := "${@oe_filter_out('linux-libc-headers', '${PROVIDES}', d)}"
> > PROVIDES += "virtual/${TARGET_PREFIX}gcc-intermediate"
> > +PROVIDES += "${@base_conditional('PREFERRED_PROVIDER_linux-libc-
> > headers', 'external-linaro-toolchain', 'linux-libc-headers linux-libc-headers-dev',
> > '', d)}"
> >
> > +PACKAGES := "${@oe_filter_out('linux-libc-headers', '${PACKAGES}', d)}"
> > +PACKAGES := "${@oe_filter_out('linux-libc-headers-dev', '${PACKAGES}', d)}"
> > PACKAGES := "${@oe_filter_out('libsegfault', '${PACKAGES}', d)}"
> > PACKAGES =+ "libsegfault"
> > +PACKAGES += "${@base_conditional('PREFERRED_PROVIDER_linux-libc-
> > headers', 'external-linaro-toolchain', 'linux-libc-headers-dev', '', d)}"
> > +
> > +DEPENDS += "${@base_conditional('PREFERRED_PROVIDER_linux-libc-
> > headers', 'external-linaro-toolchain', '', 'linux-libc-headers', d)}"
> >
> > RDEPENDS_${PN}-utils = ""
> >
> > @@ -90,6 +98,9 @@ do_install_append() {
> > install -d ${D}/include
> > cp -a ${TOOLCHAIN_PATH}/${ELT_TARGET_SYS}/include/* ${D}/include
> >
> > + ${@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*', d)}
> > +
> > rm -rf ${D}/lib/libgfortran*
> > rm -rf ${D}/lib/ldscripts
> > rm -rf ${D}${datadir}/lintian
> > --
> > 1.8.3.2
> >
> > _______________________________________________
> > meta-arago mailing list
> > meta-arago@arago-project.org
> > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-09-27 16:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-27 6:06 [PATCH] external-linaro-toolchain: add a way to use specific linux-libc-headers provider and version Denys Dmytriyenko
2013-09-27 15:32 ` Cooper Jr., Franklin
2013-09-27 16:25 ` Denys Dmytriyenko
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.