The hijack v337 and v338 patches don't seem to apply cleanly. I started with v300 from Mark's site and patched up from there, everything else applied cleanly except these two which are offset by a bit....

mcomb@grovepc:~/empeg/v300$ patch -p1 < v336-v337.patch 

patching file arch/arm/def-configs/empeg-car2

patching file arch/arm/special/hijack.c

Hunk #6 succeeded at 5036 (offset -22 lines).

Hunk #7 succeeded at 5096 (offset -22 lines).

Hunk #8 succeeded at 5157 (offset -22 lines).

Hunk #9 succeeded at 5247 (offset -22 lines).

patching file drivers/char/serial_sa1100.c

patching file Makefile

mcomb@grovepc:~/empeg/v300$ patch -p1 < v337-v338.patch 

patching file arch/arm/special/hijack.c

Hunk #7 succeeded at 5037 (offset -22 lines).

Hunk #8 succeeded at 5097 (offset -22 lines).

Hunk #9 succeeded at 5157 (offset -22 lines).

Hunk #10 succeeded at 5247 (offset -22 lines).

patching file drivers/char/serial_sa1100.c

patching file Makefile

I am also getting an error compiling v340...

arm-empeg-linux-gcc -D__KERNEL__ -I/home/mcomb/empeg/v300/include -Wall -Wstrict-prototypes 

-O2  -fno-strict-aliasing -pipe -msoft-float -march=armv4 -mtune=strongarm110   -c -o time.o time.c

time.c:68: redefinition of `mktime'

/usr/local/armtools-empeg/lib/gcc-lib/arm-empeg-linux/2.95.3/../../../../arm-empeg-linux/include/linux/time.h:71: 

`mktime' previously defined here

time.c:86: warning: `do_profile' defined but not used

make[1]: *** [time.o] Error 1

make[1]: Leaving directory `/home/mcomb/empeg/v300/arch/arm/kernel'

make: *** [_dir_arch/arm/kernel] Error 2

If I remove the redefined mktime from time.c it compiles fine. So I am wondering if one of the two patches that didn't apply quite right was missing something that would fix this mktime error? Mark?

-Mike

Somebody else noted that (unclean patch) earlier, and I've since updated the patch on the website to fix the problem -- refetch it (plus or minus one).

Cheers

The mktime thingie seems dependent on something in the build environment, or possibly the environment in which the tools were built -- just hack it so that it works for you.

Cheers

I've since updated the patch on the website to fix the problem

FYI, I have just fetched fresh copies of v300 and all the patches from there up and am still getting the patch offset.

Thanks for the tip on mktime.

-Mike

Well, ignore it then.

Cheers

Well, ignore it then.

Happily ignoring

The kernel built from it works fine, just wanted to make sure there wasn't anything important missing.

-Mike

Oh, I'm sure those 22 offset lines might have something interesting on them, but definitely not essential, except on certain dates.

Cheers