On (29/11/10 12:35), Aeschbacher, Fabrice wrote: > Hi, > > Here is my 'git format-patch' again, after having run 'git rebase master'
still I have to apply this patch manually > > With kind regards, > Fabrice > > > Signed-off-by: Aeschbacher <[email protected]> > --- > recipes/qte/qte-common_2.3.10.inc | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/recipes/qte/qte-common_2.3.10.inc > b/recipes/qte/qte-common_2.3.10.inc > index 18811c7..2eed76d 100644 > --- a/recipes/qte/qte-common_2.3.10.inc > +++ b/recipes/qte/qte-common_2.3.10.inc > @@ -109,7 +109,7 @@ export SYSCONF_LFLAGS = "${LDFLAGS} -lts" > export SYSCONF_MOC = "${STAGING_BINDIR_NATIVE}/moc" > export SYSCONF_UIC = "${STAGING_BINDIR_NATIVE}/uic" > > -# generate uclibc and eabi configurations > +# generate uclibc, eabi and powerpc configurations > do_configure() { > for f in ${S}/configs/linux-*-g++-shared; do > sed -e 's,-linux-,-linux-uclibc-,g' < $f \ > @@ -119,6 +119,7 @@ do_configure() { > sed -e 's,-linux-,-linux-uclibceabi-,g' < $f \ > > `dirname $f`/`basename $f | sed -e > 's,linux-,linux-uclibceabi-,'` > done > + sed -e 's/arm/powerpc/' ${S}/configs/linux-arm-g++-shared > > ${S}/configs/linux-powerpc-g++-shared > echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qte > failed. EXTRA_OECONF was ${EXTRA_OECONF}" > } > > -- > 1.5.6.5 > > > > > -----Ursprüngliche Nachricht----- > > Von: [email protected] > > [mailto:[email protected]] Im > > Auftrag von Eric Bénard > > Gesendet: Montag, 29. November 2010 11:37 > > An: [email protected] > > Betreff: Re: [oe] [PATCH] qte: fixed do_configure() for powercpc > > > > Hi, > > > > On 29/11/2010 11:19, Aeschbacher, Fabrice wrote: > > > Is this patch likely to be accepted and commited soon in > > branch release-2010.12, or should I overlay? > > > > > the patch doesn't apply can you please rebase it against master ? > > > > Applying: qte: fixed do_configure() for powercpc > > error: patch failed: recipes/qte/qte-common_2.3.10.inc:109 > > error: recipes/qte/qte-common_2.3.10.inc: patch does not apply > > Patch failed at 0001 qte: fixed do_configure() for powercpc > > > > Eric > > > > _______________________________________________ > > 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 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
