System has at76c503a-0.12_beta23 installed and running fine. Latest update fails while applying at76c503a-kernel-2.6-fixes.diff Reproducible: Always Steps to Reproduce: 1.emerge at76c503a 2. 3. Actual Results: >>> emerge (1 of 1) net-wireless/at76c503a-0.12_beta23-r1 to / >>> md5 files ;-) at76c503a-0.12_beta19.ebuild >>> md5 files ;-) at76c503a-0.12_beta23-r1.ebuild >>> md5 files ;-) at76c503a-0.12_beta23.ebuild >>> md5 files ;-) files/digest-at76c503a-0.12_beta19 >>> md5 files ;-) files/at76c503a-kernel-2.6-fixes.diff >>> md5 files ;-) files/digest-at76c503a-0.12_beta23 >>> md5 files ;-) files/digest-at76c503a-0.12_beta23-r1 >>> md5 src_uri ;-) at76c503a_0.12.beta23.orig.tar.gz >>> md5 src_uri ;-) at76c503a_0.12.beta23-1.diff.gz * Determining the location of the kernel source code * Found kernel source directory: * /usr/src/linux * Found sources for kernel version: * 2.6.13-gentoo-r3 * Checking for suitable kernel configuration options: >>> Unpacking source... >>> Unpacking at76c503a_0.12.beta23.orig.tar.gz to /var/tmp/portage/at76c503a-0.12_beta23-r1/work >>> Unpacking at76c503a_0.12.beta23-1.diff.gz to /var/tmp/portage/at76c503a-0.12_beta23-r1/work * Applying at76c503a_0.12.beta23-1.diff ... [ ok ] * Applying at76c503a-kernel-2.6-fixes.diff ... * Failed Patch: at76c503a-kernel-2.6-fixes.diff ! * ( /usr/portage/net-wireless/at76c503a/files/at76c503a-kernel-2.6-fixes.diff ) * * Include in your bugreport the contents of: * * /var/tmp/portage/at76c503a-0.12_beta23-r1/temp/at76c503a-kernel-2.6-fixes.diff-16008.out !!! ERROR: net-wireless/at76c503a-0.12_beta23-r1 failed. !!! Function epatch, Line 361, Exitcode 0 !!! Failed Patch: at76c503a-kernel-2.6-fixes.diff! emerge info: Portage 2.0.51.22-r3 (default-linux/x86/2005.1, gcc-3.3.6, glibc-2.3.5-r2, 2.6.13-gentoo-r3 i686) ================================================================= System uname: 2.6.13-gentoo-r3 i686 Pentium III (Katmai) Gentoo Base System version 1.6.13 ccache version 2.3 [enabled] dev-lang/python: 2.3.5-r2, 2.4.2 sys-apps/sandbox: 1.2.12 sys-devel/autoconf: 2.13, 2.59-r6 sys-devel/automake: 1.4_p6, 1.5, 1.6.3, 1.7.9-r1, 1.8.5-r3, 1.9.6-r1 sys-devel/binutils: 2.15.92.0.2-r10 sys-devel/libtool: 1.5.20 virtual/os-headers: 2.6.11-r2 ACCEPT_KEYWORDS="x86" AUTOCLEAN="yes" CBUILD="i686-pc-linux-gnu" CFLAGS="-O2 -march=pentium3" CHOST="i686-pc-linux-gnu" CONFIG_PROTECT="/etc /usr/kde/2/share/config /usr/kde/3.4/env /usr/kde/3.4/share/config /usr/kde/3.4/shutdown /usr/kde/3/share/config /usr/lib/X11/xkb /usr/share/config /var/qmail/control" CONFIG_PROTECT_MASK="/etc/gconf /etc/terminfo /etc/env.d" CXXFLAGS="-O2 -march=pentium3" DISTDIR="/usr/portage/distfiles" FEATURES="autoconfig ccache distlocks sandbox sfperms strict" GENTOO_MIRRORS="http://open-systems.ufl.edu/mirrors/gentoo http://gentoo.mirrors.pair.com http://distfiles.gentoo.org http://www.ibiblio.org/pub/Linux/distributions/gentoo" MAKEOPTS="-j1" PKGDIR="/usr/portage/packages" PORTAGE_TMPDIR="/var/tmp" PORTDIR="/usr/portage" SYNC="rsync://katana/gentoo-portage" USE="x86 X alsa apm arts avi berkdb bitmap-fonts cdparanoia cdr crypt cups curl eds emboss encode fam flac foomatic foomaticdb fortran gdbm gif gpm gtk gtk2 imagemagick imlib ipv6 java jpeg kde libg++ libwww mad mikmod motif mozilla mp3 mpeg ncurses nls ogg oggvorbis opengl oss pam pdflib perl png ppds python qt quicktime readline samba sdl spell ssl tcpd theora tiff truetype truetype-fonts type1-fonts usb userlocales vorbis xine xml2 xmms xv zlib video_cards_rage128 userland_GNU kernel_linux elibc_glibc" Unset: ASFLAGS, CTARGET, LANG, LC_ALL, LDFLAGS, LINGUAS, PORTDIR_OVERLAY cat /var/tmp/portage/at76c503a-0.12_beta23-r1/temp/at76c503a-kernel-2.6-fixes.diff-16008.out ***** at76c503a-kernel-2.6-fixes.diff ***** =========================================== PATCH COMMAND: patch -p0 -g0 --no-backup-if-mismatch < /usr/portage/net-wireless/at76c503a/files/at76c503a-kernel-2.6-fixes.diff =========================================== patching file at76c503.c Hunk #1 FAILED at 193. Hunk #2 FAILED at 205. Hunk #3 FAILED at 3609. Hunk #4 FAILED at 6703. Hunk #5 FAILED at 7360. Hunk #6 FAILED at 7462. Hunk #7 FAILED at 7613. Hunk #8 FAILED at 7669. 8 out of 8 hunks FAILED -- saving rejects to file at76c503.c.rej patching file at76c503.h Hunk #1 FAILED at 634. 1 out of 1 hunk FAILED -- saving rejects to file at76c503.h.rej =========================================== PATCH COMMAND: patch -p1 -g0 --no-backup-if-mismatch < /usr/portage/net-wireless/at76c503a/files/at76c503a-kernel-2.6-fixes.diff =========================================== missing header for unified diff at line 5 of patch can't find file to patch at input line 5 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |This patch was taken from http://lists.berlios.de/pipermail/at76c503a-develop/2005-September/000235.html | |--- at76c503.c |+++ at76c503.c -------------------------- No file to patch. Skipping patch. 8 out of 8 hunks ignored missing header for unified diff at line 91 of patch can't find file to patch at input line 91 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |--- at76c503.h |+++ at76c503.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored =========================================== PATCH COMMAND: patch -p2 -g0 --no-backup-if-mismatch < /usr/portage/net-wireless/at76c503a/files/at76c503a-kernel-2.6-fixes.diff =========================================== missing header for unified diff at line 5 of patch can't find file to patch at input line 5 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |This patch was taken from http://lists.berlios.de/pipermail/at76c503a-develop/2005-September/000235.html | |--- at76c503.c |+++ at76c503.c -------------------------- No file to patch. Skipping patch. 8 out of 8 hunks ignored missing header for unified diff at line 91 of patch can't find file to patch at input line 91 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |--- at76c503.h |+++ at76c503.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored =========================================== PATCH COMMAND: patch -p3 -g0 --no-backup-if-mismatch < /usr/portage/net-wireless/at76c503a/files/at76c503a-kernel-2.6-fixes.diff =========================================== missing header for unified diff at line 5 of patch can't find file to patch at input line 5 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |This patch was taken from http://lists.berlios.de/pipermail/at76c503a-develop/2005-September/000235.html | |--- at76c503.c |+++ at76c503.c -------------------------- No file to patch. Skipping patch. 8 out of 8 hunks ignored missing header for unified diff at line 91 of patch can't find file to patch at input line 91 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |--- at76c503.h |+++ at76c503.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored =========================================== PATCH COMMAND: patch -p4 -g0 --no-backup-if-mismatch < /usr/portage/net-wireless/at76c503a/files/at76c503a-kernel-2.6-fixes.diff =========================================== missing header for unified diff at line 5 of patch can't find file to patch at input line 5 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |This patch was taken from http://lists.berlios.de/pipermail/at76c503a-develop/2005-September/000235.html | |--- at76c503.c |+++ at76c503.c -------------------------- No file to patch. Skipping patch. 8 out of 8 hunks ignored missing header for unified diff at line 91 of patch can't find file to patch at input line 91 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |--- at76c503.h |+++ at76c503.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored
WORKSFORME Anything you see that could be the reason?
(In reply to comment #1) > WORKSFORME > > Anything you see that could be the reason? If I strip the carriage returns from at76c503a-kernel-2.6-fixes.diff it works much better.
(In reply to comment #2) > If I strip the carriage returns from at76c503a-kernel-2.6-fixes.diff it works > much better. > Was in a hurry - here is more detail: I tried manually applying the patch and it still failed. Looking at the patch it appeared like it should be working, but I noticed that at76c503a-kernel-2.6-fixes.diff was coming up in DOS mode in emacs. I stripped out the ^M's from the file, edited the Manifest with the new MD5 sum and filesize, and now I can successfully emerge at76c503a, at least until the next time I emerge sync I suppose.
*** Bug 109524 has been marked as a duplicate of this bug. ***
thanks, I fixed it .. I wonder why patching with ^M works for me and not for you ..
