How to get m68k sources?

How to get m68k sources?

[Kolbjørn Barmen]

Just wondering, what is the current procedure to get the current
"release" (or snapshot) sources, for example 2.6.29 for m68k?
I have used git before, allthough not much, but I have not figured out
what to pull from where, and how to integrate the lot. A simple
step-by-step how-to would be nice.

My systems are still running old 2.6.22, which I think was the last I
managed to build from the old CVS, I want to move on now :)

Thanks!

-- kolla

Re: How to get m68k sources?

[Geert Uytterhoeven]

2009/4/10 Kolbjørn Barmen <linux-m68k@kolla.no>:
> Just wondering, what is the current procedure to get the current
> "release" (or snapshot) sources, for example 2.6.29 for m68k?
> I have used git before, allthough not much, but I have not figured out
> what to pull from where, and how to integrate the lot. A simple
> step-by-step how-to would be nice.

    git clone git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git

gives you a copy of the Linux/m68k repository. The default (branch `master')
is the current development tree (v2.6.30-rc1 for now).

2.6.29 development is done on branch `m68k-v2.6.29', use

    git checkout m68k-v2.6.29

If you want to update later, simply do (if you're not on branch
`master', you'll have to
do `checkout master' first):

    git pull

If you already have a copy of Linus' repository around, you can save diskspace
and download bandwidth by

  1. Adding `--reference <path-to-your-copy-of-Linus'-repository' to the
    `git clone' command (if you want a separate repository for m68k)

  2. Set up a remote (if you want a combined one with Linus' and m68k):

    git remote add linux-m68k
git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git
    git remote update
    git checkout linux-m68k/master
or  git checkout linux-m68k/m68k-v2.6.29

If you have more questions, feel free to ask!

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: How to get m68k sources?

[Andreas Schwab]

Geert Uytterhoeven <geert@linux-m68k.org> writes:

> 2.6.29 development is done on branch `m68k-v2.6.29', use
>
>     git checkout m68k-v2.6.29

After cloning the repository you first have to create the tracking
m68k-v2.6.29 branch:

$ git checkout -t origin/m68k-v2.6.29

>   2. Set up a remote (if you want a combined one with Linus' and m68k):
>
>     git remote add linux-m68k
> git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git
>     git remote update
>     git checkout linux-m68k/master
> or  git checkout linux-m68k/m68k-v2.6.29

Same here, you need to add -t to the checkout commands to tell git to
create tracking branches.  In the first case when checking out
linux-m68k/master you also have to add "-b <branch>" to name the local
branch differently from the already existing master branch.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: How to get m68k sources?

[Kolbjørn Barmen]

On Sat, 11 Apr 2009, Andreas Schwab wrote:

> Geert Uytterhoeven <geert@linux-m68k.org> writes:
> 
> > 2.6.29 development is done on branch `m68k-v2.6.29', use
> >
> >     git checkout m68k-v2.6.29

Well, noone says this, but obviously one has to step into the "linux-m68k"
directory one first "cloned" to do this... so "cd linux-m68k", and then...

> After cloning the repository you first have to create the tracking
> m68k-v2.6.29 branch:
> 
> $ git checkout -t origin/m68k-v2.6.29

did you test this?

[kolla@haugum] /home/kolla/linux-m68k $ git checkout -t origin/m68k-v2.6.29
fatal: git checkout: --track and --no-track require -b

So after some fumbling...

[kolla@haugum] /home/kolla/linux-m68k $ git checkout -t -b origin/m68k-v2.6.29
Branch origin/m68k-v2.6.29 set up to track local branch refs/heads/master.
Switched to a new branch "origin/m68k-v2.6.29"

But so what - git tells me I have switched to new branch, but where is it?
I have not received anything, nor do I have any new files, and...

[kolla@haugum] /home/kolla/linux-m68k $ git checkout m68k-v2.6.29
error: pathspec 'm68k-v2.6.29' did not match any file(s) known to git.
 
[kolla@haugum] /home/kolla/linux-m68k $ git checkout origin/m68k-v2.6.29
warning: refname 'origin/m68k-v2.6.29' is ambiguous.
Already on "origin/m68k-v2.6.29"

[kolla@haugum] /home/kolla/linux-m68k $ git status | cat
# On branch origin/m68k-v2.6.29
nothing to commit (working directory clean)

[kolla@haugum] /home/kolla/linux-m68k $ git pull
>From .
 * branch            master     -> FETCH_HEAD
Already up-to-date.

[kolla@haugum] /home/kolla/linux-m68k $ head -n5 Makefile
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 30
EXTRAVERSION = -rc1
NAME = Temporary Tasmanian Devil

Obviously not 2.6.29...

So what now?

-- kolla

Re: How to get m68k sources?

[Kolbjørn Barmen]

On Sun, 12 Apr 2009, Kolbjørn Barmen wrote:

> So what now?

I found a way - using some other git package as basis, I put together
one m68k-sources-2.6.29.ebuild and one m68k-sources-2.6.9999.ebuild for my
gentoo/m68k project.

So, I'm content for now :)

-- kolla
--
To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: How to get m68k sources?

[Andreas Schwab]

Kolbjørn Barmen <linux-m68k@kolla.no> writes:

> On Sat, 11 Apr 2009, Andreas Schwab wrote:
>
>> After cloning the repository you first have to create the tracking
>> m68k-v2.6.29 branch:
>> 
>> $ git checkout -t origin/m68k-v2.6.29
>
> did you test this?

Of course.  Which git version do you have?  I have git 1.6.2.2.

> [kolla@haugum] /home/kolla/linux-m68k $ git checkout -t -b origin/m68k-v2.6.29
> Branch origin/m68k-v2.6.29 set up to track local branch refs/heads/master.
> Switched to a new branch "origin/m68k-v2.6.29"

The argument to -b must be the (new) local branch.  This is the
equivalent command line for old versions of git:

$ git checkout -t -b m68k-v2.6.29 origin/m68k-v2.6.29

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."
--
To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: How to get m68k sources?

[Geert Uytterhoeven]

2009/4/11 Andreas Schwab <schwab@linux-m68k.org>:
> Geert Uytterhoeven <geert@linux-m68k.org> writes:
>
>> 2.6.29 development is done on branch `m68k-v2.6.29', use
>>
>>     git checkout m68k-v2.6.29
>
> After cloning the repository you first have to create the tracking
> m68k-v2.6.29 branch:
>
> $ git checkout -t origin/m68k-v2.6.29
>
>>   2. Set up a remote (if you want a combined one with Linus' and m68k):
>>
>>     git remote add linux-m68k
>> git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git
>>     git remote update
>>     git checkout linux-m68k/master
>> or  git checkout linux-m68k/m68k-v2.6.29
>
> Same here, you need to add -t to the checkout commands to tell git to
> create tracking branches.  In the first case when checking out
> linux-m68k/master you also have to add "-b <branch>" to name the local
> branch differently from the already existing master branch.

You can do without a tracking branch, i.e. `git checkout
linux-m68k/m68k-v2.6.29'
does work. But for my first example above (separate clone) I forgot
the `origin/',
so that had to be:

    git checkout origin/m68k-v2.6.29

But if you want to do (and check-in) actual development, and update regularly,
it's indeed better to have the tracking branches. Thanks for the update!

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: How to get m68k sources?

[Geert Uytterhoeven]

2009/4/12 Kolbjørn Barmen <linux-m68k@kolla.no>:
> On Sat, 11 Apr 2009, Andreas Schwab wrote:
>
>> Geert Uytterhoeven <geert@linux-m68k.org> writes:
>>
>> > 2.6.29 development is done on branch `m68k-v2.6.29', use
>> >
>> >     git checkout m68k-v2.6.29
>
> Well, noone says this, but obviously one has to step into the "linux-m68k"
> directory one first "cloned" to do this... so "cd linux-m68k", and then...
>
>> After cloning the repository you first have to create the tracking
>> m68k-v2.6.29 branch:
>>
>> $ git checkout -t origin/m68k-v2.6.29
>
> did you test this?
>
> [kolla@haugum] /home/kolla/linux-m68k $ git checkout -t origin/m68k-v2.6.29
> fatal: git checkout: --track and --no-track require -b
>
> So after some fumbling...
>
> [kolla@haugum] /home/kolla/linux-m68k $ git checkout -t -b origin/m68k-v2.6.29
> Branch origin/m68k-v2.6.29 set up to track local branch refs/heads/master.
> Switched to a new branch "origin/m68k-v2.6.29"

Ah, so it created a branch `origin/m68k-v2.6.29' to track the local `master',
while the intention was to create a local `m68k-v2.6.29' branch, to track the
remote `origin/m68k-v2.6.29' branch...

> But so what - git tells me I have switched to new branch, but where is it?

`git branch -a' will tell you...

> I have not received anything, nor do I have any new files, and...

You don't have to get new files to create a new branch.
Besides, you already got all the files for the `origin/..' branches during the
clone.

> [kolla@haugum] /home/kolla/linux-m68k $ git checkout m68k-v2.6.29
> error: pathspec 'm68k-v2.6.29' did not match any file(s) known to git.
>
> [kolla@haugum] /home/kolla/linux-m68k $ git checkout origin/m68k-v2.6.29
> warning: refname 'origin/m68k-v2.6.29' is ambiguous.
> Already on "origin/m68k-v2.6.29"
>
> [kolla@haugum] /home/kolla/linux-m68k $ git status | cat
> # On branch origin/m68k-v2.6.29
> nothing to commit (working directory clean)
>
> [kolla@haugum] /home/kolla/linux-m68k $ git pull
> From .
>  * branch            master     -> FETCH_HEAD
> Already up-to-date.
>
> [kolla@haugum] /home/kolla/linux-m68k $ head -n5 Makefile
> VERSION = 2
> PATCHLEVEL = 6
> SUBLEVEL = 30
> EXTRAVERSION = -rc1
> NAME = Temporary Tasmanian Devil
>
> Obviously not 2.6.29...

Yeah, this is all `master', i.e. current development...

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: How to get m68k sources?

[Andreas Schwab]

Geert Uytterhoeven <geert@linux-m68k.org> writes:

> You can do without a tracking branch, i.e. `git checkout
> linux-m68k/m68k-v2.6.29'
> does work.

It may be ok for a quick look, but it creates a detached branch, which
you don't want in general.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: How to get m68k sources?

[Kolbjørn Barmen]

On Sun, 12 Apr 2009, Kolbjørn Barmen wrote:

> On Sun, 12 Apr 2009, Kolbjørn Barmen wrote:
> 
> > So what now?
> 
> I found a way - using some other git package as basis, I put together
> one m68k-sources-2.6.29.ebuild and one m68k-sources-2.6.9999.ebuild for my
> gentoo/m68k project.

Only I didnt check carefully enough, both actually end up as 2.6.30 :(

halbrend m68k-sources # ebuild m68k-sources-2.6.29.ebuild unpack
 * checking ebuild checksums ;-) ...                                                                          [ ok ]
 * checking auxfile checksums ;-) ...                                                                         [ ok ]
 * checking miscfile checksums ;-) ...                                                                        [ ok ]
>>> Preparing to unpack ...
>>> Not marked as unpacked; recreating WORKDIR...
>>> Unpacking source...
 * GIT update -->
 *    repository:               git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git
 *    at the commit:            7251100873ebbb3df1f7a87f622cff9509a840e6
 *    tree:                     master
 *    branch:                   m68k-v2.6.29
 *    storage directory:        "/usr/portage/distfiles/git-src/linux-m68k.git"
Initialized empty Git repository in /var/tmp/portage/sys-kernel/m68k-sources-2.6.29/work/linux-2.6.29-m68k/.git/
Checking out files: 100% (27662/27662), done.
Switched to a new branch "tree-master"
>>> Unpacked to /var/tmp/portage/sys-kernel/m68k-sources-2.6.29/work/linux-2.6.29-m68k
>>> Source unpacked in /var/tmp/portage/sys-kernel/m68k-sources-2.6.29/work
halbrend m68k-sources # head -n5  /var/tmp/portage/sys-kernel/m68k-sources-2.6.29/work/linux-2.6.29-m68k/Makefile
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 30
EXTRAVERSION = -rc1
NAME = Temporary Tasmanian Devil

Geh...

I tried using origin/m68k-v2.6.29 as branch, but that didnt work at all.

Oh well, I'll struggle on... :P


-- kolla
--
To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: How to get m68k sources?

[Kolbjørn Barmen]

On Mon, 13 Apr 2009, Kolbjørn Barmen wrote:

> I tried using origin/m68k-v2.6.29 as branch, but that didnt work at all.
> 
> Oh well, I'll struggle on... :P

It was a simple bug in my ebuild, fixed - got 2.6.29 sources now :)

-- kolla
--
To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html