CVS commit: src/sys/kern
Module Name:src
Committed By: tsutsui
Date: Sat Jun 26 06:43:14 UTC 2010
Modified Files:
src/sys/kern: subr_autoconf.c
Log Message:
Rather than referring a global variable rootvnode in autoconf(9),
prepare and use an internal root_is_mounted flag for config_mountroot(9).
Should fix annoying dependency problem in librump reported by Paul Goyette
on current-users@:
http://mail-index.NetBSD.org/current-users/2010/06/25/msg013771.html
To generate a diff of this commit:
cvs rdiff -u -r1.207 -r1.208 src/sys/kern/subr_autoconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_autoconf.c
diff -u src/sys/kern/subr_autoconf.c:1.207 src/sys/kern/subr_autoconf.c:1.208
--- src/sys/kern/subr_autoconf.c:1.207 Fri Jun 25 15:10:42 2010
+++ src/sys/kern/subr_autoconf.c Sat Jun 26 06:43:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_autoconf.c,v 1.207 2010/06/25 15:10:42 tsutsui Exp $ */
+/* $NetBSD: subr_autoconf.c,v 1.208 2010/06/26 06:43:13 tsutsui Exp $ */
/*
* Copyright (c) 1996, 2000 Christopher G. Demetriou
@@ -77,7 +77,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: subr_autoconf.c,v 1.207 2010/06/25 15:10:42 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: subr_autoconf.c,v 1.208 2010/06/26 06:43:13 tsutsui Exp $);
#ifdef _KERNEL_OPT
#include opt_ddb.h
@@ -98,7 +98,6 @@
#include sys/kthread.h
#include sys/buf.h
#include sys/dirent.h
-#include sys/vnode.h
#include sys/mount.h
#include sys/namei.h
#include sys/unistd.h
@@ -203,6 +202,7 @@
struct deferred_config_head mountroot_config_queue =
TAILQ_HEAD_INITIALIZER(mountroot_config_queue);
int mountroot_config_threads = 2;
+static bool root_is_mounted = false;
static void config_process_deferred(struct deferred_config_head *, device_t);
@@ -476,6 +476,9 @@
{
int i;
+ if (!root_is_mounted)
+ root_is_mounted = true;
+
for (i = 0; i mountroot_config_threads; i++) {
(void)kthread_create(PRI_NONE, 0, NULL,
config_mountroot_thread, NULL, NULL, config);
@@ -1887,7 +1890,7 @@
/*
* If root file system is mounted, callback now.
*/
- if (rootvnode != NULL) {
+ if (root_is_mounted) {
(*func)(dev);
return;
}
CVS commit: src/sys
Module Name:src
Committed By: pgoyette
Date: Sat Jun 26 07:23:57 UTC 2010
Modified Files:
src/sys/kern: init_main.c kern_module.c
src/sys/sys: module.h
Log Message:
1. Add an allocator for 'struct module *' and use it instead of local
allocations.
2. Add a new member mod_flags to the 'struct module *' and define
MODFLG_MUST_FORCE. If this flag is set and the entry is on the list
of builtins, it means that the module has been explicitly unloaded
and any re-loads will require the MODCTL_LOAD_FORCE flag. Provide a
module_require_force() method to set this flag; once set, it should
never be unset.
3. Rename original module_init2() to module_start_unload_thread() to be
more descriptive of what it does.
4. Add a new module_builtin_require_force() routine that sets the
MODFLG_MUST_FORCE flag for any module that has not yet successfully
been initialized. Call it after module_init_class(MODULE_CLASS_ANY)
to disable remaining built-in modules.
This makes built-in versions of the xxxVERBOSE modules work once more,
resolving breakage reported by jruoho@ and nj...@.
Discussed on tech-kern, and comments and suggestions implemented. No
additional discussion for last week. Tested only on amd64 systems, but
there's nothing here that should be port- or architecture-specific (no
more specific than existing module implementation) so others should not
break.
To generate a diff of this commit:
cvs rdiff -u -r1.421 -r1.422 src/sys/kern/init_main.c
cvs rdiff -u -r1.69 -r1.70 src/sys/kern/kern_module.c
cvs rdiff -u -r1.23 -r1.24 src/sys/sys/module.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/init_main.c
diff -u src/sys/kern/init_main.c:1.421 src/sys/kern/init_main.c:1.422
--- src/sys/kern/init_main.c:1.421 Fri Jun 25 15:10:42 2010
+++ src/sys/kern/init_main.c Sat Jun 26 07:23:57 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: init_main.c,v 1.421 2010/06/25 15:10:42 tsutsui Exp $ */
+/* $NetBSD: init_main.c,v 1.422 2010/06/26 07:23:57 pgoyette Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: init_main.c,v 1.421 2010/06/25 15:10:42 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: init_main.c,v 1.422 2010/06/26 07:23:57 pgoyette Exp $);
#include opt_ddb.h
#include opt_ipsec.h
@@ -431,7 +431,7 @@
loginit();
/* Second part of module system initialization. */
- module_init2();
+ module_start_unload_thread();
/* Initialize the file systems. */
#ifdef NVNODE_IMPLICIT
@@ -595,9 +595,11 @@
/*
* Load any remaining builtin modules, and hand back temporary
- * storage to the VM system.
+ * storage to the VM system. Then require force when loading any
+ * remaining un-init'ed built-in modules to avoid later surprises.
*/
module_init_class(MODULE_CLASS_ANY);
+ module_builtin_require_force();
/*
* Finalize configuration now that all real devices have been
Index: src/sys/kern/kern_module.c
diff -u src/sys/kern/kern_module.c:1.69 src/sys/kern/kern_module.c:1.70
--- src/sys/kern/kern_module.c:1.69 Wed May 26 23:53:21 2010
+++ src/sys/kern/kern_module.c Sat Jun 26 07:23:57 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_module.c,v 1.69 2010/05/26 23:53:21 pooka Exp $ */
+/* $NetBSD: kern_module.c,v 1.70 2010/06/26 07:23:57 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_module.c,v 1.69 2010/05/26 23:53:21 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_module.c,v 1.70 2010/06/26 07:23:57 pgoyette Exp $);
#define _MODULE_INTERNAL
@@ -87,9 +87,11 @@
static modinfo_t module_dummy;
__link_set_add_rodata(modules, module_dummy);
+static module_t *module_newmodule(modsrc_t);
+static void module_require_force(module_t *);
static int module_do_load(const char *, bool, int, prop_dictionary_t,
module_t **, modclass_t class, bool);
-static int module_do_unload(const char *);
+static int module_do_unload(const char *, bool);
static int module_do_builtin(const char *, module_t **);
static int module_fetch_info(module_t *);
static void module_thread(void *);
@@ -155,6 +157,32 @@
}
/*
+ * Allocate a new module_t
+ */
+static module_t *
+module_newmodule(modsrc_t source)
+{
+ module_t *mod;
+
+ mod = kmem_zalloc(sizeof(*mod), KM_SLEEP);
+ if (mod != NULL) {
+ mod-mod_source = source;
+ mod-mod_info = NULL;
+ mod-mod_flags = 0;
+ }
+ return mod;
+}
+
+/*
+ * Require the -f (force) flag to load a module
+ */
+static void
+module_require_force(struct module *mod)
+{
+ mod-mod_flags |= MODFLG_MUST_FORCE;
+}
+
+/*
* Add modules to the builtin list. This can done at boottime or
* at runtime if the module is linked into the kernel with an
* external linker. All or none of the input will be handled.
@@ -192,9 +220,8 @@
mipskip++;
continue;
CVS commit: src/sys/arch/evbarm/g42xxeb
Module Name:src
Committed By: bsh
Date: Sat Jun 26 07:51:45 UTC 2010
Modified Files:
src/sys/arch/evbarm/g42xxeb: g42xxeb_mci.c
Log Message:
Don't use DMA for sdmmc on TWINTAIL for now, because it causes kernel panic.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/g42xxeb/g42xxeb_mci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/g42xxeb/g42xxeb_mci.c
diff -u src/sys/arch/evbarm/g42xxeb/g42xxeb_mci.c:1.1 src/sys/arch/evbarm/g42xxeb/g42xxeb_mci.c:1.2
--- src/sys/arch/evbarm/g42xxeb/g42xxeb_mci.c:1.1 Sat Mar 13 11:37:47 2010
+++ src/sys/arch/evbarm/g42xxeb/g42xxeb_mci.c Sat Jun 26 07:51:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: g42xxeb_mci.c,v 1.1 2010/03/13 11:37:47 bsh Exp $ */
+/* $NetBSD: g42xxeb_mci.c,v 1.2 2010/06/26 07:51:45 bsh Exp $ */
/*-
* Copyright (c) 2009 Genetec Corporation. All rights reserved.
@@ -58,7 +58,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: g42xxeb_mci.c,v 1.1 2010/03/13 11:37:47 bsh Exp $);
+__KERNEL_RCSID(0, $NetBSD: g42xxeb_mci.c,v 1.2 2010/06/26 07:51:45 bsh Exp $);
#include sys/param.h
#include sys/device.h
@@ -163,6 +163,9 @@
pxa.pxa_intr = PXA2X0_INT_MMC;
#endif
+ /* disable DMA for sdmmc for now. */
+ SET(sc-sc_mci.sc_caps, PMC_CAPS_NO_DMA);
+
if (pxamci_attach_sub(self, pxa)) {
aprint_error_dev(self,
unable to attach MMC controller\n);
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src
Committed By: skrll
Date: Sat Jun 26 08:40:01 UTC 2010
Modified Files:
src/sys/arch/sparc64/sparc64: machdep.c
Log Message:
Remove unused cbit.
To generate a diff of this commit:
cvs rdiff -u -r1.253 -r1.254 src/sys/arch/sparc64/sparc64/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/sparc64/machdep.c
diff -u src/sys/arch/sparc64/sparc64/machdep.c:1.253 src/sys/arch/sparc64/sparc64/machdep.c:1.254
--- src/sys/arch/sparc64/sparc64/machdep.c:1.253 Sat May 8 07:34:02 2010
+++ src/sys/arch/sparc64/sparc64/machdep.c Sat Jun 26 08:40:01 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.253 2010/05/08 07:34:02 mrg Exp $ */
+/* $NetBSD: machdep.c,v 1.254 2010/06/26 08:40:01 skrll Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.253 2010/05/08 07:34:02 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.254 2010/06/26 08:40:01 skrll Exp $);
#include opt_ddb.h
#include opt_multiprocessor.h
@@ -1454,14 +1454,13 @@
size_t size, void **kvap, int flags)
{
vaddr_t va, sva;
- int r, cbit;
+ int r;
size_t oversize;
u_long align;
if (nsegs != 1)
panic(_bus_dmamem_map: nsegs = %d, nsegs);
- cbit = PMAP_NC;
align = PAGE_SIZE;
size = round_page(size);
CVS commit: src/share/man/man7
Module Name:src Committed By: jmmv Date: Sat Jun 26 11:15:28 UTC 2010 Modified Files: src/share/man/man7: Makefile Added Files: src/share/man/man7: tests.7 Log Message: Add the tests(7) manual page, which describes why and how to run the test suite and how to configure it. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/share/man/man7/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man7/tests.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man7/Makefile diff -u src/share/man/man7/Makefile:1.21 src/share/man/man7/Makefile:1.22 --- src/share/man/man7/Makefile:1.21 Fri Mar 2 11:28:16 2007 +++ src/share/man/man7/Makefile Sat Jun 26 11:15:27 2010 @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.21 2007/03/02 11:28:16 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2010/06/26 11:15:27 jmmv Exp $ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # missing: eqnchar.7 man.7 ms.7 term.7 MAN= ascii.7 environ.7 hier.7 hostname.7 intro.7 mailaddr.7 \ nls.7 operator.7 pkgsrc.7 release.7 \ - script.7 setuid.7 signal.7 sticky.7 symlink.7 sysctl.7 + script.7 setuid.7 signal.7 sticky.7 symlink.7 sysctl.7 \ + tests.7 .include bsd.man.mk Added files: Index: src/share/man/man7/tests.7 diff -u /dev/null src/share/man/man7/tests.7:1.1 --- /dev/null Sat Jun 26 11:15:28 2010 +++ src/share/man/man7/tests.7 Sat Jun 26 11:15:27 2010 @@ -0,0 +1,172 @@ +.\ $NetBSD: tests.7,v 1.1 2010/06/26 11:15:27 jmmv Exp $ +.\ +.\ Copyright (c) 2010 The NetBSD Foundation, Inc. +.\ All rights reserved. +.\ +.\ Redistribution and use in source and binary forms, with or without +.\ modification, are permitted provided that the following conditions +.\ are met: +.\ 1. Redistributions of source code must retain the above copyright +.\notice, this list of conditions and the following disclaimer. +.\ 2. Redistributions in binary form must reproduce the above copyright +.\notice, this list of conditions and the following disclaimer in the +.\documentation and/or other materials provided with the distribution. +.\ +.\ THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND +.\ CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, +.\ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +.\ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +.\ IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY +.\ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +.\ GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +.\ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +.\ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +.\ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +.\ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +.\ +.Dd June 26, 2010 +.Dt TESTS 7 +.Os +.Sh NAME +.Nm tests +.Nd An introduction to the NetBSD test suite +.Sh DESCRIPTION +The +.Nx +test suite provides a collection of automated tests for two major purposes. +On the one hand, the test suite aids +.Em developers +in catching bugs and regressions in the code when they performing modifications +to the source tree. +On the other hand, the test suite allows +.Em end users +(and, in particular, system administrators) to verify that fresh installations +of the +.Nx +operating system behave correctly in their hardware platform and also to ensure +that the system does not suffer from regressions during regular system +operation and maintenance. +.Pp +The +.Nx +tests are implemented using the +.Em Automated Testing Framework (ATF) , +a third-party package shipped with +.Nx ; +see +.Xr atf 7 +for details. +The +.Nx +test suite is distributed as a separate installation set, named +.Pa tests.tgz , +and the test programs are all installed under the +.Pa /usr/tests +hieararchy. +.Pp +This manual page describes how to execute the test suite and how to configure +some of its optional features. +.Ss When to run the tests? +Before diving into the details of how to run the test suite, here are some +scenarios in which you should be running them: +.Bl -bullet -offset indent +.It +After a fresh installation of +.Nx +to ensure that the system works correctly on your hardware platform. +.It +After an upgrade of +.Nx +to a different version to ensure that the new code works well on your +hardware platform and that the upgrade did not introduce regressions in your +configuration. +.It +After performing changes to the source tree to catch any bugs and/or regressions +introduced by the modifications. +.It +Periodically, maybe from a +.Xr cron 8 +job, to ensure that any changes to the system (such as the installation of +third-party packages or manual modifications to configuration files) do not +introduce unexpected failures. +.El +.Ss Running the tests +Use the following
CVS commit: src/distrib/sets/lists/man
Module Name:src Committed By: jmmv Date: Sat Jun 26 11:15:59 UTC 2010 Modified Files: src/distrib/sets/lists/man: mi Log Message: Register the tests(7) manual page. To generate a diff of this commit: cvs rdiff -u -r1.1220 -r1.1221 src/distrib/sets/lists/man/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1220 src/distrib/sets/lists/man/mi:1.1221 --- src/distrib/sets/lists/man/mi:1.1220 Thu Jun 24 16:37:48 2010 +++ src/distrib/sets/lists/man/mi Sat Jun 26 11:15:59 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1220 2010/06/24 16:37:48 skrll Exp $ +# $NetBSD: mi,v 1.1221 2010/06/26 11:15:59 jmmv Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1949,6 +1949,7 @@ ./usr/share/man/cat7/sticky.0 man-reference-catman .cat ./usr/share/man/cat7/symlink.0 man-reference-catman .cat ./usr/share/man/cat7/sysctl.0 man-reference-catman .cat +./usr/share/man/cat7/tests.0 man-reference-catman .cat ./usr/share/man/cat8/MAKEDEV.0 man-sysutil-catman .cat ./usr/share/man/cat8/MAKEDEV.local.0 man-sysutil-catman .cat ./usr/share/man/cat8/ac.0 man-sysutil-catman .cat @@ -4515,6 +4516,7 @@ ./usr/share/man/html7/sticky.html man-reference-htmlman html ./usr/share/man/html7/symlink.html man-reference-htmlman html ./usr/share/man/html7/sysctl.html man-reference-htmlman html +./usr/share/man/html7/tests.html man-reference-htmlman html ./usr/share/man/html8/MAKEDEV.html man-sysutil-htmlman html ./usr/share/man/html8/MAKEDEV.local.html man-sysutil-htmlman html ./usr/share/man/html8/ac.html man-sysutil-htmlman html @@ -7064,6 +7066,7 @@ ./usr/share/man/man7/sticky.7 man-reference-man .man ./usr/share/man/man7/symlink.7 man-reference-man .man ./usr/share/man/man7/sysctl.7 man-reference-man .man +./usr/share/man/man7/tests.7 man-reference-man .man ./usr/share/man/man8/MAKEDEV.8 man-sysutil-man .man ./usr/share/man/man8/MAKEDEV.local.8 man-sysutil-man .man ./usr/share/man/man8/ac.8 man-sysutil-man .man
CVS commit: src/share/man
Module Name:src Committed By: jmmv Date: Sat Jun 26 11:26:17 UTC 2010 Modified Files: src/share/man/man7: tests.7 src/share/man/man8: afterboot.8 Log Message: Move testing instructions from afterboot(8) to tests(7) and change the former to only provide a link to the latter. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man7/tests.7 cvs rdiff -u -r1.46 -r1.47 src/share/man/man8/afterboot.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man7/tests.7 diff -u src/share/man/man7/tests.7:1.1 src/share/man/man7/tests.7:1.2 --- src/share/man/man7/tests.7:1.1 Sat Jun 26 11:15:27 2010 +++ src/share/man/man7/tests.7 Sat Jun 26 11:26:17 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: tests.7,v 1.1 2010/06/26 11:15:27 jmmv Exp $ +.\ $NetBSD: tests.7,v 1.2 2010/06/26 11:26:17 jmmv Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -91,6 +91,18 @@ third-party packages or manual modifications to configuration files) do not introduce unexpected failures. .El +.Ss Installing the tests +If you chose to install the +.Pa tests.tgz +distribution set while setting up your +.Nx +system, the tests are already available in +.Pa /usr/tests . +Otherwise, install the set now by running: +.Bd -literal -offset indent +# cd / +# tar xzpf /path/to/tests.tgz +.Ed .Ss Running the tests Use the following commands to run the whole test suite: .Bd -literal -offset indent @@ -155,6 +167,30 @@ Specifies the name of a local, unprivileged user, that will be used by those tests that need to perform checks as non-root. .El +.Ss What to do if something fails? +If there is +.Em any failure +during the execution of the test suite, please considering reporting it to the +.Nx +developers so that the failure can be analyzed and fixed. +To do so, either send a message to the appropriate mailing list or file a +problem report. +For more details please refer to: +.Bl -bullet -offset indent -compact +.It +.Pa http://www.netbsd.org/mailinglists/ +.It +.Pa http://www.netbsd.org/support/send-pr.html +.El +.Sh FILES +.Bl -tag -compact -width etcXatfXNetBSDXconfXX +.It Pa /etc/atf/NetBSD.conf +Configuration file for the +.Nx +test suite. +.It Pa /usr/tests/ +Location of the test suites. +.El .Sh SEE ALSO .Xr atf 7 .Sh HISTORY Index: src/share/man/man8/afterboot.8 diff -u src/share/man/man8/afterboot.8:1.46 src/share/man/man8/afterboot.8:1.47 --- src/share/man/man8/afterboot.8:1.46 Wed Feb 17 00:49:21 2010 +++ src/share/man/man8/afterboot.8 Sat Jun 26 11:26:17 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: afterboot.8,v 1.46 2010/02/17 00:49:21 snj Exp $ +.\ $NetBSD: afterboot.8,v 1.47 2010/06/26 11:26:17 jmmv Exp $ .\ $OpenBSD: afterboot.8,v 1.72 2002/02/22 02:02:33 miod Exp $ .\ .\ Originally created by Marshall M. Midden -- 1997-10-20, m...@umn.edu @@ -59,7 +59,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. .\ -.Dd January 20, 2010 +.Dd June 26, 2010 .Dt AFTERBOOT 8 .Os .Sh NAME @@ -956,45 +956,10 @@ At this point, the system should be fully configured to your liking. It is now a good time to ensure that the system behaves according to its specifications and that it is stable on your hardware. -You can easily do so by running the test suites available at -.Pa /usr/tests/ , -assuming that you installed the -.Pa tests.tgz -set. -If not, you can install it now by running: -.Bd -literal -offset indent -# cd / -# tar xzpf /path/to/tests.tgz -.Ed -.Pp -Once done, edit the -.Pa /etc/atf/NetBSD.conf -file to tune the configuration of the test suite, go to -.Pa /usr/tests/ -hierarchy and use the -.Xr atf-run 1 -and -.Xr atf-report 1 -utilities to run all the tests in an automated way: -.Bd -literal -offset indent -# cd /usr/tests/ -# atf-run | atf-report -.Ed -.Pp -Should any problems appear when running the test suite, please let the -.Nx -developers know by sending a message to the appropriate mailing list or -by sending a problem report. -For more details see: -.Bl -bullet -offset indent -.It -.Pa http://www.netbsd.org/mailinglists/ -.It -.Pa http://www.netbsd.org/support/send-pr.html -.El +Please refer to +.Xr tests 7 +for details on how to do so. .Sh SEE ALSO -.Xr atf-report 1 , -.Xr atf-run 1 , .Xr chgrp 1 , .Xr chmod 1 , .Xr config 1 , @@ -1035,6 +1000,7 @@ .Xr hier 7 , .Xr hostname 7 , .Xr pkgsrc 7 , +.Xr tests 7 , .Xr amd 8 , .Xr ccdconfig 8 , .Xr chown 8 ,
CVS commit: src/external/bsd/atf/etc/atf
Module Name:src Committed By: jmmv Date: Sat Jun 26 11:27:51 UTC 2010 Modified Files: src/external/bsd/atf/etc/atf: NetBSD.conf Log Message: Reference tests(7). To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/etc/atf/NetBSD.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/atf/etc/atf/NetBSD.conf diff -u src/external/bsd/atf/etc/atf/NetBSD.conf:1.1 src/external/bsd/atf/etc/atf/NetBSD.conf:1.2 --- src/external/bsd/atf/etc/atf/NetBSD.conf:1.1 Mon Jan 19 07:13:04 2009 +++ src/external/bsd/atf/etc/atf/NetBSD.conf Sat Jun 26 11:27:50 2010 @@ -2,7 +2,9 @@ # # Configuration file for the NetBSD test suite. -# See atf-formats(5) for more details on its syntax. +# +# See atf-formats(5) for details on the syntax of this file and tests(7) for +# details on the NetBSD test suite. # # When running the test suite as root, some tests require to switch to
CVS commit: src/sys/arch
Module Name:src Committed By: bouyer Date: Sat Jun 26 13:08:37 UTC 2010 Modified Files: src/sys/arch/amd64/conf: XEN3_DOM0 src/sys/arch/i386/conf: XEN3_DOM0 Log Message: Sync DKWEDGE options with GENERIC To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.34 -r1.35 src/sys/arch/i386/conf/XEN3_DOM0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.54 src/sys/arch/amd64/conf/XEN3_DOM0:1.55 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.54 Sat May 22 19:02:07 2010 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Sat Jun 26 13:08:37 2010 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.54 2010/05/22 19:02:07 plunky Exp $ +# $NetBSD: XEN3_DOM0,v 1.55 2010/06/26 13:08:37 bouyer Exp $ include arch/amd64/conf/std.xen @@ -76,6 +76,13 @@ options EXEC_ELF32 options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. +# Wedge support +options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances +options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges +# The following two options can break /etc/fstab, so handle with care +#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges +#options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges + # File systems file-system FFS # UFS file-system EXT2FS # second extended file system (linux) Index: src/sys/arch/i386/conf/XEN3_DOM0 diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.34 src/sys/arch/i386/conf/XEN3_DOM0:1.35 --- src/sys/arch/i386/conf/XEN3_DOM0:1.34 Sat May 22 19:02:08 2010 +++ src/sys/arch/i386/conf/XEN3_DOM0 Sat Jun 26 13:08:37 2010 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.34 2010/05/22 19:02:08 plunky Exp $ +# $NetBSD: XEN3_DOM0,v 1.35 2010/06/26 13:08:37 bouyer Exp $ # # XEN3_0: Xen 3.0 domain0 kernel @@ -105,6 +105,13 @@ #options COMPAT_PECOFF # kernel support to run Win32 apps options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. +# Wedge support +options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances +options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges +# The following two options can break /etc/fstab, so handle with care +#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges +#options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges + # File systems file-system FFS # UFS file-system EXT2FS # second extended file system (linux)
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: kefren Date: Sat Jun 26 14:27:56 UTC 2010 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/comp: mi Log Message: add MPLS header files To generate a diff of this commit: cvs rdiff -u -r1.870 -r1.871 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1473 -r1.1474 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.870 src/distrib/sets/lists/base/mi:1.871 --- src/distrib/sets/lists/base/mi:1.870 Sat Jun 19 03:50:30 2010 +++ src/distrib/sets/lists/base/mi Sat Jun 26 14:27:55 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.870 2010/06/19 03:50:30 mrg Exp $ +# $NetBSD: mi,v 1.871 2010/06/26 14:27:55 kefren Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -794,6 +794,7 @@ ./usr/include/netisdnbase-c-usr ./usr/include/netisobase-c-usr ./usr/include/netkeybase-c-usr +./usr/include/netmplsbase-c-usr ./usr/include/netnatmbase-c-usr ./usr/include/netnsbase-obsolete obsolete ./usr/include/netsmbbase-c-usr Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1473 src/distrib/sets/lists/comp/mi:1.1474 --- src/distrib/sets/lists/comp/mi:1.1473 Fri Jun 25 15:16:13 2010 +++ src/distrib/sets/lists/comp/mi Sat Jun 26 14:27:55 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1473 2010/06/25 15:16:13 tsutsui Exp $ +# $NetBSD: mi,v 1.1474 2010/06/26 14:27:55 kefren Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1455,6 +1455,7 @@ ./usr/include/net/if_ieee80211.h comp-obsolete obsolete ./usr/include/net/if_llc.h comp-c-include ./usr/include/net/if_media.h comp-c-include +./usr/include/net/if_mpls.h comp-c-include ./usr/include/net/if_pflog.h comp-c-include ./usr/include/net/if_ppp.h comp-c-include ./usr/include/net/if_pppoe.h comp-c-include @@ -1633,6 +1634,7 @@ ./usr/include/netiso/tp_user.h comp-c-include ./usr/include/netiso/tp_var.h comp-c-include ./usr/include/netiso/tuba_table.h comp-obsolete obsolete +./usr/include/netmpls/mpls.h comp-c-include ./usr/include/netkey/key.h comp-c-include ./usr/include/netkey/key_debug.h comp-c-include ./usr/include/netkey/key_var.h comp-c-include
CVS commit: src/sbin/route
Module Name:src
Committed By: kefren
Date: Sat Jun 26 14:29:36 UTC 2010
Modified Files:
src/sbin/route: keywords.c keywords.h keywords.sh route.c show.c
Log Message:
add MPLS clue - mpls and tag keywords
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sbin/route/keywords.c
cvs rdiff -u -r1.10 -r1.11 src/sbin/route/keywords.h
cvs rdiff -u -r1.8 -r1.9 src/sbin/route/keywords.sh
cvs rdiff -u -r1.120 -r1.121 src/sbin/route/route.c
cvs rdiff -u -r1.40 -r1.41 src/sbin/route/show.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/route/keywords.c
diff -u src/sbin/route/keywords.c:1.7 src/sbin/route/keywords.c:1.8
--- src/sbin/route/keywords.c:1.7 Wed May 12 17:56:13 2010
+++ src/sbin/route/keywords.c Sat Jun 26 14:29:36 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: keywords.c,v 1.7 2010/05/12 17:56:13 christos Exp $ */
+/* $NetBSD: keywords.c,v 1.8 2010/06/26 14:29:36 kefren Exp $ */
/* WARNING! This file was generated by keywords.sh */
@@ -12,8 +12,6 @@
{change, K_CHANGE},
{cloned, K_CLONED},
{cloning, K_CLONING},
- {nocloned, K_NOCLONED},
- {nocloning, K_NOCLONING},
{delete, K_DELETE},
{dst, K_DST},
{expire, K_EXPIRE},
@@ -57,8 +55,12 @@
{xns, K_XNS},
{xresolve, K_XRESOLVE},
{flushall, K_FLUSHALL},
+ {nocloned, K_NOCLONED},
+ {nocloning, K_NOCLONING},
{noblackhole, K_NOBLACKHOLE},
{noreject, K_NOREJECT},
+ {mpls, K_MPLS},
+ {tag, K_TAG},
{0, 0}
};
Index: src/sbin/route/keywords.h
diff -u src/sbin/route/keywords.h:1.10 src/sbin/route/keywords.h:1.11
--- src/sbin/route/keywords.h:1.10 Wed May 12 17:56:13 2010
+++ src/sbin/route/keywords.h Sat Jun 26 14:29:36 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: keywords.h,v 1.10 2010/05/12 17:56:13 christos Exp $ */
+/* $NetBSD: keywords.h,v 1.11 2010/06/26 14:29:36 kefren Exp $ */
/* WARNING! This file was generated by keywords.sh */
@@ -61,3 +61,5 @@
#define K_NOCLONING 51
#define K_NOBLACKHOLE 52
#define K_NOREJECT 53
+#define K_MPLS 54
+#define K_TAG 55
Index: src/sbin/route/keywords.sh
diff -u src/sbin/route/keywords.sh:1.8 src/sbin/route/keywords.sh:1.9
--- src/sbin/route/keywords.sh:1.8 Wed May 12 19:26:33 2010
+++ src/sbin/route/keywords.sh Sat Jun 26 14:29:36 2010
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: keywords.sh,v 1.8 2010/05/12 19:26:33 kefren Exp $
+# $NetBSD: keywords.sh,v 1.9 2010/06/26 14:29:36 kefren Exp $
# @(#)keywords 8.2 (Berkeley) 3/19/94
#
# WARNING! If you change this file, re-run it!
@@ -61,6 +61,8 @@
nocloning
noblackhole
noreject
+mpls
+tag
_EOF_
Index: src/sbin/route/route.c
diff -u src/sbin/route/route.c:1.120 src/sbin/route/route.c:1.121
--- src/sbin/route/route.c:1.120 Wed May 12 17:56:13 2010
+++ src/sbin/route/route.c Sat Jun 26 14:29:36 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: route.c,v 1.120 2010/05/12 17:56:13 christos Exp $ */
+/* $NetBSD: route.c,v 1.121 2010/06/26 14:29:36 kefren Exp $ */
/*
* Copyright (c) 1983, 1989, 1991, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)route.c 8.6 (Berkeley) 4/28/95;
#else
-__RCSID($NetBSD: route.c,v 1.120 2010/05/12 17:56:13 christos Exp $);
+__RCSID($NetBSD: route.c,v 1.121 2010/06/26 14:29:36 kefren Exp $);
#endif
#endif /* not lint */
@@ -57,6 +57,7 @@
#include netinet/in.h
#include netatalk/at.h
#include netiso/iso.h
+#include netmpls/mpls.h
#include arpa/inet.h
#include netdb.h
@@ -83,13 +84,14 @@
struct sockaddr_dl sdl;
#ifndef SMALL
struct sockaddr_iso siso;
+ struct sockaddr_mpls smpls;
#endif /* SMALL */
};
typedef union sockunion *sup;
struct sou {
- union sockunion so_dst, so_gate, so_mask, so_genmask, so_ifa, so_ifp;
+ union sockunion so_dst, so_gate, so_mask, so_genmask, so_ifa, so_ifp, so_mpls;
};
static char *any_ntoa(const struct sockaddr *);
@@ -121,7 +123,7 @@
int pid, rtm_addrs;
int sock;
int forcehost, forcenet, doflush, nflag, af, qflag, tflag, Sflag;
-int iflag, verbose, aflen = sizeof(struct sockaddr_in);
+int iflag, verbose, aflen = sizeof(struct sockaddr_in), rtag;
int locking, lockrest, debugonly, shortoutput;
struct rt_metrics rt_metrics;
u_int32_t rtm_inits;
@@ -575,6 +577,16 @@
((const struct sockaddr_at *)sa)-sat_addr.s_net,
((const struct sockaddr_at *)sa)-sat_addr.s_node);
break;
+ case AF_MPLS:
+ {
+ union mpls_shim ms;
+
+ ms.s_addr =((const struct sockaddr_mpls*)sa)-smpls_addr.s_addr;
+ ms.s_addr = ntohl(ms.s_addr);
+
+ snprintf(line, sizeof(line), %u, ms.shim.label);
+ break;
+ }
#endif /* SMALL */
default:
@@ -819,6 +831,16 @@
af = AF_ISO;
aflen = sizeof(struct sockaddr_iso);
break;
+ case K_MPLS:
+af = AF_MPLS;
+aflen = sizeof(struct sockaddr_mpls);
+break;
+ case K_TAG:
+if (!--argc)
+ usage(1+*argv);
+aflen = sizeof(struct sockaddr_mpls);
+(void)getaddr(RTA_TAG, *++argv, 0, soup);
+break;
#endif /* SMALL */
case K_IFACE:
@@ -1140,6 +1162,10 @@
su =
CVS commit: src/usr.bin/netstat
Module Name:src
Committed By: kefren
Date: Sat Jun 26 14:30:31 UTC 2010
Modified Files:
src/usr.bin/netstat: show.c
Log Message:
add MPLS clue for showing routes
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/netstat/show.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/netstat/show.c
diff -u src/usr.bin/netstat/show.c:1.8 src/usr.bin/netstat/show.c:1.9
--- src/usr.bin/netstat/show.c:1.8 Sun Sep 13 02:53:17 2009
+++ src/usr.bin/netstat/show.c Sat Jun 26 14:30:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: show.c,v 1.8 2009/09/13 02:53:17 elad Exp $ */
+/* $NetBSD: show.c,v 1.9 2010/06/26 14:30:31 kefren Exp $ */
/* $OpenBSD: show.c,v 1.1 2006/05/27 19:16:37 claudio Exp $ */
/*
@@ -44,6 +44,7 @@
#include net/route.h
#include netinet/in.h
#include netinet/if_ether.h
+#include netmpls/mpls.h
#include arpa/inet.h
#include err.h
@@ -59,6 +60,7 @@
char *any_ntoa(const struct sockaddr *);
char *link_print(struct sockaddr *);
+char *mpls_ntoa(const struct sockaddr *);
#define ROUNDUP(a) \
((a) 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))
@@ -288,6 +290,9 @@
case AF_APPLETALK:
afname = AppleTalk;
break;
+ case AF_MPLS:
+ afname = MPLS;
+ break;
default:
afname = NULL;
break;
@@ -420,6 +425,9 @@
case AF_LINK:
return (link_print(sa));
+ case AF_MPLS:
+ return mpls_ntoa(sa);
+
#if 0 /* XXX-elad */
case AF_UNSPEC:
if (sa-sa_len == sizeof(struct sockaddr_rtlabel)) {
@@ -684,3 +692,19 @@
return (link_ntoa(sdl));
}
}
+
+char *
+mpls_ntoa(const struct sockaddr *sa)
+{
+ static char obuf[100];
+ const struct sockaddr_mpls *sm;
+ union mpls_shim ms;
+
+ sm = (const struct sockaddr_mpls*)sa;
+ ms.s_addr = ntohl(sm-smpls_addr.s_addr);
+
+ snprintf(obuf, sizeof(obuf), %u,
+ ms.shim.label);
+
+ return obuf;
+}
CVS commit: src/share/man/man7
Module Name:src Committed By: wiz Date: Sat Jun 26 14:50:14 UTC 2010 Modified Files: src/share/man/man7: tests.7 Log Message: Grammar fix; remove indefinite article from Nd; don't Xr itself, use Nm. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man7/tests.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man7/tests.7 diff -u src/share/man/man7/tests.7:1.2 src/share/man/man7/tests.7:1.3 --- src/share/man/man7/tests.7:1.2 Sat Jun 26 11:26:17 2010 +++ src/share/man/man7/tests.7 Sat Jun 26 14:50:14 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: tests.7,v 1.2 2010/06/26 11:26:17 jmmv Exp $ +.\ $NetBSD: tests.7,v 1.3 2010/06/26 14:50:14 wiz Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -30,7 +30,7 @@ .Os .Sh NAME .Nm tests -.Nd An introduction to the NetBSD test suite +.Nd introduction to the NetBSD test suite .Sh DESCRIPTION The .Nx @@ -112,8 +112,8 @@ .Pp The above will go through all test programs in .Pa /usr/tests -recursive, execute them, and, at the very end, show a report of the results of -the test suite. +recursively, execute them, and, at the very end, show a report of +the results of the test suite. These results include the count of tests that succeeded (passed), the names of the tests that failed, and the count of the tests that were not executed (skipped) because the system configuration did not meet their requirements. @@ -195,7 +195,7 @@ .Xr atf 7 .Sh HISTORY The -.Xr tests 7 +.Nm manual page first appeared in .Nx 6.0 . .Pp
CVS commit: src/sys
Module Name:src Committed By: kefren Date: Sat Jun 26 15:17:56 UTC 2010 Modified Files: src/sys/arch/i386/conf: ALL GENERIC src/sys/conf: files src/sys/net: if_mpls.c Added Files: src/sys/netmpls: files.netmpls Log Message: Fix build for MPLS import: add options MPLS, changed pseudo-device mpls to pseudo-device ifmpls To generate a diff of this commit: cvs rdiff -u -r1.259 -r1.260 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.985 -r1.986 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.990 -r1.991 src/sys/conf/files cvs rdiff -u -r1.1 -r1.2 src/sys/net/if_mpls.c cvs rdiff -u -r0 -r1.1 src/sys/netmpls/files.netmpls Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.259 src/sys/arch/i386/conf/ALL:1.260 --- src/sys/arch/i386/conf/ALL:1.259 Sat Jun 26 14:36:48 2010 +++ src/sys/arch/i386/conf/ALL Sat Jun 26 15:17:56 2010 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.259 2010/06/26 14:36:48 kefren Exp $ +# $NetBSD: ALL,v 1.260 2010/06/26 15:17:56 kefren Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident ALL-$Revision: 1.259 $ +#ident ALL-$Revision: 1.260 $ maxusers 64 # estimated number of users @@ -218,6 +218,7 @@ options IPSEC_ESP # IP security (encryption part; define w/IPSEC) options IPSEC_NAT_T # IPsec NAT traversal (NAT-T) #options IPSEC_DEBUG # debug for IP security +options MPLS # MultiProtocol Label Switching (needs ifmpls) options MROUTING # IP multicast routing options PIM # Protocol Independent Multicast options ISO,TPIP # OSI @@ -1593,7 +1594,7 @@ pseudo-device bpfilter # Berkeley packet filter pseudo-device carp # Common Address Redundancy Protocol pseudo-device ipfilter # IP filter (firewall) and NAT -pseudo-device mpls # MultiProtocol Label Switching +pseudo-device ifmpls # MPLS pseudo-interface pseudo-device loop # network loopback pseudo-device ppp # Point-to-Point Protocol pseudo-device pppoe # PPP over Ethernet (RFC 2516) Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.985 src/sys/arch/i386/conf/GENERIC:1.986 --- src/sys/arch/i386/conf/GENERIC:1.985 Sat Jun 26 14:36:48 2010 +++ src/sys/arch/i386/conf/GENERIC Sat Jun 26 15:17:56 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.985 2010/06/26 14:36:48 kefren Exp $ +# $NetBSD: GENERIC,v 1.986 2010/06/26 15:17:56 kefren Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.985 $ +#ident GENERIC-$Revision: 1.986 $ maxusers 64 # estimated number of users @@ -213,6 +213,7 @@ #options IPSEC_ESP # IP security (encryption part; define w/IPSEC) #options IPSEC_NAT_T # IPsec NAT traversal (NAT-T) #options IPSEC_DEBUG # debug for IP security +#options MPLS # MultiProtocol Label Switching (needs ifmpls) #options MROUTING # IP multicast routing #options PIM # Protocol Independent Multicast #options ISO,TPIP # OSI @@ -1536,7 +1537,7 @@ #pseudo-device carp # Common Address Redundancy Protocol pseudo-device ipfilter # IP filter (firewall) and NAT pseudo-device loop # network loopback -#pseudo-device mpls # MultiProtocol Label Switching +#pseudo-device ifmpls # MPLS pseudo-interface pseudo-device ppp # Point-to-Point Protocol pseudo-device pppoe # PPP over Ethernet (RFC 2516) #options PPPOE_SERVER# Enable PPPoE server via link0 Index: src/sys/conf/files diff -u src/sys/conf/files:1.990 src/sys/conf/files:1.991 --- src/sys/conf/files:1.990 Sat Jun 26 14:24:27 2010 +++ src/sys/conf/files Sat Jun 26 15:17:56 2010 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.990 2010/06/26 14:24:27 kefren Exp $ +# $NetBSD: files,v 1.991 2010/06/26 15:17:56 kefren Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20100430 @@ -193,6 +193,7 @@ include netinet6/files.ipsec include netipsec/files.netipsec include netiso/files.netiso +include netmpls/files.netmpls include netnatm/files.netnatm include netsmb/files.netsmb include net/files.pf @@ -1273,7 +1274,7 @@ defpseudo gre: ifnet defpseudo gif: ifnet defpseudo faith: ifnet -defpseudo mpls: ifnet +defpseudo ifmpls: ifnet defpseudo srt: ifnet defpseudo stf: ifnet defpseudodev tap: ifnet, ether, arp @@ -1612,9 +1613,7 @@ file net/if_ieee1394subr.c ieee1394 file net/if_loop.c loop needs-flag file net/if_media.c -file net/if_mpls.c mpls needs-flag -file netmpls/mpls_proto.c mpls -file netmpls/mpls_ttl.c mpls +file net/if_mpls.c ifmpls needs-flag file net/if_ppp.c ppp needs-flag file net/if_srt.c srt file net/if_stf.c stf inet inet6 needs-flag Index: src/sys/net/if_mpls.c diff -u src/sys/net/if_mpls.c:1.1
CVS commit: src/sys/arch/sparc/include
Module Name:src Committed By: tsutsui Date: Sat Jun 26 16:10:00 UTC 2010 Modified Files: src/sys/arch/sparc/include: z8530var.h Log Message: Forgot to commit this one that should have been done with zs.c rev 1.119: Establish interrupt handlers with proper softc per each zs device rather than sharing them among all zs devices and searching softc in handlers. The latter method is derived from ancient sun3 zs driver which tried to reduce overhead on autovectored interrupts, but nowadays such hack might cause recursive global locks on modern SMP capable framework. Fixes 5.99.30 sparc panic during startup reported by Hauke Fath on tech-kern@: http://mail-index.NetBSD.org/tech-kern/2010/06/19/msg008374.html and also tested by Jochen Kunz on SS20 with both serial and kbd console. Ok'ed by mrg@ and dyo...@. Noticed by mar...@. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sparc/include/z8530var.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc/include/z8530var.h diff -u src/sys/arch/sparc/include/z8530var.h:1.9 src/sys/arch/sparc/include/z8530var.h:1.10 --- src/sys/arch/sparc/include/z8530var.h:1.9 Sat Mar 29 19:15:35 2008 +++ src/sys/arch/sparc/include/z8530var.h Sat Jun 26 16:10:00 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: z8530var.h,v 1.9 2008/03/29 19:15:35 tsutsui Exp $ */ +/* $NetBSD: z8530var.h,v 1.10 2010/06/26 16:10:00 tsutsui Exp $ */ /* * Copyright (c) 1992, 1993 @@ -54,6 +54,7 @@ int zsc_node; /* PROM node, if any */ struct evcnt zsc_intrcnt; /* count interrupts */ struct zs_chanstate zsc_cs_store[2]; + void *zsc_sicookie; /* softint(9) cookie */ }; /*
CVS commit: src/sys/arch/hpcarm/conf
Module Name:src Committed By: tsutsui Date: Sat Jun 26 16:34:47 UTC 2010 Modified Files: src/sys/arch/hpcarm/conf: IPAQ Log Message: Comment out options RTC_OFFSET so that bootinfo-timezone passed by hpcboot will be used by default. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/sys/arch/hpcarm/conf/IPAQ Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hpcarm/conf/IPAQ diff -u src/sys/arch/hpcarm/conf/IPAQ:1.60 src/sys/arch/hpcarm/conf/IPAQ:1.61 --- src/sys/arch/hpcarm/conf/IPAQ:1.60 Sat Apr 17 13:36:21 2010 +++ src/sys/arch/hpcarm/conf/IPAQ Sat Jun 26 16:34:47 2010 @@ -1,4 +1,4 @@ -# $NetBSD: IPAQ,v 1.60 2010/04/17 13:36:21 nonaka Exp $ +# $NetBSD: IPAQ,v 1.61 2010/06/26 16:34:47 tsutsui Exp $ # # iPAQ H3600 -- Windows-CE based PDA # @@ -12,7 +12,8 @@ # Standard system options -options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT +#options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT +# (default timezone is passed from hpcboot) #options NTP # NTP phase/frequency locked loop # CPU options
CVS commit: src/sys/arch/sandpoint/stand/netboot
Module Name:src
Committed By: phx
Date: Sat Jun 26 22:13:32 UTC 2010
Added Files:
src/sys/arch/sandpoint/stand/netboot: dsk.c
Log Message:
- add IDE/SATA diskboot facility
known ok with KuroBox PCIIDE, need more debug on SiI3512 SATA
which fails reading sectors from a drive.
- now capable of TFTP loading
Code submitted by Toru Nishimura.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/sandpoint/stand/netboot/dsk.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/arch/sandpoint/stand/netboot/dsk.c
diff -u /dev/null src/sys/arch/sandpoint/stand/netboot/dsk.c:1.1
--- /dev/null Sat Jun 26 22:13:32 2010
+++ src/sys/arch/sandpoint/stand/netboot/dsk.c Sat Jun 26 22:13:32 2010
@@ -0,0 +1,570 @@
+/* $NetBSD: dsk.c,v 1.1 2010/06/26 22:13:32 phx Exp $ */
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Tohru Nishimura.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * assumptions;
+ * - up to 4 IDE/SATA drives.
+ * - a single (master) drive in each IDE channel.
+ * - all drives are up and spinning.
+ */
+
+#include sys/types.h
+
+#include lib/libsa/stand.h
+#include lib/libsa/ufs.h
+
+#include sys/disklabel.h
+#include sys/bootblock.h
+
+#include machine/bootinfo.h
+#include machine/stdarg.h
+
+#include globals.h
+
+/*
+ * - no vtophys() translation, vaddr_t == paddr_t.
+ */
+#define CSR_READ_4(r) in32rb(r)
+#define CSR_WRITE_4(r,v) out32rb(r,v)
+#define CSR_READ_1(r) *(volatile uint8_t *)(r)
+#define CSR_WRITE_1(r,v) *(volatile uint8_t *)(r)=(v)
+
+#define DSK_DECL(xxx) \
+int xxx ## _match(unsigned, void *); \
+void * xxx ## _init(unsigned, void *)
+
+DSK_DECL(pciide);
+DSK_DECL(siisata);
+
+struct dskdv {
+ char *name;
+ int (*match)(unsigned, void *);
+ void *(*init)(unsigned, void *);
+ void *priv;
+};
+
+static struct dskdv ldskdv[] = {
+ { pciide, pciide_match, pciide_init, },
+ { siisata, siisata_match, siisata_init, },
+};
+static int ndskdv = sizeof(ldskdv)/sizeof(ldskdv[0]);
+
+static int probe_drive(struct dkdev_ata *, int);
+static void drive_ident(struct disk *, char *);
+static char *mkident(char *, int);
+static void set_xfermode(struct dkdev_ata *, int);
+static void decode_dlabel(struct disk *, char *);
+static int sii_spinwait_irqack(struct dkdev_ata *, int);
+static int lba_read(struct disk *, uint64_t, uint32_t, void *);
+static void issue48(struct dvata_chan *, uint64_t, uint32_t);
+static void issue28(struct dvata_chan *, uint64_t, uint32_t);
+static struct disk *lookup_disk(int);
+
+static struct disk ldisk[4];
+
+int
+dskdv_init(unsigned tag, void **cookie)
+{
+ struct dskdv *dv;
+ int n;
+
+ for (n = 0; n ndskdv; n++) {
+ dv = ldskdv[n];
+ if ((*dv-match)(tag, NULL) 0)
+ goto found;
+ }
+ return 0;
+ found:
+ dv-priv = (*dv-init)(tag, NULL);
+ *cookie = dv;
+ return 1;
+}
+
+int
+disk_scan(void *cookie)
+{
+ struct dskdv *dv = cookie;
+ struct dkdev_ata *l = dv-priv;
+ struct disk *d;
+ int n, ndrive;
+
+ ndrive = 0;
+ for (n = 0; n 4; n++) {
+ if (l-presense[n] == 0)
+ continue;
+ if (probe_drive(l, n) == 0) {
+ l-presense[n] = 0;
+ continue;
+ }
+ d = ldisk[ndrive];
+ d-dvops = l;
+ d-unittag = ndrive;
+ snprintf(d-xname, sizeof(d-xname), wd%d, d-unittag);
+ drive_ident(d, l-iobuf);
+ decode_dlabel(d, l-iobuf);
+ set_xfermode(l, n);
+ ndrive += 1;
+ }
+ return ndrive;
+}
+
+int
+spinwait_unbusy(struct dkdev_ata *l, int n, int milli, const char **err)
+{
+ struct dvata_chan *chan = l-chan[n];
+ int sts;
+ const char *msg;
+
CVS commit: src/sys/external/bsd/drm/dist/shared-core
Module Name:src Committed By: mrg Date: Sat Jun 26 22:59:31 UTC 2010 Modified Files: src/sys/external/bsd/drm/dist/shared-core: radeon_drv.h Log Message: add CHIP_CEDAR, CHIP_REDWOOD, CHIP_JUNIPER, CHIP_CYPRESS and CHIP_HEMLOCK. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/sys/external/bsd/drm/dist/shared-core/radeon_drv.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm/dist/shared-core/radeon_drv.h diff -u src/sys/external/bsd/drm/dist/shared-core/radeon_drv.h:1.7 src/sys/external/bsd/drm/dist/shared-core/radeon_drv.h:1.8 --- src/sys/external/bsd/drm/dist/shared-core/radeon_drv.h:1.7 Mon May 24 01:39:06 2010 +++ src/sys/external/bsd/drm/dist/shared-core/radeon_drv.h Sat Jun 26 22:59:31 2010 @@ -150,6 +150,11 @@ CHIP_RV730, CHIP_RV710, CHIP_RV740, + CHIP_CEDAR, + CHIP_REDWOOD, + CHIP_JUNIPER, + CHIP_CYPRESS, + CHIP_HEMLOCK, CHIP_LAST, };
CVS commit: src/sys/external/bsd/drm/dist/bsd-core
Module Name:src
Committed By: mrg
Date: Sat Jun 26 23:00:19 UTC 2010
Modified Files:
src/sys/external/bsd/drm/dist/bsd-core: drm_pciids.h
Log Message:
add the latest generation of radeon cards.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm/dist/bsd-core/drm_pciids.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm/dist/bsd-core/drm_pciids.h
diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_pciids.h:1.3 src/sys/external/bsd/drm/dist/bsd-core/drm_pciids.h:1.4
--- src/sys/external/bsd/drm/dist/bsd-core/drm_pciids.h:1.3 Fri Jun 19 03:52:20 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_pciids.h Sat Jun 26 23:00:19 2010
@@ -140,6 +140,41 @@
{0x1002, 0x5e4c, CHIP_RV410|RADEON_NEW_MEMMAP, ATI Radeon RV410 X700 SE}, \
{0x1002, 0x5e4d, CHIP_RV410|RADEON_NEW_MEMMAP, ATI Radeon RV410 X700}, \
{0x1002, 0x5e4f, CHIP_RV410|RADEON_NEW_MEMMAP, ATI Radeon RV410 X700 SE}, \
+ {0x1002, 0x6880, CHIP_CYPRESS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, ATI Cypress}, \
+ {0x1002, 0x6888, CHIP_CYPRESS|RADEON_NEW_MEMMAP, ATI FirePro (FireGL)}, \
+ {0x1002, 0x6889, CHIP_CYPRESS|RADEON_NEW_MEMMAP, ATI FirePro (FireGL)}, \
+ {0x1002, 0x688A, CHIP_CYPRESS|RADEON_NEW_MEMMAP, ATI FirePro (FireGL)}, \
+ {0x1002, 0x6898, CHIP_CYPRESS|RADEON_NEW_MEMMAP, ATI Radeon HD 5800}, \
+ {0x1002, 0x6899, CHIP_CYPRESS|RADEON_NEW_MEMMAP, ATI Radeon HD 5800}, \
+ {0x1002, 0x689c, CHIP_HEMLOCK|RADEON_NEW_MEMMAP, ATI Radeon HD 5900}, \
+ {0x1002, 0x689d, CHIP_HEMLOCK|RADEON_NEW_MEMMAP, ATI Radeon HD 5900}, \
+ {0x1002, 0x689e, CHIP_CYPRESS|RADEON_NEW_MEMMAP, ATI Radeon HD 5800}, \
+ {0x1002, 0x68a0, CHIP_JUNIPER|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, ATI Mobility Radeon HD 5800}, \
+ {0x1002, 0x68a1, CHIP_JUNIPER|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, ATI Mobility Radeon HD 5800}, \
+ {0x1002, 0x68a8, CHIP_JUNIPER|RADEON_NEW_MEMMAP, ATI FirePro (FireGL)}, \
+ {0x1002, 0x68a9, CHIP_JUNIPER|RADEON_NEW_MEMMAP, ATI FirePro (FireGL)}, \
+ {0x1002, 0x68b0, CHIP_JUNIPER|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, ATI Mobility Radeon HD 5800}, \
+ {0x1002, 0x68b8, CHIP_JUNIPER|RADEON_NEW_MEMMAP, ATI Radeon HD 5700}, \
+ {0x1002, 0x68b9, CHIP_JUNIPER|RADEON_NEW_MEMMAP, ATI Radeon HD 5700}, \
+ {0x1002, 0x68be, CHIP_JUNIPER|RADEON_NEW_MEMMAP, ATI Radeon HD 5700}, \
+ {0x1002, 0x68c0, CHIP_REDWOOD|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, ATI Mobility Radeon HD 5000}, \
+ {0x1002, 0x68c1, CHIP_REDWOOD|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, ATI Mobility Radeon HD 5000}, \
+ {0x1002, 0x68c8, CHIP_REDWOOD|RADEON_NEW_MEMMAP, ATI FirePro (FireGL)}, \
+ {0x1002, 0x68c9, CHIP_REDWOOD|RADEON_NEW_MEMMAP, ATI FirePro (FireGL)}, \
+ {0x1002, 0x68d8, CHIP_REDWOOD|RADEON_NEW_MEMMAP, ATI Radeon HD 5670}, \
+ {0x1002, 0x68d9, CHIP_REDWOOD|RADEON_NEW_MEMMAP, ATI Radeon HD 5570}, \
+ {0x1002, 0x68da, CHIP_REDWOOD|RADEON_NEW_MEMMAP, ATI Radeon HD 5500}, \
+ {0x1002, 0x68de, CHIP_REDWOOD|RADEON_NEW_MEMMAP, ATI Redwood}, \
+ {0x1002, 0x68e0, CHIP_CEDAR|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, ATI Mobility Radeon HD 5000}, \
+ {0x1002, 0x68e1, CHIP_CEDAR|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, ATI Mobility Radeon HD 5000}, \
+ {0x1002, 0x68e4, CHIP_CEDAR|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, ATI Cedar}, \
+ {0x1002, 0x68e5, CHIP_CEDAR|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, ATI Cedar}, \
+ {0x1002, 0x68e8, CHIP_CEDAR|RADEON_NEW_MEMMAP, ATI Cedar}, \
+ {0x1002, 0x68e9, CHIP_CEDAR|RADEON_NEW_MEMMAP, ATI FirePro (FireGL)}, \
+ {0x1002, 0x68f1, CHIP_CEDAR|RADEON_NEW_MEMMAP, ATI FirePro (FireGL)}, \
+ {0x1002, 0x68f8, CHIP_CEDAR|RADEON_NEW_MEMMAP, ATI Cedar}, \
+ {0x1002, 0x68f9, CHIP_CEDAR|RADEON_NEW_MEMMAP, ATI Radeon HD 5450}, \
+ {0x1002, 0x68fe, CHIP_CEDAR|RADEON_NEW_MEMMAP, ATI Cedar}, \
{0x1002, 0x7100, CHIP_R520|RADEON_NEW_MEMMAP, ATI Radeon X1800}, \
{0x1002, 0x7101, CHIP_R520|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, ATI Mobility Radeon X1800 XT}, \
{0x1002, 0x7102, CHIP_R520|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, ATI Mobility Radeon X1800}, \
CVS commit: src/usr.bin/make
Module Name:src Committed By: dholland Date: Sun Jun 27 00:06:33 UTC 2010 Modified Files: src/usr.bin/make: make.1 Log Message: Clarify $(.PREFIX) / $*. Bump date. To generate a diff of this commit: cvs rdiff -u -r1.176 -r1.177 src/usr.bin/make/make.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/make/make.1 diff -u src/usr.bin/make/make.1:1.176 src/usr.bin/make/make.1:1.177 --- src/usr.bin/make/make.1:1.176 Thu Jun 10 18:35:22 2010 +++ src/usr.bin/make/make.1 Sun Jun 27 00:06:32 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: make.1,v 1.176 2010/06/10 18:35:22 wiz Exp $ +.\ $NetBSD: make.1,v 1.177 2010/06/27 00:06:32 dholland Exp $ .\ .\ Copyright (c) 1990, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ from: @(#)make.1 8.4 (Berkeley) 3/19/94 .\ -.Dd June 9, 2010 +.Dd June 27, 2010 .Dt MAKE 1 .Os .Sh NAME @@ -613,9 +613,11 @@ known as .Ql Va \? . .It Va .PREFIX -The file prefix of the file, containing only the file portion, no suffix +The file prefix of the target, containing only the file portion, no suffix or preceding directory components; also known as .Ql Va * . +This is the string that was left over when matching a particular +suffix rule and is not defined in explicit rules. .It Va .TARGET The name of the target; also known as .Ql Va @ .
CVS commit: src/usr.bin/make
Module Name:src Committed By: dholland Date: Sun Jun 27 00:53:32 UTC 2010 Modified Files: src/usr.bin/make: make.1 Log Message: fix previous, the source isn't exactly crystal clear and there's a bug that makes the behavior misleading. To generate a diff of this commit: cvs rdiff -u -r1.177 -r1.178 src/usr.bin/make/make.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/make/make.1 diff -u src/usr.bin/make/make.1:1.177 src/usr.bin/make/make.1:1.178 --- src/usr.bin/make/make.1:1.177 Sun Jun 27 00:06:32 2010 +++ src/usr.bin/make/make.1 Sun Jun 27 00:53:32 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: make.1,v 1.177 2010/06/27 00:06:32 dholland Exp $ +.\ $NetBSD: make.1,v 1.178 2010/06/27 00:53:32 dholland Exp $ .\ .\ Copyright (c) 1990, 1993 .\ The Regents of the University of California. All rights reserved. @@ -616,8 +616,6 @@ The file prefix of the target, containing only the file portion, no suffix or preceding directory components; also known as .Ql Va * . -This is the string that was left over when matching a particular -suffix rule and is not defined in explicit rules. .It Va .TARGET The name of the target; also known as .Ql Va @ .
