On Fri, 2011-05-13 at 12:28 +0200, Leon Woestenberg wrote: > Hello Khem, > > On Fri, May 13, 2011 at 5:50 AM, Khem Raj <raj.k...@gmail.com> wrote: > > On Wed, May 11, 2011 at 3:29 AM, Leon Woestenberg > > <leon.woestenb...@gmail.com> wrote: > >> From: Leon Woestenberg <l...@sidebranch.com> > >> Re-add powerpc-linux-gnuspe, from OpenEmbedded. Also adds support > >> to poky.conf so that minimal-core-image builds with DISTRO=poky, > > > > you need to rebase this patch on latest oe-core > > > Yes, I was using oe-core-contrib/master as a base, wrongly assuming > that that is the correct base for -contrib fixes/additions.
To be fair when you wrote the patch, the conflicting distro changes were not in either branch so in that case it didn't matter. It was easier to take the distro changes and fix this up than the other way around though. Cheers, Richard _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
