CVS, git, or something else?

CVS, git, or something else?

[Keith A. Milner]

I've been trying to check out the latest alsa-driver source to do some work on 
it. I followed the instructions at:
http://www.alsa-project.org/main/index.php/GIT_Server#Occasional_Developers

But when I cd alsa-drivers and gitcompile, it fails:

make[1]: Entering directory 
`/homedirs/kamilner/Development/Workspace/alsa/alsa-driver/acore'
copying file alsa-kernel/core/init.c
patching file init.c
Hunk #2 succeeded at 280 (offset 3 lines).
Hunk #3 succeeded at 306 (offset 3 lines).
Hunk #4 FAILED at 568.
1 out of 4 hunks FAILED -- saving rejects to file init.c.rej
make[1]: *** [init.c] Error 1
make[1]: Leaving directory 
`/homedirs/kamilner/Development/Workspace/alsa/alsa-driver/acore'
make: *** [dep] Error 1

Do I have the right version? Am I going about this the right way? I see a lot 
of posts on this list talking about CVS but none mentioning git.

Maybe I should be using CVS instead?


-- 
Keith A. Milner

Re: CVS, git, or something else? Build patch failure.

[Eliot Blennerhassett]

On Tuesday 25 November 2008 12:10:29 Keith A. Milner wrote:
> I've been trying to check out the latest alsa-driver source to do some work
> on it. I followed the instructions at:
> http://www.alsa-project.org/main/index.php/GIT_Server#Occasional_Developers
>
> But when I cd alsa-drivers and gitcompile, it fails:
>
> make[1]: Entering directory
> `/homedirs/kamilner/Development/Workspace/alsa/alsa-driver/acore'
> copying file alsa-kernel/core/init.c
> patching file init.c
> Hunk #2 succeeded at 280 (offset 3 lines).
> Hunk #3 succeeded at 306 (offset 3 lines).
> Hunk #4 FAILED at 568.
> 1 out of 4 hunks FAILED -- saving rejects to file init.c.rej
> make[1]: *** [init.c] Error 1
> make[1]: Leaving directory
> `/homedirs/kamilner/Development/Workspace/alsa/alsa-driver/acore'
> make: *** [dep] Error 1

I see this too. My kernel: ubuntu 2.6.24-21-generic

Heres the .rej file.

***************
*** 552,560 ****
  		return -EINVAL;
  #ifndef CONFIG_SYSFS_DEPRECATED
  	if (!card->card_dev) {
  		card->card_dev = device_create(sound_class, card->dev,
  					       MKDEV(0, 0), NULL,
  					       "card%i", card->number);
  		if (IS_ERR(card->card_dev))
  			card->card_dev = NULL;
  	}
--- 568,586 ----
  		return -EINVAL;
  #ifndef CONFIG_SYSFS_DEPRECATED
  	if (!card->card_dev) {
+ #ifdef CONFIG_SND_HAS_DEVICE_CREATE_DRVDATA
+ 		card->card_dev = device_create_drvdata(sound_class, card->dev,
+ 						       MKDEV(0, 0), NULL,
+ 						       "card%i", card->number);
+ #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
  		card->card_dev = device_create(sound_class, card->dev,
  					       MKDEV(0, 0), NULL,
  					       "card%i", card->number);
+ #else
+ 		card->card_dev = device_create(sound_class, card->dev,
+ 					       MKDEV(0, 0),
+ 					       "card%i", card->number);
+ #endif
  		if (IS_ERR(card->card_dev))
  			card->card_dev = NULL;
  	}

>
> Do I have the right version? Am I going about this the right way? I see a
> lot of posts on this list talking about CVS but none mentioning git.
>
> Maybe I should be using CVS instead?

No. git is right.



-- 
--
Eliot Blennerhassett
www.audioscience.com

Re: CVS, git, or something else? Build patch failure.

[Keith A. Milner]

On Monday 24 November 2008 23:47:27 Eliot Blennerhassett wrote:

>
> I see this too. My kernel: ubuntu 2.6.24-21-generic

I'm on Mandriva kernel version 2.6.24.7

>
> No. git is right.

Thank you very much for confirming this. I thought I was missing something, 
but I couldn't see what.

I believe the kernerl version shouldn't matter as this error occurs when 
trying to apply a patch to one of the main files. I guess we have to sit 
tight for someone to fix this, or just delete and ignore the patch file for 
now?

Cheers,

-- 
Keith A. Milner

Build patch failure.

[Eliot Blennerhassett]

On Tuesday 25 November 2008 12:56:52 Keith A. Milner wrote:
> On Monday 24 November 2008 23:47:27 Eliot Blennerhassett wrote:
> > I see this too. My kernel: ubuntu 2.6.24-21-generic
>
> I'm on Mandriva kernel version 2.6.24.7
>
> > No. git is right.
>
> Thank you very much for confirming this. I thought I was missing something,
> but I couldn't see what.
>
> I believe the kernerl version shouldn't matter as this error occurs when
> trying to apply a patch to one of the main files. I guess we have to sit
> tight for someone to fix this, or just delete and ignore the patch file for
> now?

I applied the rejected part of the patch manually.
(cp init.c.orig init.c; patch init.c init.patch;  edit init.c and apply 
init.c.rej manually)

But now have another reject in hda_beep.c (if you aren't building for 
intel-hda this might not affect you).
Well I fixed this manually and now all OK.

Heres the .rej for hda_beep.c

***************
*** 87,93 ****
  		return -ENOMEM;
  	snprintf(beep->phys, sizeof(beep->phys),
  		"card%d/codec#%d/beep0", codec->bus->card->number, codec->addr);
  	input_dev = input_allocate_device();
  
  	/* setup digital beep device */
  	input_dev->name = "HDA Digital PCBeep";
--- 93,103 ----
  		return -ENOMEM;
  	snprintf(beep->phys, sizeof(beep->phys),
  		"card%d/codec#%d/beep0", codec->bus->card->number, codec->addr);
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 15)
  	input_dev = input_allocate_device();
+ #else
+ 	input_dev = kzalloc(sizeof(*input_dev), GFP_KERNEL);
+ #endif
  
  	/* setup digital beep device */
  	input_dev->name = "HDA Digital PCBeep";


cheers


-- 
--
Eliot Blennerhassett
www.audioscience.com

Re: Build patch failure.

[Takashi Iwai]

At Tue, 25 Nov 2008 13:45:53 +1300,
Eliot Blennerhassett wrote:
> 
> On Tuesday 25 November 2008 12:56:52 Keith A. Milner wrote:
> > On Monday 24 November 2008 23:47:27 Eliot Blennerhassett wrote:
> > > I see this too. My kernel: ubuntu 2.6.24-21-generic
> >
> > I'm on Mandriva kernel version 2.6.24.7
> >
> > > No. git is right.
> >
> > Thank you very much for confirming this. I thought I was missing something,
> > but I couldn't see what.
> >
> > I believe the kernerl version shouldn't matter as this error occurs when
> > trying to apply a patch to one of the main files. I guess we have to sit
> > tight for someone to fix this, or just delete and ignore the patch file for
> > now?
> 
> I applied the rejected part of the patch manually.
> (cp init.c.orig init.c; patch init.c init.patch;  edit init.c and apply 
> init.c.rej manually)
> 
> But now have another reject in hda_beep.c (if you aren't building for 
> intel-hda this might not affect you).
> Well I fixed this manually and now all OK.

Check my snapshot version:
      ftp://ftp.kernel.org/pub/linux/kernel/people/tiwai/snapshot/alsa-driver-snapshot.tar.gz

Do you still have any build problem with it?


thanks,

Takashi

Re: Build patch failure.

[Eliot Blennerhassett]

Thanks Takashi

On Tuesday 25 November 2008 13:49:29 Takashi Iwai wrote:
> Check my snapshot version:
>      
> ftp://ftp.kernel.org/pub/linux/kernel/people/tiwai/snapshot/alsa-driver-sna
>pshot.tar.gz
>
> Do you still have any build problem with it?

It is good, the patch stage has no errors. (I configured for all cards, 
compilation step is still running)

--
Eliot

Re: Build patch failure.

[Takashi Iwai]

At Tue, 25 Nov 2008 14:00:06 +1300,
Eliot Blennerhassett wrote:
> 
> Thanks Takashi
> 
> On Tuesday 25 November 2008 13:49:29 Takashi Iwai wrote:
> > Check my snapshot version:
> >      
> > ftp://ftp.kernel.org/pub/linux/kernel/people/tiwai/snapshot/alsa-driver-sna
> >pshot.tar.gz
> >
> > Do you still have any build problem with it?
> 
> It is good, the patch stage has no errors. (I configured for all cards, 
> compilation step is still running)

FYI, the corresponding GIT repos are:
    git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git
    git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/alsa-driver-build.git

Link these two repos via alsa-driver*/utils/setup-alsa-kernel script.
See INSTALL file in alsa-driver repo for details.


Takashi

Re: Build patch failure.

[Eliot Blennerhassett]

Hi Takashi,

are the git repositories mentioned below the recommended ones, or only
until git.alsa-project.org alsa-kmirror and alsa-driver become usable again?

I.e. should they be listed here as the preferred ones here
http://www.alsa-project.org/main/index.php/GIT_Server#Occasional_Developers

--
Eliot

Takashi Iwai wrote:
> FYI, the corresponding GIT repos are:
>     git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git
>     git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/alsa-driver-build.git
> 
> Link these two repos via alsa-driver*/utils/setup-alsa-kernel script.
> See INSTALL file in alsa-driver repo for details.
> 
> 
> Takashi

Re: Build patch failure.

[Keith A. Milner]

On Tuesday 25 November 2008 20:41:08 Eliot Blennerhassett wrote:
> Hi Takashi,
>
> are the git repositories mentioned below the recommended ones, or only
> until git.alsa-project.org alsa-kmirror and alsa-driver become usable
> again?
>
> I.e. should they be listed here as the preferred ones here
> http://www.alsa-project.org/main/index.php/GIT_Server#Occasional_Developers

>
> Takashi Iwai wrote:
> > FYI, the corresponding GIT repos are:
> >     git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git
> >    
> > git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/alsa-driver-build.git
> >
> > Link these two repos via alsa-driver*/utils/setup-alsa-kernel script.
> > See INSTALL file in alsa-driver repo for details.

Yes, I was wondering the same thing.

The alsa-driver-build.git looks equivalent to the alsa-driver git repo, but 
the sound-2.6.get is HUGE (I've not finished downloading it yet so I don't 
know if it's equivalent to kmirror but I suepct it isnt.

On another note, I see the alsa-driver/INSTALL file still refers to the 
Mercurial repository. Does this need to be rewritten for git?

Cheers,

-- 
Keith A. Milner

Re: Build patch failure.

[Keith A. Milner]

On Tuesday 25 November 2008 23:53:06 Keith A. Milner wrote:
> The alsa-driver-build.git looks equivalent to the alsa-driver git repo, but
> the sound-2.6.get is HUGE (I've not finished downloading it yet so I don't
> know if it's equivalent to kmirror but I suepct it isnt.

Answering my own question, now it's finished it appears to be a complete 
kernel tree, or at least the best part of it:

bash-3.2$ ls alsa-kmirror/drivers/
accessibility  connector  gpu         lguest     net       regulator  
telephony
acpi           cpufreq    hid         macintosh  nubus     rtc        thermal
amba           cpuidle    hwmon       Makefile   of        s390       uio
ata            crypto     i2c         mca        oprofile  sbus       usb
atm            dca        ide         md         parisc    scsi       uwb
auxdisplay     dio        idle        media      parport   serial     video
base           dma        ieee1394    memstick   pci       sh         virtio
block          edac       infiniband  message    pcmcia    sn         w1
bluetooth      eisa       input       mfd        pnp       spi        watchdog
cdrom          firewire   isdn        misc       power     ssb        xen
char           firmware   Kconfig     mmc        ps3       staging    zorro
clocksource    gpio       leds        mtd        rapidio   tc

Cheers,

-- 
Keith A. Milner

Re: Build patch failure.

[Takashi Iwai]

At Wed, 26 Nov 2008 09:41:08 +1300,
Eliot Blennerhassett wrote:
> 
> Hi Takashi,
> 
> are the git repositories mentioned below the recommended ones, or only
> until git.alsa-project.org alsa-kmirror and alsa-driver become usable again?

The git repos below are currently used for linux-next, thus, for the
next linux kernel, and these are ones I've been testing for daily
builds and developments.  So, for tracking the latest development,
they are always the best place for the time being.

> I.e. should they be listed here as the preferred ones here
> http://www.alsa-project.org/main/index.php/GIT_Server#Occasional_Developers

Sounds reasonable.


thanks,

Takashi

> 
> --
> Eliot
> 
> Takashi Iwai wrote:
> > FYI, the corresponding GIT repos are:
> >     git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git
> >     git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/alsa-driver-build.git
> > 
> > Link these two repos via alsa-driver*/utils/setup-alsa-kernel script.
> > See INSTALL file in alsa-driver repo for details.
> > 
> > 
> > Takashi
>