gitcompile fails

gitcompile fails

[Brand, Mark (Mr) (Summerstrand Campus South)]

Fresh (yesterday?) git clones of alsa-driver and alsa-kmirror produce a ./gitcompile failure for me:

copying file alsa-kernel/pci/hda/hda_beep.c
patching file hda_beep.c
Hunk #2 succeeded at 96 (offset 1 line).
Hunk #3 succeeded at 124 (offset 1 line).
Hunk #4 succeeded at 142 (offset 1 line).
Hunk #5 succeeded at 164 (offset 1 line).
Hunk #6 FAILED at 282.
1 out of 6 hunks FAILED -- saving rejects to file hda_beep.c.rej
make[2]: *** [hda_beep.c] Error 1
make[2]: Leaving directory `/home/mark/workspace/alsa-driver/pci/hda'
make[1]: *** [prepare] Error 1
make[1]: Leaving directory `/home/mark/workspace/alsa-driver/pci'
make: *** [dep] Error 1

My best guess is that there is a version mismatch between the alsa-kernel/pci/hda/hda_beep.c (linked to alsa-kmirror) and pci/hda/hda_beep.patch files, since the patch seems to refer to a non-existent line-number in my source.  Any suggestions will be much appreciated, thank you.

Mark Brand.

________________________________

NOTICE: Please note that this eMail, and the contents thereof, is subject to the standard NMMU eMail disclaimer which may be found at:
http://www.nmmu.ac.za/disclaimer/email.htm

Re: gitcompile fails

[Takashi Iwai]

At Fri, 20 Jul 2012 10:30:29 +0000,
Brand, Mark (Mr) (Summerstrand Campus South) wrote:
> 
> Fresh (yesterday?) git clones of alsa-driver and alsa-kmirror produce a ./gitcompile failure for me:
> 
> copying file alsa-kernel/pci/hda/hda_beep.c
> patching file hda_beep.c
> Hunk #2 succeeded at 96 (offset 1 line).
> Hunk #3 succeeded at 124 (offset 1 line).
> Hunk #4 succeeded at 142 (offset 1 line).
> Hunk #5 succeeded at 164 (offset 1 line).
> Hunk #6 FAILED at 282.
> 1 out of 6 hunks FAILED -- saving rejects to file hda_beep.c.rej
> make[2]: *** [hda_beep.c] Error 1
> make[2]: Leaving directory `/home/mark/workspace/alsa-driver/pci/hda'
> make[1]: *** [prepare] Error 1
> make[1]: Leaving directory `/home/mark/workspace/alsa-driver/pci'
> make: *** [dep] Error 1
> 
> My best guess is that there is a version mismatch between the alsa-kernel/pci/hda/hda_beep.c (linked to alsa-kmirror) and pci/hda/hda_beep.patch files, since the patch seems to refer to a non-existent line-number in my source.  Any suggestions will be much appreciated, thank you.

Try alsa-driver-build tree:
  git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/alsa-driver-build.git

This and sound.git tree contain the latest alsa-driver stuff.


Takashi

Re: gitcompile fails

[Jaroslav Kysela]

Date 20.7.2012 12:30, Brand, Mark (Mr) (Summerstrand Campus South) wrote:
> Fresh (yesterday?) git clones of alsa-driver and alsa-kmirror produce a ./gitcompile failure for me:
> 
> copying file alsa-kernel/pci/hda/hda_beep.c
> patching file hda_beep.c
> Hunk #2 succeeded at 96 (offset 1 line).
> Hunk #3 succeeded at 124 (offset 1 line).
> Hunk #4 succeeded at 142 (offset 1 line).
> Hunk #5 succeeded at 164 (offset 1 line).
> Hunk #6 FAILED at 282.
> 1 out of 6 hunks FAILED -- saving rejects to file hda_beep.c.rej
> make[2]: *** [hda_beep.c] Error 1
> make[2]: Leaving directory `/home/mark/workspace/alsa-driver/pci/hda'
> make[1]: *** [prepare] Error 1
> make[1]: Leaving directory `/home/mark/workspace/alsa-driver/pci'
> make: *** [dep] Error 1
> 
> My best guess is that there is a version mismatch between the alsa-kernel/pci/hda/hda_beep.c (linked to alsa-kmirror) and pci/hda/hda_beep.patch files, since the patch seems to refer to a non-existent line-number in my source.  Any suggestions will be much appreciated, thank you.

It should be fixed now. Thank for this notice.

					Jaroslav

-- 
Jaroslav Kysela <perex@perex.cz>
Linux Kernel Sound Maintainer
ALSA Project; Red Hat, Inc.

gitcompile fails

[Mark Brand]

Fresh git clones of alsa-driver and alsa-kmirror produce a ./gitcompile 
failure for me:

ln -s ../../alsa-kernel/include/pcm-indirect.h
cp ../../alsa-kernel/include/pcm.h .
patch -p0 -i pcm.patch pcm.h
patching file pcm.h
Hunk #1 FAILED at 280.
Hunk #2 succeeded at 291 (offset -3 lines).
[snip]
Hunk #11 succeeded at 566 (offset -4 lines).
1 out of 11 hunks FAILED -- saving rejects to file pcm.h.rej
make[3]: *** [pcm.h] Error 1
make[3]: Leaving directory 
`/home/mark/workspace/alsa/alsa-driver/alsa/include/sound'

Since I've seen this before 
(http://mailman.alsa-project.org/pipermail/alsa-devel/2012-July/053419.html), 
would I be forgiven for assuming that this is once again as a result of 
a mismatch between alsa-driver and alsa-kmirror?  Any suggestion will be 
much appreciated, thank you.

Mark Brand.