Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 42814 - bootsplash-06-r7 patch does not apply over kernel 2.6.3 (from kernel.org)
Summary: bootsplash-06-r7 patch does not apply over kernel 2.6.3 (from kernel.org)
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: High normal (vote)
Assignee: Michal Januszewski (RETIRED)
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2004-02-24 15:41 UTC by Marcelo Borges Ribeiro
Modified: 2004-03-01 14:03 UTC (History)
0 users

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 Marcelo Borges Ribeiro 2004-02-24 15:41:08 UTC
Running bootsplash_patch I  got this error over a brand new 2.6.3 kernel:
 *
 * Patching the kernel (branch: 2.6) in /usr/src/linux ...
 *
patching file drivers/char/keyboard.c
patching file drivers/char/n_tty.c
patching file drivers/char/vt.c
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 203 with fuzz 2 (offset 1 line).
Hunk #3 succeeded at 412 (offset -3 lines).
Hunk #4 succeeded at 436 (offset -3 lines).
Hunk #5 succeeded at 466 (offset -3 lines).
Hunk #6 succeeded at 502 (offset -5 lines).
Hunk #7 succeeded at 534 (offset -5 lines).
Hunk #8 succeeded at 821 (offset -5 lines).
Hunk #9 succeeded at 904 (offset -5 lines).
Hunk #10 succeeded at 1082 (offset 1 line).
Hunk #11 succeeded at 1163 (offset 1 line).
Hunk #12 succeeded at 1473 (offset 1 line).
Hunk #13 succeeded at 1544 (offset 1 line).
Hunk #14 succeeded at 1673 (offset 1 line).
Hunk #15 succeeded at 1720 (offset 1 line).
Hunk #16 succeeded at 1798 (offset 1 line).
Hunk #17 succeeded at 1980 (offset 1 line).
Hunk #18 succeeded at 2438 with fuzz 2 (offset 40 lines).
patching file drivers/video/console/fbcon.h
patching file drivers/video/Kconfig
Hunk #1 succeeded at 922 (offset 9 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 FAILED at 449.
1 out of 1 hunk FAILED -- saving rejects to file include/linux/fb.h.rej
patching file kernel/panic.c

!!! ERROR: media-gfx/bootsplash-0.6-r7 failed.
!!! Function pkg_config, Line 146, Exitcode 1
!!! (no error message)


Reproducible: Always
Steps to Reproduce:
1. Install kernel 2.6.3 
2. run bootsplash_patch 
3.

Actual Results:  
got error message 

Expected Results:  
apply the patch without error. 

Portage 2.0.50-r1 (default-x86-1.4, gcc-3.3.2, glibc-2.3.2-r9, 2.6.3) 
================================================================= 
System uname: 2.6.3 i686 AMD Athlon(TM) XP 2400+ 
Gentoo Base System version 1.4.3.13 
distcc 2.12.1 i686-pc-linux-gnu (protocols 1 and 2) (default port 3632) 
[disabled] 
ccache version 2.3 [enabled] 
Autoconf: sys-devel/autoconf-2.58-r1 
Automake: sys-devel/automake-1.7.7 
ACCEPT_KEYWORDS="x86" 
AUTOCLEAN="yes" 
CFLAGS="-mcpu=athlon-xp -O3 -fPIC -pipe" 
CHOST="i686-pc-linux-gnu" 
COMPILER="gcc3" 
CONFIG_PROTECT="/etc /usr/X11R6/lib/X11/xkb /usr/kde/2/share/config /usr/kde/3.2/share/config /usr/kde/3/share/config /usr/share/config /usr/share/texmf/tex/generic/config/ /usr/share/texmf/tex/platex/config/ /var/qmail/control" 
CONFIG_PROTECT_MASK="/etc/gconf /etc/env.d" 
CXXFLAGS="-mcpu=athlon-xp -O3 -fPIC -pipe" 
DISTDIR="/usr/portage/distfiles" 
FEATURES="autoaddcvs ccache fixpackages sandbox" 
GENTOO_MIRRORS="http://gentoo.oregonstate.edu 
http://www.ibiblio.org/pub/Linux/distributions/gentoo" 
MAKEOPTS="-j3" 
PKGDIR="/usr/portage/packages" 
PORTAGE_TMPDIR="/var/tmp" 
PORTDIR="/usr/portage" 
PORTDIR_OVERLAY="/root/portage" 
SYNC="rsync://rsync.gentoo.org/gentoo-portage" 
USE="3dnow X alsa apache2 apm arts avi berkdb bonobo cdr crypt cups encode esd 
foomaticdb gb gdbm gif gnome gpg gpm gtk gtk2 gtkhtml guile imlib java 
joystick jpeg kde ldap libg++ libwww lm_sensors mad mikmod mmx motif mozilla 
mpeg ncurses nls oggvorbis opengl oss pam pdflib perl png ppds python qt 
quicktime readline sdl slang spell ssl svga tcl tcltk tcpd tetex tex tk 
truetype video_cards_radeon x86 xml xml2 xmms xv zlib"
Comment 1 Troy Dack 2004-03-01 00:50:39 UTC
Bump
Comment 2 Michal Januszewski (RETIRED) gentoo-dev 2004-03-01 14:03:10 UTC
This has been fixed in -r8, which I've just bumped to stable, since dev-sources 2.6.3 is stable now. Feel free, to try ~x86's -r9, too :)