[oe] Request for branch merge

[Joshua Lock]

On Mon, 2010-04-12 at 08:59 -0700, Tom Rini wrote:
> On Mon, 2010-04-12 at 10:37 +0200, Koen Kooi wrote:
> > -----BEGIN PGP SIGNED MESSAGE-----
> > Hash: SHA1
> > 
> > On 01-04-10 17:33, Richard Purdie 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
> > 
> > Joshuas last 3 commits to poky seem to fix Toms issue with binconfig and
> > my issue with chrpath, which only leaves the cross staging lamangler
> > stuff to get fixed.
> 
> Actually (and I'm OK with binconfig stuff being broken in the first
> merge) the problem with binconfig junk isn't the file contents, but the
> file location.  staging-target-pkg will contain
> staging/<host>/usr/bin/<target>/foo-config.  Which means using pstaging
> for a target pkg built on 32bit Linux fails when used on 64bit Linux.
> Not that I wouldn't mind seeing the binconfig stuff die, just saying
> it's a problem today :)

Ah, hmm... yes. That is a problem.

FWIW I don't think you'll get any arguments from the Poky team where the
binconfig stuff to suffer an untimely demise!

Cheers,
Joshua
-- 
Joshua Lock
        Intel Open Source Technology Centre