PERFORCE change 105091 for review
R. Tyler Ballance
tyler at FreeBSD.org
Sat Aug 26 07:37:19 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=105091
Change 105091 by tyler at orange on 2006/08/26 07:36:53
IFC, break the Makefile even more
Affected files ...
.. //depot/projects/l4bsd/Makefile#2 edit
.. //depot/projects/l4bsd/src/Makefile.inc1#4 integrate
.. //depot/projects/l4bsd/src/ObsoleteFiles.inc#4 integrate
.. //depot/projects/l4bsd/src/UPDATING#4 integrate
.. //depot/projects/l4bsd/src/bin/cp/cp.1#2 integrate
.. //depot/projects/l4bsd/src/bin/cp/cp.c#3 integrate
.. //depot/projects/l4bsd/src/bin/cp/extern.h#2 integrate
.. //depot/projects/l4bsd/src/bin/cp/utils.c#2 integrate
.. //depot/projects/l4bsd/src/bin/date/netdate.c#2 integrate
.. //depot/projects/l4bsd/src/bin/df/df.c#2 integrate
.. //depot/projects/l4bsd/src/bin/ed/main.c#2 integrate
.. //depot/projects/l4bsd/src/bin/ps/ps.1#2 integrate
.. //depot/projects/l4bsd/src/contrib/gdb/FREEBSD-Xlist#2 integrate
.. //depot/projects/l4bsd/src/contrib/gdb/gdb/config/powerpc/fbsd.mh#1 branch
.. //depot/projects/l4bsd/src/contrib/gdb/gdb/config/powerpc/fbsd.mt#1 branch
.. //depot/projects/l4bsd/src/contrib/gdb/gdb/config/powerpc/nm-fbsd.h#1 branch
.. //depot/projects/l4bsd/src/contrib/gdb/gdb/config/rs6000/nm-rs6000.h#1 branch
.. //depot/projects/l4bsd/src/contrib/gdb/gdb/config/rs6000/nm-rs6000ly.h#1 branch
.. //depot/projects/l4bsd/src/contrib/gdb/gdb/config/rs6000/rs6000.mh#1 branch
.. //depot/projects/l4bsd/src/contrib/gdb/gdb/config/rs6000/rs6000.mt#1 branch
.. //depot/projects/l4bsd/src/contrib/gdb/gdb/config/rs6000/rs6000lynx.mh#1 branch
.. //depot/projects/l4bsd/src/contrib/gdb/gdb/config/rs6000/rs6000lynx.mt#1 branch
.. //depot/projects/l4bsd/src/contrib/gdb/gdb/config/rs6000/tm-rs6000.h#1 branch
.. //depot/projects/l4bsd/src/contrib/gdb/gdb/config/rs6000/tm-rs6000ly.h#1 branch
.. //depot/projects/l4bsd/src/contrib/gdb/gdb/config/rs6000/xm-rs6000.h#1 branch
.. //depot/projects/l4bsd/src/contrib/gdb/gdb/ppcfbsd-nat.c#1 branch
.. //depot/projects/l4bsd/src/contrib/gdb/gdb/ppcfbsd-tdep.c#1 branch
.. //depot/projects/l4bsd/src/contrib/gdb/gdb/ppcfbsd-tdep.h#1 branch
.. //depot/projects/l4bsd/src/contrib/gdb/gdb/rs6000-nat.c#1 branch
.. //depot/projects/l4bsd/src/contrib/gdb/gdb/rs6000-tdep.c#1 branch
.. //depot/projects/l4bsd/src/contrib/less/LICENSE#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/Makefile.aut#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/Makefile.in#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/Makefile.wnb#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/NEWS#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/README#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/brac.c#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/ch.c#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/charset.c#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/charset.h#1 branch
.. //depot/projects/l4bsd/src/contrib/less/cmd.h#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/cmdbuf.c#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/command.c#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/configure#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/configure.ac#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/decode.c#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/defines.ds#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/defines.h.in#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/defines.o2#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/defines.o9#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/defines.wn#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/edit.c#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/filename.c#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/forwback.c#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/funcs.h#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/ifile.c#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/input.c#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/jump.c#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/less.h#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/less.man#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/less.nro#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/lessecho.c#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/lessecho.man#1 branch
.. //depot/projects/l4bsd/src/contrib/less/lessecho.nro#1 branch
.. //depot/projects/l4bsd/src/contrib/less/lesskey.c#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/lesskey.h#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/lesskey.man#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/lesskey.nro#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/lglob.h#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/line.c#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/linenum.c#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/lsystem.c#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/main.c#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/mark.c#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/mkhelp.c#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/optfunc.c#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/option.c#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/option.h#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/opttbl.c#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/os.c#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/output.c#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/pckeys.h#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/position.c#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/position.h#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/prompt.c#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/screen.c#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/scrsize.c#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/search.c#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/signal.c#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/tags.c#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/ttyin.c#2 integrate
.. //depot/projects/l4bsd/src/contrib/less/version.c#2 integrate
.. //depot/projects/l4bsd/src/contrib/pnpinfo/pnpinfo.c#2 integrate
.. //depot/projects/l4bsd/src/contrib/sendmail/FREEBSD-upgrade#3 integrate
.. //depot/projects/l4bsd/src/contrib/sendmail/RELEASE_NOTES#3 integrate
.. //depot/projects/l4bsd/src/contrib/sendmail/cf/cf/submit.cf#3 integrate
.. //depot/projects/l4bsd/src/contrib/sendmail/cf/m4/version.m4#3 integrate
.. //depot/projects/l4bsd/src/contrib/sendmail/contrib/cidrexpand#2 integrate
.. //depot/projects/l4bsd/src/contrib/sendmail/src/main.c#3 integrate
.. //depot/projects/l4bsd/src/contrib/sendmail/src/queue.c#3 integrate
.. //depot/projects/l4bsd/src/contrib/sendmail/src/srvrsmtp.c#3 integrate
.. //depot/projects/l4bsd/src/contrib/sendmail/src/version.c#3 integrate
.. //depot/projects/l4bsd/src/etc/defaults/periodic.conf#2 integrate
.. //depot/projects/l4bsd/src/etc/defaults/rc.conf#5 integrate
.. //depot/projects/l4bsd/src/etc/etc.alpha/ttys#2 delete
.. //depot/projects/l4bsd/src/etc/network.subr#2 integrate
.. //depot/projects/l4bsd/src/etc/pccard_ether#2 integrate
.. //depot/projects/l4bsd/src/etc/periodic/security/410.logincheck#1 branch
.. //depot/projects/l4bsd/src/etc/periodic/security/Makefile#2 integrate
.. //depot/projects/l4bsd/src/etc/rc.d/Makefile#4 integrate
.. //depot/projects/l4bsd/src/etc/rc.d/dhclient#3 integrate
.. //depot/projects/l4bsd/src/etc/rc.d/ramdisk#2 delete
.. //depot/projects/l4bsd/src/etc/rc.d/ramdisk-own#2 delete
.. //depot/projects/l4bsd/src/etc/rc.d/sshd#2 integrate
.. //depot/projects/l4bsd/src/etc/rc.d/ypxfrd#2 integrate
.. //depot/projects/l4bsd/src/etc/rc.initdiskless#2 integrate
.. //depot/projects/l4bsd/src/etc/rc.subr#4 integrate
.. //depot/projects/l4bsd/src/etc/sendmail/freebsd.mc#3 integrate
.. //depot/projects/l4bsd/src/etc/sendmail/freebsd.submit.mc#3 integrate
.. //depot/projects/l4bsd/src/gnu/lib/libsupc++/Makefile#2 integrate
.. //depot/projects/l4bsd/src/gnu/usr.bin/Makefile#2 integrate
.. //depot/projects/l4bsd/src/gnu/usr.bin/binutils/libbfd/Makefile.powerpc#2 integrate
.. //depot/projects/l4bsd/src/gnu/usr.bin/gdb/Makefile#2 integrate
.. //depot/projects/l4bsd/src/gnu/usr.bin/gdb/arch/alpha/Makefile#2 delete
.. //depot/projects/l4bsd/src/gnu/usr.bin/gdb/arch/alpha/config.h#2 delete
.. //depot/projects/l4bsd/src/gnu/usr.bin/gdb/arch/alpha/init.c#2 delete
.. //depot/projects/l4bsd/src/gnu/usr.bin/gdb/arch/powerpc/Makefile#1 branch
.. //depot/projects/l4bsd/src/gnu/usr.bin/gdb/arch/powerpc/config.h#1 branch
.. //depot/projects/l4bsd/src/gnu/usr.bin/gdb/arch/powerpc/init.c#1 branch
.. //depot/projects/l4bsd/src/gnu/usr.bin/gdb/kgdb/kthr.c#2 integrate
.. //depot/projects/l4bsd/src/gnu/usr.bin/gdb/kgdb/trgt_alpha.c#2 delete
.. //depot/projects/l4bsd/src/gnu/usr.bin/gdb/kgdb/trgt_amd64.c#2 integrate
.. //depot/projects/l4bsd/src/gnu/usr.bin/gdb/kgdb/trgt_powerpc.c#1 branch
.. //depot/projects/l4bsd/src/lib/Makefile#3 integrate
.. //depot/projects/l4bsd/src/lib/csu/alpha/Makefile#2 delete
.. //depot/projects/l4bsd/src/lib/csu/alpha/crt1.c#2 delete
.. //depot/projects/l4bsd/src/lib/csu/alpha/crti.S#2 delete
.. //depot/projects/l4bsd/src/lib/csu/alpha/crtn.S#2 delete
.. //depot/projects/l4bsd/src/lib/libc/Makefile#2 integrate
.. //depot/projects/l4bsd/src/lib/libc/alpha/Makefile.inc#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/SYS.h#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/Symbol.map#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/_fpmath.h#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/arith.h#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/gen/Makefile.inc#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/gen/_ctx_start.S#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/gen/_set_tp.c#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/gen/_setjmp.S#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/gen/divrem.m4#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/gen/fabs.S#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/gen/flt_rounds.c#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/gen/fpgetmask.c#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/gen/fpgetround.c#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/gen/fpgetsticky.c#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/gen/fpsetmask.c#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/gen/fpsetround.c#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/gen/infinity.c#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/gen/makecontext.c#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/gen/modf.c#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/gen/rfork_thread.S#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/gen/setjmp.S#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/gen/signalcontext.c#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/gen/sigsetjmp.S#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/net/Makefile.inc#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/net/byte_swap_2.S#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/net/byte_swap_4.S#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/net/htonl.S#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/net/htons.S#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/net/ntohl.S#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/net/ntohs.S#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/stdlib/Makefile.inc#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/string/Makefile.inc#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/string/bcopy.S#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/string/bzero.S#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/string/ffs.S#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/string/memcpy.S#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/string/memmove.S#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/sys/Makefile.inc#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/sys/Ovfork.S#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/sys/brk.S#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/sys/cerror.S#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/sys/exect.S#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/sys/fork.S#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/sys/pipe.S#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/sys/ptrace.S#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/sys/sbrk.S#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/sys/setlogin.S#2 delete
.. //depot/projects/l4bsd/src/lib/libc/alpha/sys/sigreturn.S#2 delete
.. //depot/projects/l4bsd/src/lib/libc/arm/net/htonl.S#2 integrate
.. //depot/projects/l4bsd/src/lib/libc/arm/net/htons.S#2 integrate
.. //depot/projects/l4bsd/src/lib/libc/arm/net/ntohl.S#2 integrate
.. //depot/projects/l4bsd/src/lib/libc/arm/net/ntohs.S#2 integrate
.. //depot/projects/l4bsd/src/lib/libc/stdio/findfp.c#2 integrate
.. //depot/projects/l4bsd/src/lib/libc/sys/kqueue.2#2 integrate
.. //depot/projects/l4bsd/src/lib/libc_r/Makefile#2 integrate
.. //depot/projects/l4bsd/src/lib/libc_r/arch/alpha/_atomic_lock.S#2 delete
.. //depot/projects/l4bsd/src/lib/libdisk/write_alpha_disk.c#2 delete
.. //depot/projects/l4bsd/src/lib/libio/Makefile#2 delete
.. //depot/projects/l4bsd/src/lib/libio/alpha_sethae.c#2 delete
.. //depot/projects/l4bsd/src/lib/libio/bwx.c#2 delete
.. //depot/projects/l4bsd/src/lib/libio/io.c#2 delete
.. //depot/projects/l4bsd/src/lib/libio/io.h#2 delete
.. //depot/projects/l4bsd/src/lib/libio/swiz.c#2 delete
.. //depot/projects/l4bsd/src/lib/libkvm/kvm_alpha.c#2 delete
.. //depot/projects/l4bsd/src/lib/libpthread/Makefile#2 integrate
.. //depot/projects/l4bsd/src/lib/libpthread/arch/alpha/Makefile.inc#2 delete
.. //depot/projects/l4bsd/src/lib/libpthread/arch/alpha/alpha/context.S#2 delete
.. //depot/projects/l4bsd/src/lib/libpthread/arch/alpha/alpha/enter_uts.S#2 delete
.. //depot/projects/l4bsd/src/lib/libpthread/arch/alpha/alpha/pthread_md.c#2 delete
.. //depot/projects/l4bsd/src/lib/libpthread/arch/alpha/include/atomic_ops.h#2 delete
.. //depot/projects/l4bsd/src/lib/libpthread/arch/alpha/include/pthread_md.h#2 delete
.. //depot/projects/l4bsd/src/lib/libstand/Makefile#2 integrate
.. //depot/projects/l4bsd/src/lib/libstand/alpha/_setjmp.S#2 delete
.. //depot/projects/l4bsd/src/lib/libthr/Makefile#2 integrate
.. //depot/projects/l4bsd/src/lib/libthr/arch/alpha/Makefile.inc#2 delete
.. //depot/projects/l4bsd/src/lib/libthr/arch/alpha/alpha/pthread_md.c#2 delete
.. //depot/projects/l4bsd/src/lib/libthr/arch/alpha/include/pthread_md.h#2 delete
.. //depot/projects/l4bsd/src/lib/libthread_db/arch/alpha/libc_r_md.c#2 delete
.. //depot/projects/l4bsd/src/lib/libthread_db/arch/alpha/libpthread_md.c#2 delete
.. //depot/projects/l4bsd/src/lib/libutil/login.conf.5#2 integrate
.. //depot/projects/l4bsd/src/lib/msun/alpha/Makefile.inc#2 delete
.. //depot/projects/l4bsd/src/lib/msun/alpha/Symbol.map#2 delete
.. //depot/projects/l4bsd/src/lib/msun/alpha/fenv.c#2 delete
.. //depot/projects/l4bsd/src/lib/msun/alpha/fenv.h#2 delete
.. //depot/projects/l4bsd/src/lib/msun/alpha/s_copysign.S#2 delete
.. //depot/projects/l4bsd/src/lib/msun/alpha/s_copysignf.S#2 delete
.. //depot/projects/l4bsd/src/libexec/rtld-elf/alpha/Makefile.inc#2 delete
.. //depot/projects/l4bsd/src/libexec/rtld-elf/alpha/ld.so.script#2 delete
.. //depot/projects/l4bsd/src/libexec/rtld-elf/alpha/reloc.c#2 delete
.. //depot/projects/l4bsd/src/libexec/rtld-elf/alpha/rtld_machdep.h#2 delete
.. //depot/projects/l4bsd/src/libexec/rtld-elf/alpha/rtld_start.S#2 delete
.. //depot/projects/l4bsd/src/release/Makefile#3 integrate
.. //depot/projects/l4bsd/src/release/alpha/boot_crunch.conf#2 delete
.. //depot/projects/l4bsd/src/release/alpha/mkisoimages.sh#2 delete
.. //depot/projects/l4bsd/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#5 integrate
.. //depot/projects/l4bsd/src/rescue/rescue/Makefile#2 integrate
.. //depot/projects/l4bsd/src/sbin/bsdlabel/Makefile#2 integrate
.. //depot/projects/l4bsd/src/sbin/camcontrol/camcontrol.8#2 integrate
.. //depot/projects/l4bsd/src/sbin/camcontrol/camcontrol.c#2 integrate
.. //depot/projects/l4bsd/src/sbin/dhclient/dhclient.8#2 integrate
.. //depot/projects/l4bsd/src/sbin/dhclient/dhclient.c#3 integrate
.. //depot/projects/l4bsd/src/sbin/fsdb/fsdb.8#3 integrate
.. //depot/projects/l4bsd/src/sbin/fsdb/fsdb.c#3 integrate
.. //depot/projects/l4bsd/src/sbin/fsdb/fsdbutil.c#2 integrate
.. //depot/projects/l4bsd/src/sbin/ggate/Makefile#2 integrate
.. //depot/projects/l4bsd/src/sbin/ifconfig/ifmedia.c#2 integrate
.. //depot/projects/l4bsd/src/sbin/ipf/libipf/Makefile#3 integrate
.. //depot/projects/l4bsd/src/sbin/ipfw/ipfw.8#4 integrate
.. //depot/projects/l4bsd/src/sbin/ipfw/ipfw2.c#4 integrate
.. //depot/projects/l4bsd/src/sbin/ping/Makefile#2 integrate
.. //depot/projects/l4bsd/src/sbin/restore/tape.c#2 integrate
.. //depot/projects/l4bsd/src/secure/lib/libcrypto/Makefile.inc#4 integrate
.. //depot/projects/l4bsd/src/secure/lib/libcrypto/opensslconf-alpha.h#2 delete
.. //depot/projects/l4bsd/src/share/examples/drivers/make_pseudo_driver.sh#3 integrate
.. //depot/projects/l4bsd/src/share/man/man4/amdsmb.4#2 integrate
.. //depot/projects/l4bsd/src/share/man/man4/fast_ipsec.4#3 integrate
.. //depot/projects/l4bsd/src/share/man/man4/ipsec.4#2 integrate
.. //depot/projects/l4bsd/src/share/man/man4/ixgb.4#2 integrate
.. //depot/projects/l4bsd/src/share/man/man4/nfsmb.4#2 integrate
.. //depot/projects/l4bsd/src/share/man/man4/uplcom.4#3 integrate
.. //depot/projects/l4bsd/src/share/man/man5/rc.conf.5#4 integrate
.. //depot/projects/l4bsd/src/share/man/man8/rc.subr.8#4 integrate
.. //depot/projects/l4bsd/src/share/man/man9/ithread.9#2 integrate
.. //depot/projects/l4bsd/src/share/man/man9/lock.9#3 integrate
.. //depot/projects/l4bsd/src/share/mk/bsd.cpu.mk#4 integrate
.. //depot/projects/l4bsd/src/share/mk/bsd.endian.mk#3 integrate
.. //depot/projects/l4bsd/src/share/mk/bsd.lib.mk#2 integrate
.. //depot/projects/l4bsd/src/share/mk/bsd.port.mk#2 integrate
.. //depot/projects/l4bsd/src/sys/amd64/linux32/linux.h#3 integrate
.. //depot/projects/l4bsd/src/sys/amd64/linux32/linux32_machdep.c#3 integrate
.. //depot/projects/l4bsd/src/sys/amd64/linux32/linux32_sysvec.c#3 integrate
.. //depot/projects/l4bsd/src/sys/arm/arm/busdma_machdep.c#3 integrate
.. //depot/projects/l4bsd/src/sys/arm/arm/cpufunc.c#2 integrate
.. //depot/projects/l4bsd/src/sys/arm/arm/elf_trampoline.c#4 integrate
.. //depot/projects/l4bsd/src/sys/arm/arm/identcpu.c#2 integrate
.. //depot/projects/l4bsd/src/sys/arm/at91/if_ate.c#4 integrate
.. //depot/projects/l4bsd/src/sys/arm/conf/EP80219#1 branch
.. //depot/projects/l4bsd/src/sys/arm/include/armreg.h#2 integrate
.. //depot/projects/l4bsd/src/sys/arm/include/cpuconf.h#3 integrate
.. //depot/projects/l4bsd/src/sys/arm/include/cpufunc.h#3 integrate
.. //depot/projects/l4bsd/src/sys/arm/include/elf.h#2 integrate
.. //depot/projects/l4bsd/src/sys/arm/include/vmparam.h#3 integrate
.. //depot/projects/l4bsd/src/sys/arm/xscale/i80321/ep80219_machdep.c#1 branch
.. //depot/projects/l4bsd/src/sys/arm/xscale/i80321/files.ep80219#1 branch
.. //depot/projects/l4bsd/src/sys/arm/xscale/i80321/files.i80219#1 branch
.. //depot/projects/l4bsd/src/sys/arm/xscale/i80321/i80321_intr.h#2 integrate
.. //depot/projects/l4bsd/src/sys/arm/xscale/i80321/i80321_pci.c#2 integrate
.. //depot/projects/l4bsd/src/sys/arm/xscale/i80321/i80321reg.h#2 integrate
.. //depot/projects/l4bsd/src/sys/arm/xscale/i80321/i80321var.h#2 integrate
.. //depot/projects/l4bsd/src/sys/arm/xscale/i80321/iq31244_machdep.c#4 integrate
.. //depot/projects/l4bsd/src/sys/arm/xscale/i80321/iq80321.c#3 integrate
.. //depot/projects/l4bsd/src/sys/arm/xscale/i80321/iq80321reg.h#2 integrate
.. //depot/projects/l4bsd/src/sys/arm/xscale/i80321/std.ep80219#1 branch
.. //depot/projects/l4bsd/src/sys/arm/xscale/i80321/std.i80219#1 branch
.. //depot/projects/l4bsd/src/sys/boot/arm/Makefile#2 integrate
.. //depot/projects/l4bsd/src/sys/boot/arm/at91/boot0/Makefile#2 integrate
.. //depot/projects/l4bsd/src/sys/boot/arm/at91/bootiic/loader_prompt.c#2 integrate
.. //depot/projects/l4bsd/src/sys/boot/arm/at91/bootspi/Makefile#2 integrate
.. //depot/projects/l4bsd/src/sys/boot/arm/at91/bootspi/arm_init.S#1 branch
.. //depot/projects/l4bsd/src/sys/boot/arm/at91/bootspi/arm_init.s#2 delete
.. //depot/projects/l4bsd/src/sys/boot/arm/at91/bootspi/env_vars.c#1 branch
.. //depot/projects/l4bsd/src/sys/boot/arm/at91/bootspi/env_vars.h#1 branch
.. //depot/projects/l4bsd/src/sys/boot/arm/at91/bootspi/loader_prompt.c#1 branch
.. //depot/projects/l4bsd/src/sys/boot/arm/at91/bootspi/loader_prompt.h#1 branch
.. //depot/projects/l4bsd/src/sys/boot/arm/at91/bootspi/main.c#2 integrate
.. //depot/projects/l4bsd/src/sys/boot/arm/at91/libat91/Makefile#3 integrate
.. //depot/projects/l4bsd/src/sys/boot/arm/at91/libat91/delay.c#1 branch
.. //depot/projects/l4bsd/src/sys/boot/arm/at91/libat91/emac.c#3 integrate
.. //depot/projects/l4bsd/src/sys/boot/arm/at91/libat91/emac.h#3 integrate
.. //depot/projects/l4bsd/src/sys/boot/arm/at91/libat91/emac_init.c#1 branch
.. //depot/projects/l4bsd/src/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#1 branch
.. //depot/projects/l4bsd/src/sys/boot/arm/at91/libat91/mci_device.c#1 branch
.. //depot/projects/l4bsd/src/sys/boot/arm/at91/libat91/mci_device.h#1 branch
.. //depot/projects/l4bsd/src/sys/boot/arm/at91/libat91/reset.c#1 branch
.. //depot/projects/l4bsd/src/sys/boot/arm/at91/libat91/sd-card.c#1 branch
.. //depot/projects/l4bsd/src/sys/boot/arm/at91/libat91/sd-card.h#1 branch
.. //depot/projects/l4bsd/src/sys/boot/common/help.common#2 integrate
.. //depot/projects/l4bsd/src/sys/boot/common/loader.8#2 integrate
.. //depot/projects/l4bsd/src/sys/boot/ficl/arm/sysdep.c#1 branch
.. //depot/projects/l4bsd/src/sys/boot/ficl/arm/sysdep.h#1 branch
.. //depot/projects/l4bsd/src/sys/boot/forth/loader.conf#3 integrate
.. //depot/projects/l4bsd/src/sys/cam/scsi/scsi_all.c#2 integrate
.. //depot/projects/l4bsd/src/sys/cam/scsi/scsi_all.h#3 integrate
.. //depot/projects/l4bsd/src/sys/compat/freebsd32/freebsd32.h#2 integrate
.. //depot/projects/l4bsd/src/sys/compat/linux/linux_emul.c#2 integrate
.. //depot/projects/l4bsd/src/sys/compat/linux/linux_emul.h#2 integrate
.. //depot/projects/l4bsd/src/sys/compat/linux/linux_futex.c#2 integrate
.. //depot/projects/l4bsd/src/sys/compat/linux/linux_misc.c#5 integrate
.. //depot/projects/l4bsd/src/sys/compat/linux/linux_signal.c#3 integrate
.. //depot/projects/l4bsd/src/sys/compat/ndis/ntoskrnl_var.h#2 integrate
.. //depot/projects/l4bsd/src/sys/conf/NOTES#5 integrate
.. //depot/projects/l4bsd/src/sys/conf/files.pc98#3 integrate
.. //depot/projects/l4bsd/src/sys/conf/files.powerpc#4 integrate
.. //depot/projects/l4bsd/src/sys/conf/options#5 integrate
.. //depot/projects/l4bsd/src/sys/conf/options.arm#5 integrate
.. //depot/projects/l4bsd/src/sys/dev/arl/if_arlreg.h#2 integrate
.. //depot/projects/l4bsd/src/sys/dev/ata/ata-chipset.c#4 integrate
.. //depot/projects/l4bsd/src/sys/dev/ata/ata-raid.c#2 integrate
.. //depot/projects/l4bsd/src/sys/dev/ath/if_athvar.h#3 integrate
.. //depot/projects/l4bsd/src/sys/dev/bge/if_bge.c#4 integrate
.. //depot/projects/l4bsd/src/sys/dev/bge/if_bgereg.h#4 integrate
.. //depot/projects/l4bsd/src/sys/dev/em/if_em.c#5 integrate
.. //depot/projects/l4bsd/src/sys/dev/fb/creator.c#2 integrate
.. //depot/projects/l4bsd/src/sys/dev/iicbus/if_ic.c#2 integrate
.. //depot/projects/l4bsd/src/sys/dev/iicbus/iicbb.c#2 integrate
.. //depot/projects/l4bsd/src/sys/dev/ips/ips.h#2 integrate
.. //depot/projects/l4bsd/src/sys/dev/isp/isp_ioctl.h#3 integrate
.. //depot/projects/l4bsd/src/sys/dev/isp/isp_pci.c#5 integrate
.. //depot/projects/l4bsd/src/sys/dev/mii/brgphy.c#3 integrate
.. //depot/projects/l4bsd/src/sys/dev/usb/usb_port.h#2 integrate
.. //depot/projects/l4bsd/src/sys/fs/msdosfs/denode.h#2 integrate
.. //depot/projects/l4bsd/src/sys/geom/vinum/geom_vinum_raid5.h#2 integrate
.. //depot/projects/l4bsd/src/sys/i386/linux/linux.h#3 integrate
.. //depot/projects/l4bsd/src/sys/i386/linux/linux_machdep.c#3 integrate
.. //depot/projects/l4bsd/src/sys/i386/linux/linux_sysvec.c#3 integrate
.. //depot/projects/l4bsd/src/sys/ia64/include/vmparam.h#2 integrate
.. //depot/projects/l4bsd/src/sys/kern/init_main.c#2 integrate
.. //depot/projects/l4bsd/src/sys/kern/kern_thr.c#4 integrate
.. //depot/projects/l4bsd/src/sys/kern/kern_umtx.c#2 integrate
.. //depot/projects/l4bsd/src/sys/kern/sched_4bsd.c#3 integrate
.. //depot/projects/l4bsd/src/sys/kern/sched_core.c#2 integrate
.. //depot/projects/l4bsd/src/sys/kern/sched_ule.c#3 integrate
.. //depot/projects/l4bsd/src/sys/kern/sys_process.c#2 integrate
.. //depot/projects/l4bsd/src/sys/kern/uipc_socket.c#5 integrate
.. //depot/projects/l4bsd/src/sys/kern/vfs_mount.c#3 integrate
.. //depot/projects/l4bsd/src/sys/modules/Makefile#4 integrate
.. //depot/projects/l4bsd/src/sys/net/if_bridge.c#4 integrate
.. //depot/projects/l4bsd/src/sys/net/if_ethersubr.c#3 integrate
.. //depot/projects/l4bsd/src/sys/net/if_spppsubr.c#3 integrate
.. //depot/projects/l4bsd/src/sys/net/if_vlan.c#4 integrate
.. //depot/projects/l4bsd/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#3 integrate
.. //depot/projects/l4bsd/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#4 integrate
.. //depot/projects/l4bsd/src/sys/netgraph/ng_fec.c#2 integrate
.. //depot/projects/l4bsd/src/sys/netinet/ip_fastfwd.c#2 integrate
.. //depot/projects/l4bsd/src/sys/netinet/ip_fw.h#3 integrate
.. //depot/projects/l4bsd/src/sys/netinet/ip_fw2.c#4 integrate
.. //depot/projects/l4bsd/src/sys/netinet/ip_input.c#2 integrate
.. //depot/projects/l4bsd/src/sys/netinet/ip_output.c#3 integrate
.. //depot/projects/l4bsd/src/sys/netsmb/smb_crypt.c#2 integrate
.. //depot/projects/l4bsd/src/sys/netsmb/smb_iod.c#2 integrate
.. //depot/projects/l4bsd/src/sys/netsmb/smb_rq.c#2 integrate
.. //depot/projects/l4bsd/src/sys/netsmb/smb_rq.h#2 integrate
.. //depot/projects/l4bsd/src/sys/nfsclient/nfs_lock.c#2 integrate
.. //depot/projects/l4bsd/src/sys/pci/agp_amd64.c#3 integrate
.. //depot/projects/l4bsd/src/sys/pci/nfsmb.c#2 integrate
.. //depot/projects/l4bsd/src/sys/powerpc/include/gdb_machdep.h#1 branch
.. //depot/projects/l4bsd/src/sys/powerpc/include/vmparam.h#2 integrate
.. //depot/projects/l4bsd/src/sys/powerpc/powerpc/gdb_machdep.c#1 branch
.. //depot/projects/l4bsd/src/sys/security/audit/audit_bsm_token.c#3 integrate
.. //depot/projects/l4bsd/src/sys/security/audit/audit_pipe.c#3 integrate
.. //depot/projects/l4bsd/src/sys/sys/kobj.h#2 integrate
.. //depot/projects/l4bsd/src/sys/sys/proc.h#2 integrate
.. //depot/projects/l4bsd/src/sys/sys/sched.h#3 integrate
.. //depot/projects/l4bsd/src/sys/sys/sysctl.h#5 integrate
.. //depot/projects/l4bsd/src/sys/sys/umtx.h#2 integrate
.. //depot/projects/l4bsd/src/sys/ufs/ffs/ffs_snapshot.c#2 integrate
.. //depot/projects/l4bsd/src/sys/ufs/ufs/ufs_vnops.c#3 integrate
.. //depot/projects/l4bsd/src/sys/vm/vm_contig.c#2 integrate
.. //depot/projects/l4bsd/src/sys/vm/vm_object.c#4 integrate
.. //depot/projects/l4bsd/src/sys/vm/vm_page.c#5 integrate
.. //depot/projects/l4bsd/src/sys/vm/vm_page.h#3 integrate
.. //depot/projects/l4bsd/src/sys/vm/vm_pageq.c#3 integrate
.. //depot/projects/l4bsd/src/sys/vm/vm_zeroidle.c#2 integrate
.. //depot/projects/l4bsd/src/tools/regression/lib/msun/Makefile#2 integrate
.. //depot/projects/l4bsd/src/usr.bin/Makefile#2 integrate
.. //depot/projects/l4bsd/src/usr.bin/calendar/calendars/calendar.freebsd#3 integrate
.. //depot/projects/l4bsd/src/usr.bin/gprof/alpha.h#2 delete
.. //depot/projects/l4bsd/src/usr.bin/gprof/gprof.h#2 integrate
.. //depot/projects/l4bsd/src/usr.bin/less/defines.h#2 integrate
.. //depot/projects/l4bsd/src/usr.bin/lessecho/Makefile#2 integrate
.. //depot/projects/l4bsd/src/usr.bin/locate/locate/locate.1#2 integrate
.. //depot/projects/l4bsd/src/usr.bin/pkill/Makefile#2 integrate
.. //depot/projects/l4bsd/src/usr.bin/truss/alpha-fbsd.c#2 delete
.. //depot/projects/l4bsd/src/usr.bin/uac/Makefile#2 delete
.. //depot/projects/l4bsd/src/usr.bin/uac/uac.1#2 delete
.. //depot/projects/l4bsd/src/usr.bin/uac/uac.c#2 delete
.. //depot/projects/l4bsd/src/usr.bin/xlint/arch/alpha/targparam.h#2 delete
.. //depot/projects/l4bsd/src/usr.sbin/Makefile#3 integrate
.. //depot/projects/l4bsd/src/usr.sbin/arp/arp.8#2 integrate
.. //depot/projects/l4bsd/src/usr.sbin/crunch/crunchide/Makefile#2 integrate
.. //depot/projects/l4bsd/src/usr.sbin/newsyslog/newsyslog.c#4 integrate
.. //depot/projects/l4bsd/src/usr.sbin/pnpinfo/Makefile#2 integrate
.. //depot/projects/l4bsd/src/usr.sbin/rpc.lockd/kern.c#4 integrate
.. //depot/projects/l4bsd/src/usr.sbin/rpc.lockd/lockd.c#2 integrate
.. //depot/projects/l4bsd/src/usr.sbin/sysinstall/devices.c#3 integrate
.. //depot/projects/l4bsd/src/usr.sbin/sysinstall/install.c#3 integrate
.. //depot/projects/l4bsd/src/usr.sbin/traceroute/Makefile#2 integrate
Differences ...
==== //depot/projects/l4bsd/Makefile#2 (text+ko) ====
@@ -1,27 +1,32 @@
# Makefile for the L4::BSD project
-# $FreeBSD$
+# R. Tyler Ballance <tyler at freebsd.org>
+# $P4: //depot/projects/l4bsd/Makefile#2 $
#
-# (c) 2006 R. Tyler Ballance - tyler at freebsd.org
.include <bsd.own.mk>
MAINTAINER = tyler at freebsd.org
IGUANA_DIR = iguana-env
-
+FREEBSD_DIR= src
+TARGET = iguana
#############
# Development related variables
#############
QEMU_IMG = c.img
#############
-all:
- cd ${IGUANA_DIR} ; \
- scons machine=pc99 l4bsd=true build/${QEMU_IMG}
+all: freebsd iguana
+
+freebsd:
+ cd ${FREEBSD_DIR} && \
+ ${MAKE} TARGET=${TARGET} TARGET_ARCH=${MACHINE} kernel-toolchain
+ ${MAKE} TARGET=${TARGET} TARGET_ARCH=${MACHINE} buildkernel
+iguana:
+ cd ${IGUANA_DIR} && scons machine=pc99 l4bsd=true build/${QEMU_IMG}
clean:
- cd ${IGUANA_DIR} ; \
- rm -rf build
+ rm -rf ${IGUANA_DIR}/build
sim:
qemu -nographic -boot c -hda ${IGUANA_DIR}/build/${QEMU_IMG}
==== //depot/projects/l4bsd/src/Makefile.inc1#4 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.552 2006/08/09 11:03:06 netchild Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.554 2006/08/24 17:02:26 imp Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -926,9 +926,6 @@
.if ${MK_RESCUE} != "no" || defined(RELEASEDIR)
_crunchide= usr.sbin/crunch/crunchide
.endif
-.if ${TARGET_ARCH} == "alpha"
-_elf2exe= usr.sbin/elf2exe
-.endif
.if ${TARGET_ARCH} == "i386" && defined(RELEASEDIR)
_kgzip= usr.sbin/kgzip
.endif
@@ -941,7 +938,6 @@
usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \
${_btxld} \
${_crunchide} \
- ${_elf2exe} \
${_kgzip}
${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
cd ${.CURDIR}/${_tool}; \
@@ -1036,8 +1032,9 @@
.for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs}
${_lib}__L: .PHONY
.if exists(${.CURDIR}/${_lib})
- ${_+_}@${ECHODIR} "===> ${_lib} (depend,all,install)"; \
+ ${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
cd ${.CURDIR}/${_lib}; \
+ ${MAKE} DIRPRFX=${_lib}/ obj; \
${MAKE} DIRPRFX=${_lib}/ depend; \
${MAKE} DIRPRFX=${_lib}/ all; \
${MAKE} DIRPRFX=${_lib}/ install
@@ -1048,8 +1045,9 @@
# static PAM library, and dynamic PAM library before dynamic PAM
# modules.
lib/libpam__L: .PHONY
- ${_+_}@${ECHODIR} "===> lib/libpam (depend,all,install)"; \
+ ${_+_}@${ECHODIR} "===> lib/libpam (obj,depend,all,install)"; \
cd ${.CURDIR}/lib/libpam; \
+ ${MAKE} DIRPRFX=lib/libpam/ obj; \
${MAKE} DIRPRFX=lib/libpam/ depend; \
${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all; \
${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET install
==== //depot/projects/l4bsd/src/ObsoleteFiles.inc#4 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.47 2006/08/14 18:20:36 netchild Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.49 2006/08/22 11:12:09 flz Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,9 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20060822: ramdisk{,-own} have been replaced by mdconfig{,2}
+OLD_FILES+=etc/rc.d/ramdisk
+OLD_FILES+=etc/rc.d/ramdisk-own
# 20060704: KAME compat file net_osdep.h removed
OLD_FILES+=usr/include/net/net_osdep.h
# 20060517: pcvt removed
@@ -334,7 +337,7 @@
OLD_FILES+=usr/share/man/man1/sgsc.1.gz
OLD_FILES+=usr/share/man/man4/i386/stl.4.gz
OLD_FILES+=usr/share/man/man8/raidctl.8.gz
-.if ${TARGET_ARCH} != "alpha" && ${TARGET_ARCH} != "sparc64"
+.if ${TARGET_ARCH} != "sparc64"
# 20040130: libkse renamed to libpthread
OLD_FILES+=usr/lib/libkse.a
OLD_FILES+=usr/lib/libkse.so
@@ -3066,7 +3069,7 @@
OLD_LIBS+=usr/lib/libisc.so.1
# 200408XX
OLD_LIBS+=usr/lib/snmp_netgraph.so.1
-.if ${TARGET_ARCH} != "alpha" && ${TARGET_ARCH} != "sparc64"
+.if ${TARGET_ARCH} != "sparc64"
# 20040130: libkse renamed to libpthread
OLD_LIBS+=usr/lib/libkse.so.1
.endif
==== //depot/projects/l4bsd/src/UPDATING#4 (text+ko) ====
@@ -21,6 +21,11 @@
developers choose to disable these features on build machines
to maximize performance.
+20060816:
+ The IPFIREWALL_FORWARD_EXTENDED option is gone and the behaviour
+ for IP_FIREWALL_FORWARD is now as it was before when it was first
+ committed and for years after. The behaviour is now ON.
+
20060725:
enigma(1)/crypt(1) utility has been changed on 64 bit architectures.
Now it can decrypt files created from different architectures.
@@ -598,4 +603,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.452 2006/07/26 16:31:10 jkim Exp $
+$FreeBSD: src/UPDATING,v 1.453 2006/08/17 00:41:05 julian Exp $
==== //depot/projects/l4bsd/src/bin/cp/cp.1#2 (text+ko) ====
@@ -30,9 +30,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)cp.1 8.3 (Berkeley) 4/18/94
-.\" $FreeBSD: src/bin/cp/cp.1,v 1.33 2005/02/25 00:40:46 trhodes Exp $
+.\" $FreeBSD: src/bin/cp/cp.1,v 1.35 2006/08/25 09:58:13 ru Exp $
.\"
-.Dd February 23, 2005
+.Dd August 24, 2006
.Dt CP 1
.Os
.Sh NAME
@@ -45,7 +45,7 @@
.Op Fl H | Fl L | Fl P
.Oc
.Op Fl f | i | n
-.Op Fl pv
+.Op Fl lpv
.Ar source_file target_file
.Nm
.Oo
@@ -53,7 +53,7 @@
.Op Fl H | Fl L | Fl P
.Oc
.Op Fl f | i | n
-.Op Fl pv
+.Op Fl lpv
.Ar source_file ... target_directory
.Sh DESCRIPTION
In the first synopsis form, the
@@ -144,6 +144,8 @@
or
.Fl n
options.)
+.It Fl l
+Create hard links to regular files in a hierarchy instead of copying.
.It Fl n
Do not overwrite an existing file.
(The
==== //depot/projects/l4bsd/src/bin/cp/cp.c#3 (text+ko) ====
@@ -42,7 +42,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.53 2006/07/04 20:52:36 maxim Exp $");
+__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.54 2006/08/24 20:45:38 julian Exp $");
/*
* Cp copies source files to target files.
@@ -83,7 +83,7 @@
PATH_T to = { to.p_path, emptystring, "" };
-int fflag, iflag, nflag, pflag, vflag;
+int fflag, iflag, lflag, nflag, pflag, vflag;
static int Rflag, rflag;
volatile sig_atomic_t info;
@@ -102,7 +102,7 @@
char *target;
Hflag = Lflag = Pflag = 0;
- while ((ch = getopt(argc, argv, "HLPRfinprv")) != -1)
+ while ((ch = getopt(argc, argv, "HLPRfinprvl")) != -1)
switch (ch) {
case 'H':
Hflag = 1;
@@ -140,6 +140,9 @@
case 'v':
vflag = 1;
break;
+ case 'l':
+ lflag = 1;
+ break;
default:
usage();
break;
@@ -457,6 +460,9 @@
badcp = rval = 1;
}
break;
+ case S_IFSOCK:
+ warnx("%s is a socket (not copied).",
+ curr->fts_path);
case S_IFIFO:
if (Rflag) {
if (copy_fifo(curr->fts_statp, !dne))
==== //depot/projects/l4bsd/src/bin/cp/extern.h#2 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* @(#)extern.h 8.2 (Berkeley) 4/1/94
- * $FreeBSD: src/bin/cp/extern.h,v 1.20 2005/09/05 04:36:08 csjp Exp $
+ * $FreeBSD: src/bin/cp/extern.h,v 1.21 2006/08/24 20:45:38 julian Exp $
*/
typedef struct {
@@ -37,7 +37,7 @@
} PATH_T;
extern PATH_T to;
-extern int fflag, iflag, nflag, pflag, vflag;
+extern int fflag, iflag, lflag, nflag, pflag, vflag;
extern volatile sig_atomic_t info;
__BEGIN_DECLS
==== //depot/projects/l4bsd/src/bin/cp/utils.c#2 (text+ko) ====
@@ -33,7 +33,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.46 2005/09/05 04:36:08 csjp Exp $");
+__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.49 2006/08/25 09:58:13 ru Exp $");
#include <sys/types.h>
#include <sys/acl.h>
@@ -61,7 +61,7 @@
{
static char buf[MAXBSIZE];
struct stat *fs;
- int ch, checkch, from_fd, rcount, rval, to_fd;
+ int ch, checkch, from_fd = 0, rcount, rval, to_fd = 0;
ssize_t wcount;
size_t wresid;
size_t wtotal;
@@ -109,15 +109,20 @@
/* remove existing destination file name,
* create a new file */
(void)unlink(to.p_path);
- to_fd = open(to.p_path, O_WRONLY | O_TRUNC | O_CREAT,
- fs->st_mode & ~(S_ISUID | S_ISGID));
- } else
- /* overwrite existing destination file name */
- to_fd = open(to.p_path, O_WRONLY | O_TRUNC, 0);
- } else
- to_fd = open(to.p_path, O_WRONLY | O_TRUNC | O_CREAT,
- fs->st_mode & ~(S_ISUID | S_ISGID));
-
+ if (!lflag)
+ to_fd = open(to.p_path, O_WRONLY | O_TRUNC | O_CREAT,
+ fs->st_mode & ~(S_ISUID | S_ISGID));
+ } else {
+ if (!lflag)
+ /* overwrite existing destination file name */
+ to_fd = open(to.p_path, O_WRONLY | O_TRUNC, 0);
+ }
+ } else {
+ if (!lflag)
+ to_fd = open(to.p_path, O_WRONLY | O_TRUNC | O_CREAT,
+ fs->st_mode & ~(S_ISUID | S_ISGID));
+ }
+
if (to_fd == -1) {
warn("%s", to.p_path);
(void)close(from_fd);
@@ -126,77 +131,85 @@
rval = 0;
- /*
- * Mmap and write if less than 8M (the limit is so we don't totally
- * trash memory on big files. This is really a minor hack, but it
- * wins some CPU back.
- */
+ if (!lflag) {
+ /*
+ * Mmap and write if less than 8M (the limit is so we don't totally
+ * trash memory on big files. This is really a minor hack, but it
+ * wins some CPU back.
+ */
#ifdef VM_AND_BUFFER_CACHE_SYNCHRONIZED
- if (S_ISREG(fs->st_mode) && fs->st_size > 0 &&
- fs->st_size <= 8 * 1048576) {
- if ((p = mmap(NULL, (size_t)fs->st_size, PROT_READ,
- MAP_SHARED, from_fd, (off_t)0)) == MAP_FAILED) {
- warn("%s", entp->fts_path);
- rval = 1;
- } else {
- wtotal = 0;
- for (bufp = p, wresid = fs->st_size; ;
- bufp += wcount, wresid -= (size_t)wcount) {
- wcount = write(to_fd, bufp, wresid);
- wtotal += wcount;
- if (info) {
- info = 0;
- (void)fprintf(stderr,
- "%s -> %s %3d%%\n",
- entp->fts_path, to.p_path,
- cp_pct(wtotal, fs->st_size));
-
- }
- if (wcount >= (ssize_t)wresid || wcount <= 0)
- break;
- }
- if (wcount != (ssize_t)wresid) {
- warn("%s", to.p_path);
- rval = 1;
- }
- /* Some systems don't unmap on close(2). */
- if (munmap(p, fs->st_size) < 0) {
+ if (S_ISREG(fs->st_mode) && fs->st_size > 0 &&
+ fs->st_size <= 8 * 1048576) {
+ if ((p = mmap(NULL, (size_t)fs->st_size, PROT_READ,
+ MAP_SHARED, from_fd, (off_t)0)) == MAP_FAILED) {
warn("%s", entp->fts_path);
rval = 1;
+ } else {
+ wtotal = 0;
+ for (bufp = p, wresid = fs->st_size; ;
+ bufp += wcount, wresid -= (size_t)wcount) {
+ wcount = write(to_fd, bufp, wresid);
+ wtotal += wcount;
+ if (info) {
+ info = 0;
+ (void)fprintf(stderr,
+ "%s -> %s %3d%%\n",
+ entp->fts_path, to.p_path,
+ cp_pct(wtotal, fs->st_size));
+
+ }
+ if (wcount >= (ssize_t)wresid || wcount <= 0)
+ break;
+ }
+ if (wcount != (ssize_t)wresid) {
+ warn("%s", to.p_path);
+ rval = 1;
+ }
+ /* Some systems don't unmap on close(2). */
+ if (munmap(p, fs->st_size) < 0) {
+ warn("%s", entp->fts_path);
+ rval = 1;
+ }
}
- }
- } else
+ } else
#endif
- {
- wtotal = 0;
- while ((rcount = read(from_fd, buf, MAXBSIZE)) > 0) {
- for (bufp = buf, wresid = rcount; ;
- bufp += wcount, wresid -= wcount) {
- wcount = write(to_fd, bufp, wresid);
- wtotal += wcount;
- if (info) {
- info = 0;
- (void)fprintf(stderr,
- "%s -> %s %3d%%\n",
- entp->fts_path, to.p_path,
- cp_pct(wtotal, fs->st_size));
-
+ {
+ wtotal = 0;
+ while ((rcount = read(from_fd, buf, MAXBSIZE)) > 0) {
+ for (bufp = buf, wresid = rcount; ;
+ bufp += wcount, wresid -= wcount) {
+ wcount = write(to_fd, bufp, wresid);
+ wtotal += wcount;
+ if (info) {
+ info = 0;
+ (void)fprintf(stderr,
+ "%s -> %s %3d%%\n",
+ entp->fts_path, to.p_path,
+ cp_pct(wtotal, fs->st_size));
+
+ }
+ if (wcount >= (ssize_t)wresid || wcount <= 0)
+ break;
}
- if (wcount >= (ssize_t)wresid || wcount <= 0)
+ if (wcount != (ssize_t)wresid) {
+ warn("%s", to.p_path);
+ rval = 1;
break;
+ }
}
- if (wcount != (ssize_t)wresid) {
- warn("%s", to.p_path);
+ if (rcount < 0) {
+ warn("%s", entp->fts_path);
rval = 1;
- break;
}
}
- if (rcount < 0) {
- warn("%s", entp->fts_path);
+ } else {
+ if (link(entp->fts_path, to.p_path)) {
+ warn("%s", to.p_path);
rval = 1;
}
}
-
+ (void)close(from_fd);
+
/*
* Don't remove the target even after an error. The target might
* not be a regular file, or its attributes might be important,
@@ -204,14 +217,16 @@
* to remove it if we created it and its length is 0.
*/
- if (pflag && setfile(fs, to_fd))
- rval = 1;
- if (pflag && preserve_fd_acls(from_fd, to_fd) != 0)
- rval = 1;
- (void)close(from_fd);
- if (close(to_fd)) {
- warn("%s", to.p_path);
- rval = 1;
+ if (!lflag) {
+ if (pflag && setfile(fs, to_fd))
+ rval = 1;
+ if (pflag && preserve_fd_acls(from_fd, to_fd) != 0)
+ rval = 1;
+ (void)close(from_fd);
+ if (close(to_fd)) {
+ warn("%s", to.p_path);
+ rval = 1;
+ }
}
return (rval);
}
@@ -411,8 +426,8 @@
{
(void)fprintf(stderr, "%s\n%s\n",
-"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-pv] source_file target_file",
-" cp [-R [-H | -L | -P]] [-f | -i | -n] [-pv] source_file ... "
+"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-lpv] source_file target_file",
+" cp [-R [-H | -L | -P]] [-f | -i | -n] [-lpv] source_file ... "
"target_directory");
exit(EX_USAGE);
}
==== //depot/projects/l4bsd/src/bin/date/netdate.c#2 (text+ko) ====
@@ -34,7 +34,7 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/date/netdate.c,v 1.18 2004/04/06 20:06:45 markm Exp $");
+__FBSDID("$FreeBSD: src/bin/date/netdate.c,v 1.19 2006/08/20 06:31:24 imp Exp $");
#include <sys/param.h>
#include <sys/time.h>
@@ -108,14 +108,14 @@
warnx("all ports in use");
goto bad;
}
+ memset(&msg, 0, sizeof(msg));
msg.tsp_type = TSP_SETDATE;
msg.tsp_vers = TSPVERSION;
if (gethostname(hostname, sizeof(hostname))) {
warn("gethostname");
goto bad;
}
- (void)strncpy(msg.tsp_name, hostname, sizeof(msg.tsp_name) - 1);
- msg.tsp_name[sizeof(msg.tsp_name) - 1] = '\0';
+ (void)strlcpy(msg.tsp_name, hostname, sizeof(msg.tsp_name));
msg.tsp_seq = htons((u_short)0);
msg.tsp_time.tv_sec = htonl((u_long)tval);
msg.tsp_time.tv_usec = htonl((u_long)0);
==== //depot/projects/l4bsd/src/bin/df/df.c#2 (text+ko) ====
@@ -44,7 +44,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.64 2005/01/10 08:39:21 imp Exp $");
+__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.65 2006/08/20 06:32:40 imp Exp $");
#include <sys/param.h>
#include <sys/stat.h>
@@ -113,7 +113,7 @@
memset(&totalbuf, 0, sizeof(totalbuf));
totalbuf.f_bsize = DEV_BSIZE;
- strncpy(totalbuf.f_mntfromname, "total", MNAMELEN);
+ strlcpy(totalbuf.f_mntfromname, "total", MNAMELEN);
vfslist = NULL;
while ((ch = getopt(argc, argv, "abcgHhiklmnPt:")) != -1)
switch (ch) {
@@ -552,7 +552,7 @@
*str = 'n'; *(str + 1) = 'o';
for (i = 0, strptr = str + 2; i < cnt; i++, strptr++) {
- strncpy(strptr, listptr[i], 32);
+ strlcpy(strptr, listptr[i], 32);
strptr += strlen(listptr[i]);
*strptr = ',';
free(listptr[i]);
==== //depot/projects/l4bsd/src/bin/ed/main.c#2 (text+ko) ====
@@ -35,7 +35,7 @@
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ed/main.c,v 1.28 2005/02/09 17:37:37 ru Exp $");
+__FBSDID("$FreeBSD: src/bin/ed/main.c,v 1.29 2006/08/17 23:00:33 imp Exp $");
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list