Re: [PATCH] eglibc-initial: Fix kernel headers symlink being wrong

[Richard Purdie <richard.purdie@linuxfoundation.org>]

On Mon, 2011-11-28 at 23:15 +0000, McClintock Matthew-B29882 wrote:
> On Mon, Nov 28, 2011 at 4:57 PM, Matthew McClintock <msm@freescale.com> wrote:
> > symlinks to the kernel headers were pointing at the wrong
> > location when being used from cache. Just copy the kernel
> > headers instead
> >
> > Signed-off-by: Matthew McClintock <msm@freescale.com>
> > ---
> > Do we need something to depend on the kernel version too since we
> > are copying instead of symlinking? Something like:
> >
> > do_install[vardeps] += "virtual/kernel:do_populate_sysroot"
> >
> >  meta/recipes-core/eglibc/eglibc-common.inc  |    2 +-
> >  meta/recipes-core/eglibc/eglibc-initial.inc |    2 +-
> >  2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/meta/recipes-core/eglibc/eglibc-common.inc b/meta/recipes-core/eglibc/eglibc-common.inc
> > index 4fa6488..6a93968 100644
> > --- a/meta/recipes-core/eglibc/eglibc-common.inc
> > +++ b/meta/recipes-core/eglibc/eglibc-common.inc
> > @@ -3,7 +3,7 @@ DESCRIPTION = "Embedded GLIBC (EGLIBC) is a variant of the GNU C Library (GLIBC)
> >  HOMEPAGE = "http://www.eglibc.org/home"
> >  SECTION = "libs"
> >  LICENSE = "GPLv2 & LGPLv2.1"
> > -INC_PR = "r11"
> > +INC_PR = "r12"
> >  LIC_FILES_CHKSUM ?= "file://LICENSES;md5=07a394b26e0902b9ffdec03765209770 \
> >       file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \
> >       file://posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \
> > diff --git a/meta/recipes-core/eglibc/eglibc-initial.inc b/meta/recipes-core/eglibc/eglibc-initial.inc
> > index 448f73a..f154d64 100644
> > --- a/meta/recipes-core/eglibc/eglibc-initial.inc
> > +++ b/meta/recipes-core/eglibc/eglibc-initial.inc
> > @@ -48,7 +48,7 @@ do_install () {
> >
> >        # add links to linux-libc-headers: gcc-{cross,crossdk}-intermediate need this.
> >        for t in linux asm asm-generic; do
> > -               ln -s ${STAGING_DIR_TARGET}${includedir}/$t ${D}${includedir}/
> > +               cp -ar ${STAGING_DIR_TARGET}${includedir}/$t ${D}${includedir}/
> 
> For reference, it looked something like this when used from cache:
> 
> /home/mattsm/git/poky/build/tmp/sysroots/${MACHINE_A}-tcbootstrap/usr/include/linux:
> broken symbolic link to
> `../../../..//sysroots/${MACHINE_B}/usr/include/linux'
> 
> And ${MACHINE_B} did not exist...

Yes, good catch. I'm going to propose a different fix though as the
builds take up a lot of disk space and I'd prefer not to continue to
grow the disk footprint unnecessarily.

Cheers,

Richard