Applying Hijack Patches (attention Mark)

Mark (or anyone else who can tell me...)

I am having problems applying the recent hijack patches. I haven't changed the way I do it in any way. Here's what I do:

tar -xf linux-v2.00b11.tar (so I have a fresh unadulterated kernel)
cd linux-v2.00b11.tar
patch -p1 <../v235.hijack.v200b11.patch

And I get....

patching file Makefile
patching file arch/arm/Makefile
patching file arch/arm/def-configs/empeg-car1
patching file arch/arm/def-configs/empeg-car2
patching file arch/arm/kernel/irq.c
patching file arch/arm/kernel/time.c
patching file arch/arm/special/Makefile
patching file arch/arm/special/empeg_audio3.c
Hunk #1 FAILED at 296.
Hunk #2 FAILED at 341.
Hunk #3 FAILED at 415.
Hunk #4 FAILED at 534.
Hunk #5 succeeded at 96 (offset -529 lines).
Hunk #6 succeeded at 726 (offset -10 lines).
Hunk #7 succeeded at 312 (offset -530 lines).
Hunk #8 FAILED at 331.
Hunk #9 succeeded at 896 (offset -35 lines).
Hunk #10 FAILED at 939.
6 out of 10 hunks FAILED -- saving rejects to file arch/arm/special/empeg_audio3.c.rej
patching file arch/arm/special/empeg_display.c
patching file arch/arm/special/empeg_display.h
patching file arch/arm/special/empeg_input.c
patching file arch/arm/special/empeg_mixer.c
patching file arch/arm/special/empeg_power.c
patching file arch/arm/special/empeg_proc.c
patching file arch/arm/special/empeg_rds.c
Hunk #1 FAILED at 677.
Hunk #2 FAILED at 736.
2 out of 2 hunks FAILED -- saving rejects to file arch/arm/special/empeg_rds.c.rej
patching file arch/arm/special/empeg_state.c
patching file arch/arm/special/fast_crc32.c
patching file arch/arm/special/hijack.c
patching file arch/arm/special/kftpd.c
patching file arch/arm/special/notify.c
patching file drivers/block/flash-empeg.c
patching file drivers/block/ide-disk.c
patching file drivers/block/ide-probe.c
patching file drivers/block/ide.c
patching file drivers/block/ide.h
patching file drivers/char/Makefile
patching file drivers/char/serial_sa1100.c
patching file fs/exec.c
patching file fs/ext2/super.c
patching file fs/open.c
patching file fs/proc/array.c
patching file fs/proc/inode.c
patching file fs/read_write.c
patching file fs/super.c
patching file include/asm-arm/arch-sa1100/hijack.h
patching file include/asm-arm/arch-sa1100/time.h
patching file include/asm-arm/ide.h
patching file include/asm-arm/proc-armv/system.h
patching file include/linux/empeg.h
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file include/linux/empeg.h.rej
patching file init/main.c
patching file net/ipv4/af_inet.c

Anyone know why this is would be happening now? If I use an older patch (say v200 since that was what I based the original time alignment stuff on), the above procedure works with no rejects or anything.

Is there anything I am doing wrong that you can see?

Keep up the good work Mark

Thanks

Refetch the linux-v2beta11.tar.gz from the Hijack site.

I finally fixed a long-standing problem whereby the Hijack patches would not apply on a pristine tree from SB; now they do, so I also fixed the "pristine tree" to be truly "pristine".

Cheers

Thanks Mark. I was about to download it again but thought I would ask in case.

Down here in Oz we pay about 20c/Mb for downloads, so I asked first.

Do you need to apply the voladj patch and RDS-fake patch for the Hijack patch to succeed? ...I understood the text on the download page to mean that these patches are required for Hijack, although looking again now I'm not quite so sure...

However, I noticed that some of the failing hunk patches are in empeg_rds.c, and some of the others are in empeg_audio3.c, which I know contains much of the VolAdj code...so I may be onto something here.

I don't think so. I asked this question a while back and I don't remember getting an answer. I was puzzled about this too when I first started playing with things.

When I tried to apply the voladj and rdsfake patches first (back about Hijack v190), I found that the hijack patch then wouldn't apply properly. If you look at the actual hijack patch you'll see that most of the rdsfake and voladj code seems to be there.

Mark is probably the only person who can accurately answer this one.

No dice Mark.

The version I downloaded is different in file size though. I downloaded the first 2.00b11 on 12/2/2002 and it's 16,014,219 bytes. The version I downloaded today is 16,014,072 bytes.

I extracted them both again and did a diff between the two trees and they are exactly the same. Are you sure you put the right tree up on the Hijack site?

Thanks,

works fine for me...

tar jxvf linux-v2.00b11.tar.bz2
cd linux-v2.00b11
patch -p0 < ../rdsfake.patch
patch -p0 < ../voladj.patch
patch -p1 < ../v235.hijack.v200b11.patch

patches cleanly... no problems...

source I downloaded is 16014072 bytes

Cheers

Kim

Hang on.. Hijack is supposed to sit on top of the RDSFAKE and VOLADJ patches, so grab those too, apply them first, and then patch in Hijack.

works for me!

This is driving me nuts. I must be doing something stupid But I can see what. I wasn't applying the voladj and rdsfake patches originally because I was originally having trouble applying them. OK I now know that they should be applied first but I still can't get it to work.

Here's what I am doing now:
[empeg@shonkylinux empeg]$ tar jxf linux-v2.00b11-2.tar.bz2
[empeg@shonkylinux empeg]$ cd linux-v2.00b11
[empeg@shonkylinux linux-v2.00b11]$ patch -p0 <../rdsfake.patch
patching file arch/arm/special/empeg_rds.c
[empeg@shonkylinux linux-v2.00b11]$ patch -p0 <../voladj.patch
patching file arch/arm/special/empeg_audio3.c
patching file include/asm-arm/arch-sa1100/empeg.h
Hunk #1 FAILED at 124.
1 out of 1 hunk FAILED -- saving rejects to file include/asm-arm/arch-sa1100/empeg.h.rej
[empeg@shonkylinux linux-v2.00b11]$ patch -p1 <../v235.hijack.v200b11.patch
patching file Makefile
patching file arch/arm/Makefile
patching file arch/arm/def-configs/empeg-car1
patching file arch/arm/def-configs/empeg-car2
patching file arch/arm/kernel/irq.c
patching file arch/arm/kernel/time.c
patching file arch/arm/special/Makefile
patching file arch/arm/special/empeg_audio3.c
patching file arch/arm/special/empeg_display.c
patching file arch/arm/special/empeg_display.h
patching file arch/arm/special/empeg_input.c
patching file arch/arm/special/empeg_mixer.c
patching file arch/arm/special/empeg_power.c
patching file arch/arm/special/empeg_proc.c
patching file arch/arm/special/empeg_rds.c
patching file arch/arm/special/empeg_state.c
patching file arch/arm/special/fast_crc32.c
patching file arch/arm/special/hijack.c
patching file arch/arm/special/kftpd.c
patching file arch/arm/special/notify.c
patching file drivers/block/flash-empeg.c
patching file drivers/block/ide-disk.c
patching file drivers/block/ide-probe.c
patching file drivers/block/ide.c
patching file drivers/block/ide.h
patching file drivers/char/Makefile
patching file drivers/char/serial_sa1100.c
patching file fs/exec.c
patching file fs/ext2/super.c
patching file fs/open.c
patching file fs/proc/array.c
patching file fs/proc/inode.c
patching file fs/read_write.c
patching file fs/super.c
patching file include/asm-arm/arch-sa1100/hijack.h
patching file include/asm-arm/arch-sa1100/time.h
patching file include/asm-arm/ide.h
patching file include/asm-arm/proc-armv/system.h
patching file include/linux/empeg.h
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file include/linux/empeg.h.rej
patching file init/main.c
patching file net/ipv4/af_inet.c

OK I figured it out. It seems you also changed the voladj patch from when I originally downloaded it.

I re-downloaded it and it's patching all 3 patches fine now. Thanks for the help.