PERFORCE change 121910 for review
Ulf Lilleengen
lulf at FreeBSD.org
Mon Jun 18 11:47:56 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=121910
Change 121910 by lulf at lulf_carrot on 2007/06/18 11:47:13
- Integrate my main gvinum SoC branch.
Affected files ...
.. //depot/projects/soc2007/lulf/gvinum_main/Makefile#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/Makefile.inc1#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sbin/Makefile#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sbin/gvinum/gvinum.c#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.amd64#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.arm#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.i386#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.ia64#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.pc98#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.powerpc#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.sparc64#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.sun4v#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/NOTES#4 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/files#4 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/files.amd64#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/files.i386#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/files.pc98#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/files.sparc64#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/files.sun4v#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/kern.mk#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/kern.pre.mk#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/kmod.mk#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/options#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/options.arm#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/cache/g_cache.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/eli/g_eli.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/geom_kern.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/journal/g_journal.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/mirror/g_mirror.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/part/g_part.c#4 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/part/g_part_apm.c#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/part/g_part_gpt.c#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/part/g_part_mbr.c#1 branch
.. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/raid3/g_raid3.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/stripe/g_stripe.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum.c#4 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum.h#4 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum_init.c#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum_plex.c#4 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum_raid5.c#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum_rm.c#4 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum_share.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum_state.c#5 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum_subr.c#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum_var.h#5 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum_volume.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/Makefile#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/conf/DEFAULTS#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/conf/GENERIC#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/conf/PAE#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/busdma_machdep.c#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/elan-mmcr.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/elf_machdep.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/genassym.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/identcpu.c#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/intr_machdep.c#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/io_apic.c#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/machdep.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/mp_clock.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/mp_machdep.c#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/mp_watchdog.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/pmap.c#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/support.s#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/swtch.s#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/sys_machdep.c#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/trap.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/tsc.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/vm_machdep.c#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/imgact_coff.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/kdb.h#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/pcpu.h#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/proc.h#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/smp.h#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/specialreg.h#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/vmparam.h#4 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/isa/clock.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/isa/npx.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/linux/linux_machdep.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/linux/linux_support.s#1 branch
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/Make.tags.inc#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/imgact_elf.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/init_main.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_acct.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_alq.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_clock.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_condvar.c#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_conf.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_cpu.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_descrip.c#4 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_event.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_exec.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_exit.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_fork.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_idle.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_intr.c#4 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_kse.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_kthread.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_ktrace.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_linker.c#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_lock.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_lockf.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_malloc.c#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_mbuf.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_mib.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_mtxpool.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_mutex.c#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_poll.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_priv.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_proc.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_prot.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_resource.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_rwlock.c#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_shutdown.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_sig.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_subr.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_switch.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_sx.c#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_synch.c#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_sysctl.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_tc.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_thr.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_thread.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_time.c#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_timeout.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_umtx.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/ksched.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/link_elf.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/link_elf_obj.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/sched_4bsd.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/sched_core.c#2 delete
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/sched_ule.c#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_acl_posix1e.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_bus.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_lock.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_mbpool.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_prof.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_sleepqueue.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_smp.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_taskqueue.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_trap.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_turnstile.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_witness.c#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/sys_generic.c#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/sys_pipe.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/sys_process.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/sysv_ipc.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/sysv_msg.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/tty.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/tty_cons.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/uipc_domain.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/uipc_mbuf.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/uipc_mqueue.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/uipc_sockbuf.c#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/uipc_socket.c#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/uipc_syscalls.c#4 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/uipc_usrreq.c#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/vfs_aio.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/vfs_bio.c#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/vfs_cache.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/vfs_cluster.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/vfs_default.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/vfs_lookup.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/vfs_mount.c#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/vfs_subr.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/vfs_syscalls.c#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/vfs_vnops.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/vnode_if.src#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/modules/Makefile#4 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/acct.h#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/callout.h#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/conf.h#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/filedesc.h#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/lock_profile.h#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/lockf.h#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/mbuf.h#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/mutex.h#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/param.h#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/pcpu.h#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/priv.h#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/proc.h#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/resource.h#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/resourcevar.h#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/sched.h#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/socket.h#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/sx.h#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/syscallsubr.h#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/sysctl.h#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/sysent.h#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/syslimits.h#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/systm.h#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/thr.h#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/turnstile.h#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/ucred.h#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/umtx.h#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/vmmeter.h#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/vnode.h#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/swap_pager.c#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/uma_core.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/uma_int.h#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_contig.c#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_fault.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_glue.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_map.c#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_meter.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_mmap.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_object.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_page.c#3 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_pageout.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_pageq.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_phys.c#1 branch
.. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_phys.h#1 branch
.. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_zeroidle.c#2 integrate
.. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vnode_pager.c#2 integrate
Differences ...
==== //depot/projects/soc2007/lulf/gvinum_main/Makefile#2 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile,v 1.340 2007/04/02 21:32:44 marcel Exp $
+# $FreeBSD: src/Makefile,v 1.341 2007/05/16 08:46:35 des Exp $
#
# The user-driven targets are:
#
@@ -17,9 +17,14 @@
# kernel - buildkernel + installkernel.
# doxygen - Build API documentation of the kernel, needs doxygen.
# update - Convenient way to update your source tree (cvs).
-# check-old - Print a list of old files/directories in the system.
-# delete-old - Delete obsolete files and directories interactively.
-# delete-old-libs - Delete obsolete libraries interactively.
+# check-old - List obsolete directories/files/libraries.
+# check-old-dirs - List obsolete directories.
+# check-old-files - List obsolete files.
+# check-old-libs - List obsolete libraries.
+# delete-old - Delete obsolete directories/files/libraries.
+# delete-old-dirs - Delete obsolete directories.
+# delete-old-files - Delete obsolete files.
+# delete-old-libs - Delete obsolete libraries.
#
# This makefile is simple by design. The FreeBSD make automatically reads
# the /usr/share/mk/sys.mk unless the -m argument is specified on the
@@ -70,8 +75,10 @@
# developer convenience only. They are intentionally not documented and
# completely subject to change without notice.
#
-TGTS= all all-man buildenv buildenvvars buildkernel buildworld check-old \
- checkdpadd clean cleandepend cleandir delete-old delete-old-libs \
+TGTS= all all-man buildenv buildenvvars buildkernel buildworld \
+ check-old check-old-dirs check-old-files check-old-libs \
+ checkdpadd clean cleandepend cleandir \
+ delete-old delete-old-dirs delete-old-files delete-old-libs \
depend distribute distributeworld distrib-dirs distribution doxygen \
everything hierarchy install installcheck installkernel \
installkernel.debug reinstallkernel reinstallkernel.debug \
==== //depot/projects/soc2007/lulf/gvinum_main/Makefile.inc1#3 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.572 2007/04/17 15:52:36 pjd Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.582 2007/05/26 20:17:19 ru Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -309,7 +309,7 @@
rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c
.endif
.for _dir in \
- usr/bin usr/games usr/include/c++/3.4 usr/include/sys usr/lib \
+ usr/bin usr/games usr/include/sys usr/lib \
usr/libexec usr/sbin usr/share/dict \
usr/share/groff_font/devX100 \
usr/share/groff_font/devX100-12 \
@@ -505,7 +505,7 @@
# and Makefile.inc1 causes the correct PATH to be used, rather than a
# modification of the current environment's PATH. In addition, we need
# to quote multiword values.
-#
+#
buildenvvars:
@echo ${WMAKEENV:Q}
@@ -994,21 +994,31 @@
#
libraries:
cd ${.CURDIR}; \
+ ${MAKE} -f Makefile.inc1 _prereq_libs; \
${MAKE} -f Makefile.inc1 _startup_libs; \
${MAKE} -f Makefile.inc1 _prebuild_libs; \
${MAKE} -f Makefile.inc1 _generic_libs;
+#
+# static libgcc.a prerequisite for shared libc
+#
+_prereq_libs= gnu/lib/libgcc
+
# These dependencies are not automatically generated:
#
-# gnu/lib/csu, gnu/lib/libgcc and lib/csu must be built before all
-# shared libraries for ELF.
+# gnu/lib/csu, gnu/lib/libgcc, lib/csu and lib/libc must be built before
+# all shared libraries for ELF.
#
-_startup_libs= gnu/lib/csu gnu/lib/libgcc
+_startup_libs= gnu/lib/csu
.if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}-elf)
_startup_libs+= lib/csu/${MACHINE_ARCH}-elf
.else
_startup_libs+= lib/csu/${MACHINE_ARCH}
.endif
+_startup_libs+= gnu/lib/libgcc
+_startup_libs+= lib/libc
+
+gnu/lib/libgcc__L: lib/libc__L
_prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libkrb5} \
${_kerberos5_lib_libroken} \
@@ -1016,7 +1026,7 @@
${_lib_libgssapi} ${_lib_libipx} \
lib/libkiconv lib/libkvm lib/libmd \
lib/ncurses/ncurses lib/ncurses/ncursesw \
- lib/libopie lib/libpam lib/libpthread \
+ lib/libopie lib/libpam lib/${DEFAULT_THREAD_LIB} \
lib/libradius lib/libsbuf lib/libtacplus lib/libutil \
${_lib_libypclnt} lib/libz lib/msun \
${_secure_lib_libcrypto} ${_secure_lib_libssh} \
@@ -1068,6 +1078,18 @@
lib/libradius__L: lib/libmd__L
.endif
+.for _lib in ${_prereq_libs}
+${_lib}__PL: .PHONY
+.if exists(${.CURDIR}/${_lib})
+ ${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
+ cd ${.CURDIR}/${_lib}; \
+ ${MAKE} DIRPRFX=${_lib}/ obj; \
+ ${MAKE} DIRPRFX=${_lib}/ depend; \
+ ${MAKE} -DWITHOUT_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all; \
+ ${MAKE} -DWITHOUT_PROFILE -DNO_PIC DIRPRFX=${_lib}/ install
+.endif
+.endfor
+
.for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs}
${_lib}__L: .PHONY
.if exists(${.CURDIR}/${_lib})
@@ -1091,6 +1113,7 @@
${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all; \
${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET install
+_prereq_libs: ${_prereq_libs:S/$/__PL/}
_startup_libs: ${_startup_libs:S/$/__L/}
_prebuild_libs: ${_prebuild_libs:S/$/__L/}
_generic_libs: ${_generic_libs:S/$/__L/}
@@ -1114,7 +1137,10 @@
.include <bsd.subdir.mk>
-.if make(delete-old) || make(delete-old-libs) || make(check-old)
+.if make(check-old) || make(check-old-dirs) || \
+ make(check-old-files) || make(check-old-libs) || \
+ make(delete-old) || make(delete-old-dirs) || \
+ make(delete-old-files) || make(delete-old-libs)
#
# check for / delete old files section
@@ -1135,18 +1161,14 @@
delete-old-files:
@echo ">>> Removing old files (only deletes safe to delete libs)"
-.for file in ${OLD_FILES}
# Ask for every old file if the user really wants to remove it.
# It's annoying, but better safe than sorry.
- @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \
- rm ${RM_I} "${DESTDIR}/${file}" || true; \
- if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then\
- echo "Removing schg flag on ${DESTDIR}/${file}"; \
- chflags noschg "${DESTDIR}/${file}"; \
- rm ${RM_I} "${DESTDIR}/${file}"; \
+ @for file in ${OLD_FILES}; do \
+ if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \
+ chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \
+ rm ${RM_I} "${DESTDIR}/$${file}"; \
fi; \
- fi
-.endfor
+ done
# Remove catpages without corresponding manpages.
@3<&0; \
find ${DESTDIR}/usr/share/man/cat* ! -type d | \
@@ -1161,11 +1183,11 @@
check-old-files:
@echo ">>> Checking for old files"
-.for file in ${OLD_FILES}
- @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \
- echo "${DESTDIR}/${file}"; \
- fi
-.endfor
+ @for file in ${OLD_FILES}; do \
+ if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \
+ echo "${DESTDIR}/$${file}"; \
+ fi; \
+ done
# Check for catpages without corresponding manpages.
@find ${DESTDIR}/usr/share/man/cat* ! -type d | \
sed -ep -e's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:' | \
@@ -1179,51 +1201,42 @@
delete-old-libs:
@echo ">>> Removing old libraries"
@echo "${OLD_LIBS_MESSAGE}" | fmt
-.for file in ${OLD_LIBS}
- @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \
- rm ${RM_I} "${DESTDIR}/${file}" || true; \
- if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then\
- echo "Removing schg flag on ${DESTDIR}/${file}"; \
- chflags noschg "${DESTDIR}/${file}"; \
- rm ${RM_I} "${DESTDIR}/${file}"; \
+ @for file in ${OLD_LIBS}; do \
+ if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \
+ chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \
+ rm ${RM_I} "${DESTDIR}/$${file}"; \
fi; \
- fi
-.endfor
+ done
@echo ">>> Old libraries removed"
check-old-libs:
@echo ">>> Checking for old libraries"
-.for file in ${OLD_LIBS}
- @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \
- echo "${DESTDIR}/${file}"; \
- fi
-.endfor
+ @for file in ${OLD_LIBS}; do \
+ if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \
+ echo "${DESTDIR}/$${file}"; \
+ fi; \
+ done
delete-old-dirs:
@echo ">>> Removing old directories"
-.for dir in ${OLD_DIRS}
-# Don't fail if an old directory isn't empty.
- @if [ -d "${DESTDIR}/${dir}" ]; then \
- rmdir -v "${DESTDIR}/${dir}" || true; \
- else \
- if [ -L "${DESTDIR}/${dir}" ]; then \
- echo "${DESTDIR}/${dir} is a link, please remove everything manually."; \
+ @for dir in ${OLD_DIRS}; do \
+ if [ -d "${DESTDIR}/$${dir}" ]; then \
+ rmdir -v "${DESTDIR}/$${dir}" || true; \
+ elif [ -L "${DESTDIR}/$${dir}" ]; then \
+ echo "${DESTDIR}/$${dir} is a link, please remove everything manually."; \
fi; \
- fi
-.endfor
+ done
@echo ">>> Old directories removed"
check-old-dirs:
@echo ">>> Checking for old directories"
-.for dir in ${OLD_DIRS}
- @if [ -d "${DESTDIR}/${dir}" ]; then \
- echo "${DESTDIR}/${dir}"; \
- else \
- if [ -L "${DESTDIR}/${dir}" ]; then \
- echo "${DESTDIR}/${dir} is a link, please remove everything manually."; \
+ @for dir in ${OLD_DIRS}; do \
+ if [ -d "${DESTDIR}/$${dir}" ]; then \
+ echo "${DESTDIR}/$${dir}"; \
+ elif [ -L "${DESTDIR}/$${dir}" ]; then \
+ echo "${DESTDIR}/$${dir} is a link, please remove everything manually."; \
fi; \
- fi
-.endfor
+ done
delete-old: delete-old-files delete-old-dirs
@echo "To remove old libraries run '${MAKE} delete-old-libs'."
==== //depot/projects/soc2007/lulf/gvinum_main/sbin/Makefile#2 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.5 (Berkeley) 3/31/94
-# $FreeBSD: src/sbin/Makefile,v 1.165 2007/01/23 09:18:25 rodrigc Exp $
+# $FreeBSD: src/sbin/Makefile,v 1.166 2007/06/12 21:31:39 phk Exp $
.include <bsd.own.mk>
@@ -73,6 +73,7 @@
quotacheck \
rcorder \
reboot \
+ recoverdisk \
restore \
route \
routed \
==== //depot/projects/soc2007/lulf/gvinum_main/sbin/gvinum/gvinum.c#3 (text+ko) ====
@@ -55,7 +55,9 @@
#include "gvinum.h"
+void gvinum_attach(int, char **);
void gvinum_create(int, char **);
+void gvinum_detach(int, char **);
void gvinum_help(void);
void gvinum_list(int, char **);
void gvinum_move(int, char **);
@@ -112,6 +114,43 @@
exit(0);
}
+/* Attach a plex to a volume or a subdisk to a plex. */
+void
+gvinum_attach(int argc, char **argv)
+{
+ struct gctl_req *req;
+ const char *errstr;
+ int rename;
+ off_t offset;
+
+ rename = 0;
+ offset = -1;
+ if (argc < 3) {
+ warnx("usage:\tattach <subdisk> <plex> [rename] "
+ "[<plexoffset>]\n"
+ "\tattach <plex> <volume> [rename]");
+ }
+ if (argc > 3) {
+ if (!strcmp(argv[3], "rename")) {
+ rename = 1;
+ if (argc == 5)
+ offset = strtol(argv[4], NULL, 0);
+ } else
+ offset = strtol(argv[3], NULL, 0);
+ }
+ req = gctl_get_handle();
+ gctl_ro_param(req, "class", -1, "VINUM");
+ gctl_ro_param(req, "verb", -1, "attach");
+ gctl_ro_param(req, "child", -1, argv[1]);
+ gctl_ro_param(req, "parent", -1, argv[2]);
+ gctl_ro_param(req, "offset", sizeof(off_t), &offset);
+ gctl_ro_param(req, "rename", sizeof(int), &rename);
+ errstr = gctl_issue(req);
+ if (errstr != NULL)
+ warnx("attach failed: %s", errstr);
+ gctl_free(req);
+}
+
void
gvinum_create(int argc, char **argv)
{
@@ -321,7 +360,45 @@
warnx("create failed: %s", errstr);
}
gctl_free(req);
- gvinum_list(0, NULL);
+}
+
+/* Detach a plex or subdisk from its parent. */
+void
+gvinum_detach(int argc, char **argv)
+{
+ const char *errstr;
+ struct gctl_req *req;
+ int flags, i;
+
+ optreset = 1;
+ optind = 1;
+ while ((i = getopt(argc, argv, "f")) != -1) {
+ switch(i) {
+ case 'f':
+ flags |= GV_FLAG_F;
+ break;
+ default:
+ warn("invalid flag: %c", i);
+ return;
+ }
+ }
+ argc -= optind;
+ argv += optind;
+ if (argc != 1) {
+ warnx("usage: detach [-f] <subdisk> | <plex>");
+ return;
+ }
+
+ req = gctl_get_handle();
+ gctl_ro_param(req, "class", -1, "VINUM");
+ gctl_ro_param(req, "verb", -1, "detach");
+ gctl_ro_param(req, "object", -1, argv[0]);
+ gctl_ro_param(req, "flags", sizeof(int), &flags);
+
+ errstr = gctl_issue(req);
+ if (errstr != NULL)
+ warnx("detach failed: %s", errstr);
+ gctl_free(req);
}
void
@@ -332,6 +409,12 @@
" Check the parity blocks of a RAID-5 plex.\n"
"create description-file\n"
" Create as per description-file or open editor.\n"
+ "attach plex volume [rename]\n"
+ "attach subdisk plex [offset] [rename]\n"
+ " Attach a plex to a volume, or a subdisk to a plex\n"
+ "detach [-f] [plex | subdisk]\n"
+ " Detach a plex or a subdisk from the volume or plex to\n"
+ " which it is attached.\n"
"l | list [-r] [-v] [-V] [volume | plex | subdisk]\n"
" List information about specified objects.\n"
"ld [-r] [-v] [-V] [volume]\n"
@@ -554,8 +637,7 @@
gvinum_parityop(int argc, char **argv, int rebuild)
{
struct gctl_req *req;
- int flags, i, rv;
- off_t offset;
+ int flags, i;
const char *errstr;
char *op, *msg;
@@ -592,7 +674,18 @@
return;
}
- do {
+ req = gctl_get_handle();
+ gctl_ro_param(req, "class", -1, "VINUM");
+ gctl_ro_param(req, "verb", -1, op);
+ gctl_ro_param(req, "rebuild", sizeof(int), &rebuild);
+ gctl_ro_param(req, "flags", sizeof(int), &flags);
+ gctl_ro_param(req, "plex", -1, argv[0]);
+
+ errstr = gctl_issue(req);
+ if (errstr)
+ warnx("%s\n", errstr);
+ gctl_free(req);
+/* do {
rv = 0;
req = gctl_get_handle();
gctl_ro_param(req, "class", -1, "VINUM");
@@ -621,16 +714,16 @@
}
fflush(stdout);
- /* Clear the -f flag. */
+ Clear the -f flag.
flags &= ~GV_FLAG_F;
- } while (rv >= 0);
+ } while (rv >= 0);*/
- if ((rv == 2) && (flags & GV_FLAG_V)) {
+/* if ((rv == 2) && (flags & GV_FLAG_V)) {
if (rebuild)
printf("Rebuilt parity on %s\n", argv[0]);
else
printf("%s has correct parity\n", argv[0]);
- }
+ }*/
}
void
@@ -729,7 +822,6 @@
return;
}
gctl_free(req);
- gvinum_list(0, NULL);
}
void
@@ -764,7 +856,6 @@
return;
}
gctl_free(req);
- gvinum_list(0, NULL);
printf("gvinum configuration obliterated\n");
}
@@ -834,7 +925,6 @@
}
gctl_free(req);
- gvinum_list(0, NULL);
}
void
@@ -880,6 +970,10 @@
gvinum_create(argc, argv);
else if (!strcmp(argv[0], "exit") || !strcmp(argv[0], "quit"))
exit(0);
+ else if (!strcmp(argv[0], "attach"))
+ gvinum_attach(argc, argv);
+ else if (!strcmp(argv[0], "detach"))
+ gvinum_detach(argc, argv);
else if (!strcmp(argv[0], "help"))
gvinum_help();
else if (!strcmp(argv[0], "list") || !strcmp(argv[0], "l"))
==== //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.amd64#2 (text+ko) ====
@@ -2,7 +2,7 @@
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
# from FreeBSD: src/sys/conf/Makefile.i386,v 1.255 2002/02/20 23:35:49
-# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.22 2005/11/28 17:51:30 imp Exp $
+# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.24 2007/05/16 17:23:53 wkoszek Exp $
#
# Makefile for FreeBSD
#
==== //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.arm#2 (text+ko) ====
@@ -1,7 +1,7 @@
# Makefile.arm -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.arm,v 1.31 2006/07/24 22:09:47 cognet Exp $
+# $FreeBSD: src/sys/conf/Makefile.arm,v 1.33 2007/05/16 17:23:53 wkoszek Exp $
#
# Makefile for FreeBSD
#
==== //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.i386#2 (text+ko) ====
@@ -1,7 +1,7 @@
# Makefile.i386 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.i386,v 1.271 2006/01/29 03:32:19 nyan Exp $
+# $FreeBSD: src/sys/conf/Makefile.i386,v 1.273 2007/05/16 17:23:53 wkoszek Exp $
#
# Makefile for FreeBSD
#
==== //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.ia64#2 (text+ko) ====
@@ -1,7 +1,7 @@
# Makefile.ia64 -- with config changes.
# Copyright 1990 W. Jolitz
# from: src/sys/conf/Makefile.alpha,v 1.76
-# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.67 2005/11/28 17:51:31 imp Exp $
+# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.70 2007/06/02 21:30:39 marcel Exp $
#
# Makefile for FreeBSD
#
@@ -16,8 +16,6 @@
# after which config should be rerun for all machines.
#
-GCC3= you bet
-
# Which version of config(8) is required.
%VERSREQ= 600004
==== //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.pc98#2 (text+ko) ====
@@ -3,7 +3,7 @@
# Makefile.i386 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.173 2006/01/29 03:32:19 nyan Exp $
+# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.175 2007/05/16 17:23:53 wkoszek Exp $
#
# Makefile for FreeBSD
#
==== //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.powerpc#2 (text+ko) ====
@@ -1,7 +1,7 @@
# Makefile.powerpc -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.283 2005/11/28 17:51:31 imp Exp $
+# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.285 2007/05/16 17:23:54 wkoszek Exp $
#
# Makefile for FreeBSD
#
==== //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.sparc64#2 (text+ko) ====
@@ -1,7 +1,7 @@
# Makefile.sparc64 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.38 2005/11/28 17:51:31 imp Exp $
+# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.40 2007/05/16 17:23:54 wkoszek Exp $
#
# Makefile for FreeBSD
#
==== //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.sun4v#2 (text+ko) ====
@@ -1,7 +1,7 @@
# Makefile.sparc64 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.sun4v,v 1.1 2006/10/05 06:14:24 kmacy Exp $
+# $FreeBSD: src/sys/conf/Makefile.sun4v,v 1.3 2007/05/16 17:23:54 wkoszek Exp $
#
# Makefile for FreeBSD
#
==== //depot/projects/soc2007/lulf/gvinum_main/sys/conf/NOTES#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1424 2007/05/09 15:55:45 scottl Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1432 2007/06/13 14:01:42 rwatson Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -151,6 +151,7 @@
options GEOM_NOP # Test class.
options GEOM_PART_APM # Apple partitioning
options GEOM_PART_GPT # GPT partitioning
+options GEOM_PART_MBR # MBR partitioning
options GEOM_PC98 # NEC PC9800 partitioning
options GEOM_RAID3 # RAID3 functionality.
options GEOM_SHSEC # Shared secret.
@@ -185,7 +186,6 @@
# not recommended for production use at this time.
#
options SCHED_4BSD
-#options SCHED_CORE
#options SCHED_ULE
#####################################################################
@@ -227,11 +227,6 @@
# and WITNESS options.
options MUTEX_NOINLINE
-# MUTEX_WAKE_ALL changes the mutex unlock algorithm to wake all waiters
-# when a contested mutex is released rather than just awaking the highest
-# priority waiter.
-options MUTEX_WAKE_ALL
-
# RWLOCK_NOINLINE forces rwlock operations to call functions to perform each
# operation rather than inlining the simple cases. This can be used to
# shrink the size of the kernel text segment. Note that this behavior is
@@ -521,7 +516,6 @@
#options FAST_IPSEC #new IPsec (cannot define w/ IPSEC)
options IPX #IPX/SPX communications protocols
-options IPXIP #IPX in IP encapsulation (not available)
options NCP #NetWare Core protocol
@@ -669,6 +663,7 @@
options NETGRAPH_BLUETOOTH_UBTBCMFW # ubtbcmfw(4)
options NETGRAPH_BPF
options NETGRAPH_BRIDGE
+options NETGRAPH_CAR
options NETGRAPH_CISCO
options NETGRAPH_DEFLATE
options NETGRAPH_DEVICE
@@ -790,6 +785,9 @@
device wlan_tkip #802.11 TKIP support
device wlan_xauth #802.11 external authenticator support
device wlan_acl #802.11 MAC ACL support
+device wlan_amrr #AMRR transmit rate control algorithm
+device wlan_scan_ap #802.11 AP mode scanning
+device wlan_scan_sta #802.11 STA mode scanning
device token #Generic TokenRing
device fddi #Generic FDDI
device arcnet #Generic Arcnet
@@ -1627,6 +1625,7 @@
device mlx # Mylex DAC960
device amr # AMI MegaRAID
device mfi # LSI MegaRAID SAS
+device mfip # LSI MegaRAID SAS passthrough, requires CAM
options MFI_DEBUG
#
==== //depot/projects/soc2007/lulf/gvinum_main/sys/conf/files#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1204 2007/05/09 07:07:24 scottl Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1220 2007/06/13 14:01:42 rwatson Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -340,6 +340,8 @@
contrib/pf/netinet/in4_cksum.c optional pf inet
crypto/blowfish/bf_ecb.c optional ipsec ipsec_esp
crypto/blowfish/bf_skey.c optional crypto | ipsec ipsec_esp
+crypto/camellia/camellia.c optional crypto | ipsec ipsec_esp
+crypto/camellia/camellia-api.c optional crypto | ipsec ipsec_esp
crypto/des/des_ecb.c optional crypto | ipsec ipsec_esp | netsmb
crypto/des/des_setkey.c optional crypto | ipsec ipsec_esp | netsmb
crypto/rc4/rc4.c optional netgraph_mppc_encryption
@@ -512,9 +514,12 @@
dev/cs/if_cs_isa.c optional cs isa
dev/cs/if_cs_pccard.c optional cs pccard
dev/cxgb/cxgb_main.c optional cxgb pci
+dev/cxgb/cxgb_offload.c optional cxgb pci
+dev/cxgb/cxgb_l2t.c optional cxgb pci
dev/cxgb/cxgb_lro.c optional cxgb pci
dev/cxgb/cxgb_sge.c optional cxgb pci
dev/cxgb/common/cxgb_mc5.c optional cxgb pci
+dev/cxgb/common/cxgb_vsc7323.c optional cxgb pci
dev/cxgb/common/cxgb_vsc8211.c optional cxgb pci
dev/cxgb/common/cxgb_ael1002.c optional cxgb pci
dev/cxgb/common/cxgb_mv88e1xxx.c optional cxgb pci
@@ -754,6 +759,7 @@
dev/mfi/mfi_pci.c optional mfi pci
dev/mfi/mfi_disk.c optional mfi
dev/mfi/mfi_linux.c optional mfi compat_linux
+dev/mfi/mfi_cam.c optional mfip scbus
dev/mii/acphy.c optional miibus | acphy
dev/mii/amphy.c optional miibus | amphy
dev/mii/bmtphy.c optional miibus | bmtphy
@@ -763,6 +769,7 @@
# XXX only xl cards?
dev/mii/exphy.c optional miibus | exphy
dev/mii/gentbi.c optional miibus | gentbi
+dev/mii/icsphy.c optional miibus | icsphy
# XXX only fxp cards?
dev/mii/inphy.c optional miibus | inphy
dev/mii/ip1000phy.c optional miibus | ip1000phy
@@ -910,6 +917,8 @@
dev/sn/if_sn_isa.c optional sn isa
dev/sn/if_sn_pccard.c optional sn pccard
dev/snp/snp.c optional snp
+dev/sound/clone.c optional sound
+dev/sound/unit.c optional sound
dev/sound/isa/ad1816.c optional snd_ad1816 isa
dev/sound/isa/ess.c optional snd_ess isa
dev/sound/isa/gusc.c optional snd_gusc isa
@@ -1252,6 +1261,7 @@
geom/part/g_part_if.m standard
geom/part/g_part_apm.c optional geom_part_apm
geom/part/g_part_gpt.c optional geom_part_gpt
+geom/part/g_part_mbr.c optional geom_part_mbr
geom/raid3/g_raid3.c optional geom_raid3
geom/raid3/g_raid3_ctl.c optional geom_raid3
geom/shsec/g_shsec.c optional geom_shsec
@@ -1421,9 +1431,8 @@
kern/p1003_1b.c standard
kern/posix4_mib.c standard
kern/sched_4bsd.c optional sched_4bsd
-kern/sched_core.c optional sched_core
kern/sched_ule.c optional sched_ule
-kern/serdev_if.m optional puc | scc
+kern/serdev_if.m standard
kern/subr_acl_posix1e.c standard
kern/subr_autoconf.c standard
kern/subr_blist.c standard
@@ -1551,13 +1560,13 @@
net/bpf.c standard
net/bpf_jitter.c optional bpf_jitter
net/bpf_filter.c optional bpf | netgraph_bpf
-net/bridgestp.c optional if_bridge
+net/bridgestp.c optional bridge | if_bridge
net/bsd_comp.c optional ppp_bsdcomp
net/ieee8023ad_lacp.c optional lagg
net/if.c standard
net/if_arcsubr.c optional arcnet
net/if_atmsubr.c optional atm
-net/if_bridge.c optional if_bridge
+net/if_bridge.c optional bridge | if_bridge
net/if_clone.c standard
net/if_disc.c optional disc
net/if_edsc.c optional edsc
@@ -1582,6 +1591,8 @@
net/if_tun.c optional tun
net/if_tap.c optional tap
net/if_vlan.c optional vlan
+net/mppcc.c optional netgraph_mppc_compression
+net/mppcd.c optional netgraph_mppc_compression
net/netisr.c standard
net/ppp_deflate.c optional ppp_deflate
net/ppp_tty.c optional ppp
@@ -1604,11 +1615,17 @@
net80211/ieee80211_crypto_tkip.c optional wlan_tkip
net80211/ieee80211_crypto_wep.c optional wlan_wep
net80211/ieee80211_freebsd.c optional wlan
+net80211/ieee80211_ht.c optional wlan
net80211/ieee80211_input.c optional wlan
net80211/ieee80211_ioctl.c optional wlan
net80211/ieee80211_node.c optional wlan
net80211/ieee80211_output.c optional wlan
+net80211/ieee80211_power.c optional wlan
net80211/ieee80211_proto.c optional wlan
+net80211/ieee80211_regdomain.c optional wlan
+net80211/ieee80211_scan.c optional wlan
+net80211/ieee80211_scan_ap.c optional wlan_scan_ap
+net80211/ieee80211_scan_sta.c optional wlan_scan_sta
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list