CVS commit: src/sys/dev/pci
Module Name:src Committed By: pgoyette Date: Sat May 8 07:18:47 UTC 2010 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add a couple more SMBus controllers. From FreeBSD. To generate a diff of this commit: cvs rdiff -u -r1.1028 -r1.1029 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1028 src/sys/dev/pci/pcidevs:1.1029 --- src/sys/dev/pci/pcidevs:1.1028 Fri May 7 14:19:36 2010 +++ src/sys/dev/pci/pcidevs Sat May 8 07:18:46 2010 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1028 2010/05/07 14:19:36 kiyohara Exp $ +$NetBSD: pcidevs,v 1.1029 2010/05/08 07:18:46 pgoyette Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -3505,6 +3505,8 @@ product NVIDIA MCP73_AHCI_12 0x07fb nForce MCP73 AHCI Controller product NVIDIA MCP73_HDA_1 0x07fc nForce MCP73 High Definition Audio Controller product NVIDIA MCP73_HDA_2 0x07fd nForce MCP73 High Definition Audio Controller +product NVIDIA MCP78S_SMB 0x0752 nForce MCP78S SMBus Controller +product NVIDIA MCP79_SMB 0x0aa2 nForce MCP79 SMBus Controller product NVIDIA MCP79_LAN1 0x0ab0 nForce MCP79 Gigabit Ethernet Controller product NVIDIA MCP79_LAN2 0x0ab1 nForce MCP79 Gigabit Ethernet Controller product NVIDIA MCP79_LAN3 0x0ab2 nForce MCP79 Gigabit Ethernet Controller
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src
Committed By: mrg
Date: Sat May 8 07:34:02 UTC 2010
Modified Files:
src/sys/arch/sparc64/sparc64: machdep.c
Log Message:
remove pmap_update() calls on the kernel_pmap -- they do nothign.
To generate a diff of this commit:
cvs rdiff -u -r1.252 -r1.253 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.252 src/sys/arch/sparc64/sparc64/machdep.c:1.253
--- src/sys/arch/sparc64/sparc64/machdep.c:1.252 Thu Mar 4 08:01:35 2010
+++ src/sys/arch/sparc64/sparc64/machdep.c Sat May 8 07:34:02 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.252 2010/03/04 08:01:35 mrg Exp $ */
+/* $NetBSD: machdep.c,v 1.253 2010/05/08 07:34:02 mrg Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.252 2010/03/04 08:01:35 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.253 2010/05/08 07:34:02 mrg Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -811,7 +811,6 @@
for (off = 0; off < n; off += PAGE_SIZE)
pmap_kenter_pa(dumpspace+off, maddr+off,
VM_PROT_READ, 0);
- pmap_update(pmap_kernel());
error = (*dump)(dumpdev, blkno,
(void *)dumpspace, (size_t)n);
pmap_kremove(dumpspace, n);
@@ -822,7 +821,6 @@
blkno += btodb(n);
}
}
- pmap_update(pmap_kernel());
switch (error) {
@@ -1732,7 +1730,6 @@
v += PAGE_SIZE;
pa += PAGE_SIZE;
} while ((size -= PAGE_SIZE) > 0);
- pmap_update(pmap_kernel());
return (0);
}
CVS commit: src/sys/dev/pci
Module Name:src Committed By: pgoyette Date: Sat May 8 07:41:44 UTC 2010 Modified Files: src/sys/dev/pci: nfsmb.c Log Message: Recognize additional SMBus controllers. From FreeBSD. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/dev/pci/nfsmb.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/dev/pci/nfsmb.c diff -u src/sys/dev/pci/nfsmb.c:1.20 src/sys/dev/pci/nfsmb.c:1.21 --- src/sys/dev/pci/nfsmb.c:1.20 Sat May 9 07:13:57 2009 +++ src/sys/dev/pci/nfsmb.c Sat May 8 07:41:44 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: nfsmb.c,v 1.20 2009/05/09 07:13:57 pgoyette Exp $ */ +/* $NetBSD: nfsmb.c,v 1.21 2010/05/08 07:41:44 pgoyette Exp $ */ /* * Copyright (c) 2007 KIYOHARA Takashi * All rights reserved. @@ -26,7 +26,7 @@ * */ #include -__KERNEL_RCSID(0, "$NetBSD: nfsmb.c,v 1.20 2009/05/09 07:13:57 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nfsmb.c,v 1.21 2010/05/08 07:41:44 pgoyette Exp $"); #include #include @@ -124,6 +124,8 @@ case PCI_PRODUCT_NVIDIA_MCP65_SMB: case PCI_PRODUCT_NVIDIA_MCP67_SMB: case PCI_PRODUCT_NVIDIA_MCP73_SMB: + case PCI_PRODUCT_NVIDIA_MCP78S_SMB: + case PCI_PRODUCT_NVIDIA_MCP79_SMB: return 1; } }
CVS commit: src/external/bsd/atf/dist
Module Name:src Committed By: jmmv Date: Sat May 8 08:05:40 UTC 2010 Update of /cvsroot/src/external/bsd/atf/dist In directory ivanova.netbsd.org:/tmp/cvs-serv18487 Log Message: Import atf 0.8. Changes in this release: * Test programs no longer run several test cases in a row. The execution of a test program now requires a test case name, and that single test case is executed. To execute several test cases, use the atf-run utility as usual. * Test programs no longer fork a subprocess to isolate the execution of test cases. They run the test case code in-process, and a crash of the test case will result in a crash of the test program. This is to ease debugging of faulty test cases. * Test programs no longer isolate their test cases. This means that they will not create temporary directories nor sanitize the environment any more. Yes: running a test case that depends on system state by hand will most likely yield different results depending on where (machine, directory, user environment, etc.) it is run. Isolation has been moved to atf-run. * Test programs no longer print a cryptic format (application/X-atf-tcs) on a special file channel. They can now print whatever they want on the screen. Because test programs can now only run one test case every time, providing controlled output is not necessary any more. * Test programs no longer write their status into a special file descriptor. Instead, they create a file with the results, which is later parsed by atf-run. This changes the semantics of the -r flag. * atf-run has been adjusted to perform the test case isolation. As a result, there is now a single canonical place that implements the isolation of test caes. In previous releases, the three language bindings (C, C++ and shell) had to be kept in sync with each other (read: not a nice thing to do at all). As a side effect of this change, writing bindings for other languages will be much, much easier from now on. * atf-run forks test programs on a test case basis, instead of on a test program basis as it did before. This is to provide the test case isolation that was before implemented by the test programs themselves. * Removed the atf-exec tool. This was used to implement test case isolation in atf-sh, but it is now unnecessary. * It is now optional to define the descr meta-data property. It has been proven to be mostly useless, because test cases often carry a descriptive name of their own. Status: Vendor Tag: TNF Release Tags: atf-0-8 U src/external/bsd/atf/dist/configure.ac U src/external/bsd/atf/dist/README U src/external/bsd/atf/dist/Makefile.am.m4 U src/external/bsd/atf/dist/aclocal.m4 U src/external/bsd/atf/dist/atf-c.h U src/external/bsd/atf/dist/atf-c++.hpp U src/external/bsd/atf/dist/Makefile.am U src/external/bsd/atf/dist/Makefile.in U src/external/bsd/atf/dist/bconfig.h.in U src/external/bsd/atf/dist/configure U src/external/bsd/atf/dist/AUTHORS U src/external/bsd/atf/dist/COPYING U src/external/bsd/atf/dist/INSTALL U src/external/bsd/atf/dist/NEWS U src/external/bsd/atf/dist/admin/config.guess U src/external/bsd/atf/dist/admin/compile U src/external/bsd/atf/dist/admin/check-install.sh U src/external/bsd/atf/dist/admin/config.sub U src/external/bsd/atf/dist/admin/depcomp U src/external/bsd/atf/dist/admin/install-sh U src/external/bsd/atf/dist/admin/ltmain.sh U src/external/bsd/atf/dist/admin/missing U src/external/bsd/atf/dist/admin/check-style-common.awk U src/external/bsd/atf/dist/admin/check-style-c.awk U src/external/bsd/atf/dist/admin/check-style-cpp.awk U src/external/bsd/atf/dist/admin/check-style-man.awk U src/external/bsd/atf/dist/admin/check-style-shell.awk U src/external/bsd/atf/dist/admin/check-style.sh U src/external/bsd/atf/dist/admin/choose-revision.sh U src/external/bsd/atf/dist/admin/generate-makefile.sh U src/external/bsd/atf/dist/admin/generate-revision.sh U src/external/bsd/atf/dist/admin/revision-dist.h U src/external/bsd/atf/dist/admin/generate-revision-dist.sh U src/external/bsd/atf/dist/atf-c/error_fwd.h U src/external/bsd/atf/dist/atf-c/build.h U src/external/bsd/atf/dist/atf-c/check.h U src/external/bsd/atf/dist/atf-c/config.h U src/external/bsd/atf/dist/atf-c/dynstr.h U src/external/bsd/atf/dist/atf-c/env.h U src/external/bsd/atf/dist/atf-c/error.h U src/external/bsd/atf/dist/atf-c/list.h U src/external/bsd/atf/dist/atf-c/fs.h U src/external/bsd/atf/dist/atf-c/io.h U src/external/bsd/atf/dist/atf-c/process.h U src/external/bsd/atf/dist/atf-c/macros.h U src/external/bsd/atf/dist/atf-c/map.h U src/external/bsd/atf/dist/atf-c/object.h U src/external/bsd/atf/dist/atf-c/atf-c-api.3 U src/external/bsd/atf/dist/atf-c/sanity.h U src/external/bsd/atf/dist/atf-c/tc.h U src/external/bsd/atf/dist/atf-c/tcr.h U src/external/bsd/atf/dist/atf-c/text.h U src/external/bsd/atf/dist/atf-c/tp.h U src/external/bsd/atf/dist/atf-c/ui.h U src/external/bsd/atf/dist/atf-c/user.h U src/exter
CVS commit: src/external/bsd/atf/dist
Module Name:src Committed By: jmmv Date: Sat May 8 08:11:05 UTC 2010 Modified Files: src/external/bsd/atf/dist/atf-c: tc.c Removed Files: src/external/bsd/atf/dist: revision.h src/external/bsd/atf/dist/atf-c: expand.c expand.h signals.c signals.h src/external/bsd/atf/dist/tests/atf/atf-c: d_include_expand_h.c d_include_signals_h.c t_expand.c t_signals.c src/external/bsd/atf/dist/tests/atf/formats: d_tcs_1 d_tcs_1.errin d_tcs_1.expout d_tcs_1.outin d_tcs_2 d_tcs_2.errin d_tcs_2.expout d_tcs_2.outin d_tcs_3 d_tcs_3.errin d_tcs_3.expout d_tcs_3.outin d_tcs_4 d_tcs_4.errin d_tcs_4.expout d_tcs_4.outin d_tcs_5 d_tcs_5.errin d_tcs_5.expout d_tcs_5.outin d_tcs_50 d_tcs_50.experr d_tcs_51 d_tcs_51.experr d_tcs_52 d_tcs_52.experr d_tcs_53 d_tcs_53.experr d_tcs_53.expout d_tcs_54 d_tcs_54.experr d_tcs_54.expout d_tcs_55 d_tcs_55.experr d_tcs_55.expout d_tcs_56 d_tcs_56.errin d_tcs_56.experr d_tcs_56.expout d_tcs_56.outin d_tcs_57 d_tcs_57.errin d_tcs_57.experr d_tcs_57.expout d_tcs_57.outin src/external/bsd/atf/dist/tests/atf/test_programs: t_cleanup.sh t_env.sh t_workdir.sh src/external/bsd/atf/dist/tests/atf/tools: Atffile h_fail.cpp h_misc.cpp h_mode.cpp h_pass.cpp t_atf_check.sh t_atf_cleanup.sh t_atf_compile.sh t_atf_config.sh t_atf_exec.sh t_atf_report.sh t_atf_run.sh src/external/bsd/atf/dist/tools: atf-check.1 atf-check.cpp atf-cleanup.1 atf-cleanup.cpp atf-compile.1 atf-compile.cpp atf-config.1 atf-config.cpp atf-exec.1 atf-exec.cpp atf-format.1 atf-format.cpp atf-host-compile.sh atf-report.1 atf-report.cpp atf-run.1 atf-run.cpp atf-run.hooks atf-version.1 atf-version.cpp Log Message: Merge atf 0.8. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/atf/dist/revision.h cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/atf/dist/atf-c/expand.c cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/atf/dist/atf-c/expand.h \ src/external/bsd/atf/dist/atf-c/signals.c \ src/external/bsd/atf/dist/atf-c/signals.h cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/dist/atf-c/tc.c cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/atf/dist/tests/atf/atf-c/d_include_expand_h.c \ src/external/bsd/atf/dist/tests/atf/atf-c/d_include_signals_h.c cvs rdiff -u -r1.1.1.2 -r0 \ src/external/bsd/atf/dist/tests/atf/atf-c/t_expand.c \ src/external/bsd/atf/dist/tests/atf/atf-c/t_signals.c cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_1 \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_1.errin \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_1.expout \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_1.outin \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_2 \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_2.errin \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_2.expout \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_2.outin \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_3 \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_3.errin \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_3.expout \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_3.outin \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_4 \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_4.errin \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_4.expout \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_4.outin \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_5 \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_5.errin \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_5.expout \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_5.outin \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_50 \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_50.experr \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_51 \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_51.experr \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_52 \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_52.experr \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_53 \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_53.experr \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_53.expout \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_54 \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_54.experr \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_54.expout \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_55 \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_55.experr \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_55.expout \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_56 \ src/external/bsd/atf/dist/tests/atf/formats/d_tcs_56.errin \
CVS commit: src/external/bsd/atf
Module Name:src Committed By: jmmv Date: Sat May 8 08:12:35 UTC 2010 Modified Files: src/external/bsd/atf/lib/libatf-c: Makefile bconfig.h src/external/bsd/atf/libexec: Makefile src/external/bsd/atf/libexec/atf-cleanup: Makefile src/external/bsd/atf/libexec/atf-format: Makefile src/external/bsd/atf/tests/atf: Makefile src/external/bsd/atf/tests/atf/atf-c: Makefile src/external/bsd/atf/tests/atf/formats: Makefile src/external/bsd/atf/tests/atf/test_programs: Makefile src/external/bsd/atf/usr.bin/atf-check: Makefile src/external/bsd/atf/usr.bin/atf-compile: Makefile src/external/bsd/atf/usr.bin/atf-config: Makefile src/external/bsd/atf/usr.bin/atf-report: Makefile src/external/bsd/atf/usr.bin/atf-run: Makefile src/external/bsd/atf/usr.bin/atf-version: Makefile Added Files: src/external/bsd/atf/tests/atf/atf-check: Makefile src/external/bsd/atf/tests/atf/atf-cleanup: Makefile src/external/bsd/atf/tests/atf/atf-compile: Makefile src/external/bsd/atf/tests/atf/atf-config: Makefile src/external/bsd/atf/tests/atf/atf-report: Makefile src/external/bsd/atf/tests/atf/atf-run: Makefile Removed Files: src/external/bsd/atf/libexec/atf-exec: Makefile Log Message: Update reachover Makefiles for atf 0.8. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/lib/libatf-c/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/lib/libatf-c/bconfig.h cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/libexec/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/libexec/atf-cleanup/Makefile cvs rdiff -u -r1.1 -r0 src/external/bsd/atf/libexec/atf-exec/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/libexec/atf-format/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/tests/atf/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/tests/atf/atf-c/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/atf-check/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/atf-cleanup/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/atf-compile/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/atf-config/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/atf-report/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/atf-run/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/tests/atf/formats/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/atf/tests/atf/test_programs/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/usr.bin/atf-check/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/usr.bin/atf-compile/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/usr.bin/atf-config/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/usr.bin/atf-report/Makefile cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/usr.bin/atf-run/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/usr.bin/atf-version/Makefile 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/lib/libatf-c/Makefile diff -u src/external/bsd/atf/lib/libatf-c/Makefile:1.3 src/external/bsd/atf/lib/libatf-c/Makefile:1.4 --- src/external/bsd/atf/lib/libatf-c/Makefile:1.3 Tue Dec 22 13:38:10 2009 +++ src/external/bsd/atf/lib/libatf-c/Makefile Sat May 8 08:12:33 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2009/12/22 13:38:10 jmmv Exp $ +# $NetBSD: Makefile,v 1.4 2010/05/08 08:12:33 jmmv Exp $ NOLINT= # defined @@ -40,7 +40,6 @@ dynstr.c \ env.c \ error.c \ - expand.c \ fs.c \ io.c \ list.c \ @@ -48,7 +47,6 @@ object.c \ process.c \ sanity.c \ - signals.c \ text.c \ ui.c \ user.c \ @@ -65,7 +63,6 @@ env.h \ error.h \ error_fwd.h \ - expand.h \ fs.h \ io.h \ list.h \ @@ -74,7 +71,6 @@ object.h \ process.h \ sanity.h \ - signals.h \ tc.h \ tcr.h \ text.h \ Index: src/external/bsd/atf/lib/libatf-c/bconfig.h diff -u src/external/bsd/atf/lib/libatf-c/bconfig.h:1.2 src/external/bsd/atf/lib/libatf-c/bconfig.h:1.3 --- src/external/bsd/atf/lib/libatf-c/bconfig.h:1.2 Tue Dec 22 13:38:10 2009 +++ src/external/bsd/atf/lib/libatf-c/bconfig.h Sat May 8 08:12:33 2010 @@ -73,6 +73,10 @@ /* Define to the last valid signal number */ #define LAST_SIGNO 63 +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#define LT_OBJDIR ".libs/" + /* Define to 1 if your C compiler doesn't accept -c and -o together. */ /* #undef NO_MINUS_C_MINUS_O */ @@ -83,25 +87,25 @@ #define PACKAGE_BUGREPORT "atf-de...@netbsd.org" /* Define to the copyright string applicable to this package. */ -#define PACKAGE_COPYRIGHT "Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc." +#define PACKAGE_COPYRIGHT "Copyright (c) 2007, 2008, 2009, 2010 The NetBSD Foundation, Inc." /* Define to th
CVS commit: src/etc/mtree
Module Name:src Committed By: jmmv Date: Sat May 8 08:13:12 UTC 2010 Modified Files: src/etc/mtree: NetBSD.dist.base Log Message: Update directories to match the atf 0.8 layout. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/etc/mtree/NetBSD.dist.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.18 src/etc/mtree/NetBSD.dist.base:1.19 --- src/etc/mtree/NetBSD.dist.base:1.18 Tue Apr 27 02:51:04 2010 +++ src/etc/mtree/NetBSD.dist.base Sat May 8 08:13:12 2010 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.18 2010/04/27 02:51:04 lukem Exp $ +# $NetBSD: NetBSD.dist.base,v 1.19 2010/05/08 08:13:12 jmmv Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -193,9 +193,11 @@ ./usr/libdata/debug/usr/tests/atf ./usr/libdata/debug/usr/tests/atf/atf-c ./usr/libdata/debug/usr/tests/atf/atf-c++ +./usr/libdata/debug/usr/tests/atf/atf-compile +./usr/libdata/debug/usr/tests/atf/atf-report +./usr/libdata/debug/usr/tests/atf/atf-run ./usr/libdata/debug/usr/tests/atf/formats ./usr/libdata/debug/usr/tests/atf/test_programs -./usr/libdata/debug/usr/tests/atf/tools ./usr/libdata/debug/usr/tests/crypto ./usr/libdata/debug/usr/tests/crypto/libcrypto ./usr/libdata/debug/usr/tests/fs @@ -1082,11 +1084,16 @@ ./usr/tests/atf ./usr/tests/atf/atf-c ./usr/tests/atf/atf-c++ +./usr/tests/atf/atf-check +./usr/tests/atf/atf-cleanup +./usr/tests/atf/atf-compile +./usr/tests/atf/atf-config +./usr/tests/atf/atf-report +./usr/tests/atf/atf-run ./usr/tests/atf/atf-sh ./usr/tests/atf/data ./usr/tests/atf/formats ./usr/tests/atf/test_programs -./usr/tests/atf/tools ./usr/tests/crypto ./usr/tests/crypto/libcrypto ./usr/tests/fs
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: jmmv Date: Sat May 8 08:14:37 UTC 2010 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/comp: mi src/distrib/sets/lists/man: mi src/distrib/sets/lists/tests: mi Log Message: Update file lists to match atf 0.8. To generate a diff of this commit: cvs rdiff -u -r1.864 -r1.865 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1441 -r1.1442 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.1206 -r1.1207 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.72 -r1.73 src/distrib/sets/lists/tests/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.864 src/distrib/sets/lists/base/mi:1.865 --- src/distrib/sets/lists/base/mi:1.864 Fri May 7 17:41:57 2010 +++ src/distrib/sets/lists/base/mi Sat May 8 08:14:37 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.864 2010/05/07 17:41:57 degroote Exp $ +# $NetBSD: mi,v 1.865 2010/05/08 08:14:37 jmmv Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -878,7 +878,7 @@ ./usr/libdata/lintbase-c-usr ./usr/libexec base-sys-usr ./usr/libexec/atf-cleanup base-atf-bin atf -./usr/libexec/atf-execbase-atf-bin atf +./usr/libexec/atf-execbase-atf-bin obsolete ./usr/libexec/atf-format base-atf-bin atf ./usr/libexec/atf-killpg base-obsolete obsolete ./usr/libexec/atrunbase-cron-bin Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1441 src/distrib/sets/lists/comp/mi:1.1442 --- src/distrib/sets/lists/comp/mi:1.1441 Mon May 3 05:01:53 2010 +++ src/distrib/sets/lists/comp/mi Sat May 8 08:14:36 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1441 2010/05/03 05:01:53 jruoho Exp $ +# $NetBSD: mi,v 1.1442 2010/05/08 08:14:36 jmmv Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -147,7 +147,7 @@ ./usr/include/atf-c/env.h comp-atf-include atf ./usr/include/atf-c/error.h comp-atf-include atf ./usr/include/atf-c/error_fwd.h comp-atf-include atf -./usr/include/atf-c/expand.h comp-atf-include atf +./usr/include/atf-c/expand.h comp-atf-include obsolete ./usr/include/atf-c/fs.h comp-atf-include atf ./usr/include/atf-c/io.h comp-atf-include atf ./usr/include/atf-c/list.h comp-atf-include atf @@ -156,7 +156,7 @@ ./usr/include/atf-c/object.h comp-atf-include atf ./usr/include/atf-c/process.h comp-atf-include atf ./usr/include/atf-c/sanity.h comp-atf-include atf -./usr/include/atf-c/signals.h comp-atf-include atf +./usr/include/atf-c/signals.h comp-atf-include obsolete ./usr/include/atf-c/tc.h comp-atf-include atf ./usr/include/atf-c/tcr.h comp-atf-include atf ./usr/include/atf-c/text.h comp-atf-include atf @@ -3377,7 +3377,7 @@ ./usr/libdata/debug/usr/games/worms.debug comp-games-debug debug ./usr/libdata/debug/usr/games/wump.debug comp-games-debug debug ./usr/libdata/debug/usr/libexec/atf-cleanup.debug comp-atf-debug debug -./usr/libdata/debug/usr/libexec/atf-exec.debug comp-atf-debug debug +./usr/libdata/debug/usr/libexec/atf-exec.debug comp-atf-debug obsolete ./usr/libdata/debug/usr/libexec/atf-format.debug comp-atf-debug debug ./usr/libdata/debug/usr/libexec/atf-killpg.debug comp-obsolete obsolete ./usr/libdata/debug/usr/libexec/atrun.debug comp-cron-debug debug Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1206 src/distrib/sets/lists/man/mi:1.1207 --- src/distrib/sets/lists/man/mi:1.1206 Fri May 7 17:41:57 2010 +++ src/distrib/sets/lists/man/mi Sat May 8 08:14:36 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1206 2010/05/07 17:41:57 degroote Exp $ +# $NetBSD: mi,v 1.1207 2010/05/08 08:14:36 jmmv Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -53,7 +53,7 @@ ./usr/share/man/cat1/atf-cleanup.0 man-atf-catman .cat,atf ./usr/share/man/cat1/atf-compile.0 man-atf-catman .cat,atf ./usr/share/man/cat1/atf-config.0 man-atf-catman .cat,atf -./usr/share/man/cat1/atf-exec.0 man-atf-catman .cat,atf +./usr/share/man/cat1/atf-exec.0 man-atf-catman obsolete ./usr/share/man/cat1/atf-format.0 man-atf-catman .cat,atf ./usr/share/man/cat1/atf-killpg.0 man-obsolete obsolete ./usr/share/man/cat1/atf-report.0 man-atf-catman .cat,atf @@ -2792,7 +2792,7 @@ ./usr/share/man/html1/atf-cleanup.html man-atf-htmlman html,atf ./usr/share/man/html1/atf-compile.html man-atf-htmlman html,atf ./usr/share/man/html1/atf-config.html man-atf-htmlman html,atf -./usr/share/man/html1/atf-exec.html man-atf-htmlman html,atf +./usr/share/man/html1/atf-exec.html man-atf-htmlman obsolete ./usr/share/man/html1/atf-format.html man-atf-htmlman html,atf ./usr/share/man/html1/atf-killpg.html man-obsolete obsolete ./usr/share/man/html1/atf-report.html man-atf-htmlman html,atf
CVS commit: src/doc
Module Name:src Committed By: jmmv Date: Sat May 8 08:16:14 UTC 2010 Modified Files: src/doc: CHANGES Log Message: Note update of atf to 0.8. To generate a diff of this commit: cvs rdiff -u -r1.1392 -r1.1393 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1392 src/doc/CHANGES:1.1393 --- src/doc/CHANGES:1.1392 Thu May 6 18:59:50 2010 +++ src/doc/CHANGES Sat May 8 08:16:14 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1392 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1393 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -608,3 +608,4 @@ xen: Enable no-execute bit feature for i386pae and amd64 kernels. [jym 20100505] cron: Import 4.1 from isc. [christos 20100506] + atf(7): Import 0.8. [jmmv 20100508]
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: jmmv Date: Sat May 8 08:16:41 UTC 2010 Modified Files: src/distrib/sets/lists/comp: md.shark Log Message: Add missing debug libraries for MKDEBUG=yes. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/comp/md.shark 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/comp/md.shark diff -u src/distrib/sets/lists/comp/md.shark:1.13 src/distrib/sets/lists/comp/md.shark:1.14 --- src/distrib/sets/lists/comp/md.shark:1.13 Fri Oct 31 20:24:52 2008 +++ src/distrib/sets/lists/comp/md.shark Sat May 8 08:16:41 2010 @@ -1,4 +1,4 @@ -# $NetBSD: md.shark,v 1.13 2008/10/31 20:24:52 mrg Exp $ +# $NetBSD: md.shark,v 1.14 2010/05/08 08:16:41 jmmv Exp $ ./usr/include/sharkcomp-c-include ./usr/include/shark/ansi.h comp-c-include ./usr/include/shark/aout_machdep.h comp-c-include @@ -50,5 +50,7 @@ ./usr/include/shark/vmparam.h comp-c-include ./usr/include/shark/wchar_limits.h comp-c-include ./usr/include/ieeefp.hcomp-c-include +./usr/libdata/debug/usr/lib/libarm.so.0.0.debug comp-sys-debug debug,pic +./usr/libdata/debug/usr/lib/libpmc.so.1.0.debug comp-sys-debug debug,pic ./usr/libdata/debug/sbin/ldconfig.debug comp-sysutil-debug debug,pic ./usr/libdata/debug/usr/sbin/ofctl.debug comp-sysutil-debug debug
CVS commit: src/tools/atf-compile
Module Name:src
Committed By: jmmv
Date: Sat May 8 08:20:18 UTC 2010
Modified Files:
src/tools/atf-compile: Makefile
Log Message:
Adjust paths to new location of the atf-compile sources in atf 0.8.
(You may be happy to know that this tool will probably disappear in
the next atf release!)
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tools/atf-compile/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/atf-compile/Makefile
diff -u src/tools/atf-compile/Makefile:1.6 src/tools/atf-compile/Makefile:1.7
--- src/tools/atf-compile/Makefile:1.6 Mon Jan 19 07:14:46 2009
+++ src/tools/atf-compile/Makefile Sat May 8 08:20:18 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/01/19 07:14:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2010/05/08 08:20:18 jmmv Exp $
CLEANFILES+= atf-host-compile
CLEANFILES+= atf-host-compile.tmp
@@ -14,7 +14,7 @@
fi && \
${TOOL_SED} -e s,__ATF_PKGDATADIR__,${SRCDIR}/atf-sh,g \
-e s,__ATF_SHELL__,${HOST_SH},g \
- <${SRCDIR}/tools/atf-host-compile.sh \
+ <${SRCDIR}/atf-compile/atf-host-compile.sh \
>atf-host-compile.tmp && \
chmod +x atf-host-compile.tmp && \
mv atf-host-compile.tmp atf-host-compile
@@ -28,4 +28,4 @@
${HOST_INSTALL_FILE} -m ${BINMODE} atf-host-compile ${.TARGET}
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH: ${SRCDIR}/tools
+.PATH: ${SRCDIR}/atf-compile
CVS commit: src/lib/libc/gen
Module Name:src Committed By: wiz Date: Sat May 8 11:22:58 UTC 2010 Modified Files: src/lib/libc/gen: valloc.3 Log Message: Remove double quotes around missing function in BUGS section. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/lib/libc/gen/valloc.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/gen/valloc.3 diff -u src/lib/libc/gen/valloc.3:1.13 src/lib/libc/gen/valloc.3:1.14 --- src/lib/libc/gen/valloc.3:1.13 Thu May 6 09:34:52 2010 +++ src/lib/libc/gen/valloc.3 Sat May 8 11:22:58 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: valloc.3,v 1.13 2010/05/06 09:34:52 jruoho Exp $ +.\" $NetBSD: valloc.3,v 1.14 2010/05/08 11:22:58 wiz Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -73,5 +73,5 @@ .Bx 3.0 . .Sh BUGS A -.Dq Fn vfree +.Fn vfree function has not been implemented.
CVS commit: src/usr.sbin/pf/pfs
Module Name:src Committed By: wiz Date: Sat May 8 11:29:40 UTC 2010 Modified Files: src/usr.sbin/pf/pfs: pfs.8 Log Message: Sort options, standardize SYNOPSIS, slight rewordings. Use more markup. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/pf/pfs/pfs.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/pf/pfs/pfs.8 diff -u src/usr.sbin/pf/pfs/pfs.8:1.1 src/usr.sbin/pf/pfs/pfs.8:1.2 --- src/usr.sbin/pf/pfs/pfs.8:1.1 Fri May 7 17:41:58 2010 +++ src/usr.sbin/pf/pfs/pfs.8 Sat May 8 11:29:40 2010 @@ -3,73 +3,75 @@ .Os .Sh NAME .Nm pfs -.Nd saves and restores information for NAT and state tables. +.Nd save and restore information for NAT and state tables. .Sh SYNOPSIS .Nm .Op Fl v .Fl l .Nm -.Op Fl v -.Fl u -.Nm -.Op Fl v -.Op Fl b -.Fl w +.Op Fl bv +.Fl R .Ar filename .Nm -.Op Fl v -.Op Fl b +.Op Fl bv .Fl r .Ar filename .Nm .Op Fl v -.Op Fl b -.Fl R -.Ar filename +.Fl u .Nm -.Op Fl v -.Op Fl b +.Op Fl bv .Fl W .Ar filename +.Nm +.Op Fl bv +.Fl w +.Ar filename .Sh DESCRIPTION The .Nm command allows state information created for NAT entries and rules using -.Pa keep state +.Dq keep state to be locked (modification prevented) and then saved to disk, allowing for the system to experience a reboot, followed by the restoration of that information, resulting in connections not being interrupted. .Sh OPTIONS -.Bl -tag -width indent +.Bl -tag -width XrXfilenameXX .It Fl b -The information are read or stored using binary format. The default format is -a readable ascii format, similar to +The information are read or stored using binary format. +The default format is a readable ASCII format, similar to .Pa pfctl.conf syntax. -.It Fl v -Provides a verbose description of what's being done. -.It Fl u -Unlock state tables in the kernel. .It Fl l Lock state tables in the kernel. -.It Fl r -Read information in from the specified file and load it into the -kernel. This requires the state tables to have already been locked -and does not change the lock once complete. -.It Fl w -Write information out to the specified file and from the kernel. +.It Fl R Ar filename +Restore information from +.Ar filename +and load it into the kernel. +The state tables are locked at the beginning of this operation and +unlocked once complete. +.It Fl r Ar filename +Read information in from +.Ar filename +and load it into the kernel. This requires the state tables to have already been locked and does not change the lock once complete. -.It Fl R -Restores information in from the specified file and load it into the -kernel. The state tables are locked at the beginning of this operation and +.It Fl u +Unlock state tables in the kernel. +.It Fl v +Provide a verbose description of what's being done. +.It Fl W Ar filename +Write information from the kernel out to +.Ar filename . +The state tables are locked at the beginning of this operation and unlocked once complete. -.It Fl W -Write information out to the specified file and from the kernel. The state -tables are locked at the beginning of this operation and unlocked once -complete. +.It Fl w Ar filename +Write information from the kernel out to +.Ar filename . +This requires the state tables to have already been locked +and does not change the lock once complete. .El .Sh FILES -/dev/pf +.Pa /dev/pf .Sh SEE ALSO .Xr pf 4
CVS commit: src/lib/libc/stdio
Module Name:src Committed By: wiz Date: Sat May 8 11:35:14 UTC 2010 Modified Files: src/lib/libc/stdio: ferror.3 Log Message: Wording. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/lib/libc/stdio/ferror.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/stdio/ferror.3 diff -u src/lib/libc/stdio/ferror.3:1.13 src/lib/libc/stdio/ferror.3:1.14 --- src/lib/libc/stdio/ferror.3:1.13 Thu May 6 09:18:06 2010 +++ src/lib/libc/stdio/ferror.3 Sat May 8 11:35:14 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: ferror.3,v 1.13 2010/05/06 09:18:06 jruoho Exp $ +.\" $NetBSD: ferror.3,v 1.14 2010/05/08 11:35:14 wiz Exp $ .\" .\" Copyright (c) 1990, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -96,13 +96,13 @@ may fail and return \-1 in case the argument .Fa stream is not associated with a valid file descriptor. -(In such case the +(In this case the .Nx implementation does not follow the optional .Tn POSIX -recommendation and set the +recommendation to set the .Va errno -to +variable to .Er EBADF . ) .Sh SEE ALSO .Xr open 2 ,
CVS commit: src/external/bsd/cron/dist
Module Name:src
Committed By: wiz
Date: Sat May 8 11:55:01 UTC 2010
Modified Files:
src/external/bsd/cron/dist: cron.8 crontab.1
Log Message:
Remove trailing whitespace; new sentence, new line; sort sections;
standardize SYNOPSIS; use serial comma.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/cron/dist/cron.8
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/cron/dist/crontab.1
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/cron/dist/cron.8
diff -u src/external/bsd/cron/dist/cron.8:1.2 src/external/bsd/cron/dist/cron.8:1.3
--- src/external/bsd/cron/dist/cron.8:1.2 Thu May 6 18:53:17 2010
+++ src/external/bsd/cron/dist/cron.8 Sat May 8 11:55:01 2010
@@ -1,5 +1,5 @@
-.\" $NetBSD: cron.8,v 1.2 2010/05/06 18:53:17 christos Exp $
-.\"
+.\" $NetBSD: cron.8,v 1.3 2010/05/08 11:55:01 wiz Exp $
+.\"
.\" Id: cron.8,v 1.8 2004/01/23 19:03:32 vixie Exp
.\"
.Dd May 5, 2010
@@ -19,7 +19,8 @@
framework, if cron is switched on in
.Xr rc.conf 5 .
.Pp
-It will return immediately so you don't have to starti it with '&'.
+It will return immediately so you don't have to start it with
+.Sq \*[Am] .
.Pp
.Nm
searches
@@ -112,18 +113,18 @@
If time has moved forward, those jobs that would have run in the
interval that has been skipped will be run immediately.
Conversely, if time has moved backward, care is taken to avoid running
-jobs twice.
+jobs twice.
.Pp
Time changes of more than 3 hours are considered to be corrections to
the clock or timezone, and the new time is used immediately.
.Sh SIGNALS
-On receipt of a
+On receipt of a
.Dv SIGHUP ,
the cron daemon will close and reopen its
log file.
-This is useful in scripts which rotate and age log files.
+This is useful in scripts which rotate and age log files.
Naturally this is not relevant if cron was built to use
-.Xr syslog 3.
+.Xr syslog 3 .
.Sh FILES
.Bl -tag -width /var/cron/tabs -compact
.It Pa /var/cron/tabs
Index: src/external/bsd/cron/dist/crontab.1
diff -u src/external/bsd/cron/dist/crontab.1:1.3 src/external/bsd/cron/dist/crontab.1:1.4
--- src/external/bsd/cron/dist/crontab.1:1.3 Fri May 7 20:43:40 2010
+++ src/external/bsd/cron/dist/crontab.1 Sat May 8 11:55:01 2010
@@ -1,9 +1,9 @@
-.\" $NetBSD: crontab.1,v 1.3 2010/05/07 20:43:40 christos Exp $
+.\" $NetBSD: crontab.1,v 1.4 2010/05/08 11:55:01 wiz Exp $
.\"
.\"/* Copyright 1988,1990,1993 by Paul Vixie
.\" * All rights reserved
.\" */
-.\"
+.\"
.\" Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
.\" Copyright (c) 1997,2000 by Internet Software Consortium, Inc.
.\"
@@ -19,7 +19,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
.\" OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" Id: crontab.1,v 1.7 2004/01/23 19:03:32 vixie Exp
+.\" Id: crontab.1,v 1.7 2004/01/23 19:03:32 vixie Exp
.\"
.Dd May 6, 2010
.Dt CRONTAB 1
@@ -31,12 +31,10 @@
.Nm
.Op Fl u Ar user
.Nm
-.Op Fl l
-.Op Fl r
-.Op Fl e
+.Op Fl elr
.Sh DESCRIPTION
.Nm
-is the program used to install, deinstall or list the tables
+is the program used to install, deinstall, or list the tables
used to drive the
.Xr cron 8
daemon in ISC Cron.
@@ -72,7 +70,8 @@
If the
.Fl u
option is given, it specifies the name of the user whose crontab is to be
-tweaked. If this option is not given,
+tweaked.
+If this option is not given,
.Nm
examines
.Dq your
@@ -88,7 +87,7 @@
option for safety's sake.
.Pp
The first form of this command is used to install a new crontab from some
-named file or standard input if the pseudo-filename
+named file or standard input if the pseudo-filename
.Dq -
is given.
.Pp
@@ -103,18 +102,15 @@
The
.Fl e
option is used to edit the current crontab using the editor specified by
-the
+the
.Dv VISUAL
or
.Dv EDITOR
environment variables.
After you exit from the editor, the modified crontab will be installed
automatically.
-.Sh SEE ALSO
-.Xr crontab 5 ,
-.Xr cron 8
.Sh FILES
-.Bl -tag -width /var/cron/maxtabsize -compact
+.Bl -tag -width /var/cron/maxtabsize -compact
.It Pa /var/cron/allow
Optional list of users that are allowed to use
.Nm .
@@ -124,13 +120,19 @@
.It Pa /var/cron/maxtabsize
Maximum size of
.Nm
-.It Pa /var/cron/tabs/
-Directory containing the individual user crontab files, named after the user.
files.
Defaults to
.Dv 256
kilobytes.
+.It Pa /var/cron/tabs/
+Directory containing the individual user crontab files, named after the user.
.El
+.Sh DIAGNOSTICS
+A fairly informative usage message appears if you run it with a bad command
+line.
+.Sh SEE ALSO
+.Xr crontab 5 ,
+.Xr cron 8
.Sh STANDARDS
The
.Nm
@@ -140,9 +142,6 @@
differs from previous versions of Vixie Cron, as well as from the classic
.At V3
syntax.
-.Sh DIAGNOSTICS
-A fairly informative usage message appears if you run it with a bad command
-line.
.Sh AUTHORS
.A
CVS commit: src/sys/arch/sandpoint/stand/netboot
Module Name:src
Committed By: phx
Date: Sat May 8 14:40:08 UTC 2010
Modified Files:
src/sys/arch/sandpoint/stand/netboot: brdsetup.c globals.h main.c
Log Message:
Calculate busclock and cpuclock for 8245-based boards from PLL_CFG and HID1.
Print the clocks after netboot's welcome-message.
Make sure DUART-mode is enabled for eumb-systems.
Support for communication with the satellite processor via the 2nd UART.
Currently only KuroBox and Synology make use of it. Synology also resets the
board via its satellite.
Fixed console speed for KuroBox and QNAP (it is 115200).
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sandpoint/stand/netboot/brdsetup.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sandpoint/stand/netboot/globals.h
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/sandpoint/stand/netboot/main.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/sandpoint/stand/netboot/brdsetup.c
diff -u src/sys/arch/sandpoint/stand/netboot/brdsetup.c:1.9 src/sys/arch/sandpoint/stand/netboot/brdsetup.c:1.10
--- src/sys/arch/sandpoint/stand/netboot/brdsetup.c:1.9 Sun May 2 13:31:14 2010
+++ src/sys/arch/sandpoint/stand/netboot/brdsetup.c Sat May 8 14:40:08 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: brdsetup.c,v 1.9 2010/05/02 13:31:14 phx Exp $ */
+/* $NetBSD: brdsetup.c,v 1.10 2010/05/08 14:40:08 phx Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -31,6 +31,8 @@
#include
+#include
+
#include
#include
#include
@@ -40,30 +42,89 @@
const unsigned dcache_line_size = 32; /* 32B linesize */
const unsigned dcache_range_size = 4 * 1024; /* 16KB / 4-way */
+static uint32_t ns_per_tick;
+
void brdsetup(void);
void setup_82C686B(void);
void setup_83C553F(void);
static inline u_quad_t mftb(void);
-unsigned uartbase;
+unsigned uart1base; /* console */
+unsigned uart2base; /* optional satellite processor */
#define THR 0
#define DLB 0
-#define DMB 1
+#define DHB 1
#define IER 1
#define FCR 2
#define LCR 3
+#define LCR_DLAB 0x80
+#define LCR_PEVEN 0x18
+#define LCR_PNONE 0x00
+#define LCR_8BITS 0x03
#define MCR 4
+#define MCR_RTS 0x02
+#define MCR_DTR 0x01
#define LSR 5
-#define DCR 11
-#define LSR_THRE 0x20
-#define UART_READ(r) *(volatile char *)(uartbase + (r))
-#define UART_WRITE(r, v) *(volatile char *)(uartbase + (r)) = (v)
+#define LSR_THRE 0x20
+#define DCR 0x11
+#define UART_READ(base, r) *(volatile char *)(base + (r))
+#define UART_WRITE(base, r, v) *(volatile char *)(base + (r)) = (v)
+
+static __inline uint32_t
+cputype(void)
+{
+ uint32_t pvr;
+
+ __asm volatile ("mfpvr %0" : "=r"(pvr));
+ return pvr >> 16;
+}
+
+static void
+init_uart(unsigned base, unsigned speed, uint8_t lcr)
+{
+ unsigned div;
+
+ div = busclock / speed / 16;
+ UART_WRITE(base, LCR, 0x80); /* turn on DLAB bit */
+ UART_WRITE(base, FCR, 0x00);
+ UART_WRITE(base, DHB, div >> 8); /* set speed */
+ UART_WRITE(base, DLB, div & 0xff);
+ UART_WRITE(base, LCR, lcr);
+ UART_WRITE(base, FCR, 0x07); /* FIFO on, TXRX FIFO reset */
+ UART_WRITE(base, IER, 0x00); /* make sure INT disabled */
+}
+
+/* talk to satellite processor */
+static void
+send_sat(char *msg)
+{
+ unsigned savedbase;
+
+ savedbase = uart1base;
+ uart1base = uart2base;
+ while (*msg)
+ putchar(*msg++);
+ uart1base = savedbase;
+}
void
brdsetup(void)
{
- unsigned pchb, pcib, div;
+ static uint8_t pci_to_memclk[] = {
+ 30, 30, 10, 10, 20, 10, 10, 10,
+ 10, 20, 20, 15, 20, 15, 20, 30,
+ 30, 40, 15, 40, 20, 25, 20, 40,
+ 25, 20, 10, 20, 15, 15, 20, 00
+ };
+ static uint8_t mem_to_cpuclk[] = {
+ 25, 30, 45, 20, 20, 00, 10, 30,
+ 30, 20, 45, 30, 25, 35, 30, 35,
+ 20, 25, 20, 30, 35, 40, 40, 20,
+ 30, 25, 40, 30, 30, 25, 35, 00
+ };
+ uint32_t extclk;
+ unsigned pchb, pcib, val;
/* BAT to arrange address space */
@@ -72,6 +133,9 @@
pcicfgwrite(pchb, 0x78, 0xfc00);
brdtype = BRD_UNKNOWN;
+ extclk = EXT_CLK_FREQ; /* usually 33MHz */
+ busclock = 0;
+
if (pcifinddev(0x10ad, 0x0565, &pcib) == 0) {
brdtype = BRD_SANDPOINTX3;
setup_83C553F();
@@ -86,31 +150,7 @@
brdtype = BRD_KUROBOX;
consname = "eumb";
consport = 0x4600;
- consspeed = 57600;
- if (pcifinddev(0x10ec, 0x8169, &pcib) == 0) /* KURO-BOX/HG */
- ticks_per_sec = 13300 / 4;
-
- /* Stop Watchdog */
- uartbase = 0xfc00 + 0x4500;
- div = (ticks_per_sec * 4) / 9600 / 16;
- UART_WRITE(DCR, 0x01); /* 2 independent UART */
- UART_WRITE(LCR, 0x80); /* turn on DLAB bit */
- UART_WRITE(FCR, 0x00);
- UART_WRITE(DMB, div >> 8);
- UART_WRITE(DLB, div & 0xff);
- UART_WRITE(LCR, 0x03 | 0x18); /* 8 E 1 */
- UART_WRITE(MCR, 0x03); /* RTS DTR */
- UART_WRITE(FCR, 0x07); /* FIFO_EN | RXSR | TXSR */
- UART_WRITE(IER, 0x00); /* make sure INT disabled */
- printf("");
- }
- else if (PCI_VENDOR(pcicfgread(pcimaketag(0, 15, 0), PCI_ID_REG)) ==
- 0x
CVS commit: src/sys/arch/sandpoint/stand/netboot
Module Name:src
Committed By: phx
Date: Sat May 8 15:26:54 UTC 2010
Modified Files:
src/sys/arch/sandpoint/stand/netboot: main.c
Log Message:
Print "Kuro Box" when detected. Print "Unknown board" when the hardware was
not identified.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/sandpoint/stand/netboot/main.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/sandpoint/stand/netboot/main.c
diff -u src/sys/arch/sandpoint/stand/netboot/main.c:1.25 src/sys/arch/sandpoint/stand/netboot/main.c:1.26
--- src/sys/arch/sandpoint/stand/netboot/main.c:1.25 Sat May 8 14:40:08 2010
+++ src/sys/arch/sandpoint/stand/netboot/main.c Sat May 8 15:26:54 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.25 2010/05/08 14:40:08 phx Exp $ */
+/* $NetBSD: main.c,v 1.26 2010/05/08 15:26:54 phx Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -87,8 +87,12 @@
printf("Encore PP1"); break;
case BRD_QNAPTS101:
printf("QNAP TS-101"); break;
+ case BRD_KUROBOX:
+ printf("Kuro Box"); break;
case BRD_SYNOLOGY:
printf("Synology DS"); break;
+ default:
+ printf("Unknown board"); break;
}
printf(", cpu %u MHz, bus %u MHz, %dMB SDRAM\n",
cpuclock / 100, busclock / 100, memsize >> 20);
CVS commit: src/external/bsd/atf/usr.bin/atf-run
Module Name:src
Committed By: jmmv
Date: Sat May 8 16:57:24 UTC 2010
Modified Files:
src/external/bsd/atf/usr.bin/atf-run: Makefile
Log Message:
Make the .pc file rules depend on the Makefile so that when rebuilding
the tree with MKUPDATE=yes set after an atf upgrade, the .pc files get
the correct version in them.
Suggested by njoly@ in private mail.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/usr.bin/atf-run/Makefile
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/usr.bin/atf-run/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-run/Makefile:1.4 src/external/bsd/atf/usr.bin/atf-run/Makefile:1.5
--- src/external/bsd/atf/usr.bin/atf-run/Makefile:1.4 Sat May 8 08:12:35 2010
+++ src/external/bsd/atf/usr.bin/atf-run/Makefile Sat May 8 16:57:24 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/05/08 08:12:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2010/05/08 16:57:24 jmmv Exp $
.include
@@ -32,7 +32,7 @@
FILESDIR_atf-c++.pc= /usr/lib/pkgconfig
realall: atf-c.pc
-atf-c.pc: atf-c.pc.in
+atf-c.pc: Makefile atf-c.pc.in
${TOOL_SED} -e 's,__ATF_VERSION__,0.8,g' \
-e 's,__CC__,gcc,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
@@ -41,7 +41,7 @@
CLEANFILES+= atf-c.pc
realall: atf-c++.pc
-atf-c++.pc: atf-c++.pc.in
+atf-c++.pc: Makefile atf-c++.pc.in
${TOOL_SED} -e 's,__ATF_VERSION__,0.8,g' \
-e 's,__CXX__,g++,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
CVS commit: src/sys/arch/sandpoint/conf
Module Name:src Committed By: phx Date: Sat May 8 18:03:15 UTC 2010 Modified Files: src/sys/arch/sandpoint/conf: GENERIC GENERIC.NAS Log Message: Synology boxes need sk(4), not msk(4). To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/sys/arch/sandpoint/conf/GENERIC cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sandpoint/conf/GENERIC.NAS 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/sandpoint/conf/GENERIC diff -u src/sys/arch/sandpoint/conf/GENERIC:1.45 src/sys/arch/sandpoint/conf/GENERIC:1.46 --- src/sys/arch/sandpoint/conf/GENERIC:1.45 Sat Dec 5 20:11:16 2009 +++ src/sys/arch/sandpoint/conf/GENERIC Sat May 8 18:03:15 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.45 2009/12/05 20:11:16 pooka Exp $ +# $NetBSD: GENERIC,v 1.46 2010/05/08 18:03:15 phx Exp $ # # GENERIC machine description file # @@ -23,7 +23,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.45 $" +#ident "GENERIC-$Revision: 1.46 $" maxusers 32 @@ -194,8 +194,8 @@ fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B tlp* at pci? dev ? function ? # DEC Tulip and similar re* at pci? dev ? function ? # Realtek 8139C+/8169/8169S/8110S -mskc* at pci? dev ? function ? # Marvell Yukon 2 Gigabit Ethernet -msk* at mskc? # Marvell Yukon 2 Gigabit Ethernet +skc* at pci? dev ? function ? # Marvell Yukon Gigabit Ethernet +sk* at skc?# Marvell Yukon Gigabit Ethernet wm* at pci? dev ? function ? # Intel 8254x gigabit inphy* at mii? phy ? # Intel 82555 PHYs Index: src/sys/arch/sandpoint/conf/GENERIC.NAS diff -u src/sys/arch/sandpoint/conf/GENERIC.NAS:1.11 src/sys/arch/sandpoint/conf/GENERIC.NAS:1.12 --- src/sys/arch/sandpoint/conf/GENERIC.NAS:1.11 Sat Dec 5 20:11:16 2009 +++ src/sys/arch/sandpoint/conf/GENERIC.NAS Sat May 8 18:03:15 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC.NAS,v 1.11 2009/12/05 20:11:16 pooka Exp $ +# $NetBSD: GENERIC.NAS,v 1.12 2010/05/08 18:03:15 phx Exp $ # # machine description file for GENERIC.NAS # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC.NAS-$Revision: 1.11 $" +#ident "GENERIC.NAS-$Revision: 1.12 $" maxusers 32 @@ -180,8 +180,8 @@ # PCI network interfaces tlp* at pci? dev ? function ? # DEC Tulip and similar re* at pci? dev ? function ? # Realtek 8139C+/8169/8169S/8110S -mskc* at pci? dev ? function ? # Marvell Yukon 2 Gigabit Ethernet -msk* at mskc? # Marvell Yukon 2 Gigabit Ethernet +skc* at pci? dev ? function ? # Marvell Yukon Gigabit Ethernet +sk* at skc?# Marvell Yukon Gigabit Ethernet wm* at pci? dev ? function ? # Intel 8254x gigabit fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/rmi
Module Name:src
Committed By: matt
Date: Sat May 8 18:08:35 UTC 2010
Modified Files:
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_pcie.c
Log Message:
Rework the way interrupts are decided on. Don't use pa_bus since that's
arbitrary. Instead grab the device from pa_intrtag since that corresponds
to the PCIe bus we are actually attached to.
While I'm here, compact some switch statements into a few simple assignments.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.13 -r1.1.2.14 src/sys/arch/mips/rmi/rmixl_pcie.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/mips/rmi/rmixl_pcie.c
diff -u src/sys/arch/mips/rmi/rmixl_pcie.c:1.1.2.13 src/sys/arch/mips/rmi/rmixl_pcie.c:1.1.2.14
--- src/sys/arch/mips/rmi/rmixl_pcie.c:1.1.2.13 Thu May 6 20:48:39 2010
+++ src/sys/arch/mips/rmi/rmixl_pcie.c Sat May 8 18:08:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_pcie.c,v 1.1.2.13 2010/05/06 20:48:39 cliff Exp $ */
+/* $NetBSD: rmixl_pcie.c,v 1.1.2.14 2010/05/08 18:08:34 matt Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rmixl_pcie.c,v 1.1.2.13 2010/05/06 20:48:39 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_pcie.c,v 1.1.2.14 2010/05/08 18:08:34 matt Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -1014,9 +1014,18 @@
int
rmixl_pcie_intr_map(struct pci_attach_args *pa, pci_intr_handle_t *pih)
{
+ int device;
u_int link;
u_int irq;
+ /*
+ * The bus is unimportant since it can change depending on the
+ * configuration. We are tied to device # of PCIe bridge we are
+ * ultimately attached to.
+ */
+ pci_decompose_tag(pa->pa_pc, pa->pa_intrtag,
+ NULL, &device, NULL);
+
#ifdef DEBUG
DPRINTF(("%s: ps_bus %d, pa_intrswiz %#x, pa_intrtag %#lx,"
" pa_intrpin %d, pa_intrline %d, pa_rawintrpin %d\n",
@@ -1032,71 +1041,32 @@
case MIPS_XLS108:
case MIPS_XLS404LITE:
case MIPS_XLS408LITE:
- switch (pa->pa_bus) {
- case 1:
- link = 0;
- irq = 26;
- break;
- case 2:
- link = 1;
- irq = 27;
- break;
- default:
- panic("%s: bad bus %d\n", __func__, pa->pa_bus);
- }
+ if (device > 1)
+ panic("%s: bad bus %d", __func__, device);
+ link = device;
+ irq = device + 26;
break;
case MIPS_XLS204:
- case MIPS_XLS208:
- switch (pa->pa_bus) {
- case 1:
- link = 0;
- irq = 26;
- break;
- case 2:
- link = 1;
- irq = 27;
- break;
- case 3:
- link = 2;
- irq = 23;
- break;
- case 4:
- link = 3;
- irq = 24;
- break;
- default:
- panic("%s: bad bus %d\n", __func__, pa->pa_bus);
- }
+ case MIPS_XLS208: {
+ if (device > 3)
+ panic("%s: bad bus %d", __func__, device);
+ link = device;
+ irq = device + (device & 2 ? 21 : 26);
break;
+ }
case MIPS_XLS404:
case MIPS_XLS408:
case MIPS_XLS416:
case MIPS_XLS608:
case MIPS_XLS616:
- switch (pa->pa_bus) {
- case 1:
- link = 0;
- irq = 26;
- break;
- case 2:
- link = 1;
- irq = 27;
- break;
- case 3:
- link = 2;
- irq = 28;
- break;
- case 4:
- link = 3;
- irq = 29;
- break;
- default:
- panic("%s: bad bus %d\n", __func__, pa->pa_bus);
- }
+ if (device > 3)
+ panic("%s: bad bus %d", __func__, device);
+ link = device;
+ irq = device + 26;
break;
default:
panic("%s: cpu IMPL %#x not supported\n",
- __func__, MIPS_PRID_IMPL(mips_options.mips_cpu_id));
+ __func__, MIPS_PRID_IMPL(mips_options.mips_cpu_id));
}
if (pa->pa_intrpin != PCI_INTERRUPT_PIN_NONE)
CVS commit: src/sys/arch/sandpoint
Module Name:src Committed By: phx Date: Sat May 8 18:48:44 UTC 2010 Modified Files: src/sys/arch/sandpoint: README.NAS Log Message: Synology uses sk(4) NIC. Included information about Iomega StorCenter. Note that the EPIC mapping is not verified. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sandpoint/README.NAS 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/sandpoint/README.NAS diff -u src/sys/arch/sandpoint/README.NAS:1.4 src/sys/arch/sandpoint/README.NAS:1.5 --- src/sys/arch/sandpoint/README.NAS:1.4 Mon Apr 7 16:36:50 2008 +++ src/sys/arch/sandpoint/README.NAS Sat May 8 18:48:44 2010 @@ -1,4 +1,4 @@ -$NetBSD: README.NAS,v 1.4 2008/04/07 16:36:50 nisimura Exp $ +$NetBSD: README.NAS,v 1.5 2010/05/08 18:48:44 phx Exp $ MPC8241/8245 NAS products @@ -11,10 +11,11 @@ re.11 iteide.12/13 classic TeraStation re.11 satalink.12/13 TeraStation Pro re.11 iteide.12 Gigabit LinkStation -mak.15 iteide.13 Synology DS-106j/LinkStation LANxxxG -mak.15 satalink.13 Synology DS-101g+/106e/106/207 -mak.15 satalink.12/13 Synology CS-406/RS-406/CS-406e/CS-407e +sk.15 iteide.13 Synology DS-106j/LinkStation LANxxxG +sk.15 satalink.13 Synology DS-101g+/106e/106/207 +sk.15 satalink.12/13 Synology CS-406/RS-406/CS-406e/CS-407e wm.15 satalink.13 QNAP TS-101/201 +re.15 viaide.13 IOMEGA StorCenter - PCI line/pin and EPIC IRQ assignments @@ -22,6 +23,7 @@ Kurobox 11, 12, 13, 14 -> 0, 1, 4, 3 Synology 12, 13, 14, 15 -> 4, 0, 1, 2 QNAP 12, 13, 14, 15 -> 0, 1, 2, 3 +StorCenter 12, 13, 14, 15 -> 0, 1, 2, 3 - USB EHCI is a multiple function PCI device which has pin assignment A, B and C. @@ -44,3 +46,4 @@ [ research still in progress ] --- +
CVS commit: src/sys/arch/sandpoint/stand/netboot
Module Name:src
Committed By: phx
Date: Sat May 8 19:41:07 UTC 2010
Modified Files:
src/sys/arch/sandpoint/stand/netboot: brdsetup.c globals.h main.c
Log Message:
Support for IOMEGA Storcenter, by Toru Nishimura.
Kurobox console is 57600.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sandpoint/stand/netboot/brdsetup.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sandpoint/stand/netboot/globals.h
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/sandpoint/stand/netboot/main.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/sandpoint/stand/netboot/brdsetup.c
diff -u src/sys/arch/sandpoint/stand/netboot/brdsetup.c:1.10 src/sys/arch/sandpoint/stand/netboot/brdsetup.c:1.11
--- src/sys/arch/sandpoint/stand/netboot/brdsetup.c:1.10 Sat May 8 14:40:08 2010
+++ src/sys/arch/sandpoint/stand/netboot/brdsetup.c Sat May 8 19:41:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: brdsetup.c,v 1.10 2010/05/08 14:40:08 phx Exp $ */
+/* $NetBSD: brdsetup.c,v 1.11 2010/05/08 19:41:07 phx Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -150,7 +150,7 @@
brdtype = BRD_KUROBOX;
consname = "eumb";
consport = 0x4600;
- consspeed = 115200;
+ consspeed = 57600;
}
else if (PCI_VENDOR(pcicfgread(pcimaketag(0, 15, 0), PCI_ID_REG)) ==
0x11ab) {/* PCI_VENDOR_MARVELL */
@@ -166,6 +166,13 @@
consport = 0x4600;
consspeed = 115200;
}
+ else if (PCI_VENDOR(pcicfgread(pcimaketag(0, 15, 0), PCI_ID_REG)) ==
+ 0x10ec) {/* PCI_VENDOR_REALTEK */
+ brdtype = BRD_STORCENTER;
+ consname = "eumb";
+ consport = 0x4600;
+ consspeed = 115200;
+ }
/* determine clock frequencies */
if (busclock == 0) {
@@ -205,6 +212,7 @@
send_sat("247");
break;
case BRD_QNAPTS101:
+ case BRD_STORCENTER:
init_uart(uart2base, 9600, LCR_8BITS | LCR_PNONE);
break;
}
Index: src/sys/arch/sandpoint/stand/netboot/globals.h
diff -u src/sys/arch/sandpoint/stand/netboot/globals.h:1.13 src/sys/arch/sandpoint/stand/netboot/globals.h:1.14
--- src/sys/arch/sandpoint/stand/netboot/globals.h:1.13 Sat May 8 14:40:08 2010
+++ src/sys/arch/sandpoint/stand/netboot/globals.h Sat May 8 19:41:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: globals.h,v 1.13 2010/05/08 14:40:08 phx Exp $ */
+/* $NetBSD: globals.h,v 1.14 2010/05/08 19:41:07 phx Exp $ */
/* clock feed */
#ifndef EXT_CLK_FREQ
@@ -13,6 +13,7 @@
#define BRD_KUROBOX 100
#define BRD_QNAPTS101 101
#define BRD_SYNOLOGY 102
+#define BRD_STORCENTER 103
#define BRD_UNKNOWN -1
extern char *consname;
Index: src/sys/arch/sandpoint/stand/netboot/main.c
diff -u src/sys/arch/sandpoint/stand/netboot/main.c:1.26 src/sys/arch/sandpoint/stand/netboot/main.c:1.27
--- src/sys/arch/sandpoint/stand/netboot/main.c:1.26 Sat May 8 15:26:54 2010
+++ src/sys/arch/sandpoint/stand/netboot/main.c Sat May 8 19:41:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.26 2010/05/08 15:26:54 phx Exp $ */
+/* $NetBSD: main.c,v 1.27 2010/05/08 19:41:07 phx Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -91,6 +91,8 @@
printf("Kuro Box"); break;
case BRD_SYNOLOGY:
printf("Synology DS"); break;
+ case BRD_STORCENTER:
+ printf("IOMEGA StorCenter"); break;
default:
printf("Unknown board"); break;
}
CVS commit: src/sys/dev/pci
Module Name:src Committed By: nakayama Date: Sat May 8 19:49:02 UTC 2010 Modified Files: src/sys/dev/pci: aceride.c Log Message: PCI-ISA Bridge paired with M5229 UDMA IDE Controller rev. 0xC3 is M1533. Follow the fix in rev 1.1004 of pcidevs. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/dev/pci/aceride.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/dev/pci/aceride.c diff -u src/sys/dev/pci/aceride.c:1.26 src/sys/dev/pci/aceride.c:1.27 --- src/sys/dev/pci/aceride.c:1.26 Mon Oct 19 18:41:14 2009 +++ src/sys/dev/pci/aceride.c Sat May 8 19:49:02 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: aceride.c,v 1.26 2009/10/19 18:41:14 bouyer Exp $ */ +/* $NetBSD: aceride.c,v 1.27 2010/05/08 19:49:02 nakayama Exp $ */ /* * Copyright (c) 1999, 2000, 2001 Manuel Bouyer. @@ -25,7 +25,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: aceride.c,v 1.26 2009/10/19 18:41:14 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aceride.c,v 1.27 2010/05/08 19:49:02 nakayama Exp $"); #include #include @@ -102,7 +102,7 @@ if (PCI_CLASS(pa->pa_class) == PCI_CLASS_BRIDGE && PCI_SUBCLASS(pa->pa_class) == PCI_SUBCLASS_BRIDGE_ISA && PCI_VENDOR(pa->pa_id) == PCI_VENDOR_ALI && - PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_ALI_M1543) + PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_ALI_M1533) return 1; return 0; }
CVS commit: src/sys/arch/atari/conf
Module Name:src Committed By: tsutsui Date: Sat May 8 20:39:55 UTC 2010 Modified Files: src/sys/arch/atari/conf: GENERIC.in Log Message: - don't enable TMPFS for SMALL030 - remove dup PTYFS To generate a diff of this commit: cvs rdiff -u -r1.88 -r1.89 src/sys/arch/atari/conf/GENERIC.in 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/atari/conf/GENERIC.in diff -u src/sys/arch/atari/conf/GENERIC.in:1.88 src/sys/arch/atari/conf/GENERIC.in:1.89 --- src/sys/arch/atari/conf/GENERIC.in:1.88 Thu Apr 29 22:40:50 2010 +++ src/sys/arch/atari/conf/GENERIC.in Sat May 8 20:39:55 2010 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC.in,v 1.88 2010/04/29 22:40:50 chs Exp $ +# $NetBSD: GENERIC.in,v 1.89 2010/05/08 20:39:55 tsutsui Exp $ # # Generic atari # @@ -112,8 +112,6 @@ file-system MFS # Memory based filesystem file-system MSDOSFS # MSDOS filesystem file-system CD9660 # ISO 9660 filesystem with Rock Ridge -file-system PTYFS # experimental - /dev/ptm support -file-system TMPFS # Efficient memory file-system #file-system UDF # experimental - OSTA UDF CD/DVD file-system #if !defined(SMALL030_KERNEL) @@ -129,6 +127,7 @@ file-system EXT2FS # second extended file system (linux) #file-system LFS # log-structured file system file-system PTYFS # /dev/pts/N support +file-system TMPFS # Efficient memory file-system #endif /* !SMALL030_KERNEL */ # File system options
CVS commit: src/sys/arch/atari/conf
Module Name:src Committed By: tsutsui Date: Sat May 8 20:41:25 UTC 2010 Modified Files: src/sys/arch/atari/conf: ATARITT FALCON HADES MILAN-ISAIDE MILAN-PCIIDE SMALL030 Log Message: Regen from GENERIC.in rev 1.89: > - don't enable TMPFS for SMALL030 > - remove dup PTYFS To generate a diff of this commit: cvs rdiff -u -r1.102 -r1.103 src/sys/arch/atari/conf/ATARITT cvs rdiff -u -r1.99 -r1.100 src/sys/arch/atari/conf/FALCON cvs rdiff -u -r1.92 -r1.93 src/sys/arch/atari/conf/HADES cvs rdiff -u -r1.69 -r1.70 src/sys/arch/atari/conf/MILAN-ISAIDE cvs rdiff -u -r1.73 -r1.74 src/sys/arch/atari/conf/MILAN-PCIIDE cvs rdiff -u -r1.9 -r1.10 src/sys/arch/atari/conf/SMALL030 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/atari/conf/ATARITT diff -u src/sys/arch/atari/conf/ATARITT:1.102 src/sys/arch/atari/conf/ATARITT:1.103 --- src/sys/arch/atari/conf/ATARITT:1.102 Thu Apr 29 22:42:27 2010 +++ src/sys/arch/atari/conf/ATARITT Sat May 8 20:41:24 2010 @@ -1,11 +1,11 @@ # -# $NetBSD: ATARITT,v 1.102 2010/04/29 22:42:27 chs Exp $ +# $NetBSD: ATARITT,v 1.103 2010/05/08 20:41:24 tsutsui Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. # # Created from: -# NetBSD: GENERIC.in,v 1.88 2010/04/29 22:40:50 chs Exp $ +# NetBSD: GENERIC.in,v 1.89 2010/05/08 20:39:55 tsutsui Exp $ include "arch/atari/conf/std.atari" options INCLUDE_CONFIG_FILE # embed config file in kernel binary maxusers 16 @@ -24,8 +24,6 @@ file-system MFS # Memory based filesystem file-system MSDOSFS # MSDOS filesystem file-system CD9660 # ISO 9660 filesystem with Rock Ridge -file-system PTYFS # experimental - /dev/ptm support -file-system TMPFS # Efficient memory file-system file-system KERNFS # Kernel parameter filesystem file-system NFS # Network File System client side code file-system PROCFS # Process filesystem @@ -37,6 +35,7 @@ file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs) file-system EXT2FS # second extended file system (linux) file-system PTYFS # /dev/pts/N support +file-system TMPFS # Efficient memory file-system options WAPBL # File system journaling support - Experimental options NFSSERVER # Network File System server side code options PANICWAIT # Require keystroke to dump/reboot Index: src/sys/arch/atari/conf/FALCON diff -u src/sys/arch/atari/conf/FALCON:1.99 src/sys/arch/atari/conf/FALCON:1.100 --- src/sys/arch/atari/conf/FALCON:1.99 Thu Apr 29 22:42:27 2010 +++ src/sys/arch/atari/conf/FALCON Sat May 8 20:41:24 2010 @@ -1,11 +1,11 @@ # -# $NetBSD: FALCON,v 1.99 2010/04/29 22:42:27 chs Exp $ +# $NetBSD: FALCON,v 1.100 2010/05/08 20:41:24 tsutsui Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. # # Created from: -# NetBSD: GENERIC.in,v 1.88 2010/04/29 22:40:50 chs Exp $ +# NetBSD: GENERIC.in,v 1.89 2010/05/08 20:39:55 tsutsui Exp $ include "arch/atari/conf/std.atari" options INCLUDE_CONFIG_FILE # embed config file in kernel binary maxusers 16 @@ -29,8 +29,6 @@ file-system MFS # Memory based filesystem file-system MSDOSFS # MSDOS filesystem file-system CD9660 # ISO 9660 filesystem with Rock Ridge -file-system PTYFS # experimental - /dev/ptm support -file-system TMPFS # Efficient memory file-system file-system KERNFS # Kernel parameter filesystem file-system NFS # Network File System client side code file-system PROCFS # Process filesystem @@ -42,6 +40,7 @@ file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs) file-system EXT2FS # second extended file system (linux) file-system PTYFS # /dev/pts/N support +file-system TMPFS # Efficient memory file-system options WAPBL # File system journaling support - Experimental options NFSSERVER # Network File System server side code options PANICWAIT # Require keystroke to dump/reboot Index: src/sys/arch/atari/conf/HADES diff -u src/sys/arch/atari/conf/HADES:1.92 src/sys/arch/atari/conf/HADES:1.93 --- src/sys/arch/atari/conf/HADES:1.92 Thu Apr 29 22:42:28 2010 +++ src/sys/arch/atari/conf/HADES Sat May 8 20:41:24 2010 @@ -1,12 +1,12 @@ # -# $NetBSD: HADES,v 1.92 2010/04/29 22:42:28 chs Exp $ +# $NetBSD: HADES,v 1.93 2010/05/08 20:41:24 tsutsui Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. # # Created from: # NetBSD: HADES.in,v 1.11 2010/04/10 01:59:40 tsutsui Exp $ -# NetBSD: GENERIC.in,v 1.88 2010/04/29 22:40:50 chs Exp $ +# NetBSD: GENERIC.in,v 1.89 2010/05/08 20:39:55 tsutsui Exp $ include "arch/atari/conf/std.hades" options INCLUDE_CONFIG_FILE # embed config file in kernel binary maxusers 16 @@ -28,8 +28,6 @@ file-system MFS # Memory based filesystem file-system MSDOSFS # MSDOS filesystem file-system CD9660 # ISO 9660 filesystem with Rock Ridge -file-system PTYFS # experimental - /dev/ptm suppo
CVS commit: src/sys/arch
Module Name:src Committed By: mrg Date: Sat May 8 22:18:24 UTC 2010 Modified Files: src/sys/arch/amiga/conf: DRACO GENERIC INSTALL src/sys/arch/atari/conf: ATARITT FALCON HADES MILAN-ISAIDE MILAN-PCIIDE SMALL030 Log Message: regenerate these configurations from GENERIC.in. To generate a diff of this commit: cvs rdiff -u -r1.134 -r1.135 src/sys/arch/amiga/conf/DRACO cvs rdiff -u -r1.263 -r1.264 src/sys/arch/amiga/conf/GENERIC cvs rdiff -u -r1.87 -r1.88 src/sys/arch/amiga/conf/INSTALL cvs rdiff -u -r1.103 -r1.104 src/sys/arch/atari/conf/ATARITT cvs rdiff -u -r1.100 -r1.101 src/sys/arch/atari/conf/FALCON cvs rdiff -u -r1.93 -r1.94 src/sys/arch/atari/conf/HADES cvs rdiff -u -r1.70 -r1.71 src/sys/arch/atari/conf/MILAN-ISAIDE cvs rdiff -u -r1.74 -r1.75 src/sys/arch/atari/conf/MILAN-PCIIDE cvs rdiff -u -r1.10 -r1.11 src/sys/arch/atari/conf/SMALL030 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/amiga/conf/DRACO diff -u src/sys/arch/amiga/conf/DRACO:1.134 src/sys/arch/amiga/conf/DRACO:1.135 --- src/sys/arch/amiga/conf/DRACO:1.134 Thu Apr 29 22:42:27 2010 +++ src/sys/arch/amiga/conf/DRACO Sat May 8 22:18:24 2010 @@ -1,9 +1,9 @@ -# $NetBSD: DRACO,v 1.134 2010/04/29 22:42:27 chs Exp $ +# $NetBSD: DRACO,v 1.135 2010/05/08 22:18:24 mrg Exp $ # # This file was automatically created. # Changes will be lost when make is run in this directory. # -# Created from: # NetBSD: GENERIC.in,v 1.75 2010/04/29 22:40:49 chs Exp $ +# Created from: # NetBSD: GENERIC.in,v 1.76 2010/05/08 22:16:25 mrg Exp $ # # GENERIC machine description file # @@ -28,7 +28,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.134 $" +#ident "GENERIC-$Revision: 1.135 $" maxusers 8 @@ -69,6 +69,7 @@ options PFIL_HOOKS # pfil(9) packet filter hooks options IPFILTER_LOG # ipmon(8) log support options IPFILTER_LOOKUP # ippool(8) support +options IPFILTER_COMPAT # Compat for IP-Filter #options IPFILTER_DEFAULT_BLOCK # block all packets by default #options ALTQ # Manipulate network interfaces' output queues Index: src/sys/arch/amiga/conf/GENERIC diff -u src/sys/arch/amiga/conf/GENERIC:1.263 src/sys/arch/amiga/conf/GENERIC:1.264 --- src/sys/arch/amiga/conf/GENERIC:1.263 Thu Apr 29 22:42:27 2010 +++ src/sys/arch/amiga/conf/GENERIC Sat May 8 22:18:24 2010 @@ -1,9 +1,9 @@ -# $NetBSD: GENERIC,v 1.263 2010/04/29 22:42:27 chs Exp $ +# $NetBSD: GENERIC,v 1.264 2010/05/08 22:18:24 mrg Exp $ # # This file was automatically created. # Changes will be lost when make is run in this directory. # -# Created from: # NetBSD: GENERIC.in,v 1.75 2010/04/29 22:40:49 chs Exp $ +# Created from: # NetBSD: GENERIC.in,v 1.76 2010/05/08 22:16:25 mrg Exp $ # # GENERIC machine description file # @@ -28,7 +28,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.263 $" +#ident "GENERIC-$Revision: 1.264 $" maxusers 8 @@ -81,6 +81,7 @@ options PFIL_HOOKS # pfil(9) packet filter hooks options IPFILTER_LOG # ipmon(8) log support options IPFILTER_LOOKUP # ippool(8) support +options IPFILTER_COMPAT # Compat for IP-Filter #options IPFILTER_DEFAULT_BLOCK # block all packets by default #options ALTQ # Manipulate network interfaces' output queues Index: src/sys/arch/amiga/conf/INSTALL diff -u src/sys/arch/amiga/conf/INSTALL:1.87 src/sys/arch/amiga/conf/INSTALL:1.88 --- src/sys/arch/amiga/conf/INSTALL:1.87 Thu Apr 29 22:42:27 2010 +++ src/sys/arch/amiga/conf/INSTALL Sat May 8 22:18:24 2010 @@ -1,9 +1,9 @@ -# $NetBSD: INSTALL,v 1.87 2010/04/29 22:42:27 chs Exp $ +# $NetBSD: INSTALL,v 1.88 2010/05/08 22:18:24 mrg Exp $ # # This file was automatically created. # Changes will be lost when make is run in this directory. # -# Created from: # NetBSD: GENERIC.in,v 1.75 2010/04/29 22:40:49 chs Exp $ +# Created from: # NetBSD: GENERIC.in,v 1.76 2010/05/08 22:16:25 mrg Exp $ # # GENERIC machine description file # @@ -28,7 +28,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.87 $" +#ident "GENERIC-$Revision: 1.88 $" makeoptions COPTS="-Os" @@ -76,6 +76,7 @@ options PFIL_HOOKS # pfil(9) packet filter hooks options IPFILTER_LOG # ipmon(8) log support options IPFILTER_LOOKUP # ippool(8) support +options IPFILTER_COMPAT # Compat for IP-Filter #options IPFILTER_DEFAULT_BLOCK # block all packets by default #options ALTQ # Manipulate network interfaces' output queues Index: src/sys/arch/atari/conf/ATARITT diff -u src/sys/arch/atari/conf/ATARITT:1.103 src/sys/arch/atari/conf/ATARITT:1.104 --- src/sys/arch/atari/conf/ATARITT:1.103 Sat May 8 20:41:24 2010 +++ src/sys/arch/atari/conf/ATARITT Sat May 8 22:18:23 2010 @@ -1,11 +1,11 @@ # -# $NetBSD: ATARITT,v 1.103 2010/05/08 20:41:24 tsutsui Exp $ +# $NetBSD: ATARITT,v
CVS commit: src/share/man/man4
Module Name:src Committed By: mrg Date: Sat May 8 22:25:12 UTC 2010 Modified Files: src/share/man/man4: options.4 Log Message: document IPFILTER_LOOKUP and IPFILTER_COMPAT. use "IP-Filter" instead of "ip-filter". bump date. To generate a diff of this commit: cvs rdiff -u -r1.389 -r1.390 src/share/man/man4/options.4 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/man4/options.4 diff -u src/share/man/man4/options.4:1.389 src/share/man/man4/options.4:1.390 --- src/share/man/man4/options.4:1.389 Sat May 1 13:07:34 2010 +++ src/share/man/man4/options.4 Sat May 8 22:25:11 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: options.4,v 1.389 2010/05/01 13:07:34 pooka Exp $ +.\" $NetBSD: options.4,v 1.390 2010/05/08 22:25:11 mrg Exp $ .\" .\" Copyright (c) 1996 .\" Perry E. Metzger. All rights reserved. @@ -30,7 +30,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" -.Dd May 1, 2010 +.Dd May 8, 2010 .Dt OPTIONS 4 .Os .Sh NAME @@ -1940,10 +1940,17 @@ .It Cd options IPFILTER_LOG This option, in conjunction with .Em pseudo-device ipfilter , -enables logging of IP packets using ip-filter. +enables logging of IP packets using IP-Filter. +.It Cd options IPFILTER_LOOKUP +This option enables the +IP-Filter +.Xr ippool 8 +functionality to be enabled. +.It Cd options IPFILTER_COMPAT +This option enables older IP-Filter binaries to work. .It Cd options IPFILTER_DEFAULT_BLOCK -This option sets the default policy of ip-filter. -If it is set, ip-filter will block packets by default. +This option sets the default policy of IP-Filter. +If it is set, IP-Filter will block packets by default. .It Cd options BRIDGE_IPF This option causes .Em bridge
CVS commit: src/tools/gdb
Module Name:src
Committed By: hans
Date: Sat May 8 23:18:44 UTC 2010
Modified Files:
src/tools/gdb: Makefile
Log Message:
Fix tools build on Solaris with MKCROSSGDB=YES.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/tools/gdb/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gdb/Makefile
diff -u src/tools/gdb/Makefile:1.16 src/tools/gdb/Makefile:1.17
--- src/tools/gdb/Makefile:1.16 Wed Dec 23 20:17:13 2009
+++ src/tools/gdb/Makefile Sat May 8 23:18:44 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2009/12/23 20:17:13 mrg Exp $
+# $NetBSD: Makefile,v 1.17 2010/05/08 23:18:44 hans Exp $
.include
@@ -33,6 +33,15 @@
bash_cv_func_strcoll_broken=no \
bash_cv_must_reinstall_sighandlers=no
+# Recent versions of Solaris have ncurses, but they hide the lib in an
+# odd directory. Prevent configure from finding the ncurses headers,
+# Solaris curses is sufficient.
+.if ${BUILD_OSTYPE} == "SunOS"
+CONFIGURE_ENV+= ac_cv_header_ncurses_h=no \
+ ac_cv_header_ncurses_ncurses_h=no \
+ ac_cv_header_ncurses_term_h=no
+.endif
+
# Disable sim unless it's known to work (configure's default is to
# enable sim if supported).
CONFIGURE_ARGS_SIM=
CVS commit: src/sys/arch/hpcarm/conf
Module Name:src Committed By: nonaka Date: Sun May 9 02:03:35 UTC 2010 Modified Files: src/sys/arch/hpcarm/conf: WZERO3 Log Message: Added 2 options for X. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hpcarm/conf/WZERO3 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/WZERO3 diff -u src/sys/arch/hpcarm/conf/WZERO3:1.2 src/sys/arch/hpcarm/conf/WZERO3:1.3 --- src/sys/arch/hpcarm/conf/WZERO3:1.2 Sat Apr 24 21:52:34 2010 +++ src/sys/arch/hpcarm/conf/WZERO3 Sun May 9 02:03:35 2010 @@ -1,4 +1,4 @@ -# $NetBSD: WZERO3,v 1.2 2010/04/24 21:52:34 nonaka Exp $ +# $NetBSD: WZERO3,v 1.3 2010/05/09 02:03:35 nonaka Exp $ # # WZERO3 -- Sharp Windows Mobile 5 based PDA # @@ -7,7 +7,7 @@ #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.2 $" +#ident "GENERIC-$Revision: 1.3 $" # estimated number of users maxusers 32 @@ -117,7 +117,9 @@ options WSEMUL_VT100 # allocate a number of virtual screens at autoconfiguration time #options WSDISPLAY_DEFAULTSCREENS=2 - +# The X server requires theses two options +options WSDISPLAY_COMPAT_USL +options WSDISPLAY_COMPAT_RAWKBD # customization of console and kernel output - see dev/wscons/wsdisplayvar.h #options WSDISPLAY_CUSTOM_OUTPUT # color customization from wsconsctl(8) #options WS_DEFAULT_FG=WSCOL_WHITE
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: lukem Date: Sun May 9 05:44:44 UTC 2010 Modified Files: src/distrib/sets/lists/comp: mi Log Message: pfs.debug To generate a diff of this commit: cvs rdiff -u -r1.1442 -r1.1443 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/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1442 src/distrib/sets/lists/comp/mi:1.1443 --- src/distrib/sets/lists/comp/mi:1.1442 Sat May 8 08:14:36 2010 +++ src/distrib/sets/lists/comp/mi Sun May 9 05:44:43 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1442 2010/05/08 08:14:36 jmmv Exp $ +# $NetBSD: mi,v 1.1443 2010/05/09 05:44:43 lukem Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -2929,6 +2929,7 @@ ./usr/libdata/debug/sbin/newfs_udf.debug comp-sysutil-debug debug ./usr/libdata/debug/sbin/pfctl.debug comp-pf-debug pf,debug ./usr/libdata/debug/sbin/pflogd.debug comp-pf-debug pf,debug +./usr/libdata/debug/sbin/pfs.debug comp-pf-debug pf,debug ./usr/libdata/debug/sbin/ping.debug comp-netutil-debug debug ./usr/libdata/debug/sbin/ping6.debug comp-netutil-debug use_inet6,debug ./usr/libdata/debug/sbin/pppoectl.debug comp-netutil-debug debug
