From: Denys Dmytriyenko <denis@denix.org>
To: openembedded-devel@lists.openembedded.org
Subject: Re: [2010.03-maintenance] [PATCH 4/7] external-toolchain-csl: allow linux-libc-headers
Date: Wed, 16 Mar 2011 16:21:49 -0400 [thread overview]
Message-ID: <20110316202149.GH3042@denix.org> (raw)
In-Reply-To: <a96c10d6cff4f8298c43eccd9139dd20d41a4cc8.1300293663.git.bengardiner@nanometrics.ca>
On Wed, Mar 16, 2011 at 12:50:37PM -0400, Ben Gardiner wrote:
> If PREFERRED_PROVIDER_linux-libc-headers is defined as anything
> other than external-toolchain-csl then don't PROVIDE, install or
> stage the linux headers packaged with the CSL toolchain.
>
> (Updated by Tom Rini to not modify local.conf.sample yet and to use
> cp + rm -rf rather than rsync)
>
> Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
> Tested-by: Andrea Galbusera <gizero@gmail.com>
> Signed-off-by: Tom Rini <tom_rini@mentor.com>
> (cherry picked from commit 3116ad58e507c6e5dc7b7249f521c395db586b9f)
>
> Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
Acked-by: Denys Dmytriyenko <denys@ti.com>
> ---
> recipes/meta/external-toolchain-csl.bb | 9 ++++++---
> 1 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/recipes/meta/external-toolchain-csl.bb b/recipes/meta/external-toolchain-csl.bb
> index 2e109c8..0761cf2 100644
> --- a/recipes/meta/external-toolchain-csl.bb
> +++ b/recipes/meta/external-toolchain-csl.bb
> @@ -1,4 +1,4 @@
> -PR = "r7"
> +PR = "r8"
>
> INHIBIT_DEFAULT_DEPS = "1"
>
> @@ -21,9 +21,10 @@ PROVIDES = "\
> virtual/libintl \
> virtual/libiconv \
> glibc-thread-db \
> - linux-libc-headers \
> + ${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-csl', 'linux-libc-headers', '', d)} \
> "
>
> +DEPENDS = "${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-csl', '', 'linux-libc-headers', d)}"
> RPROVIDES_glibc-dev += "libc-dev libc6-dev virtual-libc-dev"
> PACKAGES_DYNAMIC += "glibc-gconv-*"
> PACKAGES_DYNAMIC += "glibc-locale-*"
> @@ -35,7 +36,7 @@ PACKAGES = "\
> libgcc-dev \
> libstdc++ \
> libstdc++-dev \
> - linux-libc-headers \
> + ${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-csl', 'linux-libc-headers', '', d)} \
> glibc-dbg \
> glibc \
> catchsegv \
> @@ -214,6 +215,7 @@ do_install() {
> cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}/libc/sbin/* ${D}${base_sbindir} \
> || true
> cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}/libc/usr/* ${D}/usr
> + ${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-csl', '', 'rm -rf ${D}/usr/include/linux', d)}
> cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}/include/* ${D}/usr/include
>
> rm -rf ${D}${bindir}/gdbserver
> @@ -227,6 +229,7 @@ do_stage() {
> install -d ${STAGING_DIR_TARGET}${base_libdir}
>
> cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}/libc/usr/include/* ${STAGING_INCDIR}
> + ${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-csl', '', 'rm -rf ${D}/usr/include/linux', d)}
> cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}/include/* ${STAGING_INCDIR}
> cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}/libc/usr/lib/* ${STAGING_LIBDIR}
> cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}/libc/lib/* ${STAGING_DIR_TARGET}${base_libdir}
> --
> 1.7.1
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
next prev parent reply other threads:[~2011-03-16 20:23 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-16 16:50 [2010.03-maintenance] [PATCH 0/7] 2010.03-maintenance: libc-headers, gdbserver and ubifs Ben Gardiner
2011-03-16 16:50 ` [2010.03-maintenance] [PATCH 1/7] image.bbclass: add link to .rootfs.<type> or .<type>.img Ben Gardiner
2011-03-16 20:21 ` Denys Dmytriyenko
2011-03-16 16:50 ` [2010.03-maintenance] [PATCH 2/7] bitbake.conf: use .ubifs.img extension in IMAGE_CMD_ubi Ben Gardiner
2011-03-16 20:21 ` Denys Dmytriyenko
2011-03-16 16:50 ` [2010.03-maintenance] [PATCH 3/7] external-toolchain: allow override of linux-libc-headers provider Ben Gardiner
2011-03-16 20:21 ` Denys Dmytriyenko
2011-03-16 16:50 ` [2010.03-maintenance] [PATCH 4/7] external-toolchain-csl: allow linux-libc-headers Ben Gardiner
2011-03-16 20:21 ` Denys Dmytriyenko [this message]
2011-03-16 16:50 ` [2010.03-maintenance] [PATCH 5/7] external-toolchain-csl: Drop do_stage, add gdbserver Ben Gardiner
2011-03-16 20:21 ` Denys Dmytriyenko
2011-03-16 16:50 ` [2010.03-maintenance] [PATCH 6/7] external-toolchain-csl: handle packaging of gdbserver based on PREFERRED_PROVIDER Ben Gardiner
2011-03-16 20:22 ` Denys Dmytriyenko
2011-03-16 16:50 ` [2010.03-maintenance] [PATCH 7/7] toolchain-external.conf: set the default provider for gdbserver Ben Gardiner
2011-03-16 20:22 ` Denys Dmytriyenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110316202149.GH3042@denix.org \
--to=denis@denix.org \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.