emerge -u world update gentoo-dev-sources kernel to 2.6.3-r2 failed during patch applying with 125a_x86_64_nvidia_noapic.patch Attempting Dry-run: cmd: patch -p4 --dry-run -f < /var/tmp/portage/gentoo-dev-sources-2.6.3-r2/work/patches/genpatches-2.6-3.24/125a_x86_64_nvidia_noapic.patch ======================================================= can't find file to patch at input line 4 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -ruN linux-2.6.3/arch/x86_64/kernel/io_apic.c linux-2.6.3-nv_noioapic/arch/x86_64/kernel/io_apic.c |--- linux-2.6.3/arch/x86_64/kernel/io_apic.c 2004-02-21 14:46:52.016892664 -0500 |+++ linux-2.6.3-nv_noioapic/arch/x86_64/kernel/io_apic.c 2004-02-21 14:46:07.643638424 -0500 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored Reproducible: Always Steps to Reproduce: 1. upgrade to gentoo-dev-sources-2.6.3-r2 kernel 2. 3. Actual Results:
same error here
Same prob: Portage 2.0.50-r1 (default-x86-1.4, gcc-3.3.3, glibc-2.3.3_pre20040207-r0, 2.6.3-gentoo-r1) ================================================================= System uname: 2.6.3-gentoo-r1 i686 AMD Athlon(tm) XP 1800+ Gentoo Base System version 1.4.3.13 ccache version 2.3 [enabled] Autoconf: sys-devel/autoconf-2.59-r3 Automake: sys-devel/automake-1.8.2 ACCEPT_KEYWORDS="x86 ~x86" AUTOCLEAN="yes" CFLAGS="-march=athlon-xp -mmmx -m3dnow -msse -mfpmath=sse,387 -ffast-math -O2 -fomit-frame-pointer -frename-registers -funroll-loops -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/lib/mozilla/defaults/pref /usr/share/config /usr/share/texmf/dvipdfm/config/ /usr/share/texmf/dvips/config/ /usr/share/texmf/tex/generic/config/ /usr/share/texmf/tex/platex/config/ /usr/share/texmf/xdvi/ /var/qmail/control" CONFIG_PROTECT_MASK="/etc/gconf /etc/env.d" CXXFLAGS="-march=athlon-xp -mmmx -m3dnow -msse -mfpmath=sse,387 -ffast-math -O2 -fomit-frame-pointer -frename-registers -funroll-loops -pipe" DISTDIR="/usr/portage/distfiles" FEATURES="autoaddcvs ccache sandbox" GENTOO_MIRRORS="ftp://ftp.caliu.info/pub/gentoo/" MAKEOPTS="-j2" PKGDIR="/usr/portage/packages" PORTAGE_TMPDIR="/var/tmp" PORTDIR="/usr/portage" PORTDIR_OVERLAY="/usr/local/portage" SYNC="rsync://rsync.europe.gentoo.org/gentoo-portage" USE="3dnow X aalib acpi alsa apm avi berkdb cdr cjk crypt cscope cups dvd encode faad fbcon flac foomaticdb foreign-sysvinit gd gdbm gif gpm gtk2 gtkhtml hyriand imap imlib ipv6 java javascript jikes jpeg kde lcms libg++ libwww mad matroska mikmod mmx motif mozilla moznoirc moznomail mozsvg mpeg mpi ncurses nls oggvorbis opengl pam pdflib perl pic png ppds python qt quicktime readline sasl sdl slang snmp speex spell sse ssl svga tcltk tcpd tetex threads tiff truetype usagi vim-with-x wmf x86 xml xml2 xmms xv zlib"
I've got this >>> emerge (1 of 4) sys-kernel/gentoo-dev-sources-2.6.3-r2 to / >>> md5 src_uri ;-) linux-2.6.3.tar.bz2 >>> md5 src_uri ;-) genpatches-2.6-3.24.tar.bz2 >>> Preparing to unpack... >>> Unpacking source... >>> Unpacking linux-2.6.3.tar.bz2 to /var/tmp/portage/gentoo-dev-sources-2.6.3-r2/work * genpatches-2.6-3.24.tar.bz2 unpacked * Applying 120_e1000_interrupt-assertion-revert.patch... [ ok ] * Applying 125a_x86_64_nvidia_noapic.patch... [ !! ] * Please attach /var/tmp/portage/gentoo-dev-sources-2.6.3-r2/temp/125a_x86_64_nvidia_noapic.err to any bug you may post. !!! ERROR: sys-kernel/gentoo-dev-sources-2.6.3-r2 failed. !!! Function unipatch, Line 443, Exitcode 0 !!! Unable to dry-run patch.
I have some error
for some reason your system is trying to patch 125a_ before it patches 125_ doesn't make a bit of sense, what version of coreutils do you have on your systems?
Tried it with coreutils 5.0.91-r2 and 5.0.91-r4, no go.
The order depends on LC_COLLATE: obsidian genpatches-2.6-3.24 # LC_COLLATE=de_DE ls 12* 120_e1000_interrupt-assertion-revert.patch 125a_x86_64_nvidia_noapic.patch 125_x86_64_2.6.3-1.patch obsidian genpatches-2.6-3.24 # LC_COLLATE=C ls 12* 120_e1000_interrupt-assertion-revert.patch 125_x86_64_2.6.3-1.patch 125a_x86_64_nvidia_noapic.patch # qpkg -I -v coreutils sys-apps/coreutils-5.0.91-r4 *
Setting LC_COLLATE=C in the kernel-2 eclass fixes this bug.
another workaround: LANG="" emerge gentoo-dev-sources
Setting LANG="" doesn't work if LC_COLLATE or LC_ALL is already set, better set LC_ALL. The order to resolve the locale setting is this: LC_ALL, LC_COLLATE (or other category), and last LANG. The first set environment variable is used. Which reminds me: Setting LC_COLLATE in the kernel eclass will fail too if LC_ALL is already set because then LC_COLLATE isn't even evaluated. ;-)
Instead of hacking the eclass, in this case (the reason I'm writing the RFC draft) we should use purely numerical patch numbers. Also, leaving a space of 5 between patch numbers should be a minimum, unless your inserting a patch between two others already 5 apart. for example: 100 and 105 leaves space for 101, 102, 103, 104 in the future. This point should be kept in mind when adding patches to the patchsets. Of course this isnt specific to genpatches, but specific to kernel-2.eclass P.S. brad, dont worry about breaking the digests for this as there is no requirement for a bump :)
this should have been long fixed by now.
