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 <[email protected]> > Tested-by: Andrea Galbusera <[email protected]> > Signed-off-by: Tom Rini <[email protected]> > (cherry picked from commit 3116ad58e507c6e5dc7b7249f521c395db586b9f) > > Signed-off-by: Ben Gardiner <[email protected]>
Acked-by: Denys Dmytriyenko <[email protected]> > --- > 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 > [email protected] > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
