PERFORCE change 142268 for review
Edward Tomasz Napierala
trasz at FreeBSD.org
Sun May 25 17:14:44 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=142268
Change 142268 by trasz at trasz_traszkan on 2008/05/25 17:14:36
IFC
Affected files ...
.. //depot/projects/soc2008/trasz_nfs4acl/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/Makefile.inc1#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/cddl/compat/opensolaris/include/dtrace.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/cddl/compat/opensolaris/include/libproc.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/cddl/lib/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/cddl/lib/drti/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/cddl/lib/libctf/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/cddl/lib/libdtrace/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/cddl/lib/libdtrace/errno.d#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/cddl/lib/libdtrace/net.d#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/cddl/lib/libdtrace/nfs.d#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/cddl/lib/libdtrace/psinfo.d#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/cddl/lib/libdtrace/sched.d#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/cddl/lib/libdtrace/signal.d#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/cddl/lib/libdtrace/unistd.d#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/cddl/usr.bin/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/cddl/usr.bin/ctfconvert/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/cddl/usr.bin/ctfdump/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/cddl/usr.bin/ctfmerge/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/cddl/usr.bin/sgsmsg/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/cddl/usr.sbin/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/cddl/usr.sbin/dtrace/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/etc/portsnap.conf#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/netif#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/routing#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/gdb/kgdb/trgt_mips.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/include/protocols/dumprestore.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_entry_strmode.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_data_into_fd.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_format_mtree.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libdwarf/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libdwarf/_libdwarf.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libdwarf/dwarf.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libdwarf/dwarf_abbrev.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libdwarf/dwarf_attr.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libdwarf/dwarf_attrval.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libdwarf/dwarf_cu.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libdwarf/dwarf_dealloc.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libdwarf/dwarf_die.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libdwarf/dwarf_dump.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libdwarf/dwarf_errmsg.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libdwarf/dwarf_errno.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libdwarf/dwarf_finish.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libdwarf/dwarf_form.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libdwarf/dwarf_init.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libdwarf/dwarf_loc.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libdwarf/libdwarf.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libelf/elf_strptr.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libelf/libelf_align.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libelf/libelf_data.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libgeom/geom_util.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libgeom/libgeom.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libproc/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libproc/_libproc.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libproc/libproc.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libproc/proc_create.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libproc/proc_sym.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libproc/proc_util.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/dump/dump.8#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/dump/dump.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/dump/itime.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/dump/main.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/dump/traverse.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/restore/dirs.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/restore/tape.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/swapon/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/swapon/swapon.8#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/swapon/swapon.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man3/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man3/queue.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/age.4#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/altq.4#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/man4.i386/acpi_sony.4#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/miibus.4#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/vlan.4#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/portsnap.conf.5#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/pmap.9#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/pmap_addr_hint.9#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/taskqueue.9#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/misc/committers-doc.dot#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/misc/committers-src.dot#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/mk/bsd.lib.mk#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/mk/bsd.libnames.mk#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/mk/bsd.prog.mk#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/mk/sys.mk#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/timedef/hu_HU.ISO8859-2.src#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/timedef/hu_HU.UTF-8.src#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/exception.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/genassym.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/identcpu.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/local_apic.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/pmap.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/trap.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/conf/GENERIC#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/identcpu.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/pmap.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/forth/loader.conf#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_cmn_err.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/machine/endian.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/atomic.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/cmn_err.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/cpuvar.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/cpuvar_defs.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/cyclic.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/cyclic_impl.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/feature_tests.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/kmem.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/pcpu.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/sema.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/ctf/ctf_mod.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/ctf/ctf_subr.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/dtrace/lockstat.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/dtrace/profile.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/dtrace/sdt_subr.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/dtrace/systrace.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/sys/cmn_err.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/sys/cpupart.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/sys/ctf.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/sys/ctf_api.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/sys/sdt.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/sys/vmem.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/intel/sys/fasttrap_isa.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/sparc/sys/fasttrap_isa.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/cyclic/amd64/cyclic_machdep.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/cyclic/cyclic.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/cyclic/cyclic_test.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/cyclic/i386/cyclic_machdep.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/dtmalloc/dtmalloc.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/dtrace/amd64/dis_tables.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/dtrace/amd64/dis_tables.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/dtrace/amd64/dtrace_asm.S#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/dtrace/amd64/dtrace_isa.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/dtrace/amd64/instr_size.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/dtrace/dtrace_anon.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/dtrace/dtrace_cddl.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/dtrace/dtrace_clone.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/dtrace/dtrace_debug.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/dtrace/dtrace_hacks.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/dtrace/dtrace_ioctl.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/dtrace/dtrace_load.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/dtrace/dtrace_modevent.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/dtrace/dtrace_sysctl.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/dtrace/dtrace_test.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/dtrace/dtrace_unload.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/dtrace/dtrace_vtime.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/dtrace/i386/dis_tables.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/dtrace/i386/dis_tables.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/dtrace/i386/dtrace_asm.S#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/dtrace/i386/dtrace_isa.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/dtrace/i386/dtrace_subr.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/dtrace/i386/instr_size.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/fbt/fbt.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/profile/profile.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/prototype.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/sdt/sdt.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/systrace/systrace.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/Makefile.amd64#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/NOTES#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/kern.post.mk#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/kern.pre.mk#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options.amd64#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpi_support/acpi_ibm.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpi_support/acpi_sony.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/age/if_age.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/age/if_agereg.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/age/if_agevar.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/em/if_em.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ixgbe/LICENSE#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ixgbe/README#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ixgbe/ixgbe.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ixgbe/ixgbe.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ixgbe/ixgbe_82598.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ixgbe/ixgbe_api.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ixgbe/ixgbe_api.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ixgbe/ixgbe_common.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ixgbe/ixgbe_common.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ixgbe/ixgbe_osdep.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ixgbe/ixgbe_phy.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ixgbe/ixgbe_phy.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ixgbe/ixgbe_type.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ixgbe/tcp_lro.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ixgbe/tcp_lro.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/atphy.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/atphyreg.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/miidevs#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/puc/pucdata.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/midi/sequencer.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/hda/hdac.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/umass.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usbdevs#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/uscanner.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/uxb360gp_rdesc.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/devfs/devfs_int.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/devfs/devfs_vnops.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/fdescfs/fdesc.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/fdescfs/fdesc_vfsops.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/fdescfs/fdesc_vnops.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/udf/udf_vnops.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/geom_subr.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_share.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/GENERIC#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/exception.s#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/genassym.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/identcpu.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/local_apic.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/pmap.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/trap.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/isa/clock.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/interrupt.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/machdep.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/pmap.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_conf.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_ctf.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_descrip.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_dtrace.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_exec.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_exit.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_fork.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_linker.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_lock.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_malloc.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_proc.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_sdt.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_sig.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/link_elf.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/link_elf_obj.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/linker_if.m#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sched_4bsd.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sched_ule.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_bus.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_smp.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sys_pipe.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty_cons.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty_subr.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_sem.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_syscalls.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_mount.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips/pmap.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/age/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/cyclic/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/dtrace/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/dtrace/Makefile.inc#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/dtrace/dtmalloc/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/dtrace/dtrace/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/dtrace/dtrace_test/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/dtrace/dtraceall/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/dtrace/dtraceall/dtraceall.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/dtrace/fasttrap/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/dtrace/fbt/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/dtrace/lockstat/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/dtrace/profile/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/dtrace/prototype/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/dtrace/sdt/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/dtrace/systrace/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/iwn/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/ixgbe/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/mii/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/opensolaris/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_adhoc.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_node.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_proto.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_wds.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_dummynet.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/raw_ip.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_asconf.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_asconf.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_cc_functions.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_constants.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_indata.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_input.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_input.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_lock_bsd.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_os_bsd.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_output.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_output.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_pcb.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_pcb.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_structs.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_sysctl.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_sysctl.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_timer.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_uio.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_usrreq.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_var.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctputil.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctputil.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/udp_usrreq.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_input.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_var.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/sctp6_usrreq.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/ipsec.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/ipsec.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/ipsec_input.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/ipsec_osdep.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/ipsec_output.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/xform_ah.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/xform_esp.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/xform_ipcomp.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/xform_ipip.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/cbus/clock.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/conf/GENERIC#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/aim/machdep.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/aim/mmu_oea.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/booke/machdep.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/booke/pmap.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/conf/GENERIC#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powerpc/genassym.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powerpc/mmu_if.m#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_worker.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/conf/GENERIC#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/identcpu.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/pmap.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sun4v/conf/GENERIC#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sun4v/sun4v/pmap.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/clist.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/conf.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/cons.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/dtrace_bsd.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/file.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/kdb.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/kernel.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/linker.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/malloc.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/pipe.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/proc.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/queue.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/sdt.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/smp.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/systm.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/time.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/tty.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_vfsops.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/fs.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_lookup.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/device_pager.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/pmap.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_mmap.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_object.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_object.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vnode_pager.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/doat/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/doat/README#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/doat/doat.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/tools/test/README#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/test/dtrace/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/net80211/wlanwatch/wlanwatch.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/calendar/calendars/calendar.freebsd#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/getopt/README#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/sockstat/sockstat.1#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/sockstat/sockstat.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tar/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tar/bsdtar.1#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tar/bsdtar.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tar/bsdtar.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tar/read.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tar/siginfo.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tar/write.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/truss/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/truss/amd64-fbsd32.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/truss/amd64-linux32.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/truss/amd64linux32.conf#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/truss/extern.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/truss/fbsd32.conf#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/truss/main.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/acpi/iasl/iasl.8#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/config/mkmakefile.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/portsnap/portsnap/portsnap.sh#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sade/termcap.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sysinstall/devices.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sysinstall/termcap.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/wlandebug/wlandebug.8#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/wlandebug/wlandebug.c#2 integrate
Differences ...
==== //depot/projects/soc2008/trasz_nfs4acl/Makefile#2 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile,v 1.348 2008/04/29 09:08:33 rwatson Exp $
+# $FreeBSD: src/Makefile,v 1.350 2008/05/25 02:48:57 jb Exp $
#
# The user-driven targets are:
#
@@ -275,7 +275,7 @@
# existing system is.
#
.if make(universe)
-TARGETS?=amd64 arm i386 ia64 pc98 powerpc sparc64 sun4v
+TARGETS?=amd64 arm i386 ia64 pc98 powerpc sparc64
universe: universe_prologue
universe_prologue:
@@ -290,12 +290,14 @@
universe: universe_${target}
.ORDER: universe_prologue universe_${target} universe_epilogue
universe_${target}:
+.if !defined(MAKE_JUST_KERNELS)
@echo ">> ${target} started on `LC_ALL=C date`"
-cd ${.CURDIR} && ${MAKE} ${JFLAG} buildworld \
TARGET=${target} \
__MAKE_CONF=/dev/null \
> _.${target}.buildworld 2>&1
@echo ">> ${target} buildworld completed on `LC_ALL=C date`"
+.endif
.if exists(${.CURDIR}/sys/${target}/conf/NOTES)
-cd ${.CURDIR}/sys/${target}/conf && ${MAKE} LINT \
> ${.CURDIR}/_.${target}.makeLINT 2>&1
==== //depot/projects/soc2008/trasz_nfs4acl/Makefile.inc1#2 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.604 2008/05/07 13:52:56 dfr Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.605 2008/05/23 04:22:14 jb Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -10,6 +10,7 @@
# -DNO_KERNELDEPEND do not run ${MAKE} depend in ${MAKE} buildkernel
# -DNO_PORTSUPDATE do not update ports in ${MAKE} update
# -DNO_DOCUPDATE do not update doc in ${MAKE} update
+# -DNO_CTF do not run the DTrace CTF conversion tools on built objects
# LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list
# TARGET="machine" to crossbuild world for a different machine type
@@ -42,6 +43,8 @@
.endif
.if ${MK_CDDL} != "no"
SUBDIR+=cddl
+.else
+NO_CTF=1
.endif
SUBDIR+=gnu include
.if ${MK_KERBEROS} != "no"
@@ -102,6 +105,11 @@
.endif
.endif
+.if !defined(VERSION)
+VERSION!= uname -srp
+VERSION+= ${OSRELDATE}
+.endif
+
# Guess machine architecture from machine type, and vice versa.
.if !defined(TARGET_ARCH) && defined(TARGET)
TARGET_ARCH= ${TARGET:S/pc98/i386/:S/sun4v/sparc64/}
@@ -211,6 +219,7 @@
BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \
PATH=${BPATH}:${PATH} \
WORLDTMP=${WORLDTMP} \
+ VERSION="${VERSION}" \
MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}"
BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \
${BMAKEENV} ${MAKE} -f Makefile.inc1 \
@@ -218,14 +227,15 @@
BOOTSTRAPPING=${OSRELDATE} \
-DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \
-DWITHOUT_NLS -DNO_PIC -DWITHOUT_PROFILE -DNO_SHARED \
- -DNO_CPU_CFLAGS -DNO_WARNS
+ -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF
# build-tools stage
TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \
${BMAKEENV} ${MAKE} -f Makefile.inc1 \
TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
DESTDIR= \
- BOOTSTRAPPING=${OSRELDATE} -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS
+ BOOTSTRAPPING=${OSRELDATE} -DNO_LINT -DNO_CPU_CFLAGS \
+ -DNO_WARNS -DNO_CTF
# cross-tools stage
XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
@@ -235,8 +245,12 @@
# world stage
WMAKEENV= ${CROSSENV} \
_SHLIBDIRPREFIX=${WORLDTMP} \
+ VERSION="${VERSION}" \
INSTALL="sh ${.CURDIR}/tools/install.sh" \
PATH=${TMPPATH}
+.if ${MK_CDDL} == "no" || defined(NO_CTF)
+WMAKEENV+= NO_CTF=1
+.endif
WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP}
.if ${TARGET_ARCH} == "amd64"
@@ -256,6 +270,7 @@
# Yes, the flags are redundant.
LIB32WMAKEENV= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \
_SHLIBDIRPREFIX=${LIB32TMP} \
+ VERSION="${VERSION}" \
MACHINE=i386 \
MACHINE_ARCH=i386 \
INSTALL="sh ${.CURDIR}/tools/install.sh" \
@@ -270,7 +285,7 @@
LIB32WMAKE= ${LIB32WMAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \
-DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_INFO \
- -DWITHOUT_HTML DESTDIR=${LIB32TMP}
+ -DWITHOUT_HTML -DNO_CTF DESTDIR=${LIB32TMP}
LIB32IMAKE= ${LIB32WMAKE:NINSTALL=*:NDESTDIR=*} -DNO_INCS
.endif
@@ -471,10 +486,15 @@
distribute32 install32:
.if make(distribute32)
mkdir -p ${DISTDIR}/${DISTRIBUTION}/usr/lib32 # XXX add to mtree
+ mkdir -p ${DISTDIR}/${DISTRIBUTION}/usr/lib32/dtrace # XXX add to mtree
.else
mkdir -p ${DESTDIR}/usr/lib32 # XXX add to mtree
+ mkdir -p ${DESTDIR}/usr/lib32/dtrace # XXX add to mtree
.endif
cd ${.CURDIR}/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
+.if ${MK_CDDL} != "no"
+ cd ${.CURDIR}/cddl/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
+.endif
cd ${.CURDIR}/gnu/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
.if ${MK_CRYPT} != "no"
cd ${.CURDIR}/secure/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
@@ -740,13 +760,14 @@
@echo "--------------------------------------------------------------"
cd ${KRNLOBJDIR}/${_kernel}; \
MAKESRCPATH=${KERNSRCDIR}/dev/aic7xxx/aicasm \
- ${MAKE} -DNO_CPU_CFLAGS -f ${KERNSRCDIR}/dev/aic7xxx/aicasm/Makefile
+ ${MAKE} -DNO_CPU_CFLAGS -DNO_CTF \
+ -f ${KERNSRCDIR}/dev/aic7xxx/aicasm/Makefile
# XXX - Gratuitously builds aicasm in the ``makeoptions NO_MODULES'' case.
.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KERNSRCDIR}/modules)
.for target in obj depend all
cd ${KERNSRCDIR}/modules/aic7xxx/aicasm; \
MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \
- ${MAKE} -DNO_CPU_CFLAGS ${target}
+ ${MAKE} -DNO_CPU_CFLAGS -DNO_CTF ${target}
.endfor
.endif
.if !defined(NO_KERNELDEPEND)
@@ -892,8 +913,14 @@
_crunchgen= usr.sbin/crunch/crunchgen
.endif
+.if ${MK_CDDL} != "no"
+_dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \
+ lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge
+.endif
+
bootstrap-tools:
.for _tool in \
+ ${_dtrace_tools} \
${_strfile} \
${_gperf} \
${_groff} \
@@ -1038,15 +1065,16 @@
_prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libkrb5} \
${_kerberos5_lib_libhx509} ${_kerberos5_lib_libroken} \
${_kerberos5_lib_libheimntlm} ${_kerberos5_lib_libgssapi_krb5} \
- lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \
- ${_lib_libgssapi} ${_lib_libipx} \
+ lib/libbz2 lib/libcom_err lib/libcrypt lib/libelf \
+ lib/libexpat \
+ ${_lib_cddl} ${_lib_libgssapi} ${_lib_libipx} \
lib/libkiconv lib/libkvm lib/libmd \
lib/ncurses/ncurses lib/ncurses/ncursesw \
lib/libopie lib/libpam ${_lib_libthr} \
lib/libradius lib/libsbuf lib/libtacplus lib/libutil \
${_lib_libypclnt} lib/libz lib/msun \
${_secure_lib_libcrypto} ${_secure_lib_libssh} \
- ${_secure_lib_libssl}
+ ${_secure_lib_libssl} lib/libdwarf lib/libproc
.if ${MK_LIBTHR} != "no"
_lib_libthr= lib/libthr
==== //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 (text+ko) ====
@@ -61,7 +61,6 @@
#include <time.h>
#include <math.h>
#include <umem.h>
-#include <vmem.h>
#include <fsshare.h>
#include <sys/note.h>
#include <sys/types.h>
==== //depot/projects/soc2008/trasz_nfs4acl/cddl/lib/Makefile#2 (text+ko) ====
@@ -1,8 +1,11 @@
-# $FreeBSD: src/cddl/lib/Makefile,v 1.8 2008/03/29 17:44:40 ru Exp $
+# $FreeBSD: src/cddl/lib/Makefile,v 1.9 2008/05/22 04:26:42 jb Exp $
.include <bsd.own.mk>
-SUBDIR= libavl \
+SUBDIR= drti \
+ libavl \
+ libctf \
+ libdtrace \
libnvpair \
libumem \
libuutil \
==== //depot/projects/soc2008/trasz_nfs4acl/cddl/usr.bin/Makefile#2 (text+ko) ====
@@ -1,8 +1,13 @@
-# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.8 2008/03/29 17:44:40 ru Exp $
+# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.9 2008/05/22 08:04:48 jb Exp $
.include <bsd.own.mk>
-SUBDIR= ${_ztest}
+SUBDIR= \
+ ctfconvert \
+ ctfdump \
+ ctfmerge \
+ sgsmsg \
+ ${_ztest}
.if ${MK_ZFS} != "no"
.if ${MK_LIBTHR} != "no"
==== //depot/projects/soc2008/trasz_nfs4acl/cddl/usr.sbin/Makefile#2 (text+ko) ====
@@ -1,8 +1,9 @@
-# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.8 2008/03/29 17:44:40 ru Exp $
+# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.9 2008/05/22 23:06:19 jb Exp $
.include <bsd.own.mk>
-SUBDIR= ${_zdb}
+SUBDIR= dtrace \
+ ${_zdb}
.if ${MK_ZFS} != "no"
.if ${MK_LIBTHR} != "no"
==== //depot/projects/soc2008/trasz_nfs4acl/etc/portsnap.conf#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/portsnap.conf,v 1.3 2006/01/18 03:40:57 cperciva Exp $
+# $FreeBSD: src/etc/portsnap.conf,v 1.4 2008/05/17 16:26:27 cperciva Exp $
# Default directory where compressed snapshots are stored.
# WORKDIR=/var/db/portsnap
@@ -28,3 +28,8 @@
#
# REFUSE arabic chinese french german hebrew hungarian japanese
# REFUSE korean polish portuguese russian ukrainian vietnamese
+
+# List of INDEX files to build and the DESCRIBE file to use for each
+INDEX INDEX-5 DESCRIBE.5
+INDEX INDEX-6 DESCRIBE.6
+INDEX INDEX-7 DESCRIBE.7
==== //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/netif#2 (text+ko) ====
@@ -22,7 +22,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-# $FreeBSD: src/etc/rc.d/netif,v 1.27 2008/05/15 01:06:10 brooks Exp $
+# $FreeBSD: src/etc/rc.d/netif,v 1.28 2008/05/18 02:57:54 brooks Exp $
#
# PROVIDE: netif
@@ -70,29 +70,6 @@
# Configure the interface(s).
network_common ifn_start
- if [ -z "$cmdifn" ]; then
- dhcp_interfaces=`list_net_interfaces dhcp`
- if [ -n "${dhcp_interfaces}" ]; then
- delay=${if_up_delay}
- while [ ${delay} -gt 0 ]; do
- defif=`get_default_if -inet`
- if [ -n "${defif}" ]; then
- if [ ${delay} -ne ${if_up_delay} ]; then
- echo "($defif)"
- fi
- break
- fi
- if [ ${delay} -eq ${if_up_delay} ]; then
- echo -n "Waiting for an interface to come up: "
- else
- echo -n .
- fi
- sleep 1
- delay=`expr $delay - 1`
- done
- fi
- fi
-
if [ -f /etc/rc.d/ipfilter ] ; then
# Resync ipfilter
/etc/rc.d/ipfilter quietresync
==== //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/routing#2 (text+ko) ====
@@ -2,14 +2,15 @@
#
# Configure routing and miscellaneous network tunables
#
-# $FreeBSD: src/etc/rc.d/routing,v 1.143 2007/05/02 15:49:30 mtm Exp $
+# $FreeBSD: src/etc/rc.d/routing,v 1.144 2008/05/18 02:57:54 brooks Exp $
#
# PROVIDE: routing
-# REQUIRE: netif ppp
+# REQUIRE: devd netif ppp
# KEYWORD: nojail
. /etc/rc.subr
+. /etc/network.subr
name="routing"
start_cmd="routing_start"
@@ -22,6 +23,31 @@
{
static_start
options_start
+
+ # Return without waiting if we don't have dhcp interfaces.
+ # Once we can test that the link is actually up, we should
+ # remove this test and always wait.
+ dhcp_interfaces=`list_net_interfaces dhcp`
+ [ -z "`list_net_interfaces dhcp`" ] && return
+
+ # Wait for a default route
+ delay=${if_up_delay}
+ while [ ${delay} -gt 0 ]; do
+ defif=`get_default_if -inet`
+ if [ -n "${defif}" ]; then
+ if [ ${delay} -ne ${if_up_delay} ]; then
+ echo "($defif)"
+ fi
+ break
+ fi
+ if [ ${delay} -eq ${if_up_delay} ]; then
+ echo -n "Waiting ${delay}s for an interface to come up: "
+ else
+ echo -n .
+ fi
+ sleep 1
+ delay=`expr $delay - 1`
+ done
}
routing_stop()
==== //depot/projects/soc2008/trasz_nfs4acl/include/protocols/dumprestore.h#2 (text+ko) ====
@@ -37,7 +37,7 @@
*
* @(#)dumprestore.h 8.2 (Berkeley) 1/21/94
*
- * $FreeBSD: src/include/protocols/dumprestore.h,v 1.11 2007/02/26 08:15:56 mckusick Exp $
+ * $FreeBSD: src/include/protocols/dumprestore.h,v 1.12 2008/05/24 05:20:46 mckusick Exp $
*/
#ifndef _PROTOCOLS_DUMPRESTORE_H_
@@ -134,13 +134,4 @@
#define TS_CLRI 6 /* map of inodes deleted since last dump */
#define TS_END 5 /* end of volume marker */
-/*
- * flag values
- */
-/* None at the moment */
-
-#define DUMPOUTFMT "%-32s %c %s" /* for printf */
- /* name, level, ctime(date) */
-#define DUMPINFMT "%32s %c %[^\n]\n" /* inverse for scanf */
-
#endif /* !_DUMPRESTORE_H_ */
==== //depot/projects/soc2008/trasz_nfs4acl/lib/Makefile#2 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.229 2008/03/12 09:49:39 jeff Exp $
+# $FreeBSD: src/lib/Makefile,v 1.230 2008/05/22 04:22:43 jb Exp $
.include <bsd.own.mk>
@@ -30,11 +30,11 @@
${_libypclnt} libalias libarchive ${_libatm} \
libbegemot ${_libbluetooth} libbsnmp libbz2 \
libcalendar libcam libcompat libdevinfo libdevstat libdisk \
- libedit libexpat libfetch libftpio libgeom ${_libgpib} \
+ libdwarf libedit libexpat libfetch libftpio libgeom ${_libgpib} \
${_libgssapi} libipsec \
${_libipx} libkiconv libmagic libmemstat ${_libmilter} ${_libmp} \
${_libncp} ${_libngatm} libopie libpam libpcap \
- libpmc librt ${_libsdp} ${_libsm} ${_libsmb} \
+ libpmc libproc librt ${_libsdp} ${_libsm} ${_libsmb} \
${_libsmdb} \
${_libsmutil} libstand libtelnet ${_libthr} libthread_db libufs \
libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind}
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_entry_strmode.c#2 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_strmode.c,v 1.2 2008/02/19 05:49:02 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_strmode.c,v 1.3 2008/05/23 04:57:28 cperciva Exp $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
@@ -39,7 +39,6 @@
const char *
archive_entry_strmode(struct archive_entry *entry)
{
- static const char *perms = "?rwxrwxrwx ";
static const mode_t permbits[] =
{ 0400, 0200, 0100, 0040, 0020, 0010, 0004, 0002, 0001 };
char *bp = entry->strmode;
@@ -47,7 +46,7 @@
int i;
/* Fill in a default string, then selectively override. */
- strcpy(bp, perms);
+ strcpy(bp, "?rwxrwxrwx ");
mode = archive_entry_mode(entry);
switch (archive_entry_filetype(entry)) {
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_data_into_fd.c#2 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_data_into_fd.c,v 1.15 2007/04/02 00:21:46 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_data_into_fd.c,v 1.16 2008/05/23 05:01:29 cperciva Exp $");
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -64,8 +64,12 @@
ARCHIVE_OK) {
const char *p = buff;
if (offset > output_offset) {
- lseek(fd, offset - output_offset, SEEK_CUR);
- output_offset = offset;
+ output_offset = lseek(fd,
+ offset - output_offset, SEEK_CUR);
+ if (output_offset != offset) {
+ archive_set_error(a, errno, "Seek error");
+ return (ARCHIVE_FATAL);
+ }
}
while (size > 0) {
bytes_to_write = size;
@@ -74,7 +78,7 @@
bytes_written = write(fd, p, bytes_to_write);
if (bytes_written < 0) {
archive_set_error(a, errno, "Write error");
- return (-1);
+ return (ARCHIVE_FATAL);
}
output_offset += bytes_written;
total_written += bytes_written;
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_format_mtree.c#2 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_mtree.c,v 1.4 2008/03/15 11:02:47 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_mtree.c,v 1.5 2008/05/19 18:06:48 cperciva Exp $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
@@ -596,6 +596,7 @@
archive_set_error(&a->archive, ENOMEM,
"Can't allocate memory");
}
+ return (ARCHIVE_FATAL);
}
*buff = mtree->buff;
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libelf/elf_strptr.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libelf/elf_strptr.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $");
+__FBSDID("$FreeBSD: src/lib/libelf/elf_strptr.c,v 1.2 2008/05/23 07:35:36 jb Exp $");
#include <sys/param.h>
@@ -55,7 +55,7 @@
gelf_getshdr(s, &shdr) == NULL)
return (NULL);
- if (shdr.sh_type != SHT_STRTAB ||
+ if (/*shdr.sh_type != SHT_STRTAB || */
offset >= shdr.sh_size) {
LIBELF_SET_ERROR(ARGUMENT, 0);
return (NULL);
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libelf/libelf_align.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libelf/libelf_align.c,v 1.2 2006/12/18 05:36:23 jkoshy Exp $");
+__FBSDID("$FreeBSD: src/lib/libelf/libelf_align.c,v 1.3 2008/05/23 07:33:45 jb Exp $");
#include <sys/types.h>
@@ -122,7 +122,7 @@
#endif
[ELF_T_MOVEP] = UNSUPPORTED(),
#if __FreeBSD_version >= 700025
- [ELF_T_NOTE] = FALIGN(4,4),
+ [ELF_T_NOTE] = FALIGN(1,1),
#endif
[ELF_T_OFF] = FALIGN(4,8),
[ELF_T_PHDR] = FALIGN(4,8),
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libelf/libelf_data.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libelf/libelf_data.c,v 1.3 2007/11/23 11:29:36 jkoshy Exp $");
+__FBSDID("$FreeBSD: src/lib/libelf/libelf_data.c,v 1.4 2008/05/23 07:32:19 jb Exp $");
#include <libelf.h>
#include <osreldate.h>
@@ -78,6 +78,8 @@
case SHT_SUNW_syminfo:
return (ELF_T_SYMINFO);
#endif
+ case SHT_AMD64_UNWIND: /* == SHT_IA_64_UNWIND */
+ return (ELF_T_BYTE);
default:
return (-1);
}
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libgeom/geom_util.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libgeom/geom_util.c,v 1.1 2007/05/06 01:17:46 pjd Exp $");
+__FBSDID("$FreeBSD: src/lib/libgeom/geom_util.c,v 1.2 2008/05/20 11:45:05 pjd Exp $");
#include <sys/param.h>
#include <sys/disk.h>
@@ -46,7 +46,7 @@
* Open the given provider and at least check if this is a block device.
*/
int
-g_open(const char *name, int write)
+g_open(const char *name, int dowrite)
{
char path[MAXPATHLEN];
int fd;
@@ -56,7 +56,7 @@
else
snprintf(path, sizeof(path), "%s%s", _PATH_DEV, name);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list