Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 58544 - bootsplash 0.6.1-r4 doesn't patch the development source 2.6.8-rc2 correct
Summary: bootsplash 0.6.1-r4 doesn't patch the development source 2.6.8-rc2 correct
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: x86 Linux
: High normal (vote)
Assignee: Michal Januszewski (RETIRED)
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2004-07-27 06:39 UTC by pierre kroma
Modified: 2004-08-21 16:13 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description pierre kroma 2004-07-27 06:39:07 UTC
after I installed development source 2.6.8-rc2 I want to play a little bit with the bootsplash and I got some errors (patching and compiling errors).



Reproducible: Always
Steps to Reproduce:
so what I done:

1. emerging development-sources version 2.6.8_rc2
2. configuration my kernel (at first without any fb or bootsplash and so on)
3. compiling, installing and rebooting with my new kernel. ANYthing working perfect.
4. emerging bootsplash version 0.6.1-r4
5. anything seems to be ok.
6. starting bootsplash_patch and got the following errors:


Actual Results:  
bootsplash_patch
 * Patching the kernel (branch: 2.6) in /usr/src/linux ...
patching file drivers/char/keyboard.c
Hunk #1 succeeded at 1058 (offset -1 lines).
patching file drivers/char/n_tty.c
patching file drivers/char/vt.c
Hunk #2 succeeded at 3178 (offset 3 lines).
patching file drivers/video/bootsplash/bootsplash.c
patching file drivers/video/bootsplash/bootsplash.h
patching file drivers/video/bootsplash/decode-jpg.c
patching file drivers/video/bootsplash/decode-jpg.h
patching file drivers/video/bootsplash/Kconfig
patching file drivers/video/bootsplash/Makefile
patching file drivers/video/bootsplash/render.c
patching file drivers/video/console/fbcon.c
Hunk #2 succeeded at 214 with fuzz 2 (offset 13 lines).
Hunk #3 succeeded at 422 (offset 99 lines).
Hunk #4 succeeded at 446 (offset 99 lines).
Hunk #5 FAILED at 481.
Hunk #6 succeeded at 559 (offset 115 lines).
Hunk #7 FAILED at 739.
Hunk #8 succeeded at 662 with fuzz 1 (offset -10 lines).
Hunk #9 succeeded at 891 (offset 130 lines).
Hunk #10 succeeded at 1002 (offset 132 lines).
Hunk #11 succeeded at 1086 (offset 135 lines).
Hunk #12 succeeded at 1168 (offset 136 lines).
Hunk #13 FAILED at 1478.
Hunk #14 FAILED at 1549.
Hunk #15 succeeded at 1849 (offset 307 lines).
Hunk #16 succeeded at 1940 with fuzz 2 (offset 320 lines).
Hunk #17 succeeded at 2061 (offset 354 lines).
Hunk #18 succeeded at 2243 (offset 354 lines).
Hunk #19 succeeded at 2447 (offset 354 lines).
Hunk #20 FAILED at 2732.
5 out of 20 hunks FAILED -- saving rejects to file drivers/video/console/fbcon.c.rej
patching file drivers/video/console/fbcon.h
patching file drivers/video/Kconfig
Hunk #1 succeeded at 993 (offset 14 lines).
patching file drivers/video/Makefile
patching file include/linux/console_struct.h
patching file include/linux/fb.h
Hunk #1 succeeded at 557 (offset 33 lines).
patching file kernel/panic.c
/sbin/bootsplash_patch: line 53: die: command not found
 * 
 *  ... complete.


Expected Results:  
the patching process should be work! ;-)



so after the patching process failed and I try to compile my kernel (with my old
config but activating "bootsplash" option) I got the following error message:

----- snip -------
  LD      drivers/video/bootsplash/built-in.o
  CC      drivers/video/console/dummycon.o
  CC      drivers/video/console/vgacon.o
  CC      drivers/video/console/fbcon.o
drivers/video/console/fbcon.c: In function `fbcon_startup':
drivers/video/console/fbcon.c:664: error: `logo' undeclared (first use in this
function)
drivers/video/console/fbcon.c:664: error: (Each undeclared identifier is
reported only once
drivers/video/console/fbcon.c:664: error: for each function it appears in.)
make[3]: *** [drivers/video/console/fbcon.o] Error 1
make[2]: *** [drivers/video/console] Error 2
make[1]: *** [drivers/video] Error 2
make: *** [drivers] Error 2
Comment 1 Michal Januszewski (RETIRED) gentoo-dev 2004-08-02 11:18:22 UTC
Ermm, the thing is we don't really support the -rc kernel versions. But from what I can see there already is a bunch of fixes that have to be applied and this probably means -r5.. So I might just as well make a new patch, it will just take a while. Stay tuned :)
Comment 2 Michal Januszewski (RETIRED) gentoo-dev 2004-08-06 03:48:23 UTC
I'm sorry, but -r5 didn't get a patch for 2.6.8. Chances are there won't be a patch any time soon (but that's yet to be discussed). If you want to have bootsplash with 2.6.8, please have a look at fbsplash/gensplash/splashutils (http://dev.gentoo.org/~spock/).
Comment 3 Michal Januszewski (RETIRED) gentoo-dev 2004-08-21 16:13:42 UTC
A patch for 2.6.8.1 has been added in bootsplash-0.6.1-r6.