View previous topic :: View next topic |
Author |
Message |
Kow Apprentice

Joined: 28 Dec 2003 Posts: 227
|
Posted: Tue Mar 16, 2004 11:05 pm Post subject: Bootsplash Patch for 2.6.5 Kernel |
|
|
Bootsplash Patch for 2.6.5-rc1:
*May or may not work on newer kernel source trees(at the time of this thread this was the latest)
*This is not an official Gentoo patch
http://home.comcast.net/~kd.drake/bootsplash-3.1.3-2.6.5-r1.patch
or if you'd rather have a bzip2 version:
http://24.118.29.210/files/bootsplash-3.1.3-2.6.5-r1.patch.bz2
I did this because the latest patch in the ebuild tree is 2.6.3-rc1 and the corresponding patch is rejecting fbcon.c, so I put this one together.
Note: I did test it, and it runs flawlessly.
Instructions:
1. You will have to right click --> Save
2. Prepare the kernel source tree (needs 2.6.5-rc1 original source). Meaning no gentoo patchsets (it might work but it would be risky).
3. CD into the directory
4. Run patch -p1 < path/to/bootsplash-3.1.3-2.6.5-r1.patch
or if using bz2 version:
Run bzip2 -dc path/to/bootsplash-3.1.3-2.6.5-r1.patch | patch -p1 _________________ -Kow
Last edited by Kow on Wed Mar 17, 2004 6:36 am; edited 1 time in total |
|
Back to top |
|
 |
paulisdead Guru


Joined: 10 Apr 2002 Posts: 510 Location: Seattle, WA
|
Posted: Wed Mar 17, 2004 12:03 am Post subject: |
|
|
Works perfectly, thanks. _________________ "we should make it a law that all geeks have dates" - Linus |
|
Back to top |
|
 |
YopWongSapn l33t


Joined: 26 Jan 2004 Posts: 627
|
Posted: Wed Mar 17, 2004 8:23 pm Post subject: |
|
|
FYI.....
The newer emerge version(s) of bootsplash come with bootsplash_patch that you can run to patch the kernel without downloading the patch elsewhere. |
|
Back to top |
|
 |
Kow Apprentice

Joined: 28 Dec 2003 Posts: 227
|
Posted: Wed Mar 17, 2004 9:13 pm Post subject: |
|
|
The latest bootsplash ebuild does not have a bootsplash patch that will work for 2.6.5.. the latest is the 2.6.3-r1.patch.bz2 which will not patch fbcon.c because of changes.....
*
* Patching the kernel (branch: 2.6) in /usr/src/linux ...
*
patching file drivers/char/keyboard.c
patching file drivers/char/n_tty.c
Hunk #1 succeeded at 994 (offset 25 lines).
patching file drivers/char/vt.c
Hunk #1 succeeded at 3143 (offset 35 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 #3 succeeded at 413 (offset 1 line).
Hunk #4 succeeded at 437 (offset 1 line).
Hunk #5 succeeded at 467 (offset 1 line).
Hunk #6 succeeded at 503 (offset 1 line).
Hunk #7 succeeded at 535 (offset 1 line).
Hunk #8 succeeded at 822 (offset 1 line).
Hunk #9 succeeded at 905 (offset 1 line).
Hunk #10 succeeded at 1083 (offset 1 line).
Hunk #11 succeeded at 1164 (offset 1 line).
Hunk #12 succeeded at 1474 (offset 1 line).
Hunk #13 succeeded at 1545 (offset 1 line).
Hunk #14 succeeded at 1674 (offset 1 line).
Hunk #15 succeeded at 1721 (offset 1 line).
Hunk #16 succeeded at 1808 (offset 10 lines).
Hunk #17 succeeded at 1990 (offset 10 lines).
Hunk #18 FAILED at 2448.
1 out of 18 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 909 (offset -13 lines).
patching file drivers/video/Makefile
patching file drivers/video/vesafb.c
patching file include/linux/console_struct.h
patching file include/linux/fb.h
Hunk #1 succeeded at 525 with fuzz 1 (offset 55 lines).
patching file kernel/panic.c
Hunk #1 succeeded at 82 (offset -1 lines).
Hunk #2 succeeded at 111 (offset -1 lines).
!!! ERROR: media-gfx/bootsplash-0.6-r9 failed.
!!! Function pkg_config, Line 150, Exitcode 1
!!! (no error message)
Hence no it does not.  _________________ -Kow |
|
Back to top |
|
 |
dsd Developer

Joined: 30 Mar 2003 Posts: 2162 Location: nr London
|
|
Back to top |
|
 |
Cicero Apprentice

Joined: 21 Jul 2003 Posts: 220
|
|
Back to top |
|
 |
Godvalve n00b


Joined: 27 Jun 2003 Posts: 34 Location: Canada
|
Posted: Mon Mar 22, 2004 8:10 pm Post subject: Re: 2.6.5-rc2-mm1 |
|
|
Blah! I tried this patch on 2.6.5-rc1-mm1 and it failed. There were issues right with Hunk 1. It spit out something about portions of the patch already being there and I was given: Assume -R [n]
I tried the patch once by saying no to everything, then I started again (with the clean sources) and said yes to everything. I'm doing an emerge sync right now in the hopes that 2.6.5-rc2-mm1 is in it.
Any suggestions?
BTW, Hunks 7-18 were the only ones to succeed. _________________ Slartibartfast touched a button and added, not entirely reassurringly, 'It scares the willies out of me. Hold tight.' |
|
Back to top |
|
 |
dsd Developer

Joined: 30 Mar 2003 Posts: 2162 Location: nr London
|
Posted: Mon Mar 22, 2004 8:25 pm Post subject: Re: 2.6.5-rc2-mm1 |
|
|
Godvalve wrote: | Blah! I tried this patch on 2.6.5-rc1-mm1 and it failed. There were issues right with Hunk 1. It spit out something about portions of the patch already being there and I was given: Assume -R [n]
|
the patch wont work on 2.6.5-rc1-mm1.
the issue that you were having sounds more like that you were patching over the top of another patch or something. but anyway, it wouldnt work however you did it.
remember, to take "clean sources" you need to completely remove the /usr/src/linux-x.y.z directory. i dont think remerging is enough.
Quote: |
I tried the patch once by saying no to everything, then I started again (with the clean sources) and said yes to everything. I'm doing an emerge sync right now in the hopes that 2.6.5-rc2-mm1 is in it. |
you might want to hold on a few minutes, im working on a bootsplash-3.1.4 diff for this kernel. _________________ http://dev.gentoo.org/~dsd |
|
Back to top |
|
 |
nx12 Apprentice


Joined: 14 Jan 2004 Posts: 193
|
Posted: Mon Mar 22, 2004 8:38 pm Post subject: |
|
|
This patch is just an update or has some new features?? _________________ signature sucks |
|
Back to top |
|
 |
dsd Developer

Joined: 30 Mar 2003 Posts: 2162 Location: nr London
|
|
Back to top |
|
 |
Godvalve n00b


Joined: 27 Jun 2003 Posts: 34 Location: Canada
|
Posted: Tue Mar 23, 2004 12:53 am Post subject: |
|
|
dsd wrote: | here's a diff of 3.1.4 against 2.6.5-rc2-mm1
again, i had to update the code a little (the same way as in the last patch)
tested by me, working |
Well.... I wasn't able to grab 2.6.5-rc2-mm1 with an emerge sync & emerge -k mm-sources.
So, what patch do I use against 2.6.5-rc1-mm1? Is there a patch? How do I find 2.6.5-rc2-mm1 sources if that's the only way to use the patch? (Is there a reason that 2.6.5-rc2-mm1 isn't available through portage?)
All help greatly appreciated!
*Update*
I found the sources for 2.6.5-rc2-mm1 HERE
(Now I just need to figure out how to build them .... lol) _________________ Slartibartfast touched a button and added, not entirely reassurringly, 'It scares the willies out of me. Hold tight.' |
|
Back to top |
|
 |
Kow Apprentice

Joined: 28 Dec 2003 Posts: 227
|
Posted: Tue Mar 23, 2004 6:00 am Post subject: |
|
|
When I originally did it I was using the latest bootsplash version in gentoo's portage tree, I didn't want to go into developer (or unofficial) versions and have people think they were somewhat official, I see a new bootsplash release in my portage tree, and they're using 3.1.4 now.
EDIT: Release 12 at the time I wrote this is still arch masked I believe. The current official does not have the 2.6.5's in them (as 2.6.5 isn't technically official either).
I do not think it's worthwhile for them to keep making patches for all these minor versions, When it comes to the 2.6.5 solid release they'll prolly get a patch for that and the solid mm source patch.
If you know how to create patches and manually put code into the kernel source tree (which you have to do before you create the patch) and want to spend the time doing it, I'd personally say go for it. But if you do not want to monkey around with it, and really love bootsplash, i'd just go 2.6.3 --> 2.6.4 --> 2.6.5 --> 2.6.6.. etc and skip the inbetween, which could be quite buggy versions. _________________ -Kow |
|
Back to top |
|
 |
keli Apprentice


Joined: 18 Jul 2003 Posts: 210 Location: TgMures, RO
|
Posted: Thu Mar 25, 2004 8:30 am Post subject: |
|
|
The patch itself worked flawlessly against 2.6.5-rc2-mm2 as well. I'm compiling the new kernel right now, let's see what it does  _________________ "The future masters of technology will have to be lighthearted and intelligent. The machine easily masters the grim and the dumb."
Marshall McLuhan, 1969 |
|
Back to top |
|
 |
keli Apprentice


Joined: 18 Jul 2003 Posts: 210 Location: TgMures, RO
|
Posted: Thu Mar 25, 2004 9:08 am Post subject: |
|
|
And, we have a winner!!! The patch works flawlessly, and I have a properly working system again
Since mm-sources-2.6.5 came out, I had a sort-of broken framebuffer - the machine froze every time I wanted to switch back from X to fb console. (even though at startup, before entering X, the fb bootsplash/console worked just fine )
Muchos gracias!  _________________ "The future masters of technology will have to be lighthearted and intelligent. The machine easily masters the grim and the dumb."
Marshall McLuhan, 1969 |
|
Back to top |
|
 |
Godvalve n00b


Joined: 27 Jun 2003 Posts: 34 Location: Canada
|
Posted: Thu Mar 25, 2004 11:18 pm Post subject: |
|
|
keli wrote: | The patch itself worked flawlessly against 2.6.5-rc2-mm2 as well. I'm compiling the new kernel right now, let's see what it does ........
And, we have a winner!!! The patch works flawlessly |
Maybe you can give me a hand (Starts begging...):
1)I downloaded linux-2.6.5-rc2.tar.gz from Kernel.org to /usr/src/.
2)I extracted it and changed my symlink.
3)Then, I cd /usr/src/linux and downloaded 2.6.5-rc2-mm1.
4)I then applied the patch. Is this correct so far?
5)Then (still in the dir /usr/src/linux) I downloaded http://www.reactivated.net/patches/linux-kernel/2.6.5/bootsplash-3.1.4-2.6.5-rc2-mm1.patch and applied the patch as per the instructions.
Is this everything you did? (Oh... I compiled the kernel and and moved bzImage over to /boot (which was mounted) as well as following the rest of the instructions from the The Gentoo Framebuffer, Bootsplash & Grubsplash How-To). The only thing I changed on my own was the resolution to 1024x768.
Why can't I get bootsplash to come up?
Thx in advance! _________________ Slartibartfast touched a button and added, not entirely reassurringly, 'It scares the willies out of me. Hold tight.' |
|
Back to top |
|
 |
aminal Apprentice

Joined: 17 Mar 2004 Posts: 170 Location: Baltimore, MD
|
Posted: Fri Mar 26, 2004 12:06 am Post subject: |
|
|
I'm about to compile 2.6.5-rc2-mm3 and I'd like to put the mm patch in so I dont have to turn around and compile again. once I DL it, where do I put it? (I've never patched a kernel before)
thanks! |
|
Back to top |
|
 |
aminal Apprentice

Joined: 17 Mar 2004 Posts: 170 Location: Baltimore, MD
|
Posted: Fri Mar 26, 2004 12:59 am Post subject: |
|
|
??? I'm trying to wait for an answer before compiling |
|
Back to top |
|
 |
aminal Apprentice

Joined: 17 Mar 2004 Posts: 170 Location: Baltimore, MD
|
Posted: Fri Mar 26, 2004 1:26 am Post subject: |
|
|
ok - I know I have to do
patch -p0 < file.patch
BUt then it asks what file to patch. I don't know what I'm sposed to put
edit **
Quote: | cant find file to patch at input line 5
Perhaps you used the wrong -p or --strip option?
The text leading to this was:
------------------------------------------
}
|diff -X dontdiff-kernel -urN linux-2.6.5-rc2-mm1/drivers/char/keyboard.c |linux-dsd/drivers/char/keyboard.c
|--- linux-2.6.5-rc2-mm1/drivers/char/keyboard.c 2004-03-22 17:52:20.000000000 |+0000
|+++ linux-dsd/drivers/char/keyboard.c 2004-03-22 17:55:31.038486720 +0000
----------------------------------------------
|
??? |
|
Back to top |
|
 |
markedmann n00b


Joined: 09 Feb 2004 Posts: 18
|
Posted: Fri Mar 26, 2004 2:52 am Post subject: |
|
|
Isn't that supposed to be
Code: | patch -p1 < /whereis/myfile/to.patch | ?
I could be wrong, but I'm pretty sure
Cya,
-Mark _________________ linux-2.6.8 with linuxwacom patches
gnome 2.6
Ati Radeon 9600Pro
Ati Tv Wonder Ve
Celeron 1.7Ghz, 256 megs ddr
tdk 4x dvd+-r combo drive, lg 40x12x40 cdr drive |
|
Back to top |
|
 |
aminal Apprentice

Joined: 17 Mar 2004 Posts: 170 Location: Baltimore, MD
|
Posted: Fri Mar 26, 2004 3:03 am Post subject: |
|
|
Well the patch was in the same directory I was in so, not in this case, I dont think.
Thanks though |
|
Back to top |
|
 |
Evil Dark Archon Guru


Joined: 21 Dec 2002 Posts: 562 Location: Santa Rosa, CA
|
Posted: Fri Mar 26, 2004 3:44 am Post subject: |
|
|
for kernel patches the standard is patch -p1 and that seems to also be the case here. _________________ This post has been over explained for newb-informing purposes.
Registered Linux user 347334
Abit AV8-3rd eye, AMD Athlon64 3500+ 90nm, ATI Radeon x850 pro |
|
Back to top |
|
 |
aminal Apprentice

Joined: 17 Mar 2004 Posts: 170 Location: Baltimore, MD
|
Posted: Fri Mar 26, 2004 4:28 am Post subject: |
|
|
Evil Dark Archon wrote: | for kernel patches the standard is patch -p1 and that seems to also be the case here. |
I tried that as well and got the same result. |
|
Back to top |
|
 |
Kow Apprentice

Joined: 28 Dec 2003 Posts: 227
|
Posted: Fri Mar 26, 2004 4:41 am Post subject: |
|
|
Make sure you run the patch from within the kernel source directory... ie
Code: |
cd /usr/src/linux-2.6.5-whatever/
patch -p1 < /directory/to/bootsplash-whatever.patch
|
_________________ -Kow |
|
Back to top |
|
 |
aminal Apprentice

Joined: 17 Mar 2004 Posts: 170 Location: Baltimore, MD
|
Posted: Fri Mar 26, 2004 4:54 am Post subject: |
|
|
Kow wrote: | Make sure you run the patch from within the kernel source directory... ie
Code: |
cd /usr/src/linux-2.6.5-whatever/
patch -p1 < /directory/to/bootsplash-whatever.patch
|
|
Yep. Did that. I'm pretty sure the patch at least starts to work, but it errs out, I believe because a directory is missing or something:
Quote: | |diff -X dontdiff-kernel -urN linux-2.6.5-rc2-mm1/drivers/char/keyboard.c |linux-dsd/drivers/char/keyboard.c
|--- linux-2.6.5-rc2-mm1/drivers/char/keyboard.c 2004-03-22 17:52:20.000000000 |+0000
|+++ linux-dsd/drivers/char/keyboard.c 2004-03-22 17:55:31.038486720 +0000 |
That code above is in the very beginning of the patch. If I'm reading it right it's doing a diff between those to .c files in those directories. The problem is (I think) - the latter directory "linux-dsd/drivers/char/keyboard.c" wasn't anywhere to be found. Thats the only thing I can think of. |
|
Back to top |
|
 |
keli Apprentice


Joined: 18 Jul 2003 Posts: 210 Location: TgMures, RO
|
Posted: Fri Mar 26, 2004 7:07 am Post subject: |
|
|
Well, here's what I did:
1) emerged 2.6.5-rc2-mm2 (this practically unpacks it to /usr/src/linux-2.6.5-rc2-mm2, nothing more)
2) I downloaded the rc2-mm1 patch mentioned above
3) I did a search & replace from rc2-mm1 to rc2-mm2 in the patch, although that shouldn't be necessary
4) point the symlink /usr/src/linux to the new kernel dir
5) cd /usr/src/linux
6) patch -p1 < /path/to/downloaded patch (the -p1 should take care of exactly that AFAIK: removing the first dir name in the oatch - in this case the "linux-2.6.5-whatever" since you are in that dir anyway.)
7) copy old config file to /usr/src/linux/.config
make menuconfig - just for a quick check although I didn't had to change anything (I used bootsplash before as well, but if you didn't check out this therad: https://forums.gentoo.org/viewtopic.php?t=49036 )
9) make && make modules_install
10) make install
11) fix the grub.conf & restart
That's about it  _________________ "The future masters of technology will have to be lighthearted and intelligent. The machine easily masters the grim and the dumb."
Marshall McLuhan, 1969 |
|
Back to top |
|
 |
|