git trees

git trees

[Steve Calfee]

Hi Mark,

I am starting to look at a new codec driver. I have been looking at the
alsa-project wiki describing the various git trees. I am confused
because they seem to be lagging the linux releases (ie 2.6.38 is out,
not in the two trees I have tried.

The wiki proposed occasional developers use 3 trees - not clear what is
in each. ie:

git clone http://git.alsa-project.org/http/alsa-driver.git alsa-driver
git clone http://git.alsa-project.org/http/alsa-kmirror.git alsa-kmirror

if you like do only changes in code in alsa-kmirror, please, use
alsa-kernel repository

git clone git://git.alsa-project.org/alsa-kernel.git alsa-kernel

I really don't understand the sentence:
"if you like do only changes in code in alsa-kmirror, please, use
alsa-kernel repository"


When I built alsa-kernel, I kernel version 2.6.38-rc8+ - which built and
boots on my target.

I also cloned the kernel.org broonie/sound-2.6.git tree But when I look
at branches I see:
asoc$ git branch -r
  origin/ac97-runtime-pm
  origin/ads117x
  origin/asoc-regulator
  origin/asoc-v2-dev
  origin/bias-off
  origin/dapm
  origin/dapm-log
  origin/dev
  origin/ep93xx
  origin/for-2.6.29
  origin/for-2.6.30
  origin/for-2.6.31
  origin/for-2.6.32
  origin/for-2.6.33
  origin/for-2.6.34
  origin/for-2.6.35
  origin/for-2.6.36
  origin/for-2.6.37
  origin/for-2.6.38
  origin/for-2.6.39
  origin/for-2.6.40
  origin/for-next
  origin/init-card
  origin/new-maintainers
  origin/pending
  origin/pxa-ssp
  origin/refactoring
  origin/reg-cache
  origin/tegra-arch
  origin/twl4030-mfd
  origin/untested

So I checked out origin/for-2.6.39 when i built that I got a kernel
version 2.6.38-rc1 or something. (and it built but didn't boot)

What I need to know is which tree and which branch or tag I should use
to develop on and to submit alsa patches from.

Thanks for the help.

Regards, Steve

Re: git trees

[Mark Brown]

On Wed, Mar 30, 2011 at 05:19:30PM -0700, Steve Calfee wrote:

> I am starting to look at a new codec driver. I have been looking at the
> alsa-project wiki describing the various git trees. I am confused
> because they seem to be lagging the linux releases (ie 2.6.38 is out,
> not in the two trees I have tried.

You should be developing against the Linux kernel, not against the out
of tree ALSA, for ASoC.  This is mostly true for regular ALSA drivers
too.

> So I checked out origin/for-2.6.39 when i built that I got a kernel
> version 2.6.38-rc1 or something. (and it built but didn't boot)

If it won't boot there's some non-audio issue on your system that you
need to figure out - other than audio it's just straight upstream.  For
current work you should use the latest for-2.6.xx branch, currently
2.6.40.

> What I need to know is which tree and which branch or tag I should use
> to develop on and to submit alsa patches from.

Just follow the standard kernel patch submission process as you would
for any other system.

Re: git trees

[Steve Calfee]

On 03/30/11 17:33, Mark Brown wrote:
> On Wed, Mar 30, 2011 at 05:19:30PM -0700, Steve Calfee wrote:
> 
>> I am starting to look at a new codec driver. I have been looking at the
>> alsa-project wiki describing the various git trees. I am confused
>> because they seem to be lagging the linux releases (ie 2.6.38 is out,
>> not in the two trees I have tried.
> 
> You should be developing against the Linux kernel, not against the out
> of tree ALSA, for ASoC.  This is mostly true for regular ALSA drivers
> too.
> 

Hi Mark,

Thanks for your time. I was already using linux-next - So that would be
the correct tree when you say linux kernel?

If linux-next is the case how long do I have to wait until some of the
latest asoc patches arrive? I thought that the alsa trees were somewhat
ahead of the linux-next because they had asoc/alsa patches in them. For
instance you have patches against both 2.6.39 and 2.6.40 somewhere and I
don't think they are in linux-next.

Regards, Steve

Re: git trees

[Mark Brown]

On Wed, Mar 30, 2011 at 06:03:41PM -0700, Steve Calfee wrote:

> Thanks for your time. I was already using linux-next - So that would be
> the correct tree when you say linux kernel?

Follow the generic process covered in Documentation/SubmittingPatches.

> If linux-next is the case how long do I have to wait until some of the
> latest asoc patches arrive? I thought that the alsa trees were somewhat
> ahead of the linux-next because they had asoc/alsa patches in them. For
> instance you have patches against both 2.6.39 and 2.6.40 somewhere and I
> don't think they are in linux-next.

Mostly -next will lag my tree by at most 24 hours.  During the period
beween the release of one kernel and the release of the other we don't
put code into -next that isn't intended for -rc1 of the current kernel
in order to help with stabalisation and merge but other than that you
will find the latest ASoC code in -next.