Re: Request for branch merge

[Richard Purdie <rpurdie@rpsys.net>]

On Thu, 2010-04-01 at 08:46 -0700, Khem Raj wrote:
> On Thu, Apr 1, 2010 at 8:33 AM, Richard Purdie <rpurdie@rpsys.net> wrote:
> > I've been aware that Poky and OE have been diverging slightly and I'd
> > like to correct this. There are some patches that I've promised for a
> > while too such as the rename from do_populate_staging ->
> > do_populate_sysroot.
> >
> > With some help from Joshua Lock, I have a branch I'd like to propose be
> > merged into OE.dev:
> >
> > http://cgit.openembedded.org/cgit.cgi/openembedded/log/?h=rpurdie/work-in-progress
> >
> > This branch:
> >
> > * Renames do_populate_staging -> do_populate_sysroot as per previous
> >  staging discussion emails and also the staging directory ->
> >  sysroots. It should convert existing builds safely and insert a
> >  compatibility symlink. This continues the process of improving our
> >  "staging" concept into one focused around true sysroots.
> > * Adds some gettext class sanity checks. In Poky this error is fatal,
> >  for OE this is just a note for now. The idea being if AM_GNU_GETTEXT
> >  is in configure.ac and gettext in some form isn't in DEPENDS,
> >  something is wrong.
> > * Added relocatable binary processing from Poky for -native binaries
> >  using chrpath. This isn't enabled for -cross packages due to the
> >  relative path length problems.
> > * Added packaged-staging fetching capabilities. This uses new mirror
> >  handling abilities in bitbake master branch but should work with older
> >  bitbakes, just with less functionality.
> > * Started moving gcc dependency information into core gcc version
> >  specific includes as part of the gcc cleanup.
> > * Converted gcc to use the new style staging
> > * Added EXTRA_OECONF_INITIAL and EXTRA_OECONF_INTERMEDIATE variables to
> >  gcc as part of the gcc cleanup
> > * Converted binutils, modutils-cross, glibc and gdb to new style staging
> > * Cleaned up the gcc-cross do_install function a lot
> >
> > Along with a small number of other tweaks spotted along the way.
> >
> > I could post the patches individually and get Acked lines for each one
> > but I'm hoping to avoid that and get permission to merge the branch
> > directly. We have talked about most of these things in one form or
> > another.
> >
> 
> Looks good stuff.
> I would have preferred to have eglibc also converted to new style
> staging if possible but can be done afterwards too.

I just looked and the eglibc do_stage function can most likely just be
deleted and for the -initial version, rename do_stage to do_install and
drop the empty do_install. I didn't make that change as its not
something I've tested.

Cheers,

Richard