Date: Wed, 24 Sep 2008 11:54:45 GMT From: Ed Schouten <ed@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 150383 for review Message-ID: <200809241154.m8OBsjdk082544@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=150383 Change 150383 by ed@ed_dull on 2008/09/24 11:54:30 IFC. Affected files ... .. //depot/projects/mpsafetty/lib/libc/powerpc/gen/syncicache.c#2 integrate .. //depot/projects/mpsafetty/sbin/bsdlabel/Makefile#2 integrate .. //depot/projects/mpsafetty/sbin/fdisk/Makefile#2 integrate .. //depot/projects/mpsafetty/share/man/man5/src.conf.5#2 integrate .. //depot/projects/mpsafetty/share/misc/committers-src.dot#6 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/mpsafetty/sys/arm/arm/elf_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/mpsafetty/sys/compat/svr4/svr4_sysvec.c#3 integrate .. //depot/projects/mpsafetty/sys/conf/files#16 integrate .. //depot/projects/mpsafetty/sys/conf/files.i386#8 integrate .. //depot/projects/mpsafetty/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/mpsafetty/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/bm/if_bm.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_ael1002.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_common.h#4 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_mc5.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_t3_hw.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_tn1010.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_vsc7323.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_vsc8211.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_xgmac.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_adapter.h#7 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_config.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_include.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_main.c#9 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_multiq.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_offload.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_offload.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_osdep.h#5 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_sge.c#8 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_t3fw.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/sys/cxgb_support.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/sys/uipc_mvec.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/toecore/toedev.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#8 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/tom/cxgb_listen.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/tom/cxgb_tom.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/tom/cxgb_tom.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/tom/cxgb_vm.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/kbdmux/kbdmux.c#3 integrate .. //depot/projects/mpsafetty/sys/fs/tmpfs/tmpfs.h#3 integrate .. //depot/projects/mpsafetty/sys/fs/tmpfs/tmpfs_subr.c#3 integrate .. //depot/projects/mpsafetty/sys/fs/tmpfs/tmpfs_vnops.c#5 integrate .. //depot/projects/mpsafetty/sys/i386/i386/bios.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/i386/elf_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/ibcs2/ibcs2_sysvec.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/mpsafetty/sys/ia64/ia64/efi.c#2 integrate .. //depot/projects/mpsafetty/sys/ia64/ia64/elf_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/ia64/ia64/sal.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/imgact_aout.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/init_main.c#5 integrate .. //depot/projects/mpsafetty/sys/kern/kern_intr.c#5 integrate .. //depot/projects/mpsafetty/sys/kern/sys_generic.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/tty.c#45 edit .. //depot/projects/mpsafetty/sys/kern/tty_pts.c#23 integrate .. //depot/projects/mpsafetty/sys/libkern/memcmp.c#1 branch .. //depot/projects/mpsafetty/sys/mips/mips/elf_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/mips/mips/support.S#2 integrate .. //depot/projects/mpsafetty/sys/modules/cxgb/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/cxgb/cxgb/Makefile#4 integrate .. //depot/projects/mpsafetty/sys/modules/cxgb/cxgb_t3fw/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/cxgb/iw_cxgb/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/cxgb/toecore/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/cxgb/tom/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_input.c#6 integrate .. //depot/projects/mpsafetty/sys/powerpc/aim/machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/powerpc/aim/mmu_oea.c#4 integrate .. //depot/projects/mpsafetty/sys/powerpc/booke/machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/powerpc/include/dbdma.h#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/include/md_var.h#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/include/pmap.h#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/include/pte.h#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/ofw/ofw_syscons.c#3 integrate .. //depot/projects/mpsafetty/sys/powerpc/powermac/dbdma.c#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/powermac/dbdmavar.h#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/powerpc/elf_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/powerpc/syncicache.c#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/elf_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/sys/libkern.h#4 integrate .. //depot/projects/mpsafetty/sys/ufs/ufs/ufs_dirhash.c#3 integrate .. //depot/projects/mpsafetty/tools/build/options/WITHOUT_BSNMP#1 branch .. //depot/projects/mpsafetty/tools/build/options/WITHOUT_FLOPPY#1 branch .. //depot/projects/mpsafetty/tools/build/options/WITHOUT_NETGRAPH_SUPPORT#1 branch .. //depot/projects/mpsafetty/tools/build/options/WITHOUT_WIRELESS_SUPPORT#1 branch .. //depot/projects/mpsafetty/tools/tools/nanobsd/nanobsd.sh#10 integrate .. //depot/projects/mpsafetty/usr.sbin/timed/timed/globals.h#2 integrate Differences ... ==== //depot/projects/mpsafetty/lib/libc/powerpc/gen/syncicache.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (C) 1995-1997, 1999 Wolfgang Solfrank. * Copyright (C) 1995-1997, 1999 TooLs GmbH. * All rights reserved. @@ -33,7 +33,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/lib/libc/powerpc/gen/syncicache.c,v 1.4 2007/06/10 16:32:08 marcel Exp $"; + "$FreeBSD: src/lib/libc/powerpc/gen/syncicache.c,v 1.6 2008/09/24 01:06:11 nwhitehorn Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -47,28 +47,27 @@ #include <machine/cpu.h> #include <machine/md_var.h> -#if defined(_KERNEL) || defined(_STANDALONE) -#ifndef CACHELINESIZE -#error "Must know the size of a cache line" +#ifdef _STANDALONE +int cacheline_size = 32; #endif -#else + +#if !defined(_KERNEL) && !defined(_STANDALONE) #include <stdlib.h> +int cacheline_size = 0; + static void getcachelinesize(void); -static int _cachelinesize; -#define CACHELINESIZE _cachelinesize - static void getcachelinesize() { static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE }; int clen; - clen = sizeof(_cachelinesize); + clen = sizeof(cacheline_size); if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]), - &_cachelinesize, &clen, NULL, 0) < 0 || !_cachelinesize) { + &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size) { abort(); } } @@ -81,21 +80,24 @@ char *p; #if !defined(_KERNEL) && !defined(_STANDALONE) - if (!_cachelinesize) + if (!cacheline_size) getcachelinesize(); #endif - off = (u_int)from & (CACHELINESIZE - 1); + + off = (u_int)from & (cacheline_size - 1); l = len += off; p = (char *)from - off; + do { __asm __volatile ("dcbst 0,%0" :: "r"(p)); - p += CACHELINESIZE; - } while ((l -= CACHELINESIZE) > 0); + p += cacheline_size; + } while ((l -= cacheline_size) > 0); __asm __volatile ("sync"); p = (char *)from - off; do { __asm __volatile ("icbi 0,%0" :: "r"(p)); - p += CACHELINESIZE; - } while ((len -= CACHELINESIZE) > 0); + p += cacheline_size; + } while ((len -= cacheline_size) > 0); __asm __volatile ("sync; isync"); } + ==== //depot/projects/mpsafetty/sbin/bsdlabel/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 3/17/94 -# $FreeBSD: src/sbin/bsdlabel/Makefile,v 1.20 2006/08/22 07:51:09 ru Exp $ +# $FreeBSD: src/sbin/bsdlabel/Makefile,v 1.21 2008/09/23 13:12:51 ru Exp $ .PATH: ${.CURDIR}/../../sys/geom @@ -13,8 +13,8 @@ MLINKS= bsdlabel.8 disklabel.8 .endif -DPADD= ${LIBGEOM} -LDADD= -lgeom +DPADD= ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} +LDADD= -lgeom -lbsdxml -lsbuf .include <bsd.prog.mk> ==== //depot/projects/mpsafetty/sbin/fdisk/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sbin/fdisk/Makefile,v 1.12 2005/07/15 08:02:51 phk Exp $ +# $FreeBSD: src/sbin/fdisk/Makefile,v 1.13 2008/09/23 13:12:51 ru Exp $ PROG= fdisk SRCS= fdisk.c geom_mbr_enc.c @@ -7,8 +7,8 @@ .PATH: ${.CURDIR}/../../sys/geom -DPADD += ${LIBGEOM} -LDADD += -lgeom +DPADD+= ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} +LDADD+= -lgeom -lbsdxml -lsbuf .include <bsd.prog.mk> ==== //depot/projects/mpsafetty/share/man/man5/src.conf.5#2 (text) ==== @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: head/tools/build/options/makeman 174548 2007-12-12 16:39:32Z ru -.\" $FreeBSD: src/share/man/man5/src.conf.5,v 1.30 2008/06/25 21:42:23 ru Exp $ -.Dd June 26, 2008 +.\" $FreeBSD: src/share/man/man5/src.conf.5,v 1.31 2008/09/23 16:18:15 sam Exp $ +.Dd September 23, 2008 .Dt SRC.CONF 5 .Os .Sh NAME @@ -77,17 +77,39 @@ The following list provides a name and short description for variables that can be used for source builds. .Bl -tag -width indent +.It Va WITHOUT_ACCT +.\" from FreeBSD: head/tools/build/options/WITHOUT_ACCT 183242 2008-09-21 22:02:26Z sam +Set to not build process accounting tools such as +.Xr ac 8 +and +.Xr accton 8 . .It Va WITHOUT_ACPI .\" from FreeBSD: head/tools/build/options/WITHOUT_ACPI 156932 2006-03-21 07:50:50Z ru Set to not build .Xr acpiconf 8 , .Xr acpidump 8 and related programs. +.It Va WITHOUT_AMD +.\" from FreeBSD: head/tools/build/options/WITHOUT_AMD 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr amd 8 , +and related programs. +.It Va WITHOUT_APM +.\" from FreeBSD: head/tools/build/options/WITHOUT_APM 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr apm 8 , +.Xr apmd 8 +and related programs. .It Va WITHOUT_ASSERT_DEBUG .\" from FreeBSD: head/tools/build/options/WITHOUT_ASSERT_DEBUG 162215 2006-09-11 13:55:27Z ru Set to compile programs and libraries without the .Xr assert 3 checks. +.It Va WITHOUT_AT +.\" from FreeBSD: head/tools/build/options/WITHOUT_AT 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr at 1 +and related utilities. .It Va WITHOUT_ATM .\" from FreeBSD: head/tools/build/options/WITHOUT_ATM 156932 2006-03-21 07:50:50Z ru Set to not build @@ -178,6 +200,11 @@ .\" from FreeBSD: head/tools/build/options/WITHOUT_BSD_CPIO 179813 2008-06-16 05:48:15Z dougb Set to not build the BSD licensed version of cpio based on .Xr libarchive 3 . +.It Va WITHOUT_BSNMP +.\" from FreeBSD: head/tools/build/options/WITHOUT_BSNMP 183306 2008-09-23 16:15:42Z sam +Set to not build or install +.Xr bsnmpd 1 +and related libraries and data files. .It Va WITHOUT_BZIP2 .\" from FreeBSD: head/tools/build/options/WITHOUT_BZIP2 174550 2007-12-12 16:43:17Z ru Set to not build contributed bzip2 software as a part of the base system. @@ -229,6 +256,11 @@ .It .Va WITHOUT_OPENSSL .El +.It Va WITHOUT_CTM +.\" from FreeBSD: head/tools/build/options/WITHOUT_CTM 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr ctm 1 +and related utilities. .It Va WITHOUT_CVS .\" from FreeBSD: head/tools/build/options/WITHOUT_CVS 156932 2006-03-21 07:50:50Z ru Set to not build CVS. @@ -251,6 +283,10 @@ .\" from FreeBSD: head/tools/build/options/WITHOUT_EXAMPLES 156938 2006-03-21 09:06:24Z ru Set to avoid installing examples to .Pa /usr/share/examples/ . +.It Va WITHOUT_FLOPPY +.\" from FreeBSD: head/tools/build/options/WITHOUT_FLOPPY 183306 2008-09-23 16:15:42Z sam +Set to not build or install programs +for operating floppy disk driver. .It Va WITHOUT_FORTH .\" from FreeBSD: head/tools/build/options/WITHOUT_FORTH 156932 2006-03-21 07:50:50Z ru Set to build bootloaders without Forth support. @@ -259,6 +295,10 @@ Set to build .Nm libc without floating-point support. +.It Va WITHOUT_FREEBSD_UPDATE +.\" from FreeBSD: head/tools/build/options/WITHOUT_FREEBSD_UPDATE 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr freebsd-update 8 . .It Va WITHOUT_GAMES .\" from FreeBSD: head/tools/build/options/WITHOUT_GAMES 156932 2006-03-21 07:50:50Z ru Set to not build games. @@ -348,6 +388,9 @@ .It Va WITHOUT_IPFILTER .\" from FreeBSD: head/tools/build/options/WITHOUT_IPFILTER 156932 2006-03-21 07:50:50Z ru Set to not build IP Filter package. +.It Va WITHOUT_IPFW +.\" from FreeBSD: head/tools/build/options/WITHOUT_IPFW 183242 2008-09-21 22:02:26Z sam +Set to not build IPFW tools. .It Va WITHOUT_IPX .\" from FreeBSD: head/tools/build/options/WITHOUT_IPX 156932 2006-03-21 07:50:50Z ru Set to not build programs and libraries related to IPX networking. @@ -362,6 +405,10 @@ .It Va WITHOUT_IPX_SUPPORT .\" from FreeBSD: head/tools/build/options/WITHOUT_IPX_SUPPORT 156932 2006-03-21 07:50:50Z ru Set to build some programs without IPX support. +.It Va WITHOUT_JAIL +.\" from FreeBSD: head/tools/build/options/WITHOUT_JAIL 183242 2008-09-21 22:02:26Z sam +Set to not build tools for the support of jails; e.g. +.Xr jail 8 . .It Va WITHOUT_KERBEROS .\" from FreeBSD: head/tools/build/options/WITHOUT_KERBEROS 174549 2007-12-12 16:42:03Z ru Set this if you do not want to build Kerberos 5 (KTH Heimdal). @@ -403,6 +450,12 @@ Set to build some programs without optional .Nm libkvm support. +.It Va WITHOUT_LEGACY_CONSOLE +.\" from FreeBSD: head/tools/build/options/WITHOUT_LEGACY_CONSOLE 183242 2008-09-21 22:02:26Z sam +Set to not build programs that support a legacy PC console; e.g. +.Xr kbdcontrol 8 +and +.Xr vidcontrol 8 . .It Va WITHOUT_LIB32 .\" from FreeBSD: head/tools/build/options/WITHOUT_LIB32 156932 2006-03-21 07:50:50Z ru On amd64, set to not build 32-bit library set and a @@ -465,16 +518,37 @@ .\" from FreeBSD: head/tools/build/options/WITHOUT_LOCALES 156932 2006-03-21 07:50:50Z ru Set to not build localization files; see .Xr locale 1 . +.It Va WITHOUT_LOCATE +.\" from FreeBSD: head/tools/build/options/WITHOUT_LOCATE 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr locate 1 +and related programs. .It Va WITHOUT_LPR .\" from FreeBSD: head/tools/build/options/WITHOUT_LPR 156932 2006-03-21 07:50:50Z ru Set to not build .Xr lpr 1 and related programs. +.It Va WITHOUT_MAIL +.\" from FreeBSD: head/tools/build/options/WITHOUT_MAIL 183242 2008-09-21 22:02:26Z sam +Set to not build any mail support (MUA or MTA). +When set, it also enforces the following options: +.Pp +.Bl -item -compact +.It +.Va WITHOUT_MAILWRAPPER +.It +.Va WITHOUT_SENDMAIL +.El .It Va WITHOUT_MAILWRAPPER .\" from FreeBSD: head/tools/build/options/WITHOUT_MAILWRAPPER 156932 2006-03-21 07:50:50Z ru Set to not build the .Xr mailwrapper 8 MTA selector. +.It Va WITHOUT_MAKE +.\" from FreeBSD: head/tools/build/options/WITHOUT_MAKE 183242 2008-09-21 22:02:26Z sam +Set to not install +.Xr make 1 +and related support files. .It Va WITHOUT_MAN .\" from FreeBSD: head/tools/build/options/WITHOUT_MAN 156932 2006-03-21 07:50:50Z ru Set to not build manual pages. @@ -482,11 +556,28 @@ .\" from FreeBSD: head/tools/build/options/WITHOUT_NCP 156932 2006-03-21 07:50:50Z ru Set to not build programs, libraries, and kernel modules related to NetWare Core protocol. +.It Va WITHOUT_NDIS +.\" from FreeBSD: head/tools/build/options/WITHOUT_NDIS 183242 2008-09-21 22:02:26Z sam +Set to not build programs and libraries +related to NDIS emulation support. .It Va WITHOUT_NETCAT .\" from FreeBSD: head/tools/build/options/WITHOUT_NETCAT 156932 2006-03-21 07:50:50Z ru Set to not build .Xr nc 1 utility. +.It Va WITHOUT_NETGRAPH +.\" from FreeBSD: head/tools/build/options/WITHOUT_NETGRAPH 183242 2008-09-21 22:02:26Z sam +Set to not build applications to support +.Xr netgraph 4 . +When set, it also enforces the following options: +.Pp +.Bl -item -compact +.It +.Va WITHOUT_NETGRAPH_SUPPORT +.El +.It Va WITHOUT_NETGRAPH_SUPPORT +.\" from FreeBSD: head/tools/build/options/WITHOUT_NETGRAPH_SUPPORT 183305 2008-09-23 16:11:15Z sam +Set to build libraries, programs, and kernel modules without netgraph support. .It Va WITHOUT_NIS .\" from FreeBSD: head/tools/build/options/WITHOUT_NIS 156932 2006-03-21 07:50:50Z ru Set to not build @@ -512,6 +603,11 @@ The generic caching daemon, .Xr nscd 8 , will not be built either if this option is set. +.It Va WITHOUT_NTP +.\" from FreeBSD: head/tools/build/options/WITHOUT_NTP 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr ntpd 8 +and related programs. .It Va WITHOUT_OBJC .\" from FreeBSD: head/tools/build/options/WITHOUT_OBJC 156932 2006-03-21 07:50:50Z ru Set to not build Objective C support. @@ -562,9 +658,34 @@ .It .Va WITHOUT_AUTHPF .El +.It Va WITHOUT_PKGTOOLS +.\" from FreeBSD: head/tools/build/options/WITHOUT_PKGTOOLS 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr pkg_add 8 +and related programs. +.It Va WITHOUT_PMC +.\" from FreeBSD: head/tools/build/options/WITHOUT_PMC 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr pmccontrol 8 +and related programs. +.It Va WITHOUT_PORTSNAP +.\" from FreeBSD: head/tools/build/options/WITHOUT_PORTSNAP 183242 2008-09-21 22:02:26Z sam +Set to not build or install +.Xr portsnap 8 +and related files. +.It Va WITHOUT_PPP +.\" from FreeBSD: head/tools/build/options/WITHOUT_PPP 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr ppp 8 +and related programs. .It Va WITHOUT_PROFILE .\" from FreeBSD: head/tools/build/options/WITHOUT_PROFILE 156932 2006-03-21 07:50:50Z ru Set to avoid compiling profiled libraries. +.It Va WITHOUT_QUOTAS +.\" from FreeBSD: head/tools/build/options/WITHOUT_QUOTAS 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr quota 8 +and related programs. .It Va WITHOUT_RCMDS .\" from FreeBSD: head/tools/build/options/WITHOUT_RCMDS 156932 2006-03-21 07:50:50Z ru Disable building of the @@ -583,6 +704,11 @@ .\" from FreeBSD: head/tools/build/options/WITHOUT_RESCUE 156932 2006-03-21 07:50:50Z ru Set to not build .Xr rescue 8 . +.It Va WITHOUT_ROUTED +.\" from FreeBSD: head/tools/build/options/WITHOUT_ROUTED 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr routed 8 +utility. .It Va WITHOUT_SENDMAIL .\" from FreeBSD: head/tools/build/options/WITHOUT_SENDMAIL 156932 2006-03-21 07:50:50Z ru Set to not build @@ -598,6 +724,11 @@ Set to not build the .Bx 4.4 legacy docs. +.It Va WITHOUT_SLIP +.\" from FreeBSD: head/tools/build/options/WITHOUT_SLIP 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr sliplogin 8 +and related programs. .It Va WITHOUT_SSP .\" from FreeBSD: head/tools/build/options/WITHOUT_SSP 180012 2008-06-25 21:33:28Z ru Set to not build world with propolice stack smashing protection. @@ -609,12 +740,32 @@ Set to not build .Xr syscons 4 support files such as keyboard maps, fonts, and screen output maps. +.It Va WITHOUT_SYSINSTALL +.\" from FreeBSD: head/tools/build/options/WITHOUT_SYSINSTALL 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr sysinstall 8 +and related programs. .It Va WITHOUT_TCSH .\" from FreeBSD: head/tools/build/options/WITHOUT_TCSH 156932 2006-03-21 07:50:50Z ru Set to not build and install .Pa /bin/csh (which is .Xr tcsh 1 ) . +.It Va WITHOUT_TELNET +.\" from FreeBSD: head/tools/build/options/WITHOUT_TELNET 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr telnet 8 +and related programs. +.It Va WITHOUT_TEXTPROC +.\" from FreeBSD: head/tools/build/options/WITHOUT_TEXTPROC 183242 2008-09-21 22:02:26Z sam +Set to not build +programs used for text processing. +When set, it also enforces the following options: +.Pp +.Bl -item -compact +.It +.Va WITHOUT_GROFF +.El .It Va WITHOUT_TOOLCHAIN .\" from FreeBSD: head/tools/build/options/WITHOUT_TOOLCHAIN 174550 2007-12-12 16:43:17Z ru Set to not install @@ -632,6 +783,22 @@ .It Va WITHOUT_USB .\" from FreeBSD: head/tools/build/options/WITHOUT_USB 156932 2006-03-21 07:50:50Z ru Set to not build USB-related programs and libraries. +.It Va WITHOUT_WIRELESS +.\" from FreeBSD: head/tools/build/options/WITHOUT_WIRELESS 183242 2008-09-21 22:02:26Z sam +Set to not build programs used for 802.11 wireless networks; especially +.Xr wpa_supplicant 8 +and +.Xr hostapd 8 . +When set, it also enforces the following options: +.Pp +.Bl -item -compact +.It +.Va WITHOUT_WIRELESS_SUPPORT +.El +.It Va WITHOUT_WIRELESS_SUPPORT +.\" from FreeBSD: head/tools/build/options/WITHOUT_WIRELESS_SUPPORT 183305 2008-09-23 16:11:15Z sam +Set to build libraries, programs, and kernel modules without +802.11 wireless support. .It Va WITHOUT_WPA_SUPPLICANT_EAPOL .\" from FreeBSD: head/tools/build/options/WITHOUT_WPA_SUPPLICANT_EAPOL 156932 2006-03-21 07:50:50Z ru Build ==== //depot/projects/mpsafetty/share/misc/committers-src.dot#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/misc/committers-src.dot,v 1.85 2008/09/18 17:32:13 zec Exp $ +# $FreeBSD: src/share/misc/committers-src.dot,v 1.86 2008/09/22 21:53:00 rnoland Exp $ # This file is meant to list all FreeBSD src committers and describe the # mentor-mentee relationships between them. @@ -148,6 +148,7 @@ remko [label="Remko Lodder\nremko@FreeBSD.org\n2007/02/23"] rik [label="Roman Kurakin\nrik@FreeBSD.org\n2003/12/18"] rink [label="Rink Springer\nrink@FreeBSD.org\n2006/01/16"] +rnoland [label="Robert Noland\nrnoland@FreeBSD.org\n2008/09/15"] roberto [label="Ollivier Robert\nroberto@FreeBSD.org\n1995/02/22"] rpaulo [label="Rui Paulo\nrpaulo@FreeBSD.org\n2007/09/25"] rrs [label="Randall R Stewart\nrrs@FreeBSD.org\n2007/02/08"] @@ -292,6 +293,7 @@ jhb -> arr jhb -> jeff jhb -> kbyanc +jhb -> rnoland jkh -> imp jkh -> jlemon ==== //depot/projects/mpsafetty/sys/amd64/amd64/elf_machdep.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.26 2007/05/22 02:22:57 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.27 2008/09/24 10:14:37 kib Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -46,59 +46,60 @@ #include <machine/md_var.h> struct sysentvec elf64_freebsd_sysvec = { - SYS_MAXSYSCALL, - sysent, - 0, - 0, - NULL, - 0, - NULL, - NULL, - __elfN(freebsd_fixup), - sendsig, - sigcode, - &szsigcode, - NULL, - "FreeBSD ELF64", - __elfN(coredump), - NULL, - MINSIGSTKSZ, - PAGE_SIZE, - VM_MIN_ADDRESS, - VM_MAXUSER_ADDRESS, - USRSTACK, - PS_STRINGS, - VM_PROT_ALL, - exec_copyout_strings, - exec_setregs, - NULL + .sv_size = SYS_MAXSYSCALL, + .sv_table = sysent, + .sv_mask = 0, + .sv_sigsize = 0, + .sv_sigtbl = NULL, + .sv_errsize = 0, + .sv_errtbl = NULL, + .sv_transtrap = NULL, + .sv_fixup = __elfN(freebsd_fixup), + .sv_sendsig = sendsig, + .sv_sigcode = sigcode, + .sv_szsigcode = &szsigcode, + .sv_prepsyscall = NULL, + .sv_name = "FreeBSD ELF64", + .sv_coredump = __elfN(coredump), + .sv_imgact_try = NULL, + .sv_minsigstksz = MINSIGSTKSZ, + .sv_pagesize = PAGE_SIZE, + .sv_minuser = VM_MIN_ADDRESS, + .sv_maxuser = VM_MAXUSER_ADDRESS, + .sv_usrstack = USRSTACK, + .sv_psstrings = PS_STRINGS, + .sv_stackprot = VM_PROT_ALL, + .sv_copyout_strings = exec_copyout_strings, + .sv_setregs = exec_setregs, + .sv_fixlimit = NULL, + .sv_maxssiz = NULL }; static Elf64_Brandinfo freebsd_brand_info = { - ELFOSABI_FREEBSD, - EM_X86_64, - "FreeBSD", - NULL, - "/libexec/ld-elf.so.1", - &elf64_freebsd_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_FREEBSD, + .machine = EM_X86_64, + .compat_3_brand = "FreeBSD", + .emul_path = NULL, + .interp_path = "/libexec/ld-elf.so.1", + .sysvec = &elf64_freebsd_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf64_insert_brand_entry, &freebsd_brand_info); static Elf64_Brandinfo freebsd_brand_oinfo = { - ELFOSABI_FREEBSD, - EM_X86_64, - "FreeBSD", - NULL, - "/usr/libexec/ld-elf.so.1", - &elf64_freebsd_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_FREEBSD, + .machine = EM_X86_64, + .compat_3_brand = "FreeBSD", + .emul_path = NULL, + .interp_path = "/usr/libexec/ld-elf.so.1", + .sysvec = &elf64_freebsd_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf64_insert_brand_entry, ==== //depot/projects/mpsafetty/sys/amd64/linux32/linux32_sysvec.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.34 2008/04/08 09:45:47 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.35 2008/09/24 10:14:37 kib Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -1000,62 +1000,62 @@ } struct sysentvec elf_linux_sysvec = { - LINUX_SYS_MAXSYSCALL, - linux_sysent, - 0, - LINUX_SIGTBLSZ, - bsd_to_linux_signal, - ELAST + 1, - bsd_to_linux_errno, - translate_traps, - elf_linux_fixup, - linux_sendsig, - linux_sigcode, - &linux_szsigcode, - linux_prepsyscall, - "Linux ELF32", - elf32_coredump, - exec_linux_imgact_try, - LINUX_MINSIGSTKSZ, - PAGE_SIZE, - VM_MIN_ADDRESS, - LINUX32_USRSTACK, - LINUX32_USRSTACK, - LINUX32_PS_STRINGS, - VM_PROT_ALL, - linux_copyout_strings, - exec_linux_setregs, - linux32_fixlimit, - &linux32_maxssiz, + .sv_size = LINUX_SYS_MAXSYSCALL, + .sv_table = linux_sysent, + .sv_mask = 0, + .sv_sigsize = LINUX_SIGTBLSZ, + .sv_sigtbl = bsd_to_linux_signal, + .sv_errsize = ELAST + 1, + .sv_errtbl = bsd_to_linux_errno, + .sv_transtrap = translate_traps, + .sv_fixup = elf_linux_fixup, + .sv_sendsig = linux_sendsig, + .sv_sigcode = linux_sigcode, + .sv_szsigcode = &linux_szsigcode, + .sv_prepsyscall = linux_prepsyscall, + .sv_name = "Linux ELF32", + .sv_coredump = elf32_coredump, + .sv_imgact_try = exec_linux_imgact_try, + .sv_minsigstksz = LINUX_MINSIGSTKSZ, + .sv_pagesize = PAGE_SIZE, + .sv_minuser = VM_MIN_ADDRESS, + .sv_maxuser = LINUX32_USRSTACK, + .sv_usrstack = LINUX32_USRSTACK, + .sv_psstrings = LINUX32_PS_STRINGS, + .sv_stackprot = VM_PROT_ALL, + .sv_copyout_strings = linux_copyout_strings, + .sv_setregs = exec_linux_setregs, + .sv_fixlimit = linux32_fixlimit, + .sv_maxssiz = &linux32_maxssiz, }; static Elf32_Brandinfo linux_brand = { - ELFOSABI_LINUX, - EM_386, - "Linux", - "/compat/linux", - "/lib/ld-linux.so.1", - &elf_linux_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_LINUX, + .machine = EM_386, + .compat_3_brand = "Linux", + .emul_path = "/compat/linux", + .interp_path = "/lib/ld-linux.so.1", + .sysvec = &elf_linux_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; static Elf32_Brandinfo linux_glibc2brand = { - ELFOSABI_LINUX, - EM_386, - "Linux", - "/compat/linux", - "/lib/ld-linux.so.2", - &elf_linux_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_LINUX, + .machine = EM_386, + .compat_3_brand = "Linux", + .emul_path = "/compat/linux", + .interp_path = "/lib/ld-linux.so.2", + .sysvec = &elf_linux_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; Elf32_Brandinfo *linux_brandlist[] = { - &linux_brand, - &linux_glibc2brand, - NULL - }; + &linux_brand, + &linux_glibc2brand, + NULL +}; static int linux_elf_modevent(module_t mod, int type, void *data) ==== //depot/projects/mpsafetty/sys/arm/arm/elf_machdep.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.7 2007/05/22 02:22:57 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.8 2008/09/24 10:14:37 kib Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -46,59 +46,60 @@ #include <machine/md_var.h> struct sysentvec elf32_freebsd_sysvec = { - SYS_MAXSYSCALL, - sysent, - 0, - 0, - NULL, - 0, - NULL, - NULL, - __elfN(freebsd_fixup), - sendsig, - sigcode, - &szsigcode, - NULL, - "FreeBSD ELF32", - __elfN(coredump), - NULL, - MINSIGSTKSZ, - PAGE_SIZE, - VM_MIN_ADDRESS, - VM_MAXUSER_ADDRESS, - USRSTACK, - PS_STRINGS, - VM_PROT_ALL, - exec_copyout_strings, - exec_setregs, - NULL + .sv_size = SYS_MAXSYSCALL, + .sv_table = sysent, + .sv_mask = 0, + .sv_sigsize = 0, + .sv_sigtbl = NULL, + .sv_errsize = 0, + .sv_errtbl = NULL, + .sv_transtrap = NULL, + .sv_fixup = __elfN(freebsd_fixup), + .sv_sendsig = sendsig, + .sv_sigcode = sigcode, + .sv_szsigcode = &szsigcode, + .sv_prepsyscall = NULL, + .sv_name = "FreeBSD ELF32", + .sv_coredump = __elfN(coredump), + .sv_imgact_try = NULL, + .sv_minsigstksz = MINSIGSTKSZ, + .sv_pagesize = PAGE_SIZE, + .sv_minuser = VM_MIN_ADDRESS, + .sv_maxuser = VM_MAXUSER_ADDRESS, + .sv_usrstack = USRSTACK, + .sv_psstrings = PS_STRINGS, + .sv_stackprot = VM_PROT_ALL, + .sv_copyout_strings = exec_copyout_strings, + .sv_setregs = exec_setregs, + .sv_fixlimit = NULL, + .sv_maxssiz = NULL }; static Elf32_Brandinfo freebsd_brand_info = { - ELFOSABI_FREEBSD, - EM_ARM, - "FreeBSD", - NULL, - "/libexec/ld-elf.so.1", - &elf32_freebsd_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_FREEBSD, + .machine = EM_ARM, + .compat_3_brand = "FreeBSD", + .emul_path = NULL, + .interp_path = "/libexec/ld-elf.so.1", + .sysvec = &elf32_freebsd_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf32_insert_brand_entry, &freebsd_brand_info); static Elf32_Brandinfo freebsd_brand_oinfo = { - ELFOSABI_FREEBSD, - EM_ARM, - "FreeBSD", - NULL, - "/usr/libexec/ld-elf.so.1", - &elf32_freebsd_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_FREEBSD, + .machine = EM_ARM, + .compat_3_brand = "FreeBSD", + .emul_path = NULL, + .interp_path = "/usr/libexec/ld-elf.so.1", + .sysvec = &elf32_freebsd_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; SYSINIT(oelf32, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf32_insert_brand_entry, ==== //depot/projects/mpsafetty/sys/compat/ia32/ia32_sysvec.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.27 2007/09/24 20:49:39 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.28 2008/09/24 10:14:37 kib Exp $"); #include "opt_compat.h" @@ -111,61 +111,61 @@ TUNABLE_ULONG("compat.ia32.maxvmem", &ia32_maxvmem); struct sysentvec ia32_freebsd_sysvec = { - FREEBSD32_SYS_MAXSYSCALL, - freebsd32_sysent, - 0, - 0, - NULL, - 0, - NULL, - NULL, - elf32_freebsd_fixup, - ia32_sendsig, - ia32_sigcode, - &sz_ia32_sigcode, - NULL, - "FreeBSD ELF32", - elf32_coredump, - NULL, - MINSIGSTKSZ, - IA32_PAGE_SIZE, - 0, - FREEBSD32_USRSTACK, - FREEBSD32_USRSTACK, - FREEBSD32_PS_STRINGS, - VM_PROT_ALL, - ia32_copyout_strings, - ia32_setregs, - ia32_fixlimit, - &ia32_maxssiz + .sv_size = FREEBSD32_SYS_MAXSYSCALL, + .sv_table = freebsd32_sysent, + .sv_mask = 0, + .sv_sigsize = 0, >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200809241154.m8OBsjdk082544>