Openembedded Core Discussions
 help / color / mirror / Atom feed
From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: Martin Jansa <martin.jansa@gmail.com>
Cc: Michael, openembedded-core <openembedded-core@lists.openembedded.org>
Subject: Re: [PATCH] bash: Add fix for cross compile issues
Date: Wed, 14 Nov 2012 13:30:32 +0000	[thread overview]
Message-ID: <1352899832.13332.7.camel@ted> (raw)
In-Reply-To: <1352899442.13332.2.camel@ted>

On Wed, 2012-11-14 at 13:24 +0000, Richard Purdie wrote:
> On Wed, 2012-11-14 at 13:30 +0100, Martin Jansa wrote:
> > On Tue, Nov 13, 2012 at 01:59:19PM +0000, Richard Purdie wrote:
> > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > > ---
> > > diff --git a/meta/recipes-extended/bash/bash-4.2/crossfix.patch b/meta/recipes-extended/bash/bash-4.2/crossfix.patch
> > > new file mode 100644
> > > index 0000000..f587c34
> > > --- a/dev/null
> > > +++ b/meta/recipes-extended/bash/bash-4.2/crossfix.patch
> > > @@ -0,0 +1,28 @@
> > 
> > Are you using some special tool to generate git patches or some weird
> > git version?
> 
> Basically, the data from cgit in the web interface is broken and that is
> causing this.
> 
> > Patches from you where you add some file usually does not apply here,
> > It's caused by:
> > --- a/dev/null
> > +++ b/meta/recipes-extended/bash/bash-4.2/crossfix.patch
> > which usually looks like
> > --- /dev/null
> > +++ b/meta/recipes-extended/bash/bash-4.2/crossfix.patch
> 
> Right, there is a bug in cgit. I'm not sure if anyone fancies trying to
> find/fix it?

Actually, its not hard to find:

http://hjemli.net/git/cgit/tree/ui-patch.c


In header(), the:
		htmlf("\n--- a/%s\n", path1);
		htmlf("+++ b/%s\n", path2);
needs to be conditional on is_null_sha1(sha1)/is_null_sha1(sha2) with
the alternative of:
		htmlf("\n--- /%s\n", path1);
		htmlf("+++ /%s\n", path2);
which there are a variety of ways to achieve...

Michael: Fancy fixing that on the server and sending a patch
upstream? :)

Cheers,

Richard






  reply	other threads:[~2012-11-14 13:44 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-13 13:59 [PATCH] bash: Add fix for cross compile issues Richard Purdie
2012-11-13 23:42 ` Chris Larson
2012-11-14 13:01   ` Richard Purdie
2012-11-14 14:08     ` Chris Larson
2012-11-14 14:14       ` Richard Purdie
2012-11-14 12:30 ` Martin Jansa
2012-11-14 13:24   ` Richard Purdie
2012-11-14 13:30     ` Richard Purdie [this message]
2012-11-14 19:45       ` Michael Halstead
2012-11-14 21:07         ` Michael Halstead
2012-11-15 10:52           ` Richard Purdie
2012-11-14 14:06     ` Martin Jansa

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1352899832.13332.7.camel@ted \
    --to=richard.purdie@linuxfoundation.org \
    --cc=martin.jansa@gmail.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox