[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Libc patch no longer applies
|
From: |
Thomas Schwinge |
|
Subject: |
Re: Libc patch no longer applies |
|
Date: |
Thu, 13 Oct 2011 15:30:59 +0200 |
|
User-agent: |
Notmuch/0.9-101-g81dad07 (http://notmuchmail.org) Emacs/23.3.1 (i486-pc-linux-gnu) |
Hi!
IRC, freenode, #hurd, 2011-10-12
<civodul> tschwinge: the patch generated from Savannah's libc doesn't
apply to Sourceware's: http://hydra.nixos.org/build/1452335
<http://hydra.nixos.org/build/1452335/log>:
[...]
applying patch `/...-glibc-hurd-patches/00-glibc-hurd.patch'...
patching file .topdeps
patching file .topmsg
patching file ChangeLog
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file ChangeLog.rej
patching file ChangeLog.16
Reversed (or previously applied) patch detected! Assuming -R.
The next patch would create the file ChangeLog.17,
which already exists! Assuming -R.
patching file ChangeLog.17
patching file ChangeLog.85df5516305ee239525efaf7cfa015a07a04f39e
patching file INSTALL
Reversed (or previously applied) patch detected! Assuming -R.
patching file LICENSES
Reversed (or previously applied) patch detected! Assuming -R.
[...]
This 00-glibc-hurd.patch seems to be bogus. How exactly do you create
it? It shouldn't contain any changes to ChangeLog, ChangeLog.16,
ChangeLog.17, INSTALL, LICENSES, ...:
$ git diff --stat savannah/baseline savannah/tschwinge/Roger_Whittaker
.topdeps | 46 +
.topmsg | 7 +
ChangeLog.85df5516305ee239525efaf7cfa015a07a04f39e | 5 +
aclocal.m4 | 1 +
bits/libc-lock.h | 3 +
bits/stdio-lock.h | 17 +-
configure | 373 +--
configure.in | 23 +-
csu/libc-start.c | 2 +
elf/Makefile | 5 +-
elf/dl-support.c | 3 +-
elf/rtld.c | 2 +-
hurd/fcntl-internal.h | 60 +
hurd/hurd.h | 4 +
hurd/hurd/fd.h | 23 +-
hurd/hurd/port.h | 31 +
hurd/hurd/signal.h | 16 +-
hurd/hurd/threadvar.h | 5 +
hurd/hurd/userlink.h | 14 +
hurd/hurdfault.c | 2 +
hurd/hurdsig.c | 4 +-
hurd/intern-fd.c | 2 +-
hurd/lookup-retry.c | 2 +-
hurd/port2fd.c | 2 +-
include/errno.h | 14 +-
include/libc-symbols.h | 1 +
include/sys/socket.h | 3 +
include/verify.h | 140 +
libio/fileops.c | 1 +
libio/freopen.c | 2 +
libio/freopen64.c | 2 +
mach/devstream.c | 5 -
mach/lock-intern.h | 20 +
mach/mach.h | 3 +
mach/mach/mig_support.h | 3 +
mach/setup-thread.c | 30 +-
mach/spin-lock.c | 1 +
misc/syslog.c | 2 +
nptl/sysdeps/pthread/bits/libc-lock.h | 3 +
nscd/connections.c | 5 +-
nscd/netgroupcache.c | 5 +-
nss/makedb.c | 6 +
nss/nss_db/db-initgroups.c | 3 +
posix/glob/configure | 4864
+++++++++-----------
posix/regex.c | 1 -
posix/regex_internal.c | 5 +
sysdeps/generic/ldsodefs.h | 1 +
sysdeps/generic/machine-lock.h | 12 +
sysdeps/generic/machine-sp.h | 4 +
sysdeps/generic/not-cancel.h | 28 +-
sysdeps/generic/thread_state.h | 1 +
sysdeps/i386/configure | 413 +--
sysdeps/i386/i486/bits/atomic.h | 107 +-
sysdeps/i386/sysdep.h | 7 +
sysdeps/ia64/configure | 104 +-
sysdeps/ieee754/ldbl-opt/configure | 161 +-
sysdeps/mach/configure | 685 ++--
sysdeps/mach/hurd/Makefile | 1 +
sysdeps/mach/hurd/accept.c | 66 +-
sysdeps/mach/hurd/accept4.c | 101 +
sysdeps/mach/hurd/bits/errno.h | 6 +-
sysdeps/mach/hurd/bits/libc-lock.h | 7 +
sysdeps/mach/hurd/bits/libc-tsd.h | 35 -
sysdeps/mach/hurd/bits/socket.h | 365 ++
sysdeps/mach/hurd/bits/stat.h | 56 +-
sysdeps/mach/hurd/check_native.c | 9 +
sysdeps/mach/hurd/configure | 167 +-
sysdeps/mach/hurd/dl-sysdep.c | 10 +-
sysdeps/mach/hurd/dup2.c | 115 +-
sysdeps/mach/hurd/dup3.c | 140 +
sysdeps/mach/hurd/fork.c | 7 +-
sysdeps/mach/hurd/i386/Makefile | 4 +
sysdeps/mach/hurd/i386/____longjmp_chk.S | 108 +
sysdeps/mach/hurd/i386/init-first.c | 94 +-
sysdeps/mach/hurd/i386/signal-defines.sym | 10 +
sysdeps/mach/hurd/i386/tls.h | 53 +-
sysdeps/mach/hurd/i386/tlsdesc.sym | 19 +
sysdeps/mach/hurd/i386/trampoline.c | 2 +-
sysdeps/mach/hurd/kernel-features.h | 8 +-
sysdeps/mach/hurd/ldsodefs.h | 52 +
sysdeps/mach/hurd/opendir.c | 44 +-
sysdeps/mach/hurd/pipe.c | 25 +-
sysdeps/mach/hurd/pipe2.c | 61 +
sysdeps/mach/hurd/powerpc/init-first.c | 3 -
sysdeps/mach/hurd/profil.c | 2 +
sysdeps/mach/hurd/ptsname.c | 18 +-
sysdeps/mach/hurd/setitimer.c | 3 +-
sysdeps/mach/hurd/socket.c | 19 +-
sysdeps/mach/hurd/socketpair.c | 29 +-
sysdeps/mach/hurd/sysdep-cancel.h | 9 +
sysdeps/mach/hurd/tls.h | 19 +-
sysdeps/mach/hurd/xstatconv.c | 9 +-
sysdeps/mach/i386/machine-lock.h | 12 +
sysdeps/mach/i386/sysdep.h | 9 +
sysdeps/mach/i386/thread_state.h | 11 +-
sysdeps/mach/powerpc/machine-lock.h | 12 +
sysdeps/mach/powerpc/machine-sp.h | 4 +
sysdeps/mach/powerpc/thread_state.h | 1 +
sysdeps/mach/thread_state.h | 3 +
sysdeps/posix/getaddrinfo.c | 2 +-
sysdeps/posix/getcwd.c | 1 +
sysdeps/powerpc/configure | 103 +-
sysdeps/powerpc/powerpc32/configure | 114 +-
sysdeps/powerpc/powerpc64/configure | 114 +-
sysdeps/unix/clock_settime.c | 3 +
sysdeps/unix/sysv/linux/ldsodefs.h | 6 +-
sysdeps/unix/sysv/linux/powerpc/configure | 198 +-
107 files changed, 5031 insertions(+), 4532 deletions(-)
Grüße,
Thomas
pgpd8Ljhdhup0.pgp
Description: PGP signature