Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Peter Korsgaard <jacmet@uclibc.org>
To: buildroot@busybox.net
Subject: [Buildroot] [GIT PULL] avr32 updates
Date: Fri, 08 May 2009 11:48:19 +0200	[thread overview]
Message-ID: <87ab5oapss.fsf@macbook.be.48ers.dk> (raw)
In-Reply-To: <d6cda7730905080217u3ade15c6r401cb5832d5d1609@mail.gmail.com> ("Thiago A. Corrêa"'s message of "Fri\, 8 May 2009 06\:17\:27 -0300")

>>>>> "Thiago" == Thiago A Corr?a <thiago.correa@gmail.com> writes:

Hi,

 Thiago> Ok, after an hour of wrestling with git and it's man pages, I
 Thiago> think I got it right :) I was even able to split the kernel
 Thiago> update commit.

Heh, was git rebase -i that bad?

 >> ?Thiago> Something is wrong in the kernel headers in previous versions.
 >> ?Thiago> Something in byteorder.h prevended it from building earlier.
 >> 
 >> But the Linux.advanced stuff doesn't have anything to do with kernel
 >> headers, right?

 Thiago> Unfortunally, it doesn't look like it. Even if I select
 Thiago> 2.6.29 for the linux headers (toolchain), the build
 Thiago> fails. Unless I actually update the kernel on the target, it
 Thiago> fails to build for avr32. According to the avr32-linux
 Thiago> mailling list, there was a byteorder.h restructuring a while
 Thiago> back, so I guess some versions of the headers are not what
 Thiago> iptables expects.

I still don't get it - I've never used the Linux.advanced stuff, but
it's just used to build a kernel for the target and doesn't have
anything to do with the rootfs, right? How can it then influence the
iptables build?

 >> Ok. git am is easy - Simply save the mail and run git am -s <file>

 Thiago> A bit easier said than done *smile*.

 Thiago> I do all of my buildroot development over ssh.

And? Do you mean that your desktop machine is running Windows?

 Thiago> Anyway, what happens if I apply a patch and then you apply it
 Thiago> a while later before pulling from my tree? I guess we will
 Thiago> conflict right?

No, if none of us modify the patch then the git sha1 id will be the
same and the commit just ignored (if one of us modifies it you will
most likely get a merge conflict that you'll have to resolve when you
rebase your changes against me).

 Thiago> my git pull-request: (thanks for the tip)

pulled and pushed.

-- 
Bye, Peter Korsgaard

  reply	other threads:[~2009-05-08  9:48 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-05-08  4:52 [Buildroot] [GIT PULL] avr32 updates Thiago A. Corrêa
2009-05-08  7:13 ` Peter Korsgaard
2009-05-08  7:59   ` Thiago A. Corrêa
2009-05-08  8:29     ` Peter Korsgaard
2009-05-08  9:17       ` Thiago A. Corrêa
2009-05-08  9:48         ` Peter Korsgaard [this message]
2009-05-08  9:57           ` Peter Korsgaard
2009-05-08 10:30             ` Peter Korsgaard
2009-05-08 10:56           ` Thiago A. Corrêa
2009-05-08 11:03             ` Daniel Mack
2009-05-08 16:59             ` Thiago A. Corrêa
2009-05-08 17:06               ` Peter Korsgaard
2009-05-09  9:18             ` Markus Heidelberg
2009-05-09  8:50           ` Markus Heidelberg
2009-05-12 10:30             ` Peter Korsgaard
2009-05-12 17:33               ` Thiago A. Corrêa
2009-05-12 19:46                 ` Peter Korsgaard
2009-05-12 20:09                   ` Thiago A. Corrêa
2009-05-12 20:27                     ` Peter Korsgaard
2009-05-08  7:15 ` Peter Korsgaard
2009-05-08  8:25 ` Daniel Mack

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=87ab5oapss.fsf@macbook.be.48ers.dk \
    --to=jacmet@uclibc.org \
    --cc=buildroot@busybox.net \
    /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