Issues trying to apply patch, uncertain of best route to proceed

crypted · 01-22-2013, 10:40 AM

I've had a number of problems where this kernel, 2.6.34-xx (unknown which), fails to boot with certain items which ought to work with this setup I think.

The kernel version shows up as 2.6.34-g3cb739e-dirty.

Anyway, so I tried a dry run of the patch and receive a flood of issues with the patch. However, I know that the latest patch is not applied at all. In fact, no patch probably was applied since February 2012 at the latest.

Code:

derek@ubuntu:~/kernel_patched$ bzip2 -dc ../patch-2.6.34.14.bz2 | patch -s -p1 --dry-run
3 out of 4 hunks FAILED -- saving rejects to file drivers/base/firmware_class.c.rej
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
1 out of 1 hunk ignored -- saving rejects to file drivers/media/video/uvc/uvc_ctrl.c.rej
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
4 out of 4 hunks ignored -- saving rejects to file drivers/media/video/uvc/uvc_driver.c.rej
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
2 out of 2 hunks ignored -- saving rejects to file drivers/media/video/uvc/uvc_video.c.rej

Reversed (or previously applied) patch detected!  Assume -R? [n] Apply anyway? [n] 
1 out of 1 hunk ignored -- saving rejects to file drivers/usb/gadget/at91_udc.c.rej
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
1 out of 1 hunk ignored -- saving rejects to file drivers/usb/gadget/f_rndis.c.rej
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
1 out of 1 hunk ignored -- saving rejects to file drivers/usb/gadget/fsl_udc_core.c.rej
1 out of 1 hunk FAILED -- saving rejects to file drivers/usb/gadget/rndis.c.rej
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
3 out of 3 hunks ignored -- saving rejects to file drivers/usb/gadget/u_serial.c.rej
4 out of 14 hunks FAILED -- saving rejects to file drivers/usb/serial/option.c.rej
1 out of 1 hunk FAILED -- saving rejects to file include/linux/firmware.h.rej
1 out of 22 hunks FAILED -- saving rejects to file kernel/futex.c.rej
Reversed (or previously applied) patch detected!  Assume -R? [n]

Do I need to apply previous patches first? And if so, how can I determine what patches are necessary?

If I cannot patch at this point, what should I do to try and merge the latest source from kernel.org and my current setup?

Any advice on this would be very much appreciated.

Thank you!

crypted · 01-22-2013, 02:10 PM

I went ahead and just ran the patch hitting the default "no" to reverse issues.

Compile works for a while, but breaks at futex.c.

Code:

  CC      kernel/time/clockevents.o
  CC      kernel/time/tick-common.o
  CC      kernel/time/timer_stats.o
  LD      kernel/time/built-in.o
  CC      kernel/futex.o
kernel/futex.c: In function 'get_futex_key':
kernel/futex.c:288: error: 'rw' undeclared (first use in this function)
kernel/futex.c:288: error: (Each undeclared identifier is reported only once
kernel/futex.c:288: error: for each function it appears in.)
kernel/futex.c:290: error: 'ro' undeclared (first use in this function)
kernel/futex.c: In function 'futex_wake':
kernel/futex.c:956: error: too many arguments to function 'get_futex_key'
kernel/futex.c: In function 'futex_wake_op':
kernel/futex.c:1002: error: too many arguments to function 'get_futex_key'
kernel/futex.c:1005: error: too many arguments to function 'get_futex_key'
kernel/futex.c: In function 'futex_requeue':
kernel/futex.c:1264: error: too many arguments to function 'get_futex_key'
kernel/futex.c:1268: error: too many arguments to function 'get_futex_key'
kernel/futex.c: In function 'futex_wait_setup':
kernel/futex.c:1823: error: too many arguments to function 'get_futex_key'
kernel/futex.c: In function 'futex_lock_pi':
kernel/futex.c:1989: error: too many arguments to function 'get_futex_key'
kernel/futex.c: In function 'futex_unlock_pi':
kernel/futex.c:2108: error: too many arguments to function 'get_futex_key'
kernel/futex.c: In function 'futex_wait_requeue_pi':
kernel/futex.c:2300: error: too many arguments to function 'get_futex_key'
make[1]: *** [kernel/futex.o] Error 1
make: *** [kernel] Error 2

I see that there was a rejection on that file.

Quote:

-rw-r--r-- 1 derek derek 71K 2013-01-22 15:02 futex.c
-rw-r--r-- 1 derek derek 4.6K 2013-01-13 22:09 futex_compat.c
-rw-r--r-- 1 derek derek 70K 2013-01-13 22:09 futex.c.orig
-rw-r--r-- 1 derek derek 490 2013-01-22 15:02 futex.c.rej

Any thoughts on how to proceed?