CVS commit: src/usr.sbin/npf/npfd
Module Name:src Committed By: abs Date: Fri Oct 30 09:23:36 UTC 2020 Modified Files: src/usr.sbin/npf/npfd: npfd.8 Log Message: Fix tcpdump example from "‐i npflog0.pcap" to "‐i npflog0" To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/npf/npfd/npfd.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/npf/npfd/npfd.8 diff -u src/usr.sbin/npf/npfd/npfd.8:1.6 src/usr.sbin/npf/npfd/npfd.8:1.7 --- src/usr.sbin/npf/npfd/npfd.8:1.6 Fri Aug 31 10:38:17 2018 +++ src/usr.sbin/npf/npfd/npfd.8 Fri Oct 30 09:23:36 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: npfd.8,v 1.6 2018/08/31 10:38:17 maxv Exp $ +.\" $NetBSD: npfd.8,v 1.7 2020/10/30 09:23:36 abs Exp $ .\" $OpenBSD: pflogd.8,v 1.35 2007/05/31 19:19:47 jmc Exp $ .\" .\" Copyright (c) 2001 Can Erkin Acar. All rights reserved. @@ -171,7 +171,7 @@ Display the logs in real time (this does operation of .Nm ) : .Bd -literal -offset indent -# tcpdump -n -e -ttt -i npflog0.pcap +# tcpdump -n -e -ttt -i npflog0 .Ed .Pp Tcpdump has been extended to be able to filter on the
CVS commit: src/usr.sbin/mopd
Module Name:src
Committed By: abs
Date: Tue Oct 27 17:16:25 UTC 2020
Modified Files:
src/usr.sbin/mopd/common: file.c
src/usr.sbin/mopd/mopcopy: mopcopy.c
Log Message:
Update mopd for 4k VAX page size and support 1k page a.out binaries
>From dreamlayers
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/mopd/common/file.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/mopd/mopcopy/mopcopy.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.sbin/mopd/common/file.c
diff -u src/usr.sbin/mopd/common/file.c:1.16 src/usr.sbin/mopd/common/file.c:1.17
--- src/usr.sbin/mopd/common/file.c:1.16 Wed Jun 8 01:11:49 2016
+++ src/usr.sbin/mopd/common/file.c Tue Oct 27 17:16:24 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: file.c,v 1.16 2016/06/08 01:11:49 christos Exp $ */
+/* $NetBSD: file.c,v 1.17 2020/10/27 17:16:24 abs Exp $ */
/*
* Copyright (c) 1995-96 Mats O Jansson. All rights reserved.
@@ -26,7 +26,7 @@
#include "port.h"
#ifndef lint
-__RCSID("$NetBSD: file.c,v 1.16 2016/06/08 01:11:49 christos Exp $");
+__RCSID("$NetBSD: file.c,v 1.17 2020/10/27 17:16:24 abs Exp $");
#endif
#include "os.h"
@@ -46,7 +46,10 @@ __RCSID("$NetBSD: file.c,v 1.16 2016/06/
# include
# endif
# if !defined(MID_VAX)
-# define MID_VAX 140
+# define MID_VAX 150
+# endif
+# if !defined(MID_VAX1K)
+# define MID_VAX1K 140
# endif
#endif /* NOAOUT */
@@ -328,6 +331,11 @@ getMID(int old_mid, int new_mid)
mid = MID_VAX;
break;
#endif
+#ifdef MID_VAX1K
+ case MID_VAX1K:
+ mid = MID_VAX1K;
+ break;
+#endif
#ifdef MID_ALPHA
case MID_ALPHA:
mid = MID_ALPHA;
@@ -356,8 +364,8 @@ getCLBYTES(int mid)
int clbytes;
switch (mid) {
-#ifdef MID_VAX
- case MID_VAX:
+#ifdef MID_VAX1K
+ case MID_VAX1K:
clbytes = 1024;
break;
#endif
@@ -379,8 +387,12 @@ getCLBYTES(int mid)
#ifdef MID_ARM6
case MID_ARM6:
#endif
+#ifdef MID_VAX
+ case MID_VAX:
+#endif
#if defined(MID_I386) || defined(MID_M68K4K) || defined(MID_NS32532) || \
-defined(MID_PMAX) || defined(MID_MIPS) || defined(MID_ARM6)
+defined(MID_PMAX) || defined(MID_MIPS) || defined(MID_ARM6) || \
+defined(MID_VAX)
clbytes = 4096;
break;
#endif
@@ -697,6 +709,9 @@ GetAOutFileInfo(struct dllist *dl)
#ifdef MID_VAX
case MID_VAX:
#endif
+#ifdef MID_VAX1K
+ case MID_VAX1K:
+#endif
#ifdef MID_ALPHA
case MID_ALPHA:
#endif
@@ -766,6 +781,11 @@ GetAOutFileInfo(struct dllist *dl)
printf("vax");
break;
#endif
+#ifdef MID_VAX1K
+ case MID_VAX1K:
+ printf("vax 1k");
+ break;
+#endif
#ifdef MID_ALPHA
case MID_ALPHA:
printf("alpha");
Index: src/usr.sbin/mopd/mopcopy/mopcopy.c
diff -u src/usr.sbin/mopd/mopcopy/mopcopy.c:1.7 src/usr.sbin/mopd/mopcopy/mopcopy.c:1.8
--- src/usr.sbin/mopd/mopcopy/mopcopy.c:1.7 Fri Dec 27 09:41:52 2019
+++ src/usr.sbin/mopd/mopcopy/mopcopy.c Tue Oct 27 17:16:24 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mopcopy.c,v 1.7 2019/12/27 09:41:52 msaitoh Exp $ */
+/* $NetBSD: mopcopy.c,v 1.8 2020/10/27 17:16:24 abs Exp $ */
/* mopcopy - Convert a Unix format kernel into something that
* can be transferred via MOP.
@@ -49,7 +49,7 @@
#include "port.h"
#ifndef lint
-__RCSID("$NetBSD: mopcopy.c,v 1.7 2019/12/27 09:41:52 msaitoh Exp $");
+__RCSID("$NetBSD: mopcopy.c,v 1.8 2020/10/27 17:16:24 abs Exp $");
#endif
#include "os.h"
@@ -69,6 +69,9 @@ __RCSID("$NetBSD: mopcopy.c,v 1.7 2019/1
#define NOAOUT
#endif
#if !defined(MID_VAX)
+#define MID_VAX 150
+#endif
+#if !defined(MID_VAX1K)
#define MID_VAX 140
#endif
@@ -125,7 +128,7 @@ main(int argc, char **argv)
#ifndef NOAOUT
case IMAGE_TYPE_AOUT:
- if (dl.a_mid != MID_VAX)
+ if (dl.a_mid != MID_VAX && dl.a_mid != MID_VAX1K)
printf("WARNING: `%s' is not a VAX image (mid=%d)\n",
argv[1], dl.a_mid);
i = dl.a_text + dl.a_text_fill + dl.a_data + dl.a_data_fill +
CVS commit: src/usr.sbin/mopd/common
Module Name:src
Committed By: abs
Date: Tue Oct 27 17:07:14 UTC 2020
Modified Files:
src/usr.sbin/mopd/common: pf-linux2.c
Log Message:
Fix Linux pfInit() parameter order for mopd
>From dreamlayers
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/mopd/common/pf-linux2.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.sbin/mopd/common/pf-linux2.c
diff -u src/usr.sbin/mopd/common/pf-linux2.c:1.1 src/usr.sbin/mopd/common/pf-linux2.c:1.2
--- src/usr.sbin/mopd/common/pf-linux2.c:1.1 Wed Jun 8 01:11:49 2016
+++ src/usr.sbin/mopd/common/pf-linux2.c Tue Oct 27 17:07:14 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pf-linux2.c,v 1.1 2016/06/08 01:11:49 christos Exp $ */
+/* $NetBSD: pf-linux2.c,v 1.2 2020/10/27 17:07:14 abs Exp $ */
/*
* General Purpose AppleTalk Packet Filter Interface
@@ -23,7 +23,7 @@
*/
#include "port.h"
-__RCSID("$NetBSD: pf-linux2.c,v 1.1 2016/06/08 01:11:49 christos Exp $");
+__RCSID("$NetBSD: pf-linux2.c,v 1.2 2020/10/27 17:07:14 abs Exp $");
/*
* include header files
@@ -86,7 +86,7 @@ static int setup_pf(int, int, u_short);
int
-pfInit(char *interface, u_short protocol, int typ, int mode)
+pfInit(char *interface, int mode, u_short protocol, int typ)
{
int s;
int ioarg;
CVS commit: src
Module Name:src
Committed By: abs
Date: Fri Nov 9 21:33:50 UTC 2018
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/misc: mi
src/etc/mtree: NetBSD.dist.base
src/usr.sbin/sliplogin: Makefile
Log Message:
Install the sample slip.login to share/examples/slip/slip.login
To generate a diff of this commit:
cvs rdiff -u -r1.1192 -r1.1193 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.208 -r1.209 src/distrib/sets/lists/misc/mi
cvs rdiff -u -r1.179 -r1.180 src/etc/mtree/NetBSD.dist.base
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sliplogin/Makefile
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.1192 src/distrib/sets/lists/base/mi:1.1193
--- src/distrib/sets/lists/base/mi:1.1192 Thu Oct 11 15:41:07 2018
+++ src/distrib/sets/lists/base/mi Fri Nov 9 21:33:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1192 2018/10/11 15:41:07 christos Exp $
+# $NetBSD: mi,v 1.1193 2018/11/09 21:33:50 abs Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -2249,6 +2249,7 @@
./usr/share/examples/racoon/roadwarrior/client base-netutil-examples
./usr/share/examples/racoon/roadwarrior/server base-netutil-examples
./usr/share/examples/rtadvd base-router-examples
+./usr/share/examples/slip base-slip-examples
./usr/share/examples/smbfs base-sysutil-examples
./usr/share/examples/supfiles base-sup-examples
./usr/share/examples/syslogd base-sysutil-examples
Index: src/distrib/sets/lists/misc/mi
diff -u src/distrib/sets/lists/misc/mi:1.208 src/distrib/sets/lists/misc/mi:1.209
--- src/distrib/sets/lists/misc/mi:1.208 Sun Sep 23 07:24:19 2018
+++ src/distrib/sets/lists/misc/mi Fri Nov 9 21:33:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.208 2018/09/23 07:24:19 maxv Exp $
+# $NetBSD: mi,v 1.209 2018/11/09 21:33:50 abs Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1603,6 +1603,7 @@
./usr/share/examples/racoon/roadwarrior/server/racoon.conf misc-netutil-examples share
./usr/share/examples/racoon/roadwarrior/server/racoon.conf-radius misc-netutil-examples share
./usr/share/examples/rtadvd/rtadvd.conf misc-router-examples use_inet6,share
+./usr/share/examples/slip/slip.login misc-slip-examples share
./usr/share/examples/smbfs/dot.nsmbrc misc-sysutil-examples share
./usr/share/examples/supfiles/ftp.cs.umn.edu misc-obsolete obsolete
./usr/share/examples/supfiles/skarven.itea.unit.no misc-obsolete obsolete
Index: src/etc/mtree/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.179 src/etc/mtree/NetBSD.dist.base:1.180
--- src/etc/mtree/NetBSD.dist.base:1.179 Thu Oct 11 18:04:06 2018
+++ src/etc/mtree/NetBSD.dist.base Fri Nov 9 21:33:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.base,v 1.179 2018/10/11 18:04:06 christos Exp $
+# $NetBSD: NetBSD.dist.base,v 1.180 2018/11/09 21:33:50 abs Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -392,6 +392,7 @@
./usr/share/examples/racoon/roadwarrior/client
./usr/share/examples/racoon/roadwarrior/server
./usr/share/examples/rtadvd
+./usr/share/examples/slip
./usr/share/examples/smbfs
./usr/share/examples/supfiles
./usr/share/examples/syslogd
Index: src/usr.sbin/sliplogin/Makefile
diff -u src/usr.sbin/sliplogin/Makefile:1.6 src/usr.sbin/sliplogin/Makefile:1.7
--- src/usr.sbin/sliplogin/Makefile:1.6 Wed Jul 13 13:10:04 2016
+++ src/usr.sbin/sliplogin/Makefile Fri Nov 9 21:33:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/07/13 13:10:04 shm Exp $
+# $NetBSD: Makefile,v 1.7 2018/11/09 21:33:50 abs Exp $
# from: @(#)Makefile 8.1 (Berkeley) 7/19/93
USE_FORT?= yes # setuid
@@ -7,4 +7,11 @@ MAN= sliplogin.8
BINOWN= root
BINMODE=4555
+.include
+
+.if ${MKSHARE} != "no"
+FILESDIR= /usr/share/examples/slip
+FILES= slip.login
+.endif
+
.include
CVS commit: src/sys/external/bsd/drm2/dist/drm/i915
Module Name:src
Committed By: abs
Date: Sun Jul 26 15:30:36 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_pm.c
Log Message:
Avoid NULL dev_priv-vlv_pctx- deref in a WARN check on Lenovo B50-30,
add an additional check for the NULL dev_priv-vlv_pctx.
System now boots (though does not recognise any of the USB(3) ports)
pullup#7
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.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/external/bsd/drm2/dist/drm/i915/intel_pm.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.6 src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.7
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.6 Wed Feb 25 13:06:13 2015
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c Sun Jul 26 15:30:36 2015
@@ -3625,6 +3625,8 @@ static void valleyview_check_pctx(struct
{
unsigned long pctx_addr = I915_READ(VLV_PCBR) ~4095;
+ if (WARN_ON(!dev_priv-vlv_pctx))
+ return;
WARN_ON(pctx_addr != dev_priv-mm.stolen_base +
dev_priv-vlv_pctx-stolen-start);
}
CVS commit: src/sys/arch/vax/vsa
Module Name:src Committed By: abs Date: Sun May 31 07:04:18 UTC 2015 Modified Files: src/sys/arch/vax/vsa: vsbus.c Log Message: Add missing break - from Felix Deichmann in PR port-vax/49935 To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/sys/arch/vax/vsa/vsbus.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/vax/vsa/vsbus.c diff -u src/sys/arch/vax/vsa/vsbus.c:1.60 src/sys/arch/vax/vsa/vsbus.c:1.61 --- src/sys/arch/vax/vsa/vsbus.c:1.60 Thu Jun 28 13:58:21 2012 +++ src/sys/arch/vax/vsa/vsbus.c Sun May 31 07:04:18 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: vsbus.c,v 1.60 2012/06/28 13:58:21 abs Exp $ */ +/* $NetBSD: vsbus.c,v 1.61 2015/05/31 07:04:18 abs Exp $ */ /* * Copyright (c) 1996, 1999 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -33,7 +33,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: vsbus.c,v 1.60 2012/06/28 13:58:21 abs Exp $); +__KERNEL_RCSID(0, $NetBSD: vsbus.c,v 1.61 2015/05/31 07:04:18 abs Exp $); #include opt_cputype.h @@ -138,6 +138,7 @@ vsbus_attach(device_t parent, device_t s sc-sc_intclr = (char *)sc-sc_vsregs + 15; sc-sc_intmsk = (char *)sc-sc_vsregs + 12; vsbus_dma_init(sc, 32768); + break; #endif default:
CVS commit: src/sbin/newfs_msdos
Module Name:src
Committed By: abs
Date: Thu Apr 23 13:27:14 UTC 2015
Modified Files:
src/sbin/newfs_msdos: newfs_msdos.c
Log Message:
newfs_msdos allowed suffixes such as 'k', 'm' for some parameters,
but amusingly this did not include Block size, or Sectors per cluster.
Allow for all numeric parameters (If I want to specify the number
of drive heads as '1K', then why not?)
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sbin/newfs_msdos/newfs_msdos.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/newfs_msdos/newfs_msdos.c
diff -u src/sbin/newfs_msdos/newfs_msdos.c:1.42 src/sbin/newfs_msdos/newfs_msdos.c:1.43
--- src/sbin/newfs_msdos/newfs_msdos.c:1.42 Wed Jan 23 15:29:15 2013
+++ src/sbin/newfs_msdos/newfs_msdos.c Thu Apr 23 13:27:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: newfs_msdos.c,v 1.42 2013/01/23 15:29:15 christos Exp $ */
+/* $NetBSD: newfs_msdos.c,v 1.43 2015/04/23 13:27:14 abs Exp $ */
/*
* Copyright (c) 1998 Robert Nordier
@@ -33,7 +33,7 @@
static const char rcsid[] =
$FreeBSD: src/sbin/newfs_msdos/newfs_msdos.c,v 1.15 2000/10/10 01:49:37 wollman Exp $;
#else
-__RCSID($NetBSD: newfs_msdos.c,v 1.42 2013/01/23 15:29:15 christos Exp $);
+__RCSID($NetBSD: newfs_msdos.c,v 1.43 2015/04/23 13:27:14 abs Exp $);
#endif
#endif /* not lint */
@@ -168,14 +168,13 @@ main(int argc, char *argv[])
static u_int
argtou(const char *arg, u_int lo, u_int hi, const char *msg)
{
-char *s;
-u_long x;
+off_t x;
errno = 0;
-x = strtoul(arg, s, 0);
-if (errno || !*arg || *s || x lo || x hi)
+x = argtooff(arg, msg);
+if (x lo || x hi)
errx(1, %s: bad %s, arg, msg);
-return x;
+return (u_int)x;
}
/*
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: abs
Date: Fri Jan 2 19:43:14 UTC 2015
Modified Files:
src/usr.sbin/sysinst: defs.h disks.c install.c partman.c upgrade.c
src/usr.sbin/sysinst/arch/arc: md.c
src/usr.sbin/sysinst/arch/cobalt: md.c
src/usr.sbin/sysinst/arch/evbsh3: md.c
src/usr.sbin/sysinst/arch/hp300: md.c
src/usr.sbin/sysinst/arch/hpcsh: md.c
src/usr.sbin/sysinst/arch/i386: md.c
src/usr.sbin/sysinst/arch/luna68k: md.c
src/usr.sbin/sysinst/arch/mvme68k: md.c
src/usr.sbin/sysinst/arch/news68k: md.c
src/usr.sbin/sysinst/arch/sgimips: md.c
src/usr.sbin/sysinst/arch/vax: md.c
src/usr.sbin/sysinst/arch/x68k: md.c
Log Message:
Rather than scatter set_swap() calls wrapped in ram size checks through
md_post_disklabel() and md_pre_update(), abstract them out to an MI
set_swap_if_low_ram() and call from the appropriate MI places.
Now all platforms add swap if the system has = 32M of RAM.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/defs.h
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/disks.c
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/install.c \
src/usr.sbin/sysinst/upgrade.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/partman.c
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/arc/md.c
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/cobalt/md.c
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/evbsh3/md.c
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/hp300/md.c
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/hpcsh/md.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/i386/md.c
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/luna68k/md.c
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/mvme68k/md.c
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/news68k/md.c
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/sgimips/md.c
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/vax/md.c
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/x68k/md.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.sbin/sysinst/defs.h
diff -u src/usr.sbin/sysinst/defs.h:1.5 src/usr.sbin/sysinst/defs.h:1.6
--- src/usr.sbin/sysinst/defs.h:1.5 Tue Oct 14 16:35:20 2014
+++ src/usr.sbin/sysinst/defs.h Fri Jan 2 19:43:13 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.5 2014/10/14 16:35:20 christos Exp $ */
+/* $NetBSD: defs.h,v 1.6 2015/01/02 19:43:13 abs Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -451,6 +451,7 @@ int write_disklabel(void);
int make_filesystems(void);
int make_fstab(void);
int mount_disks(void);
+int set_swap_if_low_ram(const char *, partinfo *);
int set_swap(const char *, partinfo *);
int check_swap(const char *, int);
char *bootxx_name(void);
Index: src/usr.sbin/sysinst/disks.c
diff -u src/usr.sbin/sysinst/disks.c:1.6 src/usr.sbin/sysinst/disks.c:1.7
--- src/usr.sbin/sysinst/disks.c:1.6 Sun Dec 28 12:05:27 2014
+++ src/usr.sbin/sysinst/disks.c Fri Jan 2 19:43:13 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: disks.c,v 1.6 2014/12/28 12:05:27 martin Exp $ */
+/* $NetBSD: disks.c,v 1.7 2015/01/02 19:43:13 abs Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1213,6 +1213,13 @@ mount_disks(void)
}
int
+set_swap_if_low_ram(const char *disk, partinfo *pp) {
+if (get_ramsize() = 32)
+return set_swap(disk, pp);
+return 0;
+}
+
+int
set_swap(const char *disk, partinfo *pp)
{
int i;
Index: src/usr.sbin/sysinst/install.c
diff -u src/usr.sbin/sysinst/install.c:1.2 src/usr.sbin/sysinst/install.c:1.3
--- src/usr.sbin/sysinst/install.c:1.2 Sun Aug 3 16:09:38 2014
+++ src/usr.sbin/sysinst/install.c Fri Jan 2 19:43:13 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: install.c,v 1.2 2014/08/03 16:09:38 martin Exp $ */
+/* $NetBSD: install.c,v 1.3 2015/01/02 19:43:13 abs Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -101,6 +101,7 @@ do_install(void)
if (md_pre_disklabel() != 0 ||
write_disklabel() != 0 ||
+set_swap_if_low_ram(pm-diskdev, pm-bsdlabel) != 0 ||
md_post_disklabel() != 0 ||
make_filesystems() ||
make_fstab() != 0 ||
Index: src/usr.sbin/sysinst/upgrade.c
diff -u src/usr.sbin/sysinst/upgrade.c:1.2 src/usr.sbin/sysinst/upgrade.c:1.3
--- src/usr.sbin/sysinst/upgrade.c:1.2 Sun Aug 3 16:09:38 2014
+++ src/usr.sbin/sysinst/upgrade.c Fri Jan 2 19:43:13 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: upgrade.c,v 1.2 2014/08/03 16:09:38 martin Exp $ */
+/* $NetBSD: upgrade.c,v 1.3 2015/01/02 19:43:13 abs Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -67,6 +67,9 @@ do_upgrade(void)
if (find_disks(msg_string(MSG_upgrade)) 0)
return;
+if (set_swap_if_low_ram(pm-diskdev, NULL) 0)
+ return;
+
if (md_pre_update() 0)
return;
Index: src/usr.sbin/sysinst/partman.c
diff -u
CVS commit: src/sys/arch/sun3/conf
Module Name:src Committed By: abs Date: Wed Jun 25 16:14:43 UTC 2014 Modified Files: src/sys/arch/sun3/conf: DISKLESS Log Message: Enable ie0 in DISKLESS for sun3/110 To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/sys/arch/sun3/conf/DISKLESS 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/sun3/conf/DISKLESS diff -u src/sys/arch/sun3/conf/DISKLESS:1.68 src/sys/arch/sun3/conf/DISKLESS:1.69 --- src/sys/arch/sun3/conf/DISKLESS:1.68 Wed Jun 4 20:21:24 2014 +++ src/sys/arch/sun3/conf/DISKLESS Wed Jun 25 16:14:43 2014 @@ -1,4 +1,4 @@ -# $NetBSD: DISKLESS,v 1.68 2014/06/04 20:21:24 abs Exp $ +# $NetBSD: DISKLESS,v 1.69 2014/06/25 16:14:43 abs Exp $ # DISKLESS - Root and swap on NFS # Desktop machines only (3/50, 3/60, 3/110) @@ -127,7 +127,7 @@ ms0 at zsc0 channel 1 # mouse # # Intel Ethernet (onboard, or VME) -#ie0 at obio0 addr 0x0C ipl 3 +ie0 at obio0 addr 0x0C ipl 3 #ie1 at vme2 addr 0xe88000 ipl 3 vect 0x75 # Lance Ethernet (only onboard)
CVS commit: src/sys/arch/sun3/conf
Module Name:src Committed By: abs Date: Wed Jun 4 20:21:24 UTC 2014 Modified Files: src/sys/arch/sun3/conf: DISKLESS Log Message: Sync (commented out) some of the network and filesystem related blocks from GENERIC. Only functional change is to comment out tun in DISKLESS to match GENERIC. To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 src/sys/arch/sun3/conf/DISKLESS 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/sun3/conf/DISKLESS diff -u src/sys/arch/sun3/conf/DISKLESS:1.67 src/sys/arch/sun3/conf/DISKLESS:1.68 --- src/sys/arch/sun3/conf/DISKLESS:1.67 Sun Jun 30 21:38:59 2013 +++ src/sys/arch/sun3/conf/DISKLESS Wed Jun 4 20:21:24 2014 @@ -1,4 +1,4 @@ -# $NetBSD: DISKLESS,v 1.67 2013/06/30 21:38:59 rmind Exp $ +# $NetBSD: DISKLESS,v 1.68 2014/06/04 20:21:24 abs Exp $ # DISKLESS - Root and swap on NFS # Desktop machines only (3/50, 3/60, 3/110) @@ -41,9 +41,12 @@ options USERCONF # userconf(4) support #options DIAGNOSTIC # extra kernel sanity checking #options KMEMSTATS # kernel memory statistics (vmstat -m) #options PMAP_DEBUG +#options SCSIDEBUG +#options SCSIVERBOSE # Verbose SCSI errors # Compatibility options #options COMPAT_SUNOS # can run SunOS 4.1.1 executables +#options COMPAT_SVR4 # can run SVR4 executables #options COMPAT_43 # and 4.3BSD and ... #options COMPAT_10 # NetBSD 1.0 #options COMPAT_11 # NetBSD 1.1 @@ -57,7 +60,9 @@ options COMPAT_30 # NetBSD 3.0 options COMPAT_40 # NetBSD 4.0 options COMPAT_50 # NetBSD 5.0 compatibility. options COMPAT_60 # NetBSD 6.0 compatibility. +#options COMPAT_AOUT_M68K # support for NetBSD a.out executables #options COMPAT_LINUX # can run Linux/m68k executables +#options EXEC_AOUT # support for a.out executables #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. @@ -68,18 +73,27 @@ file-system NFS # Sun NFS client suppor #file-system FDESC # /dev/fd/* #file-system KERNFS # /kern #file-system NULLFS # loopback file system +#file-system OVERLAY # overlay file system #file-system PROCFS # /proc #file-system UNION # union file system #file-system MFS # memory-based filesystem #file-system PTYFS # /dev/pts/N support +#file-system TMPFS # Efficient memory file-system +#file-system UDF # experimental - OSTA UDF CD/DVD file-system #options NFSSERVER # nfs server support #options QUOTA # legacy UFS quotas #options QUOTA2 # new, in-filesystem UFS quotas #options FFS_EI # FFS Endian Independent support +#options WAPBL # File system journaling support +#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental +#options FFS_NO_SNAPSHOT # No FFS snapshot support # Networking options options INET # IP protocol stack support +#options INET6 # IPV6 +#options IPSEC # IP security +#options IPSEC_DEBUG # debug for IP security #options GATEWAY # IP packet forwarding #options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG @@ -145,11 +159,21 @@ include arch/sun3/conf/cg4.sun3 # Misc. pseudo-device loop # network loopback pseudo-device bpfilter # packet filter +#pseudo-device carp # Common Address Redundancy Protocol pseudo-device sl # CSLIP pseudo-device ppp # PPP -pseudo-device tun # network tunneling over tty +#pseudo-device pppoe # PPP over Ethernet (RFC 2516) +#pseudo-device tun # network tunneling over tty +#pseudo-device tap # virtual Ethernet #pseudo-device gre # generic L3 over IP tunnel #pseudo-device ipfilter # ip filter +#pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC1933) +#pseudo-device faith # IPv[46] tcp relay translation i/f +#pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation +#pseudo-device vlan # IEEE 802.1q encapsulation +#pseudo-device bridge # simple inter-network bridging +#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too +#pseudo-device agr # IEEE 802.3ad link aggregation pseudo-device pty # pseudo-terminals pseudo-device clockctl # user control of clock subsystem
CVS commit: src/doc
Module Name:src Committed By: abs Date: Wed May 28 21:51:18 UTC 2014 Modified Files: src/doc: HACKS Log Message: Add a hack entry for lib/libcurses/Makefile workaround for lib/48827 To generate a diff of this commit: cvs rdiff -u -r1.150 -r1.151 src/doc/HACKS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/HACKS diff -u src/doc/HACKS:1.150 src/doc/HACKS:1.151 --- src/doc/HACKS:1.150 Sat May 24 07:42:45 2014 +++ src/doc/HACKS Wed May 28 21:51:18 2014 @@ -1,4 +1,4 @@ -# $NetBSD: HACKS,v 1.150 2014/05/24 07:42:45 martin Exp $ +# $NetBSD: HACKS,v 1.151 2014/05/28 21:51:18 abs Exp $ # # This file is intended to document workarounds for currently unsolved # (mostly) compiler bugs. @@ -604,6 +604,16 @@ port vax internal compiler error: in change_address_1, at emit-rtl.c:2019 kcah + hack gcc -fno-guess-branch-probability + cdate 28 May 2014 + mdate 28 May 2014 + who abs + file lib/libcurses/Makefile : 1.69 + descr sysinst crashes under vax gcc 4.1 after selecting +partition sizes due to curses bug +pr lib/48827 + kcah + port arm hack gcc-unsigned-compare
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: abs
Date: Sat May 24 22:14:27 UTC 2014
Modified Files:
src/sys/dev/pci: siside.c
Log Message:
Add in missing space after 96X UDMA%d. Changes 96X UDMA6746 to 96X UDMA6
746
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/pci/siside.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/siside.c
diff -u src/sys/dev/pci/siside.c:1.34 src/sys/dev/pci/siside.c:1.35
--- src/sys/dev/pci/siside.c:1.34 Mon Oct 7 19:51:55 2013
+++ src/sys/dev/pci/siside.c Sat May 24 22:14:26 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: siside.c,v 1.34 2013/10/07 19:51:55 jakllsch Exp $ */
+/* $NetBSD: siside.c,v 1.35 2014/05/24 22:14:26 abs Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -25,7 +25,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: siside.c,v 1.34 2013/10/07 19:51:55 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: siside.c,v 1.35 2014/05/24 22:14:26 abs Exp $);
#include sys/param.h
#include sys/systm.h
@@ -241,7 +241,7 @@ sis_chip_map(struct pciide_softc *sc, co
SIS_REG_57) 0x7f);
if (PCI_PRODUCT(pci_conf_read(sc-sc_pc, sc-sc_tag,
PCI_ID_REG)) == SIS_PRODUCT_5518) {
-aprint_normal(96X UDMA%d,
+aprint_normal(96X UDMA%d ,
sis_hostbr_type_match-udma_mode);
sc-sis_type = SIS_TYPE_133NEW;
sc-sc_wdcdev.sc_atac.atac_udma_cap =
CVS commit: src/lib/libcurses
Module Name:src
Committed By: abs
Date: Wed May 21 14:01:30 UTC 2014
Modified Files:
src/lib/libcurses: Makefile
Log Message:
Add workaround for lib/48827 for vax to avoid segv in sysinst for now
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/lib/libcurses/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libcurses/Makefile
diff -u src/lib/libcurses/Makefile:1.68 src/lib/libcurses/Makefile:1.69
--- src/lib/libcurses/Makefile:1.68 Sat Apr 21 14:39:35 2012
+++ src/lib/libcurses/Makefile Wed May 21 14:01:30 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2012/04/21 14:39:35 roy Exp $
+# $NetBSD: Makefile,v 1.69 2014/05/21 14:01:30 abs Exp $
# @(#)Makefile 8.2 (Berkeley) 1/2/94
.include bsd.own.mk
@@ -176,6 +176,11 @@ MLINKS+= curses_addch.3 addch.3 curses_a
curses_touch.3 wtouchln.3 curses_underscore.3 wunderend.3 \
curses_underscore.3 wunderscore.3 curses_line.3 wvline.3
+# sysinst crashes under gcc 4.1 after selecting partition sizes - PR lib/48827
+.if ${HAVE_GCC:U} == 4 ${ACTIVE_CC} == gcc ${MACHINE_ARCH} == vax
+COPTS.refresh.c+= -fno-guess-branch-probability
+.endif
+
.if make(install)
SUBDIR+= PSD.doc
.endif
CVS commit: src/sys/kern
Module Name:src Committed By: abs Date: Sat Apr 26 16:30:05 UTC 2014 Modified Files: src/sys/kern: subr_pool.c Log Message: Ensure pool_head is non static - for vmstat -i To generate a diff of this commit: cvs rdiff -u -r1.201 -r1.202 src/sys/kern/subr_pool.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_pool.c diff -u src/sys/kern/subr_pool.c:1.201 src/sys/kern/subr_pool.c:1.202 --- src/sys/kern/subr_pool.c:1.201 Mon Feb 17 20:40:06 2014 +++ src/sys/kern/subr_pool.c Sat Apr 26 16:30:05 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_pool.c,v 1.201 2014/02/17 20:40:06 para Exp $ */ +/* $NetBSD: subr_pool.c,v 1.202 2014/04/26 16:30:05 abs Exp $ */ /*- * Copyright (c) 1997, 1999, 2000, 2002, 2007, 2008, 2010 @@ -32,7 +32,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: subr_pool.c,v 1.201 2014/02/17 20:40:06 para Exp $); +__KERNEL_RCSID(0, $NetBSD: subr_pool.c,v 1.202 2014/04/26 16:30:05 abs Exp $); #include opt_ddb.h #include opt_lockdebug.h @@ -67,8 +67,8 @@ __KERNEL_RCSID(0, $NetBSD: subr_pool.c, * an internal pool of page headers (`phpool'). */ -/* List of all pools */ -static TAILQ_HEAD(, pool) pool_head = TAILQ_HEAD_INITIALIZER(pool_head); +/* List of all pools. Non static as needed by 'vmstat -i' */ +TAILQ_HEAD(, pool) pool_head = TAILQ_HEAD_INITIALIZER(pool_head); /* Private pool for page header structures */ #define PHPOOL_MAX 8
CVS commit: src/share/man/man9
Module Name:src Committed By: abs Date: Thu Nov 22 14:27:33 UTC 2012 Modified Files: src/share/man/man9: secmodel_bsd44.9 secmodel_extensions.9 secmodel_securelevel.9 Log Message: Punctuation and (non-)capitalization fixes. From Bug Hunting. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/share/man/man9/secmodel_bsd44.9 cvs rdiff -u -r1.2 -r1.3 src/share/man/man9/secmodel_extensions.9 cvs rdiff -u -r1.12 -r1.13 src/share/man/man9/secmodel_securelevel.9 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/man9/secmodel_bsd44.9 diff -u src/share/man/man9/secmodel_bsd44.9:1.14 src/share/man/man9/secmodel_bsd44.9:1.15 --- src/share/man/man9/secmodel_bsd44.9:1.14 Sun Dec 4 21:08:45 2011 +++ src/share/man/man9/secmodel_bsd44.9 Thu Nov 22 14:27:32 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: secmodel_bsd44.9,v 1.14 2011/12/04 21:08:45 jym Exp $ +.\ $NetBSD: secmodel_bsd44.9,v 1.15 2012/11/22 14:27:32 abs Exp $ .\ .\ Copyright (c) 2006 Elad Efrat e...@netbsd.org .\ All rights reserved. @@ -25,7 +25,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 December 4, 2011 +.Dd November 22, 2012 .Dt SECMODEL_BSD44 9 .Os .Sh NAME @@ -39,10 +39,10 @@ security model (based on is the default security model in .Nx . It is the traditional security model based on -.Bx 4.4 +.Bx 4.4 , and is composed of three separate security models: .Xr secmodel_extensions 9 , -.Xr secmodel_securelevel 9 +.Xr secmodel_securelevel 9 , and .Xr secmodel_suser 9 . .Sh SEE ALSO Index: src/share/man/man9/secmodel_extensions.9 diff -u src/share/man/man9/secmodel_extensions.9:1.2 src/share/man/man9/secmodel_extensions.9:1.3 --- src/share/man/man9/secmodel_extensions.9:1.2 Fri Dec 9 10:58:51 2011 +++ src/share/man/man9/secmodel_extensions.9 Thu Nov 22 14:27:32 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: secmodel_extensions.9,v 1.2 2011/12/09 10:58:51 njoly Exp $ +.\ $NetBSD: secmodel_extensions.9,v 1.3 2012/11/22 14:27:32 abs Exp $ .\ .\ Copyright (c) 2011 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,12 +27,12 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd December 3, 2011 +.Dd November 22, 2012 .Dt SECMODEL_EXTENSIONS 9 .Os .Sh NAME .Nm secmodel_extensions -.Nd Extensions security model +.Nd extensions security model .Sh DESCRIPTION .Nm implements extensions to the traditional security model based on Index: src/share/man/man9/secmodel_securelevel.9 diff -u src/share/man/man9/secmodel_securelevel.9:1.12 src/share/man/man9/secmodel_securelevel.9:1.13 --- src/share/man/man9/secmodel_securelevel.9:1.12 Tue Jan 17 10:47:27 2012 +++ src/share/man/man9/secmodel_securelevel.9 Thu Nov 22 14:27:32 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: secmodel_securelevel.9,v 1.12 2012/01/17 10:47:27 cegger Exp $ +.\ $NetBSD: secmodel_securelevel.9,v 1.13 2012/11/22 14:27:32 abs Exp $ .\ .\ Copyright (c) 2006 Elad Efrat e...@netbsd.org .\ Copyright (c) 2000 Hugh Graham @@ -26,7 +26,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 16, 2012 +.Dd November 22, 2012 .Dt SECMODEL_SECURELEVEL 9 .Os .Sh NAME @@ -36,7 +36,7 @@ The securelevel mechanism is intended to allow protecting the persistence of code and data on the system, or a subset thereof, from modification, even by the -.Em super-user +.Em super-user , by providing convenient means of .Dq locking down a system to a degree suited to its environment. @@ -51,14 +51,14 @@ but only .Xr init 8 can lower it. .Pp -Four security levels are provided. +Four security levels are provided: .Bl -tag -width flag .It \-1 Em Permanently insecure mode .Bl -bullet .It Do not raise the .Em securelevel -on boot +on boot. .El .It \ 0 Em Insecure mode .Bl -bullet @@ -247,7 +247,7 @@ the unique identifier of .Qo Dv org.netbsd.secmodel.securelevel Qc . .It what a string, -.Qo Dv is-securelevel-above Qc +.Qo Dv is-securelevel-above Qc . .It arg a reference to an .Dv int
CVS commit: src/lib/libc/gen
Module Name:src Committed By: abs Date: Thu Nov 22 16:19:49 UTC 2012 Modified Files: src/lib/libc/gen: exec.3 Log Message: - Correct macro usage; - sort section order. From Bug Hunting. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/lib/libc/gen/exec.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/exec.3 diff -u src/lib/libc/gen/exec.3:1.21 src/lib/libc/gen/exec.3:1.22 --- src/lib/libc/gen/exec.3:1.21 Mon Mar 22 19:30:53 2010 +++ src/lib/libc/gen/exec.3 Thu Nov 22 16:19:49 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: exec.3,v 1.21 2010/03/22 19:30:53 joerg Exp $ +.\ $NetBSD: exec.3,v 1.22 2012/11/22 16:19:49 abs Exp $ .\ .\ Copyright (c) 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -59,7 +59,7 @@ .Fn execvp const char *file char *const argv[] .Sh DESCRIPTION The -.Nm exec +.Fn exec family of functions replaces the current process image with a new process image. The functions described in this manual page are front-ends for the function @@ -185,7 +185,7 @@ executes a file with the program tracing .Xr ptrace 2 ) . .Sh RETURN VALUES If any of the -.Nm exec +.Fn exec functions returns, an error will have occurred. The return value is \-1, and the global variable .Va errno @@ -195,33 +195,6 @@ will be set to indicate the error. .It Pa /bin/sh The shell. .El -.Sh ERRORS -.Fn execl , -.Fn execle , -.Fn execlp -and -.Fn execvp -may fail and set -.Va errno -for any of the errors specified for the library functions -.Xr execve 2 -and -.Xr malloc 3 . -.Pp -.Fn exect -and -.Fn execv -may fail and set -.Va errno -for any of the errors specified for the library function -.Xr execve 2 . -.Sh SEE ALSO -.Xr sh 1 , -.Xr execve 2 , -.Xr fork 2 , -.Xr ptrace 2 , -.Xr environ 7 , -.Xr script 7 .Sh COMPATIBILITY Historically, the default path for the .Fn execlp @@ -251,6 +224,33 @@ and .Er E2BIG , upon which they returned. They now return if any error other than the ones described above occurs. +.Sh ERRORS +.Fn execl , +.Fn execle , +.Fn execlp +and +.Fn execvp +may fail and set +.Va errno +for any of the errors specified for the library functions +.Xr execve 2 +and +.Xr malloc 3 . +.Pp +.Fn exect +and +.Fn execv +may fail and set +.Va errno +for any of the errors specified for the library function +.Xr execve 2 . +.Sh SEE ALSO +.Xr sh 1 , +.Xr execve 2 , +.Xr fork 2 , +.Xr ptrace 2 , +.Xr environ 7 , +.Xr script 7 .Sh STANDARDS .Fn execl , .Fn execv ,
CVS commit: src/bin/ls
Module Name:src Committed By: abs Date: Tue Nov 20 12:37:29 UTC 2012 Modified Files: src/bin/ls: ls.1 ls.c Log Message: PR/47167 ls.1: - Sort options in `SYNOPSIS', the option list, and texts within the man page; - improve wording; - improve macro usage; - use more consistency regarding (locations for) information about which options override which; - cross-reference `-d' and `-R'; - simplify description of `-k', removing redundant and unneeded information; - sort entry type list (but leave `-a' and `-A' as they are, given their meaning); - correct / augment description of `BLOCKSIZE' environment variable in `ENVIRONMENT' section; - bump date. ls.c: - Sort options in `usage'; - augment comment about when to figure out block size. To generate a diff of this commit: cvs rdiff -u -r1.71 -r1.72 src/bin/ls/ls.1 cvs rdiff -u -r1.69 -r1.70 src/bin/ls/ls.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/ls/ls.1 diff -u src/bin/ls/ls.1:1.71 src/bin/ls/ls.1:1.72 --- src/bin/ls/ls.1:1.71 Sun Oct 21 08:18:27 2012 +++ src/bin/ls/ls.1 Tue Nov 20 12:37:29 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: ls.1,v 1.71 2012/10/21 08:18:27 wiz Exp $ +.\ $NetBSD: ls.1,v 1.72 2012/11/20 12:37:29 abs Exp $ .\ .\ Copyright (c) 1980, 1990, 1991, 1993, 1994 .\ The Regents of the University of California. All rights reserved. @@ -32,7 +32,7 @@ .\ .\ @(#)ls.1 8.7 (Berkeley) 7/29/94 .\ -.Dd April 2, 2011 +.Dd November 20, 2012 .Dt LS 1 .Os .Sh NAME @@ -40,19 +40,19 @@ .Nd list directory contents .Sh SYNOPSIS .Nm -.Op Fl AaBbCcdFfghikLlMmnopqRrSsTtuWwx1 +.Op Fl 1AaBbCcdFfghikLlMmnopqRrSsTtuWwx .Op Ar .Sh DESCRIPTION -For each operand that names a +For each .Ar file -of a type other than +operand that names a file of a type other than directory, .Nm displays its name as well as any requested, associated information. -For each operand that names a +For each .Ar file -of type directory, +operand that names a file of type directory, .Nm displays the names of files contained within that directory, as well as any requested, associated @@ -67,6 +67,11 @@ lexicographical order. .Pp The following options are available: .Bl -tag -width indent +.It Fl \1 +(The numeric digit +.Dq one ) . +Force output to be one entry per line. +This is the default when output is not to a terminal. .It Fl A List all entries except for .Ql \. @@ -88,13 +93,18 @@ but use C escape codes whenever possible Force multi-column output; this is the default when output is to a terminal. .It Fl c Use time when file status was last changed, -instead of time of last modification of the file for sorting -.Pq Fl t -or printing -.Pq Fl l . +instead of time of last modification of the file for printing +.Pq Fl l +or sorting +.Pq Fl t . +Overrides +.Fl u . .It Fl d Directories are listed as plain files (not searched recursively) and symbolic links in the argument list are not followed. +Turns off +.Fl R +if also given. .It Fl F Display a slash .Pq Sq \/ @@ -123,9 +133,9 @@ The same as except that the owner is not printed. .It Fl h Modifies the -.Fl s -and .Fl l +and +.Fl s options, causing the sizes to be reported in bytes displayed in a human readable format. Overrides @@ -138,15 +148,8 @@ For each file, print the file's file ser Modifies the .Fl s option, causing the sizes to be reported in kilobytes. -The rightmost of the -.Fl k -and -.Fl h -flags overrides the previous flag. -See also -.Fl h -and -.Fl M . +Overrides +.Fl h . .It Fl L For each file, if it's a link, evaluate file information and file type of the referenced file and not the link itself; however still print @@ -169,8 +172,8 @@ options, causing the sizes or block coun commas (or a locale appropriate separator) resulting in a more readable output. Overrides -.Fl h . -Does not override +.Fl h ; +does not override .Fl k . .It Fl m Stream output format; list files across the page, separated by commas. @@ -201,6 +204,8 @@ the character this is the default when output is to a terminal. .It Fl R Recursively list subdirectories encountered. +See also +.Fl d . .It Fl r Reverse the order of the sort to get reverse lexicographical order or the smallest or oldest entries first. @@ -230,10 +235,12 @@ order. .It Fl u Use time of last access, instead of last modification -of the file for sorting -.Pq Fl t -or printing -.Pq Fl l . +of the file for printing +.Pq Fl l +or sorting +.Pq Fl t . +Overrides +.Fl c . .It Fl W Display whiteouts when scanning directories. .It Fl w @@ -241,19 +248,14 @@ Force raw printing of non-printable char This is the default when output is not to a terminal. .It Fl x Multi-column output sorted across the page rather than down the page. -.It Fl \1 -(The numeric digit -.Dq one ) . -Force output to be one entry per line. -This is the default when output is not to a terminal. .El .Pp The .Fl B , .Fl b , -.Fl
CVS commit: src/games/wtf
Module Name:src
Committed By: abs
Date: Tue Nov 20 12:40:54 UTC 2012
Modified Files:
src/games/wtf: wtf wtf.6
Log Message:
PR/47178 from Bug Hunting
src/games/wtf/wtf:
- Correct `usage' (to match new `SYNOPSIS' from man page);
- augment comment on quering pkgsrc's help facility;
- correct interpretation of pkgsrc' help facility query result.
src/games/wtf/wtf.6:
- enhance `SYNOPSIS', document description (`.Dd'), and overal
program description;
- augment description about quering pkgsrc's help facility;
- improve wording;
- augment `HISTORY' section;
- bump date.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/games/wtf/wtf
cvs rdiff -u -r1.15 -r1.16 src/games/wtf/wtf.6
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/wtf/wtf
diff -u src/games/wtf/wtf:1.18 src/games/wtf/wtf:1.19
--- src/games/wtf/wtf:1.18 Wed Oct 3 19:50:06 2012
+++ src/games/wtf/wtf Tue Nov 20 12:40:54 2012
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: wtf,v 1.18 2012/10/03 19:50:06 wiz Exp $
+# $NetBSD: wtf,v 1.19 2012/11/20 12:40:54 abs Exp $
#
# Public domain
#
@@ -8,7 +8,7 @@
PROGNAME=$(basename $0)
usage() {
- echo usage: $PROGNAME [-f dbfile] [is] acronym ...
+ echo usage: $PROGNAME [-f dbfile] [is] term ...
exit 1
}
@@ -76,10 +76,11 @@ for i; do
continue
fi
- # Try querying pkgsrc's help facility next
+ # If called from pkgsrc package directory,
+ # try querying pkgsrc's help facility next
if [ -f ../../mk/bsd.pkg.mk ]; then
ans=$(make help topic=$i)
- if [ $? -eq 0 ]; then
+ if [ $ans != No help found for $i. ]; then
echo $i: $ans
continue
fi
Index: src/games/wtf/wtf.6
diff -u src/games/wtf/wtf.6:1.15 src/games/wtf/wtf.6:1.16
--- src/games/wtf/wtf.6:1.15 Wed Oct 3 19:50:43 2012
+++ src/games/wtf/wtf.6 Tue Nov 20 12:40:54 2012
@@ -1,41 +1,46 @@
-.\ $NetBSD: wtf.6,v 1.15 2012/10/03 19:50:43 wiz Exp $
+.\ $NetBSD: wtf.6,v 1.16 2012/11/20 12:40:54 abs Exp $
.\
.\ Public Domain
.\
-.Dd October 3, 2012
+.Dd November 20, 2012
.Dt WTF 6
.Os
.Sh NAME
.Nm wtf
-.Nd translate acronyms
+.Nd look up terms
.Sh SYNOPSIS
.Nm
.Op Fl f Ar dbfile
.Op Ar is
-.Ar acronym ...
+.Ar term ...
.Sh DESCRIPTION
The
.Nm
-utility displays the expansion of one or more acronyms
-specified on the command line.
-If an acronym is not in any of the acronym databases,
+utility looks up the meaning of one or more
+.Ar term
+operands specified on the command line.
+.Pp
+.Ar term
+will first be searched for as an acronym in the acronym databases,
which are expected to be in the format
-.Dq acronym[tab]meaning ,
+.Dq acronym[tab]meaning .
+If no match has been found,
.Nm
-will check to see if it is known by
+will check to see if the term is known by
.Xr whatis 1 ,
.Xr pkg_info 1 ,
-or via pkgsrc's internal help mechanism,
+or, when called from within a pkgsrc package directory,
+pkgsrc's internal help facility,
.Dq make help topic=XXX .
.Pp
-If
-.Dq is
-is specified on the command line, it will be ignored, allowing the
+The optional
+.Ar is
+operand will be ignored, allowing the
fairly natural
.Dq wtf is WTF
usage.
.Pp
-The following options are available:
+The following option is available:
.Bl -tag -width flag
.It Fl f Ar dbfile
Overrides the default list of acronym databases, bypassing the value of the
@@ -70,3 +75,5 @@ default computer-related acronym databas
.Nm
first appeared in
.Nx 1.5 .
+Initially it only translated acronyms;
+functionality to look up the meaning of terms in other sources was added later.
CVS commit: xsrc/external/mit/xorg-server/dist/exa
Module Name:xsrc
Committed By: abs
Date: Fri Nov 9 10:27:33 UTC 2012
Modified Files:
xsrc/external/mit/xorg-server/dist/exa: exa_priv.h exa_unaccel.c
Log Message:
Apply patch https://bugs.freedesktop.org/attachment.cgi?id=68718
(with whitespace tweaks) from
https://bugs.freedesktop.org/show_bug.cgi?id=47266
to address graphics corruption using recent Cairo, manifested most
commonly by certain rendered text sections appearing as solid rectangular
blocks of colour.
Should be pulled up to netbsd-6 (and probably -5)
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/xorg-server/dist/exa/exa_priv.h
cvs rdiff -u -r1.1.1.6 -r1.2 \
xsrc/external/mit/xorg-server/dist/exa/exa_unaccel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/exa/exa_priv.h
diff -u xsrc/external/mit/xorg-server/dist/exa/exa_priv.h:1.1.1.4 xsrc/external/mit/xorg-server/dist/exa/exa_priv.h:1.2
--- xsrc/external/mit/xorg-server/dist/exa/exa_priv.h:1.1.1.4 Tue Nov 23 05:21:03 2010
+++ xsrc/external/mit/xorg-server/dist/exa/exa_priv.h Fri Nov 9 10:27:33 2012
@@ -206,6 +206,7 @@ typedef struct {
RegionRec srcReg;
RegionRec maskReg;
PixmapPtr srcPix;
+PixmapPtr maskPix;
} ExaScreenPrivRec, *ExaScreenPrivPtr;
Index: xsrc/external/mit/xorg-server/dist/exa/exa_unaccel.c
diff -u xsrc/external/mit/xorg-server/dist/exa/exa_unaccel.c:1.1.1.6 xsrc/external/mit/xorg-server/dist/exa/exa_unaccel.c:1.2
--- xsrc/external/mit/xorg-server/dist/exa/exa_unaccel.c:1.1.1.6 Tue Aug 2 06:56:46 2011
+++ xsrc/external/mit/xorg-server/dist/exa/exa_unaccel.c Fri Nov 9 10:27:33 2012
@@ -449,6 +449,13 @@ ExaSrcValidate(DrawablePtr pDrawable,
RegionPtr dst;
int xoff, yoff;
+if (pExaScr-srcPix == pPix)
+dst = pExaScr-srcReg;
+else if (pExaScr-maskPix == pPix)
+dst = pExaScr-maskReg;
+else
+return;
+
exaGetDrawableDeltas(pDrawable, pPix, xoff, yoff);
box.x1 = x + xoff;
@@ -456,9 +463,6 @@ ExaSrcValidate(DrawablePtr pDrawable,
box.x2 = box.x1 + width;
box.y2 = box.y1 + height;
-dst = (pExaScr-srcPix == pPix) ? pExaScr-srcReg :
- pExaScr-maskReg;
-
RegionInit(reg, box, 1);
RegionUnion(dst, dst, reg);
RegionUninit(reg);
@@ -507,17 +511,20 @@ ExaPrepareCompositeReg(ScreenPtr pScree
RegionTranslate(pSrc-pCompositeClip,
-pSrc-pDrawable-x,
-pSrc-pDrawable-y);
-}
+} else
+pExaScr-srcPix = NULL;
if (pMask pMask-pDrawable) {
pMaskPix = exaGetDrawablePixmap(pMask-pDrawable);
RegionNull(pExaScr-maskReg);
maskReg = pExaScr-maskReg;
+pExaScr-maskPix = pMaskPix;
if (pMask != pDst pMask != pSrc)
RegionTranslate(pMask-pCompositeClip,
-pMask-pDrawable-x,
-pMask-pDrawable-y);
-}
+} else
+pExaScr-maskPix = NULL;
RegionTranslate(pDst-pCompositeClip,
-pDst-pDrawable-x,
CVS commit: src/sys/dev/ata
Module Name:src Committed By: abs Date: Thu Nov 1 13:46:52 UTC 2012 Modified Files: src/sys/dev/ata: ata.c Log Message: Allow setting ATADEBUG_MASK to default value of atadebug_mask To generate a diff of this commit: cvs rdiff -u -r1.125 -r1.126 src/sys/dev/ata/ata.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/ata/ata.c diff -u src/sys/dev/ata/ata.c:1.125 src/sys/dev/ata/ata.c:1.126 --- src/sys/dev/ata/ata.c:1.125 Sat Aug 4 21:21:09 2012 +++ src/sys/dev/ata/ata.c Thu Nov 1 13:46:52 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: ata.c,v 1.125 2012/08/04 21:21:09 bouyer Exp $ */ +/* $NetBSD: ata.c,v 1.126 2012/11/01 13:46:52 abs Exp $ */ /* * Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved. @@ -25,7 +25,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ata.c,v 1.125 2012/08/04 21:21:09 bouyer Exp $); +__KERNEL_RCSID(0, $NetBSD: ata.c,v 1.126 2012/11/01 13:46:52 abs Exp $); #include opt_ata.h @@ -70,7 +70,10 @@ __KERNEL_RCSID(0, $NetBSD: ata.c,v 1.12 #define DEBUG_DETACH 0x20 #define DEBUG_XFERS 0x40 #ifdef ATADEBUG -int atadebug_mask = 0; +#ifndef ATADEBUG_MASK +#define ATADEBUG_MASK 0 +#endif +int atadebug_mask = ATADEBUG_MASK; #define ATADEBUG_PRINT(args, level) \ if (atadebug_mask (level)) \ printf args
CVS commit: src/usr.bin/sed
Module Name:src Committed By: abs Date: Tue Oct 2 14:15:04 UTC 2012 Modified Files: src/usr.bin/sed: sed.1 Log Message: i.e. - i.e., - from Snader_LB on IRC To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/usr.bin/sed/sed.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/sed/sed.1 diff -u src/usr.bin/sed/sed.1:1.27 src/usr.bin/sed/sed.1:1.28 --- src/usr.bin/sed/sed.1:1.27 Sun Sep 21 16:46:01 2008 +++ src/usr.bin/sed/sed.1 Tue Oct 2 14:15:04 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: sed.1,v 1.27 2008/09/21 16:46:01 wiz Exp $ +.\ $NetBSD: sed.1,v 1.28 2012/10/02 14:15:04 abs Exp $ .\ .\ Copyright (c) 1992, 1993 .\ The Regents of the University of California. All rights reserved. @@ -32,7 +32,7 @@ .\ .\ @(#)sed.1 8.2 (Berkeley) 12/30/93 .\ -.Dd September 21, 2008 +.Dd October 2, 2012 .Dt SED 1 .Os .Sh NAME @@ -196,7 +196,7 @@ One special feature of .Nm regular expressions is that they can default to the last regular expression used. -If a regular expression is empty, i.e. just the delimiter characters +If a regular expression is empty, i.e., just the delimiter characters are specified, the last regular expression encountered is used instead. The last regular expression is defined as the last regular expression used as part of an address or substitute command, and at run-time, not
CVS commit: src/share/mk
Module Name:src
Committed By: abs
Date: Thu Sep 20 15:48:54 UTC 2012
Modified Files:
src/share/mk: bsd.README
Log Message:
strip trailing whitespace - noted by Snader_LB on IRC
To generate a diff of this commit:
cvs rdiff -u -r1.300 -r1.301 src/share/mk/bsd.README
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.300 src/share/mk/bsd.README:1.301
--- src/share/mk/bsd.README:1.300 Thu Aug 23 21:21:16 2012
+++ src/share/mk/bsd.README Thu Sep 20 15:48:54 2012
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.300 2012/08/23 21:21:16 joerg Exp $
+# $NetBSD: bsd.README,v 1.301 2012/09/20 15:48:54 abs Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make include files for the NetBSD
@@ -283,7 +283,7 @@ MKPF If no, don't build or install th
MKPIC If no, don't build or install shared libraries, and
also acts as MKPICLIB=no
- Default: yes (for MACHINE_ARCHs that support it)
+ Default: yes (for MACHINE_ARCHs that support it)
MKPICINSTALL If no, don't install the *_pic.a libraries.
Default: yes
@@ -357,8 +357,8 @@ MKYP If no, disables building of YP (
infrastructure (libraries and support programs).
Default: yes
-MKZFS If no, do not build and install utilities and libraries
- used to manage ZFS file system. Do not build zfs and solaris
+MKZFS If no, do not build and install utilities and libraries
+ used to manage ZFS file system. Do not build zfs and solaris
compatibility kernel modules.
Default: yes on i386/amd64, no elsewhere.
@@ -409,7 +409,7 @@ USE_SSP If no, disables GCC stack pro
USE_FORT If yes turns on substitute wrappers for commonly used
functions that do not do bounds checking regularly, but
they could in some cases by using the gcc
- __builtin_object_size() function to determine the buffer
+ __builtin_object_size() function to determine the buffer
size where it is known and detect buffer overflows.
These substitute functions are in /usr/include/ssp.
Default: depends on the part of the source tree
@@ -641,7 +641,7 @@ TOOLCHAIN_MISSING
If not no, this indicates that the platform being built
does not have a working in-tree toolchain. If the
${MACHINE_ARCH} in question falls into this category,
- TOOLCHAIN_MISSING is conditionally assigned the value yes.
+ TOOLCHAIN_MISSING is conditionally assigned the value yes.
Otherwise, the variable is unconditionally assigned the
value no.
If not no, ${MKBINUTILS}, ${MKGCC}, and ${MKGDB} are
@@ -935,7 +935,7 @@ BUILDSYMLINKS List of two word items:
UUDECODE_FILES List of files which are stored as file.uue in the source
tree. Each one will be decoded with ${TOOL_UUDECODE}.
- The source files have a `.uue' suffix, the generated files do
+ The source files have a `.uue' suffix, the generated files do
not.
UUDECODE_FILES_RENAME_fn
@@ -1132,7 +1132,7 @@ LIBDPLIBS A list of the tuples:
${LIBDO.libname}/liblibname.a added.
This variable may be used for individual libraries, as
- well as in parent directories to cache common libraries
+ well as in parent directories to cache common libraries
as a build-time optimization.
The include file bsd.lib.mk includes the file named ../Makefile.inc
@@ -1274,7 +1274,7 @@ BUILDID If set, the contents of this va
The include file bsd.prog.mk handles building programs from one or
more source files, along with their manual pages. It has a limited number
-of suffixes, consistent with the current needs of the BSD tree.
+of suffixes, consistent with the current needs of the BSD tree.
bsd.prog.mk includes bsd.shlib.mk to get shared library parameters.
It has eight targets:
CVS commit: src
Module Name:src Committed By: abs Date: Wed Sep 19 23:06:22 UTC 2012 Modified Files: src/doc: BUILDING.mdoc src/share/man/man5: mk.conf.5 Log Message: Fix inverted logic description for MKSTRIPIDENT. Noted by Snader_LB on freenode IRC To generate a diff of this commit: cvs rdiff -u -r1.89 -r1.90 src/doc/BUILDING.mdoc cvs rdiff -u -r1.61 -r1.62 src/share/man/man5/mk.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/BUILDING.mdoc diff -u src/doc/BUILDING.mdoc:1.89 src/doc/BUILDING.mdoc:1.90 --- src/doc/BUILDING.mdoc:1.89 Fri May 25 10:47:25 2012 +++ src/doc/BUILDING.mdoc Wed Sep 19 23:06:22 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: BUILDING.mdoc,v 1.89 2012/05/25 10:47:25 wiz Exp $ +.\ $NetBSD: BUILDING.mdoc,v 1.90 2012/09/19 23:06:22 abs Exp $ .\ .\ Copyright (c) 2001-2011 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -33,7 +33,7 @@ .\ Toolchain prefix for commands .ds toolprefix nb . -.Dd May 25, 2012 +.Dd September 19, 2012 .Dt BUILDING 8 .Os NetBSD . @@ -580,9 +580,9 @@ unconditionally. . .It Sy MKSTRIPIDENT .YorN -Indicates whether program binaries and shared libraries should be built -to include RCS IDs for use with -.Xr ident 1 . +Indicates whether RCS IDs, for use with +.Xr ident 1 , +should be stripped from program binaries and shared libraries. .DFLTn . .It Sy MKUNPRIVED Index: src/share/man/man5/mk.conf.5 diff -u src/share/man/man5/mk.conf.5:1.61 src/share/man/man5/mk.conf.5:1.62 --- src/share/man/man5/mk.conf.5:1.61 Sat Jul 14 17:12:27 2012 +++ src/share/man/man5/mk.conf.5 Wed Sep 19 23:06:22 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: mk.conf.5,v 1.61 2012/07/14 17:12:27 wiz Exp $ +.\ $NetBSD: mk.conf.5,v 1.62 2012/09/19 23:06:22 abs Exp $ .\ .\ Copyright (c) 1999-2003 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd July 14, 2012 +.Dd September 19, 2012 .Dt MK.CONF 5 .Os .\ turn off hyphenation @@ -641,9 +641,9 @@ will be built and installed. . .It Sy MKSTRIPIDENT .YorN -Indicates whether program binaries and shared libraries should be built -to include RCS IDs for use with -.Xr ident 1 . +Indicates whether RCS IDs, for use with +.Xr ident 1 , +should be stripped from program binaries and shared libraries. .DFLTn . .It Sy MKUNPRIVED
CVS commit: src/doc
Module Name:src
Committed By: abs
Date: Wed Sep 19 23:08:37 UTC 2012
Modified Files:
src/doc: BUILDING.mdoc
Log Message:
strip trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/doc/BUILDING.mdoc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/BUILDING.mdoc
diff -u src/doc/BUILDING.mdoc:1.90 src/doc/BUILDING.mdoc:1.91
--- src/doc/BUILDING.mdoc:1.90 Wed Sep 19 23:06:22 2012
+++ src/doc/BUILDING.mdoc Wed Sep 19 23:08:37 2012
@@ -1,4 +1,4 @@
-.\ $NetBSD: BUILDING.mdoc,v 1.90 2012/09/19 23:06:22 abs Exp $
+.\ $NetBSD: BUILDING.mdoc,v 1.91 2012/09/19 23:08:37 abs Exp $
.\
.\ Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -287,7 +287,7 @@ can be provided only in the environment
.Fl M
flag of
.Nm build.sh ;
-it cannot usefully be set inside a Makefile, including
+it cannot usefully be set inside a Makefile, including
.Pa mk.conf
or
.Sy ${MAKECONF} .
@@ -744,7 +744,7 @@ If set, then in addition to the effects
.Sy MKUPDATE=yes
above, this implies the effects of
.Sy NOCLEANDIR
-(i.e.,
+(i.e.,
.Dq make cleandir
is avoided).
.DFLTn
@@ -757,7 +757,7 @@ option.
.
.It Sy NBUILDJOBS
Now obsolete.
-Use the
+Use the
.Xr make 1
option
.Fl j ,
@@ -838,9 +838,9 @@ builds are listed here.
.It Fl j Ar njob
Run up to
.Ar njob
-.Xr make 1
+.Xr make 1
subjobs in parallel.
-Makefiles should use .WAIT or have explicit dependencies
+Makefiles should use .WAIT or have explicit dependencies
as necessary to enforce build ordering.
.
.It Fl m Ar dir
@@ -1192,7 +1192,7 @@ must be populated by
.Dq make release
or equivalent.
The build must have been performed with
-.Sy MKUNPRIVED=yes
+.Sy MKUNPRIVED=yes
because
.Dq make install-image
relies on information in
@@ -1225,7 +1225,7 @@ is attempted, RELEASEDIR must be populat
.Dq make release
or equivalent.
The build must have been performed with
-.Sy MKUNPRIVED=yes
+.Sy MKUNPRIVED=yes
because
.Dq make install-image
relies on information in
@@ -1367,7 +1367,7 @@ This command will first run
.Dq make obj
and
.Dq make cleandir
-in the
+in the
.Pa tools
subdirectory unless the
.Fl o
@@ -1501,7 +1501,7 @@ wrapper script so that the resulting nam
.
.It Fl C Ar cdextras
Append
-.Ar cdextras
+.Ar cdextras
to the
.Sy CDEXTRA
variable,
@@ -1549,16 +1549,16 @@ Print a help message.
.It Fl j Ar njob
Run up to
.Ar njob
-.Xr make 1
+.Xr make 1
subjobs in parallel;
-passed through to
+passed through to
.Xr make 1 .
If you see failures for reasons other than running out of memory
while using
.Sy build.sh
with
.Fl j ,
-please save complete build logs
+please save complete build logs
so the failures can be analyzed.
.Pp
To achieve the fastest builds,
@@ -1772,7 +1772,7 @@ Set the environment variable
.Ar var
to an optional
.Ar value .
-This is propagated to the
+This is propagated to the
.Sy \*[toolprefix]make
wrapper.
.
@@ -1806,7 +1806,7 @@ Set
.It Fl Z Ar var
Unset (zap) the environment variable
.Ar var .
-This is propagated to the
+This is propagated to the
.Sy \*[toolprefix]make
wrapper.
.
@@ -1904,7 +1904,7 @@ portion of the release build.
.Bl -tag -width NBUILDJOBS
.
.It Sy NBUILDJOBS
-Use the
+Use the
.Xr make 1
option
.Fl j
CVS commit: src/doc
Module Name:src Committed By: abs Date: Wed Sep 19 23:31:36 UTC 2012 Modified Files: src/doc: BUILDING.mdoc Log Message: Adjust postinstall recommendation syntax. based on comment from Snader_LB on IRC To generate a diff of this commit: cvs rdiff -u -r1.91 -r1.92 src/doc/BUILDING.mdoc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/BUILDING.mdoc diff -u src/doc/BUILDING.mdoc:1.91 src/doc/BUILDING.mdoc:1.92 --- src/doc/BUILDING.mdoc:1.91 Wed Sep 19 23:08:37 2012 +++ src/doc/BUILDING.mdoc Wed Sep 19 23:31:36 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: BUILDING.mdoc,v 1.91 2012/09/19 23:08:37 abs Exp $ +.\ $NetBSD: BUILDING.mdoc,v 1.92 2012/09/19 23:31:36 abs Exp $ .\ .\ Copyright (c) 2001-2011 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -1030,10 +1030,10 @@ After performing this operation, it is recommended that you use .Xr etcupdate 8 to update files in -.Sy INSTALLWORLDDIR Ns Pa /etc -and that you use +.Sy INSTALLWORLDDIR Ns Pa /etc , +and .Xr postinstall 8 -to check for inconsistencies (and possibly to fix them). +to check for or fix inconsistencies. .It Sy sets Create distribution sets from .Sy DESTDIR
CVS commit: src
Module Name:src Committed By: abs Date: Wed Sep 19 23:40:03 UTC 2012 Modified Files: src: BUILDING Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.101 -r1.102 src/BUILDING Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/BUILDING diff -u src/BUILDING:1.101 src/BUILDING:1.102 --- src/BUILDING:1.101 Fri May 25 13:47:30 2012 +++ src/BUILDING Wed Sep 19 23:40:03 2012 @@ -313,9 +313,9 @@ CONFIGURATION Default: ``yes'' MKSTRIPIDENT - Can be set to ``yes'' or ``no''. Indicates whether program - binaries and shared libraries should be built to include RCS - IDs for use with ident(1). + Can be set to ``yes'' or ``no''. Indicates whether RCS IDs, + for use with ident(1), should be stripped from program bina- + ries and shared libraries. Default: ``no'' @@ -557,9 +557,8 @@ BUILDING INSTALLWORLDDIR=/, it is highly recommended that you upgrade your kernel and reboot. After performing this operation, it is recommended that you use etcupdate(8) to - update files in INSTALLWORLDDIR/etc and that you use - postinstall(8) to check for inconsistencies (and possibly - to fix them). + update files in INSTALLWORLDDIR/etc, and postinstall(8) to + check for or fix inconsistencies. sets Create distribution sets from DESTDIR into RELEASEDIR/RELEASEMACHINEDIR/binary/sets. Should be run @@ -1003,4 +1002,4 @@ HISTORY The build.sh based build scheme was introduced for NetBSD 1.6 as USE_NEW_TOOLCHAIN, and re-worked to TOOLCHAIN_MISSING after that. -NetBSD May 25, 2012 NetBSD +NetBSDSeptember 19, 2012NetBSD
CVS commit: src/sys/arch
Module Name:src Committed By: abs Date: Fri Aug 17 19:43:26 UTC 2012 Modified Files: src/sys/arch/acorn32/conf: GENERIC src/sys/arch/evbarm/conf: RPI src/sys/arch/hpcarm/conf: JORNADA720 JORNADA820 NETBOOKPRO WZERO3 src/sys/arch/sparc/conf: GENERIC src/sys/arch/usermode/conf: GENERIC.common src/sys/arch/zaurus/conf: INSTALL Log Message: Ensure all WSDISPLAY_COMPAT_USL entries have same comment To generate a diff of this commit: cvs rdiff -u -r1.102 -r1.103 src/sys/arch/acorn32/conf/GENERIC cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/RPI cvs rdiff -u -r1.86 -r1.87 src/sys/arch/hpcarm/conf/JORNADA720 cvs rdiff -u -r1.26 -r1.27 src/sys/arch/hpcarm/conf/JORNADA820 cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hpcarm/conf/NETBOOKPRO cvs rdiff -u -r1.25 -r1.26 src/sys/arch/hpcarm/conf/WZERO3 cvs rdiff -u -r1.233 -r1.234 src/sys/arch/sparc/conf/GENERIC cvs rdiff -u -r1.17 -r1.18 src/sys/arch/usermode/conf/GENERIC.common cvs rdiff -u -r1.15 -r1.16 src/sys/arch/zaurus/conf/INSTALL 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/acorn32/conf/GENERIC diff -u src/sys/arch/acorn32/conf/GENERIC:1.102 src/sys/arch/acorn32/conf/GENERIC:1.103 --- src/sys/arch/acorn32/conf/GENERIC:1.102 Sat Mar 10 21:51:48 2012 +++ src/sys/arch/acorn32/conf/GENERIC Fri Aug 17 19:43:24 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.102 2012/03/10 21:51:48 joerg Exp $ +# $NetBSD: GENERIC,v 1.103 2012/08/17 19:43:24 abs Exp $ # # GENERIC --- NetBSD/acorn32 complete configuration # @@ -22,7 +22,7 @@ include arch/acorn32/conf/std.acorn32 options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.102 $ +#ident GENERIC-$Revision: 1.103 $ # estimated number of users maxusers 32 @@ -201,7 +201,7 @@ options WSEMUL_VT100 options WS_KERNEL_FG=WSCOL_GREEN #options WSDISPLAY_COMPAT_RAWKBD -options WSDISPLAY_COMPAT_USL +options WSDISPLAY_COMPAT_USL # wsconscfg VT handling options WSDISPLAY_SCROLLSUPPORT vidcvideo0 at vidc? # wscons driver for VIDC Index: src/sys/arch/evbarm/conf/RPI diff -u src/sys/arch/evbarm/conf/RPI:1.2 src/sys/arch/evbarm/conf/RPI:1.3 --- src/sys/arch/evbarm/conf/RPI:1.2 Thu Aug 16 23:45:58 2012 +++ src/sys/arch/evbarm/conf/RPI Fri Aug 17 19:43:24 2012 @@ -1,5 +1,5 @@ # -# $NetBSD: RPI,v 1.2 2012/08/16 23:45:58 jakllsch Exp $ +# $NetBSD: RPI,v 1.3 2012/08/17 19:43:24 abs Exp $ # # RPi -- Raspberry Pi # @@ -198,7 +198,7 @@ options WS_DEFAULT_FG=WSCOL_BLACK options WS_DEFAULT_BG=WSCOL_LIGHT_WHITE options WS_KERNEL_FG=WSCOL_GREEN options WS_KERNEL_BG=WSCOL_LIGHT_WHITE -options WSDISPLAY_COMPAT_USL # VT handling +options WSDISPLAY_COMPAT_USL # wsconscfg VT handling options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes options WSDISPLAY_DEFAULTSCREENS=4 options FONT_QVSS8x15 Index: src/sys/arch/hpcarm/conf/JORNADA720 diff -u src/sys/arch/hpcarm/conf/JORNADA720:1.86 src/sys/arch/hpcarm/conf/JORNADA720:1.87 --- src/sys/arch/hpcarm/conf/JORNADA720:1.86 Sat Mar 10 21:51:52 2012 +++ src/sys/arch/hpcarm/conf/JORNADA720 Fri Aug 17 19:43:25 2012 @@ -1,4 +1,4 @@ -# $NetBSD: JORNADA720,v 1.86 2012/03/10 21:51:52 joerg Exp $ +# $NetBSD: JORNADA720,v 1.87 2012/08/17 19:43:25 abs Exp $ # # JORNADA -- Windows-CE based jornada 720 # @@ -7,7 +7,7 @@ include arch/hpcarm/conf/std.sa11x0 #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.86 $ +#ident GENERIC-$Revision: 1.87 $ # estimated number of users maxusers 32 @@ -261,7 +261,7 @@ options WSEMUL_VT100 options WSDISPLAY_DEFAULTSCREENS=2 options FONT_VT220L8x10 # The X server requires theses two options -options WSDISPLAY_COMPAT_USL +options WSDISPLAY_COMPAT_USL # wsconscfg VT handling options WSDISPLAY_COMPAT_RAWKBD # customization of console and kernel output - see dev/wscons/wsdisplayvar.h options WSDISPLAY_CUSTOM_OUTPUT # color customization from wsconsctl(8) Index: src/sys/arch/hpcarm/conf/JORNADA820 diff -u src/sys/arch/hpcarm/conf/JORNADA820:1.26 src/sys/arch/hpcarm/conf/JORNADA820:1.27 --- src/sys/arch/hpcarm/conf/JORNADA820:1.26 Sat Mar 10 21:51:52 2012 +++ src/sys/arch/hpcarm/conf/JORNADA820 Fri Aug 17 19:43:25 2012 @@ -1,4 +1,4 @@ -# $NetBSD: JORNADA820,v 1.26 2012/03/10 21:51:52 joerg Exp $ +# $NetBSD: JORNADA820,v 1.27 2012/08/17 19:43:25 abs Exp $ # # JORNADA -- Windows-CE based jornada 820 # @@ -7,7 +7,7 @@ include arch/hpcarm/conf/std.sa11x0 #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.26 $ +#ident GENERIC-$Revision: 1.27 $ # estimated number of users maxusers 32 @@ -222,7 +222,7 @@ saost* at saip? addr 0x9000 size 0x2 #options J720KBD_LAYOUT=KB_FR #options FONT_VT220L8x10 # The X server requires theses two options -#options WSDISPLAY_COMPAT_USL
CVS commit: src/etc/etc.vax
Module Name:src Committed By: abs Date: Sat Aug 18 00:50:38 UTC 2012 Modified Files: src/etc/etc.vax: MAKEDEV.conf Log Message: Seems like all the trendy ramdisks are using makedev ipty rather than makedev pty0 now. Update vax to match so install media doesn't fail with .../MAKEDEV: pty0: creating BSD style tty nodes with ptyfs is a security issue To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/etc/etc.vax/MAKEDEV.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/etc.vax/MAKEDEV.conf diff -u src/etc/etc.vax/MAKEDEV.conf:1.16 src/etc/etc.vax/MAKEDEV.conf:1.17 --- src/etc/etc.vax/MAKEDEV.conf:1.16 Wed Jul 4 08:03:08 2012 +++ src/etc/etc.vax/MAKEDEV.conf Sat Aug 18 00:50:37 2012 @@ -1,4 +1,4 @@ -# $NetBSD: MAKEDEV.conf,v 1.16 2012/07/04 08:03:08 abs Exp $ +# $NetBSD: MAKEDEV.conf,v 1.17 2012/08/18 00:50:37 abs Exp $ all_md) makedev mt0 mt1 ts0 ts1 st0 st1 uk0 ss0 cd0 vt0 @@ -10,7 +10,7 @@ all_md) ;; ramdisk) - makedev std bpf md0 pty0 mt0 st0 rd0 rd1 dz0 dl0 dhu0 + makedev std bpf md0 ipty mt0 st0 rd0 rd1 dz0 dl0 dhu0 makedev rx0 ra0 ra1 ra2 ra3 hp0 hp1 makedev sd0 sd1 sd2 makedev cd0 cd1 racd0 racd1
CVS commit: src/etc
Module Name:src Committed By: abs Date: Thu Aug 16 13:31:27 UTC 2012 Modified Files: src/etc/etc.acorn26: MAKEDEV.conf src/etc/etc.acorn32: MAKEDEV.conf src/etc/etc.bebox: MAKEDEV.conf src/etc/etc.cats: MAKEDEV.conf src/etc/etc.dreamcast: MAKEDEV.conf src/etc/etc.evbarm: MAKEDEV.conf src/etc/etc.evbppc: MAKEDEV.conf src/etc/etc.evbsh3: MAKEDEV.conf src/etc/etc.ews4800mips: MAKEDEV.conf src/etc/etc.hpcarm: MAKEDEV.conf src/etc/etc.hpcmips: MAKEDEV.conf src/etc/etc.hpcsh: MAKEDEV.conf src/etc/etc.i386: MAKEDEV.conf src/etc/etc.ibmnws: MAKEDEV.conf src/etc/etc.iyonix: MAKEDEV.conf src/etc/etc.landisk: MAKEDEV.conf src/etc/etc.luna68k: MAKEDEV.conf src/etc/etc.mipsco: MAKEDEV.conf src/etc/etc.mmeye: MAKEDEV.conf src/etc/etc.mvmeppc: MAKEDEV.conf src/etc/etc.netwinder: MAKEDEV.conf src/etc/etc.ofppc: MAKEDEV.conf src/etc/etc.prep: MAKEDEV.conf src/etc/etc.rs6000: MAKEDEV.conf src/etc/etc.sandpoint: MAKEDEV.conf src/etc/etc.shark: MAKEDEV.conf src/etc/etc.sparc: MAKEDEV.conf src/etc/etc.sparc64: MAKEDEV.conf src/etc/etc.x68k: MAKEDEV.conf src/etc/etc.zaurus: MAKEDEV.conf Log Message: Add 'bpf' to all ramdisk targets (*), or floppy targets if ramdisk calls that. Sort bpf to come directly after 'std' where relevant. * (apart from etc.evbppc who's ramdisk target *only* builds md0, which just doesn't make sense). Should allow a fighting chance for dhcpcd to get an IP address. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/etc/etc.acorn26/MAKEDEV.conf cvs rdiff -u -r1.9 -r1.10 src/etc/etc.acorn32/MAKEDEV.conf cvs rdiff -u -r1.7 -r1.8 src/etc/etc.bebox/MAKEDEV.conf cvs rdiff -u -r1.7 -r1.8 src/etc/etc.cats/MAKEDEV.conf cvs rdiff -u -r1.4 -r1.5 src/etc/etc.dreamcast/MAKEDEV.conf cvs rdiff -u -r1.5 -r1.6 src/etc/etc.evbarm/MAKEDEV.conf cvs rdiff -u -r1.8 -r1.9 src/etc/etc.evbppc/MAKEDEV.conf cvs rdiff -u -r1.6 -r1.7 src/etc/etc.evbsh3/MAKEDEV.conf cvs rdiff -u -r1.1 -r1.2 src/etc/etc.ews4800mips/MAKEDEV.conf cvs rdiff -u -r1.12 -r1.13 src/etc/etc.hpcarm/MAKEDEV.conf cvs rdiff -u -r1.5 -r1.6 src/etc/etc.hpcmips/MAKEDEV.conf cvs rdiff -u -r1.3 -r1.4 src/etc/etc.hpcsh/MAKEDEV.conf cvs rdiff -u -r1.22 -r1.23 src/etc/etc.i386/MAKEDEV.conf cvs rdiff -u -r1.8 -r1.9 src/etc/etc.ibmnws/MAKEDEV.conf cvs rdiff -u -r1.2 -r1.3 src/etc/etc.iyonix/MAKEDEV.conf cvs rdiff -u -r1.5 -r1.6 src/etc/etc.landisk/MAKEDEV.conf cvs rdiff -u -r1.6 -r1.7 src/etc/etc.luna68k/MAKEDEV.conf cvs rdiff -u -r1.3 -r1.4 src/etc/etc.mipsco/MAKEDEV.conf cvs rdiff -u -r1.6 -r1.7 src/etc/etc.mmeye/MAKEDEV.conf cvs rdiff -u -r1.6 -r1.7 src/etc/etc.mvmeppc/MAKEDEV.conf cvs rdiff -u -r1.4 -r1.5 src/etc/etc.netwinder/MAKEDEV.conf cvs rdiff -u -r1.8 -r1.9 src/etc/etc.ofppc/MAKEDEV.conf cvs rdiff -u -r1.7 -r1.8 src/etc/etc.prep/MAKEDEV.conf cvs rdiff -u -r1.2 -r1.3 src/etc/etc.rs6000/MAKEDEV.conf cvs rdiff -u -r1.15 -r1.16 src/etc/etc.sandpoint/MAKEDEV.conf cvs rdiff -u -r1.12 -r1.13 src/etc/etc.shark/MAKEDEV.conf cvs rdiff -u -r1.14 -r1.15 src/etc/etc.sparc/MAKEDEV.conf cvs rdiff -u -r1.14 -r1.15 src/etc/etc.sparc64/MAKEDEV.conf cvs rdiff -u -r1.13 -r1.14 src/etc/etc.x68k/MAKEDEV.conf cvs rdiff -u -r1.8 -r1.9 src/etc/etc.zaurus/MAKEDEV.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/etc.acorn26/MAKEDEV.conf diff -u src/etc/etc.acorn26/MAKEDEV.conf:1.5 src/etc/etc.acorn26/MAKEDEV.conf:1.6 --- src/etc/etc.acorn26/MAKEDEV.conf:1.5 Sat Sep 13 11:46:18 2008 +++ src/etc/etc.acorn26/MAKEDEV.conf Thu Aug 16 13:31:24 2012 @@ -1,4 +1,4 @@ -# $NetBSD: MAKEDEV.conf,v 1.5 2008/09/13 11:46:18 tsutsui Exp $ +# $NetBSD: MAKEDEV.conf,v 1.6 2012/08/16 13:31:24 abs Exp $ all_md) makedev wscons @@ -8,7 +8,7 @@ all_md) ;; ramdisk) - makedev std wd0 wd1 wd2 wd3 md0 md1 sd0 sd1 sd2 sd3 + makedev std bpf wd0 wd1 wd2 wd3 md0 md1 sd0 sd1 sd2 sd3 makedev opty ttyE0 wskbd0 ttyEcfg makedev cd0 cd1 ;; Index: src/etc/etc.acorn32/MAKEDEV.conf diff -u src/etc/etc.acorn32/MAKEDEV.conf:1.9 src/etc/etc.acorn32/MAKEDEV.conf:1.10 --- src/etc/etc.acorn32/MAKEDEV.conf:1.9 Sat Sep 13 11:46:18 2008 +++ src/etc/etc.acorn32/MAKEDEV.conf Thu Aug 16 13:31:24 2012 @@ -1,4 +1,4 @@ -# $NetBSD: MAKEDEV.conf,v 1.9 2008/09/13 11:46:18 tsutsui Exp $ +# $NetBSD: MAKEDEV.conf,v 1.10 2012/08/16 13:31:24 abs Exp $ all_md) makedev wscons fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3 @@ -14,7 +14,7 @@ all_md) ;; ramdisk|floppy) - makedev std fd0 fd1 wd0 wd1 wd2 wd3 md0 md1 sd0 sd1 sd2 sd3 + makedev std bpf fd0 fd1 wd0 wd1 wd2 wd3 md0 md1 sd0 sd1 sd2 sd3 makedev tty0 tty1 opty makedev st0 st1 cd0 cd1 ;; Index: src/etc/etc.bebox/MAKEDEV.conf diff -u src/etc/etc.bebox/MAKEDEV.conf:1.7 src/etc/etc.bebox/MAKEDEV.conf:1.8 ---
CVS commit: src/doc
Module Name:src Committed By: abs Date: Tue Aug 14 12:31:05 UTC 2012 Modified Files: src/doc: 3RDPARTY Log Message: update current version of grep to 2.13 - from Snader_LB To generate a diff of this commit: cvs rdiff -u -r1.957 -r1.958 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.957 src/doc/3RDPARTY:1.958 --- src/doc/3RDPARTY:1.957 Fri Aug 10 14:23:05 2012 +++ src/doc/3RDPARTY Tue Aug 14 12:31:05 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.957 2012/08/10 14:23:05 tron Exp $ +# $NetBSD: 3RDPARTY,v 1.958 2012/08/14 12:31:05 abs Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -434,7 +434,7 @@ Notes: Package: grep Version: 2.5.1 -Current Vers: 2.10 +Current Vers: 2.13 Maintainer: FSF Archive Site: ftp://ftp.gnu.org/gnu/grep/ Home Page: http://www.gnu.org/software/grep/
CVS commit: src/sys/arch/dreamcast/dev
Module Name:src
Committed By: abs
Date: Fri Jul 27 07:42:27 UTC 2012
Modified Files:
src/sys/arch/dreamcast/dev: gdrom.c
Log Message:
- Adjust the TOC parsing to reject an TOC with invalid (zero) track ids.
Avoids dereferencing off the start of the TOC track array.
- Add #ifdef GDROMDEBUGTOC for dumping out the gdrom TOC values
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/dreamcast/dev/gdrom.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/dreamcast/dev/gdrom.c
diff -u src/sys/arch/dreamcast/dev/gdrom.c:1.34 src/sys/arch/dreamcast/dev/gdrom.c:1.35
--- src/sys/arch/dreamcast/dev/gdrom.c:1.34 Wed Sep 1 16:48:00 2010
+++ src/sys/arch/dreamcast/dev/gdrom.c Fri Jul 27 07:42:26 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: gdrom.c,v 1.34 2010/09/01 16:48:00 tsutsui Exp $ */
+/* $NetBSD: gdrom.c,v 1.35 2012/07/27 07:42:26 abs Exp $ */
/*-
* Copyright (c) 2001 Marcus Comstedt
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: gdrom.c,v 1.34 2010/09/01 16:48:00 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: gdrom.c,v 1.35 2012/07/27 07:42:26 abs Exp $);
#include sys/param.h
#include sys/systm.h
@@ -586,15 +586,35 @@ gdromioctl(dev_t dev, u_long cmd, void *
if (error != 0)
return error;
-
+#ifdef GDROMDEBUGTOC
+ { /* Dump the GDROM TOC */
+ unsigned char *ptr = (unsigned char *)toc;
+ int i;
+
+ printf(gdrom: TOC\n);
+ for(i = 0; i sizeof(toc); ++i) {
+ printf(%02x, *ptr++);
+ if( i%32 == 31)
+printf(\n);
+ else if( i%4 == 3)
+printf(,);
+ }
+ printf(\n);
+ }
+#endif
for (track = TOC_TRACK(toc.last);
track = TOC_TRACK(toc.first);
- --track)
+ --track) {
+ if (track 1 || track 100)
+return ENXIO;
if (TOC_CTRL(toc.entry[track - 1]))
break;
+ }
- if (track TOC_TRACK(toc.first) || track 100)
- return ENXIO;
+#ifdef GDROMDEBUGTOC
+ printf(gdrom: Using track %d, LBA %u\n, track,
+ TOC_LBA(toc.entry[track - 1]));
+#endif
*(int *)addr = htonl(TOC_LBA(toc.entry[track - 1])) -
sc-openpart_start;
CVS commit: src/sys/arch/dreamcast/conf
Module Name:src Committed By: abs Date: Tue Jul 17 08:05:18 UTC 2012 Modified Files: src/sys/arch/dreamcast/conf: GENERIC Log Message: On a system with no default writable local media, the union file system can be handy To generate a diff of this commit: cvs rdiff -u -r1.106 -r1.107 src/sys/arch/dreamcast/conf/GENERIC 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/dreamcast/conf/GENERIC diff -u src/sys/arch/dreamcast/conf/GENERIC:1.106 src/sys/arch/dreamcast/conf/GENERIC:1.107 --- src/sys/arch/dreamcast/conf/GENERIC:1.106 Sat Mar 10 21:51:50 2012 +++ src/sys/arch/dreamcast/conf/GENERIC Tue Jul 17 08:05:17 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.106 2012/03/10 21:51:50 joerg Exp $ +# $NetBSD: GENERIC,v 1.107 2012/07/17 08:05:17 abs Exp $ # # GENERIC machine description file # @@ -83,7 +83,7 @@ file-system PROCFS # /proc #file-system NULLFS # loopback file system #file-system OVERLAY # overlay file system #file-system UMAPFS # NULLFS + uid and gid remapping -#file-system UNION # union file system +file-system UNION # union file system file-system PTYFS # /dev/pts/N support file-system TMPFS # Efficient memory file-system #file-system UDF # experimental - OSTA UDF CD/DVD file-system
CVS commit: src/external/mit/xorg/server/drivers/xf86-input-keyboard
Module Name:src
Committed By: abs
Date: Mon Jul 16 12:48:43 UTC 2012
Modified Files:
src/external/mit/xorg/server/drivers/xf86-input-keyboard: Makefile
Log Message:
Add vax to DEFAULT_TO_WSKBD
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/drivers/xf86-input-keyboard/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/mit/xorg/server/drivers/xf86-input-keyboard/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.13 src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.14
--- src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.13 Tue Jun 21 11:42:20 2011
+++ src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile Mon Jul 16 12:48:42 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2011/06/21 11:42:20 nonaka Exp $
+# $NetBSD: Makefile,v 1.14 2012/07/16 12:48:42 abs Exp $
DRIVER= xf86-input-keyboard
DRIVER_NAME= kbd_drv
@@ -15,7 +15,7 @@ CPPFLAGS+= -DPCVT_SUPPORT
.if ${MACHINE_ARCH} == powerpc || ${MACHINE} == sparc || \
${MACHINE} == sparc64 || ${MACHINE} == sgimips || \
-${MACHINE} == shark
+${MACHINE} == shark || ${MACHINE} == vax
CPPFLAGS+= -DDEFAULT_TO_WSKBD
.endif
CVS commit: xsrc/external/mit/xf86-input-keyboard/dist/src
Module Name:xsrc
Committed By: abs
Date: Mon Jul 16 12:49:42 UTC 2012
Modified Files:
xsrc/external/mit/xf86-input-keyboard/dist/src: bsd_KbdMap.c
Log Message:
Add a basic map for an LK201 keyboard
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c
diff -u xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c:1.7 xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c:1.8
--- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c:1.7 Sat Feb 25 15:38:46 2012
+++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c Mon Jul 16 12:49:42 2012
@@ -826,6 +826,270 @@ TransMapRec wsAdb = {
wsAdbMap
};
+/* Map for LK201 keyboards */
+static CARD8 wsLk201Map[] = {
+ /* 0 */ KEY_F1,
+ /* 1 */ KEY_F2,
+ /* 2 */ KEY_F3,
+ /* 3 */ KEY_F4,
+ /* 4 */ KEY_F5,
+ /* 5 */ KEY_NOTUSED,
+ /* 6 */ KEY_NOTUSED,
+ /* 7 */ KEY_NOTUSED,
+ /* 8 */ KEY_NOTUSED,
+ /* 9 */ KEY_NOTUSED,
+ /* 10 */ KEY_NOTUSED,
+ /* 11 */ KEY_NOTUSED,
+ /* 12 */ KEY_NOTUSED,
+ /* 13 */ KEY_NOTUSED,
+ /* 14 */ KEY_F6,
+ /* 15 */ KEY_F7,
+ /* 16 */ KEY_F8,
+ /* 17 */ KEY_F9,
+ /* 18 */ KEY_F10,
+ /* 19 */ KEY_NOTUSED,
+ /* 20 */ KEY_NOTUSED,
+ /* 21 */ KEY_NOTUSED,
+ /* 22 */ KEY_NOTUSED,
+ /* 23 */ KEY_NOTUSED,
+ /* 24 */ KEY_NOTUSED,
+ /* 25 */ KEY_NOTUSED,
+ /* 26 */ KEY_NOTUSED,
+ /* 27 */ KEY_F11,
+ /* 28 */ KEY_F12,
+ /* 29 */ KEY_F13,
+ /* 30 */ KEY_F14,
+ /* 31 */ KEY_NOTUSED,
+ /* 32 */ KEY_NOTUSED,
+ /* 33 */ KEY_NOTUSED,
+ /* 34 */ KEY_NOTUSED,
+ /* 35 */ KEY_NOTUSED,
+ /* 36 */ KEY_NOTUSED,
+ /* 37 */ KEY_NOTUSED,
+ /* 38 */ KEY_Help,
+ /* 39 */ KEY_F16, /* Do */
+ /* 40 */ KEY_NOTUSED,
+ /* 41 */ KEY_NOTUSED,
+ /* 42 */ KEY_F17,
+ /* 43 */ KEY_L8, /* F18 */
+ /* 44 */ KEY_L9, /* F19 */
+ /* 45 */ KEY_L10, /* F20 */
+ /* 46 */ KEY_NOTUSED,
+ /* 47 */ KEY_NOTUSED,
+ /* 48 */ KEY_NOTUSED,
+ /* 49 */ KEY_NOTUSED,
+ /* 50 */ KEY_NOTUSED,
+ /* 51 */ KEY_NOTUSED,
+ /* 52 */ KEY_Home, /* Find */
+ /* 53 */ KEY_Insert, /* Insert Here */
+ /* 54 */ KEY_Delete, /* Re-move */
+ /* 55 */ KEY_End, /* Select */
+ /* 56 */ KEY_PgUp, /* Prev-Screen */
+ /* 57 */ KEY_PgDown, /* Next-Screen */
+ /* 58 */ KEY_NOTUSED,
+ /* 59 */ KEY_NOTUSED,
+ /* 60 */ KEY_KP_0,
+ /* 61 */ KEY_NOTUSED,
+ /* 62 */ KEY_KP_Decimal,
+ /* 63 */ KEY_KP_Enter,
+ /* 64 */ KEY_KP_1,
+ /* 65 */ KEY_KP_2,
+ /* 66 */ KEY_KP_3,
+ /* 67 */ KEY_KP_4,
+ /* 68 */ KEY_KP_5,
+ /* 69 */ KEY_KP_6,
+ /* 70 */ KEY_KP_Plus, /* KP Comma */
+ /* 71 */ KEY_KP_7,
+ /* 72 */ KEY_KP_8,
+ /* 73 */ KEY_KP_9,
+ /* 74 */ KEY_KP_Minus,
+ /* 75 */ KEY_L1, /* PF1 */
+ /* 76 */ KEY_L2, /* PF2 */
+ /* 77 */ KEY_L3, /* PF3 */
+ /* 78 */ KEY_L4, /* PF4 */
+ /* 79 */ KEY_NOTUSED,
+ /* 80 */ KEY_NOTUSED,
+ /* 81 */ KEY_Left,
+ /* 82 */ KEY_Right,
+ /* 83 */ KEY_Down,
+ /* 84 */ KEY_Up,
+ /* 85 */ KEY_NOTUSED,
+ /* 86 */ KEY_NOTUSED,
+ /* 87 */ KEY_NOTUSED,
+ /* 88 */ KEY_ShiftL,
+ /* 89 */ KEY_LCtrl,
+ /* 90 */ KEY_CapsLock,
+ /* 91 */ KEY_Alt, /* Compose */
+ /* 92 */ KEY_NOTUSED,
+ /* 93 */ KEY_NOTUSED,
+ /* 94 */ KEY_NOTUSED,
+ /* 95 */ KEY_NOTUSED,
+ /* 96 */ KEY_NOTUSED,
+ /* 97 */ KEY_NOTUSED,
+ /* 98 */ KEY_NOTUSED,
+ /* 99 */ KEY_NOTUSED,
+ /* 100 */ KEY_NOTUSED,
+ /* 101 */ KEY_NOTUSED,
+ /* 102 */ KEY_Delete,
+ /* 103 */ KEY_Enter,
+ /* 104 */ KEY_Tab,
+ /* 105 */ KEY_Escape, /* tilde */
+ /* 106 */ KEY_1,
+ /* 107 */ KEY_Q,
+ /* 108 */ KEY_A,
+ /* 109 */ KEY_Z,
+ /* 110 */ KEY_NOTUSED,
+ /* 111 */ KEY_2,
+ /* 112 */ KEY_W,
+ /* 113 */ KEY_S,
+ /* 114 */ KEY_X,
+ /* 115 */ KEY_Less,
+ /* 116 */ KEY_NOTUSED,
+ /* 117 */ KEY_3,
+ /* 118 */ KEY_E,
+ /* 119 */ KEY_D,
+ /* 120 */ KEY_C,
+ /* 121 */ KEY_NOTUSED,
+ /* 122 */ KEY_4,
+ /* 123 */ KEY_R,
+ /* 124 */ KEY_F,
+ /* 125 */ KEY_V,
+ /* 126 */ KEY_Space,
+ /* 127 */ KEY_NOTUSED,
+ /* 128 */ KEY_5,
+ /* 129 */ KEY_T,
+ /* 130 */ KEY_G,
+ /* 131 */ KEY_B,
+ /* 132 */ KEY_NOTUSED,
+ /* 133 */ KEY_6,
+ /* 134 */ KEY_Y,
+ /* 135 */ KEY_H,
+ /* 136 */ KEY_N,
+ /* 137 */ KEY_NOTUSED,
+ /* 138 */ KEY_7,
+ /* 139 */ KEY_U,
+ /* 140 */ KEY_J,
+ /* 141 */ KEY_M,
+ /* 142 */ KEY_NOTUSED,
+ /* 143 */ KEY_8,
+ /* 144 */ KEY_I,
+ /* 145 */ KEY_K,
+ /* 146 */ KEY_Comma,
+ /* 147 */ KEY_NOTUSED,
+ /* 148 */ KEY_9,
+ /* 149 */ KEY_O,
+ /* 150 */ KEY_L,
+ /* 151 */ KEY_Period,
+ /* 152 */ KEY_NOTUSED,
+ /* 153 */ KEY_0,
+ /* 154 */ KEY_P,
+ /* 155 */ KEY_NOTUSED,
+ /* 156 */ KEY_SemiColon,
+ /* 157 */ KEY_Slash,
+ /* 158 */ KEY_NOTUSED,
+ /* 159 */ KEY_Equal,
+ /* 160 */ KEY_RBrace,
+ /* 161 */ KEY_BSlash,
+ /* 162 */ KEY_NOTUSED,
+ /* 163 */ KEY_Minus,
+ /* 164 */ KEY_LBrace,
+ /* 165 */ KEY_Quote,
+ /* 166 */ KEY_NOTUSED,
+ /* 167 */ KEY_NOTUSED,
+ /* 168 */ KEY_NOTUSED,
+ /* 169 */ KEY_NOTUSED,
+ /* 170 */ KEY_NOTUSED,
+ /* 171 */ KEY_NOTUSED,
+ /* 172
CVS commit: xsrc/external/mit/xf86-input-keyboard/dist/src
Module Name:xsrc Committed By: abs Date: Mon Jul 16 12:50:25 UTC 2012 Modified Files: xsrc/external/mit/xf86-input-keyboard/dist/src: bsd_kbd.c Log Message: Add WSKBD_TYPE_LK201 To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 \ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c diff -u xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.14 xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.15 --- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.14 Sun Jul 24 00:45:04 2011 +++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c Mon Jul 16 12:50:25 2012 @@ -411,6 +411,11 @@ OpenKeyboard(InputInfoPtr pInfo) printWsType(ADB, pInfo-name); break; #endif +#ifdef WSKBD_TYPE_LK201 + case WSKBD_TYPE_LK201: + printWsType(LK201, pInfo-name); + break; +#endif #ifdef WSKBD_TYPE_MAPLE case WSKBD_TYPE_MAPLE: printWsType(Maple, pInfo-name);
CVS commit: src/sys/dev/dec
Module Name:src
Committed By: abs
Date: Mon Jul 16 12:52:47 UTC 2012
Modified Files:
src/sys/dev/dec: dzkbd.c
Log Message:
Allow WSKBDIO_SETMODE
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/dec/dzkbd.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/dec/dzkbd.c
diff -u src/sys/dev/dec/dzkbd.c:1.23 src/sys/dev/dec/dzkbd.c:1.24
--- src/sys/dev/dec/dzkbd.c:1.23 Tue May 12 14:18:16 2009
+++ src/sys/dev/dec/dzkbd.c Mon Jul 16 12:52:47 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dzkbd.c,v 1.23 2009/05/12 14:18:16 cegger Exp $ */
+/* $NetBSD: dzkbd.c,v 1.24 2012/07/16 12:52:47 abs Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dzkbd.c,v 1.23 2009/05/12 14:18:16 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: dzkbd.c,v 1.24 2012/07/16 12:52:47 abs Exp $);
#include sys/param.h
#include sys/systm.h
@@ -85,6 +85,7 @@ struct dzkbd_softc {
int sc_enabled;
int kbd_type;
+ int wsraw;
device_t sc_wskbddev;
};
@@ -286,6 +287,11 @@ dzkbd_ioctl(void *v, u_long cmd, void *d
/* XXX don't dig in kbd internals */
*(int *)data = sc-sc_itl-dzi_ks.kcvol;
return 0;
+#ifdef WSDISPLAY_COMPAT_RAWKBD
+ case WSKBDIO_SETMODE:
+ sc-wsraw = *(int *)data == WSKBD_RAW;
+ return 0;
+#endif
}
return (EPASSTHROUGH);
}
CVS commit: src/sys/dev/dec
Module Name:src
Committed By: abs
Date: Mon Jul 16 12:55:36 UTC 2012
Modified Files:
src/sys/dev/dec: dzkbd.c
Log Message:
revert last
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/dec/dzkbd.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/dec/dzkbd.c
diff -u src/sys/dev/dec/dzkbd.c:1.24 src/sys/dev/dec/dzkbd.c:1.25
--- src/sys/dev/dec/dzkbd.c:1.24 Mon Jul 16 12:52:47 2012
+++ src/sys/dev/dec/dzkbd.c Mon Jul 16 12:55:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dzkbd.c,v 1.24 2012/07/16 12:52:47 abs Exp $ */
+/* $NetBSD: dzkbd.c,v 1.25 2012/07/16 12:55:36 abs Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dzkbd.c,v 1.24 2012/07/16 12:52:47 abs Exp $);
+__KERNEL_RCSID(0, $NetBSD: dzkbd.c,v 1.25 2012/07/16 12:55:36 abs Exp $);
#include sys/param.h
#include sys/systm.h
@@ -85,7 +85,6 @@ struct dzkbd_softc {
int sc_enabled;
int kbd_type;
- int wsraw;
device_t sc_wskbddev;
};
@@ -287,11 +286,6 @@ dzkbd_ioctl(void *v, u_long cmd, void *d
/* XXX don't dig in kbd internals */
*(int *)data = sc-sc_itl-dzi_ks.kcvol;
return 0;
-#ifdef WSDISPLAY_COMPAT_RAWKBD
- case WSKBDIO_SETMODE:
- sc-wsraw = *(int *)data == WSKBD_RAW;
- return 0;
-#endif
}
return (EPASSTHROUGH);
}
CVS commit: src/distrib/utils/libhack
Module Name:src
Committed By: abs
Date: Sat Jul 14 20:32:39 UTC 2012
Modified Files:
src/distrib/utils/libhack: syslog.c
Log Message:
Add a check hack to ensure %m causes error message string to be shown
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/utils/libhack/syslog.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/libhack/syslog.c
diff -u src/distrib/utils/libhack/syslog.c:1.6 src/distrib/utils/libhack/syslog.c:1.7
--- src/distrib/utils/libhack/syslog.c:1.6 Sat Feb 3 19:49:21 2007
+++ src/distrib/utils/libhack/syslog.c Sat Jul 14 20:32:39 2012
@@ -1,6 +1,8 @@
#include sys/types.h
#include sys/syslog.h
#include stdio.h
+#include string.h
+#include errno.h
#include stdarg.h
void
@@ -25,10 +27,8 @@ syslog(int fac, const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
- (void)vfprintf(stderr, fmt, ap);
+ vsyslog(fac, fmt, ap);
va_end(ap);
- (void)fprintf(stderr, \n);
- fflush(stderr);
}
__strong_alias(_vsyslog, vsyslog)
@@ -36,6 +36,9 @@ void
vsyslog(int fac, const char *fmt, va_list ap)
{
(void)vfprintf(stderr, fmt, ap);
+ /* Cheap hack to ensure %m causes error message string to be shown */
+ if (strstr(fmt, %m))
+ (void)fprintf(stderr, (%s), strerror(errno));
(void)fprintf(stderr, \n);
fflush(stderr);
}
CVS commit: src/usr.bin/eject
Module Name:src
Committed By: abs
Date: Sat Jul 14 20:41:27 UTC 2012
Modified Files:
src/usr.bin/eject: eject.c
Log Message:
racd *should* be ejectable. Kernel side to come
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/eject/eject.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/eject/eject.c
diff -u src/usr.bin/eject/eject.c:1.26 src/usr.bin/eject/eject.c:1.27
--- src/usr.bin/eject/eject.c:1.26 Wed Jun 23 18:07:59 2010
+++ src/usr.bin/eject/eject.c Sat Jul 14 20:41:27 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: eject.c,v 1.26 2010/06/23 18:07:59 yamt Exp $ */
+/* $NetBSD: eject.c,v 1.27 2012/07/14 20:41:27 abs Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@ __COPYRIGHT(@(#) Copyright (c) 1999\
#endif/* not lint */
#ifndef lint
-__RCSID($NetBSD: eject.c,v 1.26 2010/06/23 18:07:59 yamt Exp $);
+__RCSID($NetBSD: eject.c,v 1.27 2012/07/14 20:41:27 abs Exp $);
#endif/* not lint */
#include sys/types.h
@@ -74,23 +74,24 @@ struct nicknames_s {
# define FLOPPY 0x2
# define TYPEMASK ((int)~0x01)
} nicknames[] = {
- { diskette, fd, DISK | FLOPPY | NOTLOADABLE },
- { floppy, fd, DISK | FLOPPY | NOTLOADABLE },
- { fd, fd, DISK | FLOPPY | NOTLOADABLE },
- { sd, sd, DISK | NOTLOADABLE },
- { cdrom,cd, DISK | LOADABLE },
- { cd, cd, DISK | LOADABLE },
- { cdr, cd, DISK | LOADABLE },
- { cdrw, cd, DISK | LOADABLE },
- { dvdrom, cd, DISK | LOADABLE },
- { dvd, cd, DISK | LOADABLE },
- { dvdr, cd, DISK | LOADABLE },
- { dvdrw,cd, DISK | LOADABLE },
- { mcd, mcd, DISK | LOADABLE }, /* XXX Is this true? */
- { tape, st, TAPE | NOTLOADABLE },
- { st, st, TAPE | NOTLOADABLE },
- { dat, st, TAPE | NOTLOADABLE },
- { exabyte, st, TAPE | NOTLOADABLE }
+ { diskette, fd, DISK | FLOPPY | NOTLOADABLE },
+ { floppy, fd, DISK | FLOPPY | NOTLOADABLE },
+ { fd, fd, DISK | FLOPPY | NOTLOADABLE },
+ { sd, sd, DISK | NOTLOADABLE },
+ { cdrom,cd, DISK | LOADABLE },
+ { cd, cd, DISK | LOADABLE },
+ { racd, racd, DISK | LOADABLE },
+ { cdr, cd, DISK | LOADABLE },
+ { cdrw, cd, DISK | LOADABLE },
+ { dvdrom, cd, DISK | LOADABLE },
+ { dvd, cd, DISK | LOADABLE },
+ { dvdr, cd, DISK | LOADABLE },
+ { dvdrw,cd, DISK | LOADABLE },
+ { mcd, mcd, DISK | LOADABLE }, /* XXX Is this true? */
+ { tape, st, TAPE | NOTLOADABLE },
+ { st, st, TAPE | NOTLOADABLE },
+ { dat, st, TAPE | NOTLOADABLE },
+ { exabyte, st, TAPE | NOTLOADABLE }
};
#define MAXNICKLEN 12 /* at least enough room for the longest
* nickname */
CVS commit: src/external/bsd/atf/lib/libatf-c++
Module Name:src
Committed By: abs
Date: Sun Jul 15 00:05:51 UTC 2012
Modified Files:
src/external/bsd/atf/lib/libatf-c++: Makefile
Log Message:
Check for ${HAVE_GCC} and pick the right path to stdc++
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/atf/lib/libatf-c++/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.15 src/external/bsd/atf/lib/libatf-c++/Makefile:1.16
--- src/external/bsd/atf/lib/libatf-c++/Makefile:1.15 Thu Jul 12 22:15:29 2012
+++ src/external/bsd/atf/lib/libatf-c++/Makefile Sun Jul 15 00:05:51 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2012/07/12 22:15:29 christos Exp $
+# $NetBSD: Makefile,v 1.16 2012/07/15 00:05:51 abs Exp $
NOLINT= # defined
@@ -8,7 +8,11 @@ LIB= atf-c++
LIBISCXX= yes
LIBDPLIBS+= atf-c ${.CURDIR}/../libatf-c
+.if ${HAVE_GCC} == 4
+LIBDPLIBS+= stdc++ ${.CURDIR}/../../../../../gnu/lib/libstdc++-v3_4
+.else
LIBDPLIBS+= stdc++ ${.CURDIR}/../../../../../external/gpl3/gcc/lib/libstdc++-v3
+.endif
LIBDPLIBS+= m ${.CURDIR}/../../../../../lib/libm
CVS commit: src
Module Name:src Committed By: abs Date: Fri Jul 13 22:58:45 UTC 2012 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4: Makefile dk.4 Log Message: Adjust some wording based on suggestion from Snader_LB, plus install a link to wedge.4 To generate a diff of this commit: cvs rdiff -u -r1.1396 -r1.1397 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.587 -r1.588 src/share/man/man4/Makefile cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/dk.4 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.1396 src/distrib/sets/lists/man/mi:1.1397 --- src/distrib/sets/lists/man/mi:1.1396 Fri Jul 13 16:21:38 2012 +++ src/distrib/sets/lists/man/mi Fri Jul 13 22:58:44 2012 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1396 2012/07/13 16:21:38 rkujawa Exp $ +# $NetBSD: mi,v 1.1397 2012/07/13 22:58:44 abs Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -4624,6 +4624,7 @@ ./usr/share/man/html4/wdc.html man-sys-htmlman html ./usr/share/man/html4/wds.html man-sys-htmlman html ./usr/share/man/html4/we.html man-sys-htmlman html +./usr/share/man/html4/wedge.html man-sys-htmlman html ./usr/share/man/html4/wi.html man-sys-htmlman html ./usr/share/man/html4/wm.html man-sys-htmlman html ./usr/share/man/html4/wmidell.html man-sys-htmlman html @@ -7359,6 +7360,7 @@ ./usr/share/man/man4/wdc.4 man-sys-man .man ./usr/share/man/man4/wds.4 man-sys-man .man ./usr/share/man/man4/we.4 man-sys-man .man +./usr/share/man/man4/wedge.4 man-sys-man .man ./usr/share/man/man4/wi.4 man-sys-man .man ./usr/share/man/man4/wm.4 man-sys-man .man ./usr/share/man/man4/wmidell.4 man-sys-man .man Index: src/share/man/man4/Makefile diff -u src/share/man/man4/Makefile:1.587 src/share/man/man4/Makefile:1.588 --- src/share/man/man4/Makefile:1.587 Fri Jul 13 16:19:42 2012 +++ src/share/man/man4/Makefile Fri Jul 13 22:58:45 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.587 2012/07/13 16:19:42 rkujawa Exp $ +# $NetBSD: Makefile,v 1.588 2012/07/13 22:58:45 abs Exp $ # @(#)Makefile 8.1 (Berkeley) 6/18/93 MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \ @@ -197,6 +197,7 @@ MLINKS+=dbcool.4 adt7468.4 MLINKS+=dbcool.4 adt7473.4 MLINKS+=dbcool.4 adt7475.4 MLINKS+=dbcool.4 adt7476.4 +MLINKS+=dk.4 wedge.4 MLINKS+=fd.4 stderr.4 fd.4 stdin.4 fd.4 stdout.4 MLINKS+=fpa.4 fea.4 fpa.4 fta.4 MLINKS+=fujbp.4 fujhk.4 Index: src/share/man/man4/dk.4 diff -u src/share/man/man4/dk.4:1.5 src/share/man/man4/dk.4:1.6 --- src/share/man/man4/dk.4:1.5 Tue May 18 23:34:40 2010 +++ src/share/man/man4/dk.4 Fri Jul 13 22:58:45 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: dk.4,v 1.5 2010/05/18 23:34:40 wiz Exp $ +.\ $NetBSD: dk.4,v 1.6 2012/07/13 22:58:45 abs Exp $ .\ .\ Copyright (c) 2006 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -34,7 +34,7 @@ .Os .Sh NAME .Nm dk -.Nd Disk partition +.Nd disk partition .Pq wedge driver .Sh SYNOPSIS @@ -45,7 +45,9 @@ driver .Sh DESCRIPTION The .Nm -driver provides a disk-like interface to an area of a physical disk. +driver provides a disk-like interface, or +.Em wedge , +to an area of a physical disk. Wedges may be configured manually with .Xr dkctl 8 or automatically by the kernel upon the attachment of the physical disk.
CVS commit: src/sys/dev/mscp
Module Name:src
Committed By: abs
Date: Wed Jul 11 16:41:16 UTC 2012
Modified Files:
src/sys/dev/mscp: mscp_disk.c
Log Message:
- Unconditionally initialise tp to avoid a warning
- Use DK_CLOSED rather than CLOSED (no functional change)
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/dev/mscp/mscp_disk.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/mscp/mscp_disk.c
diff -u src/sys/dev/mscp/mscp_disk.c:1.74 src/sys/dev/mscp/mscp_disk.c:1.75
--- src/sys/dev/mscp/mscp_disk.c:1.74 Tue Jul 10 22:34:37 2012
+++ src/sys/dev/mscp/mscp_disk.c Wed Jul 11 16:41:16 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mscp_disk.c,v 1.74 2012/07/10 22:34:37 abs Exp $ */
+/* $NetBSD: mscp_disk.c,v 1.75 2012/07/11 16:41:16 abs Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -82,7 +82,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mscp_disk.c,v 1.74 2012/07/10 22:34:37 abs Exp $);
+__KERNEL_RCSID(0, $NetBSD: mscp_disk.c,v 1.75 2012/07/11 16:41:16 abs Exp $);
#include sys/param.h
#include sys/buf.h
@@ -305,7 +305,7 @@ raclose(dev_t dev, int flags, int fmt, s
(void) tsleep(udautab[unit], PZERO - 1,
raclose, 0);
splx(s);
- ra-ra_state = CLOSED;
+ ra-ra_state = DK_CLOSED;
ra-ra_wlabel = 0;
}
#endif
@@ -461,9 +461,8 @@ raioctl(dev_t dev, u_long cmd, void *dat
if (cmd == ODIOCGDEFLABEL)
tp = newlabel;
else
-#else
- tp = (struct disklabel *)data;
#endif
+ tp = (struct disklabel *)data;
memset(tp, 0, sizeof(struct disklabel));
tp-d_secsize = lp-d_secsize;
tp-d_nsectors = lp-d_nsectors;
@@ -523,7 +522,6 @@ raioctl(dev_t dev, u_long cmd, void *dat
return (error);
}
-
int
radump(dev_t dev, daddr_t blkno, void *va, size_t size)
{
CVS commit: src/sys/dev/mscp
Module Name:src
Committed By: abs
Date: Tue Jul 10 22:30:24 UTC 2012
Modified Files:
src/sys/dev/mscp: mscp.c mscp.h mscp_disk.c mscp_subr.c
Log Message:
Adjust MSCP attach routines. The current code worked fine on simh-vax, but
unfortunately failed on at least one 'real' SCSI MSCP adaptor.
In the updated code
mscp_dorsp()
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/mscp/mscp.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/mscp/mscp.h
cvs rdiff -u -r1.72 -r1.73 src/sys/dev/mscp/mscp_disk.c
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/mscp/mscp_subr.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/mscp/mscp.c
diff -u src/sys/dev/mscp/mscp.c:1.34 src/sys/dev/mscp/mscp.c:1.35
--- src/sys/dev/mscp/mscp.c:1.34 Tue May 12 14:37:59 2009
+++ src/sys/dev/mscp/mscp.c Tue Jul 10 22:30:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mscp.c,v 1.34 2009/05/12 14:37:59 cegger Exp $ */
+/* $NetBSD: mscp.c,v 1.35 2012/07/10 22:30:23 abs Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
@@ -76,7 +76,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mscp.c,v 1.34 2009/05/12 14:37:59 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: mscp.c,v 1.35 2012/07/10 22:30:23 abs Exp $);
#include sys/param.h
#include sys/buf.h
@@ -173,7 +173,8 @@ mscp_dorsp(struct mscp_softc *mi)
struct mscp_xi *mxi;
int nextrsp;
int st, error;
- extern struct mscp slavereply;
+ extern struct mscp mscp_cold_reply;
+ extern int mscp_cold_unit;
nextrsp = mi-mi_rsp.mri_next;
loop:
@@ -287,8 +288,12 @@ loop:
* to set it up, otherwise it's just a normal unit
* status.
*/
- if (cold)
- memcpy(slavereply, mp, sizeof(struct mscp));
+ if (cold) {
+ memcpy(mscp_cold_reply, mp, sizeof(struct mscp));
+ /* Detect that we've reached the end of all units */
+ if (mp-mscp_unit mscp_cold_unit)
+break;
+ }
if (mp-mscp_status == (M_ST_OFFLINE|M_OFFLINE_UNKNOWN))
break;
Index: src/sys/dev/mscp/mscp.h
diff -u src/sys/dev/mscp/mscp.h:1.8 src/sys/dev/mscp/mscp.h:1.9
--- src/sys/dev/mscp/mscp.h:1.8 Sun Dec 11 12:22:47 2005
+++ src/sys/dev/mscp/mscp.h Tue Jul 10 22:30:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mscp.h,v 1.8 2005/12/11 12:22:47 christos Exp $ */
+/* $NetBSD: mscp.h,v 1.9 2012/07/10 22:30:23 abs Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
@@ -40,6 +40,8 @@
* IF DEC SOLD DOCUMENTATION FOR THEIR OWN CONTROLLERS.
*/
+#define MSCP_MAX_UNIT 4095
+
/*
* Control message opcodes
*/
Index: src/sys/dev/mscp/mscp_disk.c
diff -u src/sys/dev/mscp/mscp_disk.c:1.72 src/sys/dev/mscp/mscp_disk.c:1.73
--- src/sys/dev/mscp/mscp_disk.c:1.72 Fri Jun 22 20:42:24 2012
+++ src/sys/dev/mscp/mscp_disk.c Tue Jul 10 22:30:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mscp_disk.c,v 1.72 2012/06/22 20:42:24 abs Exp $ */
+/* $NetBSD: mscp_disk.c,v 1.73 2012/07/10 22:30:23 abs Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -82,11 +82,12 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mscp_disk.c,v 1.72 2012/06/22 20:42:24 abs Exp $);
+__KERNEL_RCSID(0, $NetBSD: mscp_disk.c,v 1.73 2012/07/10 22:30:23 abs Exp $);
#include sys/param.h
#include sys/buf.h
#include sys/bufq.h
+#include sys/cdio.h
#include sys/device.h
#include sys/disk.h
#include sys/disklabel.h
@@ -305,7 +306,7 @@ raclose(dev_t dev, int flags, int fmt, s
(void) tsleep(udautab[unit], PZERO - 1,
raclose, 0);
splx(s);
- ra-ra_state = CLOSED;
+ ra-ra_state = DK_CLOSED;
ra-ra_wlabel = 0;
}
#endif
@@ -461,9 +462,8 @@ raioctl(dev_t dev, u_long cmd, void *dat
if (cmd == ODIOCGDEFLABEL)
tp = newlabel;
else
-#else
- tp = (struct disklabel *)data;
#endif
+ tp = (struct disklabel *)data;
memset(tp, 0, sizeof(struct disklabel));
tp-d_secsize = lp-d_secsize;
tp-d_nsectors = lp-d_nsectors;
@@ -516,14 +516,21 @@ raioctl(dev_t dev, u_long cmd, void *dat
return (dkwedge_list(ra-ra_disk, dkwl, l));
}
+ case DIOCTUR:
+ /* test unit ready */
+ if (ra-ra_state == DK_CLOSED
+ ra_putonline(dev, ra) == MSCP_FAILED)
+ error = ENXIO;
+ *((int*)data) = (ra-ra_state == DK_OPEN);
+ return error;
+
default:
error = ENOTTY;
break;
}
- return (error);
+ return error;
}
-
int
radump(dev_t dev, daddr_t blkno, void *va, size_t size)
{
@@ -750,6 +757,7 @@ rx_putonline(struct rx_softc *rx)
return MSCP_DONE;
}
+
#if NRX
/*
Index: src/sys/dev/mscp/mscp_subr.c
diff -u src/sys/dev/mscp/mscp_subr.c:1.42 src/sys/dev/mscp/mscp_subr.c:1.43
--- src/sys/dev/mscp/mscp_subr.c:1.42 Fri Jun 22 20:42:24 2012
+++ src/sys/dev/mscp/mscp_subr.c Tue Jul 10 22:30:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mscp_subr.c,v 1.42 2012/06/22 20:42:24 abs Exp $ */
+/* $NetBSD: mscp_subr.c,v 1.43 2012/07/10 22:30:23 abs Exp $ */
/*
* Copyright (c) 1988 Regents of the University of
CVS commit: src/sys/dev/mscp
Module Name:src
Committed By: abs
Date: Tue Jul 10 22:34:37 UTC 2012
Modified Files:
src/sys/dev/mscp: mscp_disk.c
Log Message:
revert unwanted part of previous MSCP commit
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/sys/dev/mscp/mscp_disk.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/mscp/mscp_disk.c
diff -u src/sys/dev/mscp/mscp_disk.c:1.73 src/sys/dev/mscp/mscp_disk.c:1.74
--- src/sys/dev/mscp/mscp_disk.c:1.73 Tue Jul 10 22:30:23 2012
+++ src/sys/dev/mscp/mscp_disk.c Tue Jul 10 22:34:37 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mscp_disk.c,v 1.73 2012/07/10 22:30:23 abs Exp $ */
+/* $NetBSD: mscp_disk.c,v 1.74 2012/07/10 22:34:37 abs Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -82,12 +82,11 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mscp_disk.c,v 1.73 2012/07/10 22:30:23 abs Exp $);
+__KERNEL_RCSID(0, $NetBSD: mscp_disk.c,v 1.74 2012/07/10 22:34:37 abs Exp $);
#include sys/param.h
#include sys/buf.h
#include sys/bufq.h
-#include sys/cdio.h
#include sys/device.h
#include sys/disk.h
#include sys/disklabel.h
@@ -306,7 +305,7 @@ raclose(dev_t dev, int flags, int fmt, s
(void) tsleep(udautab[unit], PZERO - 1,
raclose, 0);
splx(s);
- ra-ra_state = DK_CLOSED;
+ ra-ra_state = CLOSED;
ra-ra_wlabel = 0;
}
#endif
@@ -462,8 +461,9 @@ raioctl(dev_t dev, u_long cmd, void *dat
if (cmd == ODIOCGDEFLABEL)
tp = newlabel;
else
-#endif
+#else
tp = (struct disklabel *)data;
+#endif
memset(tp, 0, sizeof(struct disklabel));
tp-d_secsize = lp-d_secsize;
tp-d_nsectors = lp-d_nsectors;
@@ -516,21 +516,14 @@ raioctl(dev_t dev, u_long cmd, void *dat
return (dkwedge_list(ra-ra_disk, dkwl, l));
}
- case DIOCTUR:
- /* test unit ready */
- if (ra-ra_state == DK_CLOSED
- ra_putonline(dev, ra) == MSCP_FAILED)
- error = ENXIO;
- *((int*)data) = (ra-ra_state == DK_OPEN);
- return error;
-
default:
error = ENOTTY;
break;
}
- return error;
+ return (error);
}
+
int
radump(dev_t dev, daddr_t blkno, void *va, size_t size)
{
@@ -757,7 +750,6 @@ rx_putonline(struct rx_softc *rx)
return MSCP_DONE;
}
-
#if NRX
/*
CVS commit: src/etc/etc.vax
Module Name:src Committed By: abs Date: Wed Jul 4 08:03:08 UTC 2012 Modified Files: src/etc/etc.vax: MAKEDEV.conf Log Message: Ensure the ramdisk has bpf for dhcpcd To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/etc/etc.vax/MAKEDEV.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/etc.vax/MAKEDEV.conf diff -u src/etc/etc.vax/MAKEDEV.conf:1.15 src/etc/etc.vax/MAKEDEV.conf:1.16 --- src/etc/etc.vax/MAKEDEV.conf:1.15 Tue Jul 3 21:49:56 2012 +++ src/etc/etc.vax/MAKEDEV.conf Wed Jul 4 08:03:08 2012 @@ -1,4 +1,4 @@ -# $NetBSD: MAKEDEV.conf,v 1.15 2012/07/03 21:49:56 abs Exp $ +# $NetBSD: MAKEDEV.conf,v 1.16 2012/07/04 08:03:08 abs Exp $ all_md) makedev mt0 mt1 ts0 ts1 st0 st1 uk0 ss0 cd0 vt0 @@ -10,7 +10,7 @@ all_md) ;; ramdisk) - makedev std md0 pty0 mt0 st0 rd0 rd1 dz0 dl0 dhu0 + makedev std bpf md0 pty0 mt0 st0 rd0 rd1 dz0 dl0 dhu0 makedev rx0 ra0 ra1 ra2 ra3 hp0 hp1 makedev sd0 sd1 sd2 makedev cd0 cd1 racd0 racd1
CVS commit: src
Module Name:src
Committed By: abs
Date: Tue Jul 3 21:49:56 UTC 2012
Modified Files:
src/distrib/vax/miniroot: Makefile.inc list
src/distrib/vax/ramdisk: Makefile dot.profile list
src/etc/etc.vax: MAKEDEV.conf
src/sys/arch/vax/conf: INSTALL
Removed Files:
src/distrib/vax: install.md
Log Message:
All apply to vax only:
- Drop KERNFS from INSTALL kernel
- Add dmesg to sysinst ramdisk
- Add 'ramdisk' target to MAKEDEV and use
- Add dhcpcd to sysinst ramdisk
- Drop old install.md script
- Misc install image cleanup (reduce diff to zaurus of all things)
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r0 src/distrib/vax/install.md
cvs rdiff -u -r1.21 -r1.22 src/distrib/vax/miniroot/Makefile.inc
cvs rdiff -u -r1.14 -r1.15 src/distrib/vax/miniroot/list
cvs rdiff -u -r1.29 -r1.30 src/distrib/vax/ramdisk/Makefile \
src/distrib/vax/ramdisk/list
cvs rdiff -u -r1.8 -r1.9 src/distrib/vax/ramdisk/dot.profile
cvs rdiff -u -r1.14 -r1.15 src/etc/etc.vax/MAKEDEV.conf
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/vax/conf/INSTALL
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/vax/miniroot/Makefile.inc
diff -u src/distrib/vax/miniroot/Makefile.inc:1.21 src/distrib/vax/miniroot/Makefile.inc:1.22
--- src/distrib/vax/miniroot/Makefile.inc:1.21 Mon Jul 2 22:42:18 2012
+++ src/distrib/vax/miniroot/Makefile.inc Tue Jul 3 21:49:55 2012
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile.inc,v 1.21 2012/07/02 22:42:18 abs Exp $
+# $NetBSD: Makefile.inc,v 1.22 2012/07/03 21:49:55 abs Exp $
IMAGESIZE= 7m
MAKEFS_FLAGS= -o density=3k
IMAGEENDIAN= le
MAKEDEVTARGETS= all
LISTS+= ${DISTRIBDIR}/common/list.sysinst
-IMAGEDEPENDS+= ${ARCHDIR}/../install.md \
- ${ARCHDIR}/dot.profile \
+IMAGEDEPENDS+= ${ARCHDIR}/dot.profile \
${DESTDIR}/usr/mdec/boot \
${KERNOBJDIR}/GENERIC/netbsd
Index: src/distrib/vax/miniroot/list
diff -u src/distrib/vax/miniroot/list:1.14 src/distrib/vax/miniroot/list:1.15
--- src/distrib/vax/miniroot/list:1.14 Sun Jul 3 23:11:34 2011
+++ src/distrib/vax/miniroot/list Tue Jul 3 21:49:55 2012
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.14 2011/07/03 23:11:34 tron Exp $
+# $NetBSD: list,v 1.15 2012/07/03 21:49:55 abs Exp $
# Vax extras
PROG sbin/disklabel
@@ -36,5 +36,4 @@ SYMLINK /tmp/hosts etc/hosts
# and the installation tools
COPY ${ARCHDIR}/dot.profile .profile
-COPY ${ARCHDIR}/../install.md install.md
COPY ${DESTDIR}/usr/mdec/boot boot
Index: src/distrib/vax/ramdisk/Makefile
diff -u src/distrib/vax/ramdisk/Makefile:1.29 src/distrib/vax/ramdisk/Makefile:1.30
--- src/distrib/vax/ramdisk/Makefile:1.29 Thu Jun 28 13:53:49 2012
+++ src/distrib/vax/ramdisk/Makefile Tue Jul 3 21:49:56 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2012/06/28 13:53:49 abs Exp $
+# $NetBSD: Makefile,v 1.30 2012/07/03 21:49:56 abs Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -11,11 +11,10 @@ WARNS= 1
DBG= -Os
CRUNCHBIN= ramdiskbin
-LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst
+LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst
MTREECONF= ${DISTRIBDIR}/common/mtree.common
IMAGEENDIAN= le
-MAKEDEVTARGETS= std mt0 st0 rd0 rd1 dz0 dl0 dhu0 rx0 ra0 ra1 ra2 ra3 hp0 hp1 \
- sd0 sd1 sd2 md0 pty0 cd0 cd1 racd0 racd1
+MAKEDEVTARGETS= ramdisk
IMAGEDEPENDS= ${CRUNCHBIN} \
Makefile dot.profile \
${DESTDIR}/boot ${DESTDIR}/usr/mdec/xxboot \
@@ -29,6 +28,7 @@ HACKSRC= ${DISTRIBDIR}/utils/libhack
${CRUNCHBIN}: libhack.o
.include ${DISTRIBDIR}/common/Makefile.crunch
+.include ${DISTRIBDIR}/common/Makefile.dhcpcd
.include ${DISTRIBDIR}/common/Makefile.makedev
.include ${DISTRIBDIR}/common/Makefile.image
Index: src/distrib/vax/ramdisk/list
diff -u src/distrib/vax/ramdisk/list:1.29 src/distrib/vax/ramdisk/list:1.30
--- src/distrib/vax/ramdisk/list:1.29 Wed Mar 21 05:49:17 2012
+++ src/distrib/vax/ramdisk/list Tue Jul 3 21:49:56 2012
@@ -1,6 +1,6 @@
-# $NetBSD: list,v 1.29 2012/03/21 05:49:17 matt Exp $
+# $NetBSD: list,v 1.30 2012/07/03 21:49:56 abs Exp $
-SRCDIRS bin sbin external/bsd/less/bin usr.bin usr.sbin
+SRCDIRS external/bsd/less/bin bin sbin usr.bin usr.sbin
PROG bin/cat
PROG bin/chmod
@@ -22,6 +22,7 @@ PROG bin/sync
PROG sbin/chown bin/chgrp
PROG sbin/disklabel
+PROG sbin/dmesg
PROG sbin/fsck
PROG sbin/fsck_ffs
PROG sbin/ifconfig
@@ -30,7 +31,6 @@ PROG sbin/mknod
PROG sbin/mount
PROG sbin/mount_cd9660
PROG sbin/mount_ffs
-PROG sbin/mount_kernfs
PROG sbin/mount_nfs
PROG sbin/newfs sbin/mount_mfs
PROG sbin/ping
@@ -45,7 +45,6 @@ PROG usr/bin/ftp
PROG usr/bin/gzip usr/bin/gzcat usr/bin/gunzip
PROG usr/bin/less usr/bin/more
PROG usr/bin/sed
-# PROG usr/bin/strings
# PROG usr/sbin/bad144
PROG usr/sbin/chroot
@@ -61,7 +60,7 @@ SPECIAL ping srcdir distrib/utils/x_pin
SPECIAL route srcdir distrib/utils/x_route
SPECIAL umount srcdir distrib/utils/x_umount
-LIBS
CVS commit: src/sys/arch/vax/conf
Module Name:src Committed By: abs Date: Tue Jul 3 22:42:48 UTC 2012 Modified Files: src/sys/arch/vax/conf: INSTALL Log Message: Sync devices with GENERIC, and include bpfilter to allow dhcpcd to work To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 src/sys/arch/vax/conf/INSTALL 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/vax/conf/INSTALL diff -u src/sys/arch/vax/conf/INSTALL:1.61 src/sys/arch/vax/conf/INSTALL:1.62 --- src/sys/arch/vax/conf/INSTALL:1.61 Tue Jul 3 21:49:56 2012 +++ src/sys/arch/vax/conf/INSTALL Tue Jul 3 22:42:47 2012 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.61 2012/07/03 21:49:56 abs Exp $ +# $NetBSD: INSTALL,v 1.62 2012/07/03 22:42:47 abs Exp $ # # INSTALL kernel; all supported devices but nothing fancy. # @@ -24,7 +24,7 @@ options VAX43 # VS 3100/76 options VAX46 # VS 4000/60 options VAX48 # VS 4000 VLC options VAX49 # VS 4000/90 -options VAX53 # VAX 4000/105A +options VAX53 # VAX 4000/10[058], MicroVAX 3100/m96 # Max users on system; this is just a hint maxusers 8 @@ -38,15 +38,15 @@ options MEMORY_DISK_RBFLAGS=RB_SINGLE # # Kernel compiled-in symbolic debugger system call tracer #options DDB -#options DDB_HISTORY_SIZE=100 # enable history editing in DDB +#options DDB_HISTORY_SIZE=512 # enable history editing in DDB #options KTRACE #options DIAGNOSTIC,DEBUG,KMEMSTATS,PMAPDEBUG,TRAPDEBUG #options SCSIVERBOSE # Verbose SCSI errors -# Network support -#options GATEWAY -options INET +# Networking options +#options GATEWAY # packet forwarding +options INET # IP + ICMP + TCP + UDP # File systems file-system FFS @@ -56,11 +56,14 @@ file-system NFS #file-system FDESC #file-system KERNFS #file-system NULLFS +#file-system OVERLAY # overlay file system #file-system PROCFS #file-system UMAPFS #file-system UNION file-system CD9660 #file-system PTYFS # /dev/pts/N support +#file-system TMPFS # Efficient memory file-system +#file-system UDF # experimental - OSTA UDF CD/DVD file-system # Filesystem options #options QUOTA # legacy UFS quotas @@ -96,15 +99,17 @@ options WSEMUL_VT100 #options COMPAT_13 options COMPAT_14 options COMPAT_15 +options COMPAT_16 options COMPAT_20 options COMPAT_30 # NetBSD 3.0 compatibility. options COMPAT_40 # NetBSD 4.0 compatibility. +options COMPAT_50 # NetBSD 5.0 compatibility. #options COMPAT_ULTRIX options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. options USERCONF # userconf(4) support -options PIPE_SOCKETPAIR # smaller, but slower pipe(2) +options PIPE_SOCKETPAIR # smaller, but slower pipe(2) #options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel # Kernel(s) to compile @@ -112,74 +117,109 @@ config netbsd root on ? type ? mainbus0 at root -# Devices directly attached to mainbus. -sbi* at mainbus0 # SBI's, VAX-11/78[05] main bus -bi* at mainbus0 # VAXBI bus -cmi0 at mainbus0 # 11/750 internal bus. -vsbus0 at mainbus0 # Internal virtual VAXstation bus -sbi* at mainbus0 # SBI adapter -uba0 at mainbus0 # Q-Bus adapter -ze0 at mainbus0 # SGEC on-board ethernet -le0 at mainbus0 # LANCE +cpu* at mainbus0 -# Devices connected at VAXBI -cpu0 at bi? node? # KA820/KA825 CPU -cpu* at bi? node? -mem* at bi? node? # Memory subsystems -#uba* at bi? node? # DWBUA BI-Unibus adapter -#ni* at bi? node? # DEBNA/DEBNT ethernet adapter -kdb* at bi? node? # KDB50 MSCP disk ctlr -mscpbus* at kdb? +# All buses; from the beginning attached to mainbus. +abus0 at mainbus0 # Master bus on VAX 86x0 +sbi0 at mainbus0 # SBI, master bus on 11/78x. +cmi0 at mainbus0 # 11/750 internal bus. +bi0 at mainbus0 # VAX 8200 +vsbus0 at mainbus0 # All VAXstations +#nmi0 at mainbus0 # VAX 8800 +#xmi0 at mainbus0 # VAX 6000 +uba0 at mainbus0 # All MicroVAX +ze0 at mainbus0 # KA48, KA49, KA53 +le0 at mainbus0 # LANCE ethernet (MV3400) +#shac0 at mainbus0 # DSSI controller + +# NMI (internal bus) on VAX 88xx-series. +#cpu* at nmi0 slot? # 1-4 KA88 CPUs +#mem* at nmi0 slot? +#bi* at nmi0 slot? # BI bus adapters + +# XMI on VAX 6000 (and higher) +#cpu* at xmi? node? # 1-? VAX 6000 CPUs +#mem* at xmi? node? +#bi* at xmi? node? # XMI-BI adapter -# Devices connected at cmi -mem* at cmi? tr? # Memory subsystems -uba* at cmi? tr? # Unibus adapters -mba* at cmi? tr? # Massbus adapters - -# Devices connected at abus - -# Devices connected at sbi -mem* at sbi? tr? # Memory subsystems -uba* at sbi? tr? # Unibus adapters -mba* at sbi? tr? # Massbus adapters +# Vsbus, the virtual VAXstation bus, and possible devices. +le0 at vsbus0 csr 0x200e # LANCE ethernet +dz0 at vsbus0 csr 0x200a # DC-367 DZ-11 lookalike ctlr +dz0 at vsbus0 csr 0x2500 # VS4000/90 and 4000/10x serial line +si0 at vsbus0 csr 0x200c0080 # VS2000/3100 SCSI-ctlr +si1 at vsbus0 csr 0x200c0180 # VS2000/3100 SCSI-ctlr
CVS commit: src
Module Name:src
Committed By: abs
Date: Mon Jul 2 22:42:18 UTC 2012
Modified Files:
src/distrib/vax/miniroot: Makefile.inc
src/sys/arch/vax/include: disklabel.h types.h
src/sys/sys: bootblock.h
Log Message:
- Increase MAXPARTITIONS for vax from 8 to 16, using the standard NetBSD
mechanism to ensure all existing /dev nodes continue to work
- Adjust boot block layout to fit additional partitions
- Adjust number of inodes on install media
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/distrib/vax/miniroot/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/vax/include/disklabel.h
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/vax/include/types.h
cvs rdiff -u -r1.53 -r1.54 src/sys/sys/bootblock.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/vax/miniroot/Makefile.inc
diff -u src/distrib/vax/miniroot/Makefile.inc:1.20 src/distrib/vax/miniroot/Makefile.inc:1.21
--- src/distrib/vax/miniroot/Makefile.inc:1.20 Thu Feb 11 09:06:51 2010
+++ src/distrib/vax/miniroot/Makefile.inc Mon Jul 2 22:42:18 2012
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.20 2010/02/11 09:06:51 roy Exp $
+# $NetBSD: Makefile.inc,v 1.21 2012/07/02 22:42:18 abs Exp $
IMAGESIZE= 7m
-MAKEFS_FLAGS= -o density=4k
+MAKEFS_FLAGS= -o density=3k
IMAGEENDIAN= le
MAKEDEVTARGETS= all
LISTS+= ${DISTRIBDIR}/common/list.sysinst
Index: src/sys/arch/vax/include/disklabel.h
diff -u src/sys/arch/vax/include/disklabel.h:1.5 src/sys/arch/vax/include/disklabel.h:1.6
--- src/sys/arch/vax/include/disklabel.h:1.5 Tue Aug 30 12:39:59 2011
+++ src/sys/arch/vax/include/disklabel.h Mon Jul 2 22:42:18 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.5 2011/08/30 12:39:59 bouyer Exp $ */
+/* $NetBSD: disklabel.h,v 1.6 2012/07/02 22:42:18 abs Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -33,11 +33,25 @@
#ifndef _MACHINE_DISKLABEL_H_
#define _MACHINE_DISKLABEL_H_
-#define LABELUSESMBR 0 /* no MBR partitionning */
-#define LABELSECTOR 0 /* sector containing label */
-#define LABELOFFSET 64 /* offset of label in sector */
-#define MAXPARTITIONS 8 /* number of partitions */
-#define RAW_PART 2 /* raw partition: xx?c */
+#define LABELUSESMBR 0 /* no MBR partitionning */
+#define LABELSECTOR 0 /* sector containing label */
+#define LABELOFFSET 64 /* offset of label in sector */
+#define MAXPARTITIONS 16 /* number of partitions */
+#define OLDMAXPARTITIONS 8 /* number of partitions before nb-6 */
+#define RAW_PART 2 /* raw partition: xx?c */
+
+/*
+ * We use the highest bit of the minor number for the partition number.
+ * This maintains backward compatibility with device nodes created before
+ * MAXPARTITIONS was increased.
+ */
+#define __VAX_MAXDISKS ((1 20) / MAXPARTITIONS)
+#define DISKUNIT(dev) ((minor(dev) / OLDMAXPARTITIONS) % __VAX_MAXDISKS)
+#define DISKPART(dev) ((minor(dev) % OLDMAXPARTITIONS) + \
+((minor(dev) / (__VAX_MAXDISKS * OLDMAXPARTITIONS)) * OLDMAXPARTITIONS))
+#define DISKMINOR(unit, part) \
+(((unit) * OLDMAXPARTITIONS) + ((part) % OLDMAXPARTITIONS) + \
+ ((part) / OLDMAXPARTITIONS) * (__VAX_MAXDISKS * OLDMAXPARTITIONS))
/* Just a dummy */
#ifndef _LOCORE
Index: src/sys/arch/vax/include/types.h
diff -u src/sys/arch/vax/include/types.h:1.45 src/sys/arch/vax/include/types.h:1.46
--- src/sys/arch/vax/include/types.h:1.45 Fri May 25 12:32:48 2012
+++ src/sys/arch/vax/include/types.h Mon Jul 2 22:42:18 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.45 2012/05/25 12:32:48 matt Exp $ */
+/* $NetBSD: types.h,v 1.46 2012/07/02 22:42:18 abs Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -78,6 +78,7 @@ typedef volatile char __cpu_simple_lock_
#define __HAVE_CPU_DATA_FIRST
#define __HAVE_MM_MD_READWRITE
#define __HAVE_MM_MD_DIRECT_MAPPED_PHYS
+#define __HAVE_OLD_DISKLABEL
#ifdef _KERNEL
#define __HAVE_RAS
#endif
Index: src/sys/sys/bootblock.h
diff -u src/sys/sys/bootblock.h:1.53 src/sys/sys/bootblock.h:1.54
--- src/sys/sys/bootblock.h:1.53 Mon Apr 2 18:53:54 2012
+++ src/sys/sys/bootblock.h Mon Jul 2 22:42:18 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bootblock.h,v 1.53 2012/04/02 18:53:54 christos Exp $ */
+/* $NetBSD: bootblock.h,v 1.54 2012/07/02 22:42:18 abs Exp $ */
/*-
* Copyright (c) 2002-2004 The NetBSD Foundation, Inc.
@@ -1409,7 +1409,8 @@ struct vax_boot_block {
uint8_t bb_mbone; /* must be one */
uint16_t bb_lbn_hi; /* lbn (hi word) of bootstrap */
uint16_t bb_lbn_low; /* lbn (low word) of bootstrap */
- uint8_t pad1[332];
+ uint8_t pad1[460];
+ /* disklabel offset is 64 from base, or 56 from start of pad1 */
/* The rest of these fields are identification area and describe
* the secondary block for uVAX VMB.
@@ -1431,7 +1432,7 @@ struct vax_boot_block {
/* The rest is unused.
*/
- uint8_t pad2[148];
+ uint8_t pad2[20];
} __packed;
#define VAX_BOOT_MAGIC1
CVS commit: src/lib/libperfuse
Module Name:src
Committed By: abs
Date: Thu Jun 28 13:53:13 UTC 2012
Modified Files:
src/lib/libperfuse: ops.c perfuse_priv.h
Log Message:
Fix the build by adding (unused) flags argument to perfuse_node_setattr_ttl
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/lib/libperfuse/ops.c
cvs rdiff -u -r1.29 -r1.30 src/lib/libperfuse/perfuse_priv.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libperfuse/ops.c
diff -u src/lib/libperfuse/ops.c:1.57 src/lib/libperfuse/ops.c:1.58
--- src/lib/libperfuse/ops.c:1.57 Thu Jun 14 05:58:22 2012
+++ src/lib/libperfuse/ops.c Thu Jun 28 13:53:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ops.c,v 1.57 2012/06/14 05:58:22 manu Exp $ */
+/* $NetBSD: ops.c,v 1.58 2012/06/28 13:53:13 abs Exp $ */
/*-
* Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -1680,13 +1680,13 @@ perfuse_node_setattr(struct puffs_usermo
const struct vattr *vap, const struct puffs_cred *pcr)
{
return perfuse_node_setattr_ttl(pu, opc,
- __UNCONST(vap), pcr, NULL);
+ __UNCONST(vap), pcr, NULL, 0);
}
int
perfuse_node_setattr_ttl(struct puffs_usermount *pu, puffs_cookie_t opc,
struct vattr *vap, const struct puffs_cred *pcr,
- struct timespec *va_ttl)
+ struct timespec *va_ttl, int flags)
{
perfuse_msg_t *pm;
uint64_t fh;
Index: src/lib/libperfuse/perfuse_priv.h
diff -u src/lib/libperfuse/perfuse_priv.h:1.29 src/lib/libperfuse/perfuse_priv.h:1.30
--- src/lib/libperfuse/perfuse_priv.h:1.29 Wed Apr 18 00:57:22 2012
+++ src/lib/libperfuse/perfuse_priv.h Thu Jun 28 13:53:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: perfuse_priv.h,v 1.29 2012/04/18 00:57:22 manu Exp $ */
+/* $NetBSD: perfuse_priv.h,v 1.30 2012/06/28 13:53:13 abs Exp $ */
/*-
* Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -259,7 +259,7 @@ int perfuse_node_getattr_ttl(struct puff
struct timespec *);
int perfuse_node_setattr_ttl(struct puffs_usermount *,
puffs_cookie_t, struct vattr *, const struct puffs_cred *,
-struct timespec *);
+struct timespec *, int flags);
struct perfuse_trace *perfuse_trace_begin(struct perfuse_state *,
puffs_cookie_t, perfuse_msg_t *);
CVS commit: src/distrib/vax/ramdisk
Module Name:src
Committed By: abs
Date: Thu Jun 28 13:53:49 UTC 2012
Modified Files:
src/distrib/vax/ramdisk: Makefile
Log Message:
Include racd0 and racd1 on ramdisk
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/distrib/vax/ramdisk/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/vax/ramdisk/Makefile
diff -u src/distrib/vax/ramdisk/Makefile:1.28 src/distrib/vax/ramdisk/Makefile:1.29
--- src/distrib/vax/ramdisk/Makefile:1.28 Wed Mar 21 05:49:39 2012
+++ src/distrib/vax/ramdisk/Makefile Thu Jun 28 13:53:49 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2012/03/21 05:49:39 matt Exp $
+# $NetBSD: Makefile,v 1.29 2012/06/28 13:53:49 abs Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -15,7 +15,7 @@ LISTS= ${.CURDIR}/list ${DISTRIBDIR}/c
MTREECONF= ${DISTRIBDIR}/common/mtree.common
IMAGEENDIAN= le
MAKEDEVTARGETS= std mt0 st0 rd0 rd1 dz0 dl0 dhu0 rx0 ra0 ra1 ra2 ra3 hp0 hp1 \
- sd0 sd1 sd2 md0 pty0 cd0 cd1
+ sd0 sd1 sd2 md0 pty0 cd0 cd1 racd0 racd1
IMAGEDEPENDS= ${CRUNCHBIN} \
Makefile dot.profile \
${DESTDIR}/boot ${DESTDIR}/usr/mdec/xxboot \
CVS commit: src/sys/arch/vax
Module Name:src
Committed By: abs
Date: Thu Jun 28 13:58:21 UTC 2012
Modified Files:
src/sys/arch/vax/include: vsbus.h
src/sys/arch/vax/vsa: dz_vsbus.c vsbus.c
Log Message:
Define and use VS_REGS_KA49 rather than magic numbers. From OpenBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/vax/include/vsbus.h
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/vax/vsa/dz_vsbus.c
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/vax/vsa/vsbus.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/vax/include/vsbus.h
diff -u src/sys/arch/vax/include/vsbus.h:1.18 src/sys/arch/vax/include/vsbus.h:1.19
--- src/sys/arch/vax/include/vsbus.h:1.18 Tue Mar 11 05:34:02 2008
+++ src/sys/arch/vax/include/vsbus.h Thu Jun 28 13:58:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vsbus.h,v 1.18 2008/03/11 05:34:02 matt Exp $ */
+/* $NetBSD: vsbus.h,v 1.19 2012/06/28 13:58:21 abs Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -60,10 +60,13 @@ struct vsbus_attach_args {
*/
#define VS_CFGTST 0x2002 /* config register */
#define VS_REGS 0x2008 /* Misc CPU internal regs */
+#define VS_REGS_KA49 0x25c0 /* ... same, on 512KB ROM systems */
#define NI_ADDR 0x2009 /* Ethernet address */
#define DZ_CSR 0x200a /* DZ11-compatible chip csr */
+#define DZ_CSR_KA49 0x2500 /* ... same, on 512KB ROM systems */
#define VS_CLOCK0x200b /* clock chip address */
#define SCA_REGS0x200c /* disk device addresses */
+#define SCA_REGS_KA49 0x2600 /* ... same, on 512KB ROM systems */
#define NI_BASE 0x200e /* LANCE CSRs */
#define NI_IOSIZE (128 * VAX_NBPG)/* IO address size */
Index: src/sys/arch/vax/vsa/dz_vsbus.c
diff -u src/sys/arch/vax/vsa/dz_vsbus.c:1.42 src/sys/arch/vax/vsa/dz_vsbus.c:1.43
--- src/sys/arch/vax/vsa/dz_vsbus.c:1.42 Tue Dec 14 23:31:16 2010
+++ src/sys/arch/vax/vsa/dz_vsbus.c Thu Jun 28 13:58:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dz_vsbus.c,v 1.42 2010/12/14 23:31:16 matt Exp $ */
+/* $NetBSD: dz_vsbus.c,v 1.43 2012/06/28 13:58:21 abs Exp $ */
/*
* Copyright (c) 1998 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dz_vsbus.c,v 1.42 2010/12/14 23:31:16 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: dz_vsbus.c,v 1.43 2012/06/28 13:58:21 abs Exp $);
#include sys/param.h
#include sys/systm.h
@@ -123,7 +123,7 @@ dz_vsbus_match(device_t parent, cfdata_t
#if VAX53 || VAX49 || VAXANY
if (vax_boardtype == VAX_BTYP_53 || vax_boardtype == VAX_BTYP_49)
- if (cf-cf_loc[VSBUSCF_CSR] != 0x2500)
+ if (cf-cf_loc[VSBUSCF_CSR] != DZ_CSR_KA49)
return 0; /* Ugly */
#endif
@@ -262,12 +262,12 @@ dzcnprobe(struct consdev *cndev)
break;
case VAX_BTYP_49:
- ioaddr = 0x2500;
+ ioaddr = DZ_CSR_KA49;
diagcons = (vax_confdata 8 ? 3 : 0);
break;
case VAX_BTYP_53:
- ioaddr = 0x2500;
+ ioaddr = DZ_CSR_KA49;
diagcons = 3;
break;
Index: src/sys/arch/vax/vsa/vsbus.c
diff -u src/sys/arch/vax/vsa/vsbus.c:1.59 src/sys/arch/vax/vsa/vsbus.c:1.60
--- src/sys/arch/vax/vsa/vsbus.c:1.59 Tue Dec 14 23:31:17 2010
+++ src/sys/arch/vax/vsa/vsbus.c Thu Jun 28 13:58:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vsbus.c,v 1.59 2010/12/14 23:31:17 matt Exp $ */
+/* $NetBSD: vsbus.c,v 1.60 2012/06/28 13:58:21 abs Exp $ */
/*
* Copyright (c) 1996, 1999 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vsbus.c,v 1.59 2010/12/14 23:31:17 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: vsbus.c,v 1.60 2012/06/28 13:58:21 abs Exp $);
#include opt_cputype.h
@@ -122,7 +122,7 @@ vsbus_attach(device_t parent, device_t s
#if VAX49 || VAX53
case VAX_BTYP_53:
case VAX_BTYP_49:
- sc-sc_vsregs = vax_map_physmem(0x25c0, 1);
+ sc-sc_vsregs = vax_map_physmem(VS_REGS_KA49, 1);
sc-sc_intreq = (char *)sc-sc_vsregs + 12;
sc-sc_intclr = (char *)sc-sc_vsregs + 12;
sc-sc_intmsk = (char *)sc-sc_vsregs + 8;
CVS commit: src/sys/arch/vax/vax
Module Name:src Committed By: abs Date: Thu Jun 28 13:59:26 UTC 2012 Modified Files: src/sys/arch/vax/vax: findcpu.c Log Message: dependent not dependend To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/vax/vax/findcpu.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/vax/vax/findcpu.c diff -u src/sys/arch/vax/vax/findcpu.c:1.18 src/sys/arch/vax/vax/findcpu.c:1.19 --- src/sys/arch/vax/vax/findcpu.c:1.18 Tue Mar 11 05:34:03 2008 +++ src/sys/arch/vax/vax/findcpu.c Thu Jun 28 13:59:25 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: findcpu.c,v 1.18 2008/03/11 05:34:03 matt Exp $ */ +/* $NetBSD: findcpu.c,v 1.19 2012/06/28 13:59:25 abs Exp $ */ /* * Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: findcpu.c,v 1.18 2008/03/11 05:34:03 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: findcpu.c,v 1.19 2012/06/28 13:59:25 abs Exp $); #include sys/param.h #ifdef _KERNEL @@ -50,11 +50,11 @@ __KERNEL_RCSID(0, $NetBSD: findcpu.c,v */ int vax_cputype; /* highest byte of SID register */ int vax_bustype; /* holds/defines all busses on this machine */ -int vax_boardtype; /* machine dependend, combination of SID and SIE */ +int vax_boardtype; /* machine dependent, combination of SID and SIE */ int vax_cpudata; /* contents of the SID register */ int vax_siedata; /* contents of the SIE register */ -int vax_confdata; /* machine dependend, configuration/setup data */ +int vax_confdata; /* machine dependent, configuration/setup data */ /* * Try to figure out which type of system this is.
CVS commit: src/sys/arch/vax/vax
Module Name:src Committed By: abs Date: Thu Jun 28 13:59:55 UTC 2012 Modified Files: src/sys/arch/vax/vax: ka49.c Log Message: drop some blank lines - no functional change To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/vax/vax/ka49.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/vax/vax/ka49.c diff -u src/sys/arch/vax/vax/ka49.c:1.18 src/sys/arch/vax/vax/ka49.c:1.19 --- src/sys/arch/vax/vax/ka49.c:1.18 Tue Dec 14 23:44:49 2010 +++ src/sys/arch/vax/vax/ka49.c Thu Jun 28 13:59:55 2012 @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ka49.c,v 1.18 2010/12/14 23:44:49 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: ka49.c,v 1.19 2012/06/28 13:59:55 abs Exp $); #include sys/param.h #include sys/systm.h @@ -157,7 +157,6 @@ ka49_cache_enable(void) mtpr(mfpr(PR_BCEDSTS), PR_BCEDSTS); /* Clear error bits */ mtpr(mfpr(PR_NESTS), PR_NESTS); /* Clear error bits */ - start = 0x0140; slut = 0x0144; @@ -224,7 +223,6 @@ ka49_steal_pages(void) /* Turn on caches (to speed up execution a bit) */ ka49_cache_enable(); - } void
CVS commit: src/dist/pdisk
Module Name:src
Committed By: abs
Date: Mon Jun 25 16:47:03 UTC 2012
Modified Files:
src/dist/pdisk: partition_map.c
Log Message:
Casting an uint32_t pointer to (long *) may have been acceptable
in the eighties but that time has long past. Minimally invasive
fix using a temporary long variable, so while we can still overflow
at least we're less broken.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/dist/pdisk/partition_map.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/pdisk/partition_map.c
diff -u src/dist/pdisk/partition_map.c:1.14 src/dist/pdisk/partition_map.c:1.15
--- src/dist/pdisk/partition_map.c:1.14 Fri Apr 6 22:41:47 2012
+++ src/dist/pdisk/partition_map.c Mon Jun 25 16:47:03 2012
@@ -514,12 +514,14 @@ create_partition_map(char *name, partiti
default_number = number;
flush_to_newline(0);
do {
+ long long_number = number;
if (get_number_argument(what should be the size? ,
- (long *)number, default_number) == 0) {
+ long_number, default_number) == 0) {
printf(Not a number\n);
flush_to_newline(1);
number = 0;
} else {
+ number = long_number;
multiple = get_multiplier(map-logical_block);
if (multiple == 0) {
printf(Bad multiplier\n);
CVS commit: src/share/mk
Module Name:src
Committed By: abs
Date: Mon Jun 25 16:48:55 UTC 2012
Modified Files:
src/share/mk: bsd.sys.mk
Log Message:
Whatever -Wl,--fatal-warnings get-out-of-jail-free card gcc-4.5 gets,
give the same treatment to gcc-4.1.
To generate a diff of this commit:
cvs rdiff -u -r1.215 -r1.216 src/share/mk/bsd.sys.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.215 src/share/mk/bsd.sys.mk:1.216
--- src/share/mk/bsd.sys.mk:1.215 Tue Mar 20 21:48:20 2012
+++ src/share/mk/bsd.sys.mk Mon Jun 25 16:48:55 2012
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.215 2012/03/20 21:48:20 matt Exp $
+# $NetBSD: bsd.sys.mk,v 1.216 2012/06/25 16:48:55 abs Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -40,7 +40,7 @@ CFLAGS+= -Wa,--fatal-warnings
.if (!defined(MKPIC) || ${MKPIC} != no) \
(!defined(LDSTATIC) || ${LDSTATIC} != -static)
# XXX there are some strange problems not yet resolved
-. if !defined(HAVE_GCC) || ${HAVE_GCC} != 45
+. if !defined(HAVE_GCC)
LDFLAGS+= -Wl,--fatal-warnings
. endif
.endif
CVS commit: src/sys/netinet6
Module Name:src
Committed By: abs
Date: Mon Jun 25 17:25:29 UTC 2012
Modified Files:
src/sys/netinet6: nd6_rtr.c
Log Message:
Some fun in trying to work out what was broken with gcc-4.1 to
trigger the following warning when gcc-4.5 was silent:
nd6_rtr.c: In function 'nd6_ra_input':
nd6_rtr.c:788: warning: 'ext' may be used uninitialized in this function
Eventually determined that it was not unreasonable for gcc-4.1 to
bleat in this case as there is a nasty 'goto insert' which could
indeed have resulted in an uninitialised variable use. Yay gcc 4.1.
To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/sys/netinet6/nd6_rtr.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/netinet6/nd6_rtr.c
diff -u src/sys/netinet6/nd6_rtr.c:1.83 src/sys/netinet6/nd6_rtr.c:1.84
--- src/sys/netinet6/nd6_rtr.c:1.83 Sat Jun 23 03:14:04 2012
+++ src/sys/netinet6/nd6_rtr.c Mon Jun 25 17:25:29 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6_rtr.c,v 1.83 2012/06/23 03:14:04 christos Exp $ */
+/* $NetBSD: nd6_rtr.c,v 1.84 2012/06/25 17:25:29 abs Exp $ */
/* $KAME: nd6_rtr.c,v 1.95 2001/02/07 08:09:47 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nd6_rtr.c,v 1.83 2012/06/23 03:14:04 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: nd6_rtr.c,v 1.84 2012/06/25 17:25:29 abs Exp $);
#include sys/param.h
#include sys/systm.h
@@ -744,6 +744,7 @@ static struct nd_defrouter *
defrtrlist_update(struct nd_defrouter *new)
{
struct nd_defrouter *dr, *n;
+ struct in6_ifextra *ext = new-ifp-if_afdata[AF_INET6];
int s = splsoftnet();
if ((dr = defrouter_lookup(new-rtaddr, new-ifp)) != NULL) {
@@ -785,7 +786,6 @@ defrtrlist_update(struct nd_defrouter *n
return (dr);
}
- struct in6_ifextra *ext = new-ifp-if_afdata[AF_INET6];
if (ip6_maxifdefrouters = 0
ext-ndefrouters = ip6_maxifdefrouters) {
splx(s);
CVS commit: src/share/man/man4
Module Name:src Committed By: abs Date: Sat Jun 23 19:14:35 UTC 2012 Modified Files: src/share/man/man4: cd.4 Log Message: Document DIOCTUR (test unit ready) To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/share/man/man4/cd.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/cd.4 diff -u src/share/man/man4/cd.4:1.18 src/share/man/man4/cd.4:1.19 --- src/share/man/man4/cd.4:1.18 Mon Mar 22 18:58:31 2010 +++ src/share/man/man4/cd.4 Sat Jun 23 19:14:34 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: cd.4,v 1.18 2010/03/22 18:58:31 joerg Exp $ +.\ $NetBSD: cd.4,v 1.19 2012/06/23 19:14:34 abs Exp $ .\ .\ Copyright (c) 1996 .\ Julian Elischer jul...@freebsd.org. All rights reserved. @@ -25,7 +25,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd January 16, 1996 +.Dd June 23, 2012 .Dt CD 4 .Os .Sh NAME @@ -317,6 +317,9 @@ Cause the ATAPI changer to load or unloa .It Dv CDIOCCLOSE Tell the drive to close its door and load the media. Not all drives support this feature. +.It Dv DIOCTUR +Test unit ready - to allow userland to silently check for presence of media. +disc. .\ .\.It Dv CDIOCPITCH .\.Pq Li struct ioc_pitch
CVS commit: src
Module Name:src
Committed By: abs
Date: Fri Jun 22 20:32:35 UTC 2012
Modified Files:
src/external/bsd/cron/bin/cron: Makefile
src/external/gpl3/binutils/lib/libbfd: Makefile
src/external/gpl3/gdb: Makefile.inc
src/share/mk: bsd.own.mk sys.mk
Log Message:
Switch -current vax back to gcc 4.1 to match netbsd-6 - until someone has
time to look at the gcc 4.5 codegen issues we should at least have a usable
-current for vax.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/cron/bin/cron/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/binutils/lib/libbfd/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gdb/Makefile.inc
cvs rdiff -u -r1.698 -r1.699 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.108 -r1.109 src/share/mk/sys.mk
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/bin/cron/Makefile
diff -u src/external/bsd/cron/bin/cron/Makefile:1.2 src/external/bsd/cron/bin/cron/Makefile:1.3
--- src/external/bsd/cron/bin/cron/Makefile:1.2 Wed Apr 4 10:59:44 2012
+++ src/external/bsd/cron/bin/cron/Makefile Fri Jun 22 20:32:34 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/04/04 10:59:44 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/22 20:32:34 abs Exp $
BINDIR= /usr/sbin
PROG= cron
@@ -8,6 +8,6 @@ CPPFLAGS+=-I${.CURDIR} -DLOGIN_CAP
LDADD+=-lutil
MAN= cron.8
-CWARNFLAGS+= -Wno-string-plus-int
+CWARNFLAGS.clang+= -Wno-string-plus-int
.include bsd.prog.mk
Index: src/external/gpl3/binutils/lib/libbfd/Makefile
diff -u src/external/gpl3/binutils/lib/libbfd/Makefile:1.6 src/external/gpl3/binutils/lib/libbfd/Makefile:1.7
--- src/external/gpl3/binutils/lib/libbfd/Makefile:1.6 Sun Sep 25 04:32:46 2011
+++ src/external/gpl3/binutils/lib/libbfd/Makefile Fri Jun 22 20:32:35 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/09/25 04:32:46 christos Exp $
+# $NetBSD: Makefile,v 1.7 2012/06/22 20:32:35 abs Exp $
NOLINKLIB= # defined
NOLINT= # defined
@@ -35,6 +35,10 @@ CPPFLAGS+= -I${.CURDIR}/arch/${BFD_MACHI
-I${DIST}/bfd ${GCPPFLAGS:M-D*} ${GCPPFLAGS:M-I*:N-I.*} \
-DDEBUGDIR=\${DEBUGDIR}\
+.if (${MACHINE_ARCH} == vax)
+CPPFLAGS.elf.c += -O0
+.endif
+
GSRCS= ${G_libbfd_la_OBJECTS:libbfd.lo=lib_bfd.lo} \
${G_libbfd_la_DEPENDENCIES:M*.lo}
SRCS= ${GSRCS:.lo=.c}
Index: src/external/gpl3/gdb/Makefile.inc
diff -u src/external/gpl3/gdb/Makefile.inc:1.5 src/external/gpl3/gdb/Makefile.inc:1.6
--- src/external/gpl3/gdb/Makefile.inc:1.5 Wed Apr 4 10:59:45 2012
+++ src/external/gpl3/gdb/Makefile.inc Fri Jun 22 20:32:35 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.5 2012/04/04 10:59:45 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.6 2012/06/22 20:32:35 abs Exp $
USE_LIBEDIT=no
USE_TUI=yes
@@ -11,8 +11,4 @@ CWARNFLAGS.clang+= -Wno-unused-value -Wn
-Wno-tautological-compare -Wno-format-extra-args \
-Wno-string-plus-int
-.if ${MACHINE} == vax
-CWARNFLAGS.gcc+= -Wno-overflow
-.endif
-
DIST= ${NETBSDSRCDIR}/external/gpl3/gdb/dist
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.698 src/share/mk/bsd.own.mk:1.699
--- src/share/mk/bsd.own.mk:1.698 Sun Jun 17 22:59:48 2012
+++ src/share/mk/bsd.own.mk Fri Jun 22 20:32:35 2012
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.698 2012/06/17 22:59:48 uwe Exp $
+# $NetBSD: bsd.own.mk,v 1.699 2012/06/22 20:32:35 abs Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -47,8 +47,14 @@ NEED_OWN_INSTALL_TARGET?= yes
TOOLCHAIN_MISSING?= no
#
-# Everyone uses GCC4.5
+# Platforms still using GCC 4.1
+#
+.if ${MACHINE_CPU} == vax
+HAVE_GCC?=4
+.else
+# Otherwise, default to GCC4.5
HAVE_GCC?=45
+.endif
.if \
${MACHINE_ARCH} == i386 || \
Index: src/share/mk/sys.mk
diff -u src/share/mk/sys.mk:1.108 src/share/mk/sys.mk:1.109
--- src/share/mk/sys.mk:1.108 Fri Feb 10 05:57:42 2012
+++ src/share/mk/sys.mk Fri Jun 22 20:32:35 2012
@@ -1,4 +1,4 @@
-# $NetBSD: sys.mk,v 1.108 2012/02/10 05:57:42 matt Exp $
+# $NetBSD: sys.mk,v 1.109 2012/06/22 20:32:35 abs Exp $
# @(#)sys.mk 8.2 (Berkeley) 3/21/94
unix?= We run NetBSD.
@@ -26,8 +26,8 @@ DBG?= -Os -freorder-blocks
.elif ${MACHINE_ARCH} == m68k || ${MACHINE_ARCH} == m68000
# see src/doc/HACKS for details
DBG?= -Os
-#.elif ${MACHINE_ARCH} == vax
-#DBG?= -O1 -fgcse -fstrength-reduce -fgcse-after-reload
+.elif ${MACHINE_ARCH} == vax
+DBG?= -O1 -fgcse -fstrength-reduce -fgcse-after-reload
.else
DBG?= -O2
.endif
CVS commit: src
Module Name:src
Committed By: abs
Date: Fri Jun 22 20:42:24 UTC 2012
Modified Files:
src/etc/etc.vax: MAKEDEV.conf
src/sys/arch/vax/conf: GENERIC INSTALL VAX780 majors.vax
src/sys/arch/vax/vax: disksubr.c
src/sys/dev: DEVNAMES
src/sys/dev/mscp: files.mscp mscp_disk.c mscp_subr.c
Log Message:
- Add racd* devices for MSCP based CD-ROM drives (RRD40s), as opposed
to mixing them in with the ra* disks, modelled loosely on how MSCP
rx* floppies are handled
- racd* defaults to the same single iso9660 partition as cd*
- Cleanup config option handling slightly so any combination of ra*,
rx* (and now raccd*) can be defined without build errors.
- Avoid ugly printf when disks have all zero disklabel magic number
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/etc/etc.vax/MAKEDEV.conf
cvs rdiff -u -r1.181 -r1.182 src/sys/arch/vax/conf/GENERIC
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/vax/conf/INSTALL
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/vax/conf/VAX780
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/vax/conf/majors.vax
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/vax/vax/disksubr.c
cvs rdiff -u -r1.274 -r1.275 src/sys/dev/DEVNAMES
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/mscp/files.mscp
cvs rdiff -u -r1.71 -r1.72 src/sys/dev/mscp/mscp_disk.c
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/mscp/mscp_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/etc.vax/MAKEDEV.conf
diff -u src/etc/etc.vax/MAKEDEV.conf:1.13 src/etc/etc.vax/MAKEDEV.conf:1.14
--- src/etc/etc.vax/MAKEDEV.conf:1.13 Wed Oct 12 17:03:49 2011
+++ src/etc/etc.vax/MAKEDEV.conf Fri Jun 22 20:42:22 2012
@@ -1,9 +1,9 @@
-# $NetBSD: MAKEDEV.conf,v 1.13 2011/10/12 17:03:49 njoly Exp $
+# $NetBSD: MAKEDEV.conf,v 1.14 2012/06/22 20:42:22 abs Exp $
all_md)
makedev mt0 mt1 ts0 ts1 st0 st1 uk0 ss0 cd0 vt0
makedev ra0 ra1 ra2 ra3 hp0 hp1 hp2 hp3 sd0 sd1 sd2 sd3 rd0 rd1 rd2
- makedev dz0 dl0 dhu0 rx0 rx1
+ makedev dz0 dl0 dhu0 racd0 racd1 rx0 rx1
makedev scsibus0 scsibus1 scsibus2 scsibus3
makedev ses0 ses1 ses2 ses3
makedev std_vax
@@ -60,11 +60,12 @@ ht[0-9]*|tm[0-9]*|mt[0-9]*|ts[0-9]*|ut[0
esac
;;
-hp[0-9]*|hk[0-9]*|up[0-9]*|ra[0-9]*|rl[0-9]*|rb[0-9]*|rd[0-9]*|rx[0-9]*)
+hp[0-9]*|hk[0-9]*|up[0-9]*|ra[0-9]*|racd[0-9]*|rl[0-9]*|rb[0-9]*|rd[0-9]*|rx[0-9]*)
case $i in
hp*) name=hp; unit=${i#hp}; blk=0; chr=4;;
hk*) name=hk; unit=${i#hk}; blk=3; chr=11;;
up*) name=up; unit=${i#up}; blk=2; chr=13;;
+ racd*) name=racd; unit=${i#racd}; blk=28; chr=28;; # before ra*
ra*) name=ra; unit=${i#ra}; blk=9; chr=9;;
rb*) name=rb; unit=${i#rb}; blk=11; chr=23;;
rx*) name=rx; unit=${i#rx}; blk=12; chr=30;;
Index: src/sys/arch/vax/conf/GENERIC
diff -u src/sys/arch/vax/conf/GENERIC:1.181 src/sys/arch/vax/conf/GENERIC:1.182
--- src/sys/arch/vax/conf/GENERIC:1.181 Tue Jun 5 08:41:36 2012
+++ src/sys/arch/vax/conf/GENERIC Fri Jun 22 20:42:22 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.181 2012/06/05 08:41:36 abs Exp $
+# $NetBSD: GENERIC,v 1.182 2012/06/22 20:42:22 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include arch/vax/conf/std.vax
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident GENERIC-$Revision: 1.181 $
+#ident GENERIC-$Revision: 1.182 $
# Here are all different supported CPU types listed.
#options VAX8800 # VAX 8500, 8530, 8550, 8700, 8800
@@ -270,7 +270,8 @@ mscpbus* at uda?
mscpbus* at mtc?
mscpbus* at kdb?
-ra* at mscpbus? drive? # MSCP disk
+ra* at mscpbus? drive? # MSCP disk
+racd* at mscpbus? drive? # MSCP CD-ROM (RRD40)
rx* at mscpbus? drive? # MSCP floppy
mt* at mscpbus? drive? # MSCP tape
Index: src/sys/arch/vax/conf/INSTALL
diff -u src/sys/arch/vax/conf/INSTALL:1.59 src/sys/arch/vax/conf/INSTALL:1.60
--- src/sys/arch/vax/conf/INSTALL:1.59 Sun Mar 18 14:12:55 2012
+++ src/sys/arch/vax/conf/INSTALL Fri Jun 22 20:42:23 2012
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.59 2012/03/18 14:12:55 he Exp $
+# $NetBSD: INSTALL,v 1.60 2012/06/22 20:42:23 abs Exp $
#
# INSTALL kernel; all supported devices but nothing fancy.
#
@@ -160,6 +160,7 @@ mscpbus* at mtc?
# MSCP devices
ra* at mscpbus? drive? # MSCP disk
+racd* at mscpbus? drive? # MSCP CD-ROM (RRD40)
rx* at mscpbus? drive? # MSCP floppy
mt* at mscpbus? drive? # MSCP tape
Index: src/sys/arch/vax/conf/VAX780
diff -u src/sys/arch/vax/conf/VAX780:1.8 src/sys/arch/vax/conf/VAX780:1.9
--- src/sys/arch/vax/conf/VAX780:1.8 Sat Mar 10 21:51:57 2012
+++ src/sys/arch/vax/conf/VAX780 Fri Jun 22 20:42:23 2012
@@ -1,4 +1,4 @@
-# $NetBSD: VAX780,v 1.8 2012/03/10 21:51:57 joerg Exp $
+# $NetBSD: VAX780,v 1.9 2012/06/22 20:42:23 abs Exp $
#
# 11/780,750,730 machine description file
#
@@ -255,6 +255,7 @@ mscpbus* at mtc?
#mscpbus* at kdb?
ra* at mscpbus? drive? # MSCP disk
+racd* at mscpbus? drive? # MSCP CD-ROM (RRD40)
rx* at mscpbus? drive? #
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: abs
Date: Fri Jun 22 20:54:39 UTC 2012
Modified Files:
src/distrib/utils/sysinst: defs.h disks.c main.c
src/distrib/utils/sysinst/arch/emips: md.h
src/distrib/utils/sysinst/arch/i386: md.h
src/distrib/utils/sysinst/arch/vax: md.h
Log Message:
- Replace the CD_NAME definition with a CD_NAMES comma separate list,
the default remains cd0a, but i386 sets cd0a, mcd0a while vax
takes cd0a, racd0a
- Add get_default_cdrom() to disks.c, which is called in init(). This
checks the contents of hw.disknames against CD_NAMES. The first one
found (minus partition letter) is picked, otherwise the first entry
in CD_NAMES is used
The primary beneficiary is vax systems with an MSCP but no SCSI CD
drive, which now default to (a valid) racd0a rather than an invalid
cd0a. The obvious example being simh-vax
To generate a diff of this commit:
cvs rdiff -u -r1.162 -r1.163 src/distrib/utils/sysinst/defs.h
cvs rdiff -u -r1.124 -r1.125 src/distrib/utils/sysinst/disks.c
cvs rdiff -u -r1.64 -r1.65 src/distrib/utils/sysinst/main.c
cvs rdiff -u -r1.3 -r1.4 src/distrib/utils/sysinst/arch/emips/md.h
cvs rdiff -u -r1.68 -r1.69 src/distrib/utils/sysinst/arch/i386/md.h
cvs rdiff -u -r1.20 -r1.21 src/distrib/utils/sysinst/arch/vax/md.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/defs.h
diff -u src/distrib/utils/sysinst/defs.h:1.162 src/distrib/utils/sysinst/defs.h:1.163
--- src/distrib/utils/sysinst/defs.h:1.162 Fri Apr 6 23:48:53 2012
+++ src/distrib/utils/sysinst/defs.h Fri Jun 22 20:54:39 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.162 2012/04/06 23:48:53 riz Exp $ */
+/* $NetBSD: defs.h,v 1.163 2012/06/22 20:54:39 abs Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -171,10 +171,8 @@ enum {
#define PI_ISBSDFS(p) ((p)-pi_fstype == FS_BSDLFS || \
(p)-pi_fstype == FS_BSDFFS)
-/* non-standard cd0 driver */
-#ifndef CD_NAME
-#define CD_NAME cd0a
-#endif
+/* standard cd0 device */
+#define CD_NAMES cd0a
/* Types */
typedef struct distinfo {
@@ -379,6 +377,7 @@ int md_update(void);
void toplevel(void);
/* from disks.c */
+const char *get_default_cdrom(void);
int find_disks(const char *);
struct menudesc;
void fmt_fspart(struct menudesc *, int, void *);
Index: src/distrib/utils/sysinst/disks.c
diff -u src/distrib/utils/sysinst/disks.c:1.124 src/distrib/utils/sysinst/disks.c:1.125
--- src/distrib/utils/sysinst/disks.c:1.124 Mon May 21 22:38:26 2012
+++ src/distrib/utils/sysinst/disks.c Fri Jun 22 20:54:39 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: disks.c,v 1.124 2012/05/21 22:38:26 jdf Exp $ */
+/* $NetBSD: disks.c,v 1.125 2012/06/22 20:54:39 abs Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -43,6 +43,7 @@
#include util.h
#include sys/param.h
+#include sys/sysctl.h
#include sys/swap.h
#include ufs/ufs/dinode.h
#include ufs/ffs/fs.h
@@ -305,6 +306,45 @@ done:
strcpy(dd-dd_descr, dd-dd_name);
}
+/* disknames - contains device names without partition letters
+ * cdrom_devices - contains devices including partition letters
+ * returns the first entry in hw.disknames matching a cdrom_device, or
+ * first entry on error or no match
+ */
+const char *
+get_default_cdrom(void)
+{
+ static const char *cdrom_devices[] = { CD_NAMES, 0};
+ static const char mib_name[] = hw.disknames;
+ size_t len;
+ char *disknames;
+ char *last;
+ char *name;
+ const char **arg;
+ const char *cd_dev;
+
+ /* On error just use first entry in cdrom_devices */
+ if (sysctlbyname(mib_name, NULL, len, NULL, 0) != 0)
+ return cdrom_devices[0];
+ if ((disknames = malloc(len)) == 0) /* skip on malloc fail */
+ return cdrom_devices[0];
+
+ sysctlbyname(mib_name, disknames, len, NULL, 0);
+for ((name = strtok_r(disknames, , last)); name;
+ (name = strtok_r(NULL, , last))) {
+ for (arg = cdrom_devices ; *arg ; ++arg ) {
+ cd_dev = *arg;
+ if (strncmp(cd_dev, name, strlen(cd_dev) - 1) == 0) {
+free(disknames);
+return cd_dev;
+ }
+
+ }
+ }
+ free(disknames);
+ return cdrom_devices[0];
+}
+
static int
get_disks(struct disk_desc *dd)
{
@@ -773,7 +813,8 @@ make_fstab(void)
scripting_fprintf(f, kernfs\t\t/kern\tkernfs\trw\n);
scripting_fprintf(f, ptyfs\t\t/dev/pts\tptyfs\trw\n);
scripting_fprintf(f, procfs\t\t/proc\tprocfs\trw\n);
- scripting_fprintf(f, /dev/ CD_NAME \t\t/cdrom\tcd9660\tro,noauto\n);
+ scripting_fprintf(f, /dev/%s\t\t/cdrom\tcd9660\tro,noauto\n,
+ (char *)get_default_cdrom);
make_target_dir(/kern);
make_target_dir(/proc);
make_target_dir(/dev/pts);
Index: src/distrib/utils/sysinst/main.c
diff -u src/distrib/utils/sysinst/main.c:1.64 src/distrib/utils/sysinst/main.c:1.65
--- src/distrib/utils/sysinst/main.c:1.64 Fri Apr 6 23:48:53 2012
+++ src/distrib/utils/sysinst/main.c Fri Jun 22 20:54:39 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.64
CVS commit: src/lib/libm/noieee_src
Module Name:src
Committed By: abs
Date: Fri Jun 8 11:13:33 UTC 2012
Modified Files:
src/lib/libm/noieee_src: n_gamma.c
Log Message:
ANSI prototypes
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/libm/noieee_src/n_gamma.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/noieee_src/n_gamma.c
diff -u src/lib/libm/noieee_src/n_gamma.c:1.7 src/lib/libm/noieee_src/n_gamma.c:1.8
--- src/lib/libm/noieee_src/n_gamma.c:1.7 Wed Nov 2 02:34:56 2011
+++ src/lib/libm/noieee_src/n_gamma.c Fri Jun 8 11:13:33 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: n_gamma.c,v 1.7 2011/11/02 02:34:56 christos Exp $ */
+/* $NetBSD: n_gamma.c,v 1.8 2012/06/08 11:13:33 abs Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -135,8 +135,7 @@ static int endian;
#endif
double
-gamma(x)
- double x;
+gamma(double x)
{
double b;
struct Double u;
CVS commit: src/lib/libc/stdlib
Module Name:src
Committed By: abs
Date: Fri Jun 8 11:15:26 UTC 2012
Modified Files:
src/lib/libc/stdlib: a64l.c abort.c abs.c
Log Message:
ANSI prototypes
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/lib/libc/stdlib/a64l.c
cvs rdiff -u -r1.14 -r1.15 src/lib/libc/stdlib/abort.c
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/stdlib/abs.c
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/stdlib/a64l.c
diff -u src/lib/libc/stdlib/a64l.c:1.9 src/lib/libc/stdlib/a64l.c:1.10
--- src/lib/libc/stdlib/a64l.c:1.9 Sat Jul 26 19:24:53 2003
+++ src/lib/libc/stdlib/a64l.c Fri Jun 8 11:15:26 2012
@@ -5,7 +5,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: a64l.c,v 1.9 2003/07/26 19:24:53 salo Exp $);
+__RCSID($NetBSD: a64l.c,v 1.10 2012/06/08 11:15:26 abs Exp $);
#endif
#include namespace.h
@@ -18,8 +18,7 @@ __weak_alias(a64l,_a64l)
#endif
long
-a64l(s)
- const char *s;
+a64l(const char *s)
{
long value, digit, shift;
int i;
Index: src/lib/libc/stdlib/abort.c
diff -u src/lib/libc/stdlib/abort.c:1.14 src/lib/libc/stdlib/abort.c:1.15
--- src/lib/libc/stdlib/abort.c:1.14 Wed May 18 19:36:36 2011
+++ src/lib/libc/stdlib/abort.c Fri Jun 8 11:15:26 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: abort.c,v 1.14 2011/05/18 19:36:36 dsl Exp $ */
+/* $NetBSD: abort.c,v 1.15 2012/06/08 11:15:26 abs Exp $ */
/*
* Copyright (c) 1985, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)abort.c 8.1 (Berkeley) 6/4/93;
#else
-__RCSID($NetBSD: abort.c,v 1.14 2011/05/18 19:36:36 dsl Exp $);
+__RCSID($NetBSD: abort.c,v 1.15 2012/06/08 11:15:26 abs Exp $);
#endif
#endif /* LIBC_SCCS and not lint */
@@ -47,7 +47,7 @@ extern void (*__cleanup)(void);
static int aborting = 0;
void
-abort()
+abort(void)
{
sigset_t mask;
Index: src/lib/libc/stdlib/abs.c
diff -u src/lib/libc/stdlib/abs.c:1.7 src/lib/libc/stdlib/abs.c:1.8
--- src/lib/libc/stdlib/abs.c:1.7 Thu Aug 7 16:43:37 2003
+++ src/lib/libc/stdlib/abs.c Fri Jun 8 11:15:26 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: abs.c,v 1.7 2003/08/07 16:43:37 agc Exp $ */
+/* $NetBSD: abs.c,v 1.8 2012/06/08 11:15:26 abs Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -34,15 +34,14 @@
#if 0
static char sccsid[] = @(#)abs.c 8.1 (Berkeley) 6/4/93;
#else
-__RCSID($NetBSD: abs.c,v 1.7 2003/08/07 16:43:37 agc Exp $);
+__RCSID($NetBSD: abs.c,v 1.8 2012/06/08 11:15:26 abs Exp $);
#endif
#endif /* LIBC_SCCS and not lint */
#include stdlib.h
int
-abs(j)
- int j;
+abs(int j)
{
return(j 0 ? -j : j);
}
CVS commit: src/sys/arch/vax/conf
Module Name:src Committed By: abs Date: Tue Jun 5 08:41:36 UTC 2012 Modified Files: src/sys/arch/vax/conf: GENERIC Log Message: If a port is going to have wscons for virtual terminals then it really makes sense to enable WSDISPLAY_COMPAT_USL so the system can switch between the virtual terminals... To generate a diff of this commit: cvs rdiff -u -r1.180 -r1.181 src/sys/arch/vax/conf/GENERIC 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/vax/conf/GENERIC diff -u src/sys/arch/vax/conf/GENERIC:1.180 src/sys/arch/vax/conf/GENERIC:1.181 --- src/sys/arch/vax/conf/GENERIC:1.180 Sat Mar 10 21:51:57 2012 +++ src/sys/arch/vax/conf/GENERIC Tue Jun 5 08:41:36 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.180 2012/03/10 21:51:57 joerg Exp $ +# $NetBSD: GENERIC,v 1.181 2012/06/05 08:41:36 abs Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include arch/vax/conf/std.vax options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.180 $ +#ident GENERIC-$Revision: 1.181 $ # Here are all different supported CPU types listed. #options VAX8800 # VAX 8500, 8530, 8550, 8700, 8800 @@ -128,6 +128,7 @@ options NFS_BOOT_BOOTPARAM # Use the Su # WS console uses VT100 terminal emulation options WSEMUL_VT100 options WSDISPLAY_DEFAULTSCREENS=8 +options WSDISPLAY_COMPAT_USL # wsconscfg VT handling options FONT_QVSS8x15 # System V shared memory semaphores support.
CVS commit: src/sys/arch
Module Name:src Committed By: abs Date: Tue Jun 5 08:44:16 UTC 2012 Modified Files: src/sys/arch/amd64/conf: GENERIC XEN3_DOM0 src/sys/arch/atari/conf: MILAN.in src/sys/arch/bebox/conf: GENERIC INSTALL src/sys/arch/cats/conf: GENERIC INSTALL src/sys/arch/evbarm/conf: ARMADILLO9 BEAGLEBOARD HPT5325 MMNET_GENERIC MPCSA_GENERIC NETWALKER TS7200 src/sys/arch/evbppc/conf: EXPLORA451 VIRTEX_DFC VIRTEX_GSRD1 VIRTEX_GSRD2 src/sys/arch/hp700/conf: GENERIC src/sys/arch/hpcmips/conf: GENERIC MPC303 TX3912 TX3922 VR41XX src/sys/arch/hpcsh/conf: GENERIC src/sys/arch/i386/conf: ALL GENERIC GENERIC_TINY INSTALL_FLOPPY INSTALL_TINY XEN3_DOM0 src/sys/arch/netwinder/conf: GENERIC src/sys/arch/next68k/conf: GENERIC SLAB src/sys/arch/prep/conf: GENERIC src/sys/arch/shark/conf: GENERIC INSTALL src/sys/arch/sparc/conf: KRUPS TADPOLE3GX src/sys/arch/sparc64/conf: GENERIC src/sys/arch/zaurus/conf: GENERIC Log Message: Adjust the WSDISPLAY_COMPAT_USL comment to mention wsconscfg, to at least give a hint that its not just for third party compat. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.355 -r1.356 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.83 -r1.84 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.25 -r1.26 src/sys/arch/atari/conf/MILAN.in cvs rdiff -u -r1.130 -r1.131 src/sys/arch/bebox/conf/GENERIC cvs rdiff -u -r1.53 -r1.54 src/sys/arch/bebox/conf/INSTALL cvs rdiff -u -r1.139 -r1.140 src/sys/arch/cats/conf/GENERIC cvs rdiff -u -r1.81 -r1.82 src/sys/arch/cats/conf/INSTALL cvs rdiff -u -r1.34 -r1.35 src/sys/arch/evbarm/conf/ARMADILLO9 cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbarm/conf/BEAGLEBOARD cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/HPT5325 cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/MMNET_GENERIC cvs rdiff -u -r1.28 -r1.29 src/sys/arch/evbarm/conf/MPCSA_GENERIC cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/conf/NETWALKER cvs rdiff -u -r1.48 -r1.49 src/sys/arch/evbarm/conf/TS7200 cvs rdiff -u -r1.47 -r1.48 src/sys/arch/evbppc/conf/EXPLORA451 cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbppc/conf/VIRTEX_DFC cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbppc/conf/VIRTEX_GSRD1 cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbppc/conf/VIRTEX_GSRD2 cvs rdiff -u -r1.114 -r1.115 src/sys/arch/hp700/conf/GENERIC cvs rdiff -u -r1.215 -r1.216 src/sys/arch/hpcmips/conf/GENERIC cvs rdiff -u -r1.59 -r1.60 src/sys/arch/hpcmips/conf/MPC303 cvs rdiff -u -r1.78 -r1.79 src/sys/arch/hpcmips/conf/TX3912 cvs rdiff -u -r1.92 -r1.93 src/sys/arch/hpcmips/conf/TX3922 cvs rdiff -u -r1.54 -r1.55 src/sys/arch/hpcmips/conf/VR41XX cvs rdiff -u -r1.96 -r1.97 src/sys/arch/hpcsh/conf/GENERIC cvs rdiff -u -r1.338 -r1.339 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1073 -r1.1074 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.131 -r1.132 src/sys/arch/i386/conf/GENERIC_TINY cvs rdiff -u -r1.15 -r1.16 src/sys/arch/i386/conf/INSTALL_FLOPPY cvs rdiff -u -r1.134 -r1.135 src/sys/arch/i386/conf/INSTALL_TINY cvs rdiff -u -r1.66 -r1.67 src/sys/arch/i386/conf/XEN3_DOM0 cvs rdiff -u -r1.111 -r1.112 src/sys/arch/netwinder/conf/GENERIC cvs rdiff -u -r1.126 -r1.127 src/sys/arch/next68k/conf/GENERIC cvs rdiff -u -r1.45 -r1.46 src/sys/arch/next68k/conf/SLAB cvs rdiff -u -r1.162 -r1.163 src/sys/arch/prep/conf/GENERIC cvs rdiff -u -r1.100 -r1.101 src/sys/arch/shark/conf/GENERIC cvs rdiff -u -r1.49 -r1.50 src/sys/arch/shark/conf/INSTALL cvs rdiff -u -r1.58 -r1.59 src/sys/arch/sparc/conf/KRUPS cvs rdiff -u -r1.55 -r1.56 src/sys/arch/sparc/conf/TADPOLE3GX cvs rdiff -u -r1.150 -r1.151 src/sys/arch/sparc64/conf/GENERIC cvs rdiff -u -r1.53 -r1.54 src/sys/arch/zaurus/conf/GENERIC 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/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.355 src/sys/arch/amd64/conf/GENERIC:1.356 --- src/sys/arch/amd64/conf/GENERIC:1.355 Wed May 30 14:30:34 2012 +++ src/sys/arch/amd64/conf/GENERIC Tue Jun 5 08:44:07 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.355 2012/05/30 14:30:34 nonaka Exp $ +# $NetBSD: GENERIC,v 1.356 2012/06/05 08:44:07 abs Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include arch/amd64/conf/std.amd64 options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.355 $ +#ident GENERIC-$Revision: 1.356 $ maxusers 64 # estimated number of users @@ -231,7 +231,7 @@ options WS_KERNEL_FG=WSCOL_GREEN # compatibility to other console drivers options WSDISPLAY_COMPAT_PCVT # emulate some ioctls options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls -options WSDISPLAY_COMPAT_USL # VT handling +options WSDISPLAY_COMPAT_USL # wsconscfg VT handling options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes # don't attach pckbd as
CVS commit: src/share/man/man4
Module Name:src Committed By: abs Date: Tue Jun 5 08:49:16 UTC 2012 Modified Files: src/share/man/man4: wscons.4 Log Message: Mention wsconscfg(8) needs WSDISPLAY_COMPAT_USL To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/share/man/man4/wscons.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/wscons.4 diff -u src/share/man/man4/wscons.4:1.30 src/share/man/man4/wscons.4:1.31 --- src/share/man/man4/wscons.4:1.30 Sat Apr 21 12:27:28 2012 +++ src/share/man/man4/wscons.4 Tue Jun 5 08:49:16 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: wscons.4,v 1.30 2012/04/21 12:27:28 roy Exp $ +.\ $NetBSD: wscons.4,v 1.31 2012/06/05 08:49:16 abs Exp $ .\ .\ Copyright (c) 1999, 2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -24,7 +24,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd April 5, 2012 +.Dd June 5, 2012 .Dt WSCONS 4 .Os .Sh NAME @@ -185,7 +185,7 @@ or if no emulation type was passed to th utility. .Ss Compatibility options these options allow X servers and other programs using low-level -console driver functions which were written specifically for other +console driver functions usually written specifically for other console drivers to run on .Nx systems. @@ -194,6 +194,10 @@ The options are in particular: .It Cd WSDISPLAY_COMPAT_USL Support the protocol for switches between multiple virtual screens on one display as used by most PC-UNIX variants. +This is used by the +.Nx +.Xr wsconscfg 8 +utility. .It Cd WSDISPLAY_COMPAT_RAWKBD Allows to get raw XT keyboard scancodes from PC keyboards as needed by i386 X servers.
CVS commit: src/share/man/man4
Module Name:src Committed By: abs Date: Sun May 27 10:45:49 UTC 2012 Modified Files: src/share/man/man4: wsdisplay.4 wskbd.4 wsmouse.4 Log Message: Document WSDISPLAYIO_SETVERSION, WSKBDIO_SETVERSION and WSMOUSEIO_SETVERSION ioctls(). Also at least enumerate the WSKBDIO_ ioctls(). To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/share/man/man4/wsdisplay.4 cvs rdiff -u -r1.14 -r1.15 src/share/man/man4/wskbd.4 cvs rdiff -u -r1.20 -r1.21 src/share/man/man4/wsmouse.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/wsdisplay.4 diff -u src/share/man/man4/wsdisplay.4:1.38 src/share/man/man4/wsdisplay.4:1.39 --- src/share/man/man4/wsdisplay.4:1.38 Thu Jun 30 22:13:02 2011 +++ src/share/man/man4/wsdisplay.4 Sun May 27 10:45:49 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: wsdisplay.4,v 1.38 2011/06/30 22:13:02 wiz Exp $ +.\ $NetBSD: wsdisplay.4,v 1.39 2012/05/27 10:45:49 abs Exp $ .\ .\ Copyright (c) 1999 Matthias Drochner. .\ Copyright (c) 2002 Ben Harris. @@ -561,6 +561,18 @@ and the driver will set data_size to the Otherwise the EDID block will be written into the buffer pointed at by edid_data and data_size will be set to the number of bytes written. +.It Dv WSDISPLAYIO_SETVERSION Pq Li int +Set the wscons_event protocol version. +The default is 0 for binary compatibility. The latest version is +always available as WSDISPLAYIO_EVENT_VERSION, and is currently 1. +All new code should use a call similar to the below to ensure the +correct version is returned. +.Bd -literal -offset indent +int ver = WSDISPLAY_EVENT_VERSION; +if (ioctl(fd, WSDISPLAYIO_SETVERSION, ver) == -1) +err(EXIT_FAILURE, cannot set version); +.Ed +.El .El .Sh FILES .Bl -item Index: src/share/man/man4/wskbd.4 diff -u src/share/man/man4/wskbd.4:1.14 src/share/man/man4/wskbd.4:1.15 --- src/share/man/man4/wskbd.4:1.14 Sun Mar 6 17:39:05 2011 +++ src/share/man/man4/wskbd.4 Sun May 27 10:45:49 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: wskbd.4,v 1.14 2011/03/06 17:39:05 wiz Exp $ +.\ $NetBSD: wskbd.4,v 1.15 2012/05/27 10:45:49 abs Exp $ .\ .\ Copyright (c) 1999 .\ Matthias Drochner. All rights reserved. @@ -114,6 +114,41 @@ match if the device is in use as system (The console device selection in early system startup is not influenced.) This way, the console device can be connected to a known wskbd device instance. +.Ss Ioctls +The following +.Xr ioctl 2 +calls are provided by the +.Nm +driver or by devices which use it. +Their definitions are found in +.Pa dev/wscons/wsconsio.h . +.Bl -tag -width Dv +.It Dv WSKBDIO_GTYPE +Get the keyboard type. +.It Dv WSKBDIO_COMPLEXBELL, WSKBDIO_SETBELL, WSKBDIO_GETBELL, WSKBDIO_SETDEFAULTBELL, WSKBDIO_GETDEFAULTBELL Pq Li struct wsmouse_repeat +Get and set keyboard bell settings. +.It Dv WSKBDIO_SETKEYREPEAT, WSKBDIO_GETKEYREPEAT, WSKBDIO_SETDEFAULTKEYREPEAT, WSKBDIO_GETDEFAULTKEYREPEAT Pq Li struct wskbd_keyrepeat_data +Get and set keyboard autorepeat settings. +.It Dv WSKBDIO_SETLEDS, WSKBDIO_GETLEDS Pq Li int +Get and set keyboard LED settings. +.It Dv WSKBDIO_GETMAP, WSKBDIO_SETMAP Pq Li struct wskbd_map_data +Get and set keyboard keymapping settings. +.It Dv WSKBDIO_GETENCODING, WSKBDIO_SETENCODING Pq Li kbd_t +Get and set keyboard encoding settings. +.It Dv WSKBDIO_GETKEYCLICK, WSKBDIO_SETKEYCLICK Pq Li int +Get and set keyboard keyclick settings. +.It Dv WSKBDIO_SETVERSION Pq Li int +Set the wscons_event protocol version. +The default is 0 for binary compatibility. The latest version is +always available as WSKBD_EVENT_VERSION, and is currently 1. +All new code should use a call similar to the below to ensure the +correct version is returned. +.Bd -literal -offset indent +int ver = WSKBD_EVENT_VERSION; +if (ioctl(fd, WSKBDIO_SETVERSION, ver) == -1) +err(EXIT_FAILURE, cannot set version); +.Ed +.El .Sh FILES .Bl -item .It Index: src/share/man/man4/wsmouse.4 diff -u src/share/man/man4/wsmouse.4:1.20 src/share/man/man4/wsmouse.4:1.21 --- src/share/man/man4/wsmouse.4:1.20 Tue Jan 17 08:23:40 2012 +++ src/share/man/man4/wsmouse.4 Sun May 27 10:45:49 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: wsmouse.4,v 1.20 2012/01/17 08:23:40 wiz Exp $ +.\ $NetBSD: wsmouse.4,v 1.21 2012/05/27 10:45:49 abs Exp $ .\ .\ Copyright (c) 1999 .\ Matthias Drochner. All rights reserved. @@ -27,7 +27,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd January 17, 2012 +.Dd May 24, 2012 .Dt WSMOUSE 4 .Os .Sh NAME @@ -48,6 +48,8 @@ (Apple ADB mouse) .Cd wsmouse* at btms? mux 0 (Bluetooth mouse) +.Cd wsmouse* at lkms? mux 0 +(DEC VSXXX serial mice) .Sh DESCRIPTION The .Nm @@ -111,6 +113,17 @@ Set the automatic button repeating confi See .Dv WSMOUSEIO_GETREPEAT above for more details. +.It Dv WSMOUSEIO_SETVERSION Pq Li int +Set the wscons_event protocol version. +The default is 0 for binary compatibility. The
CVS commit: src/sys/dev/wscons
Module Name:src Committed By: abs Date: Thu May 24 18:16:32 UTC 2012 Modified Files: src/sys/dev/wscons: wsevent.c Log Message: Add the following above the version = 0 line, just to provide a hint... /* For binary compat. New code must call WSxxxIO_SETVERSION */ To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/dev/wscons/wsevent.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/wscons/wsevent.c diff -u src/sys/dev/wscons/wsevent.c:1.34 src/sys/dev/wscons/wsevent.c:1.35 --- src/sys/dev/wscons/wsevent.c:1.34 Wed Feb 18 13:20:02 2009 +++ src/sys/dev/wscons/wsevent.c Thu May 24 18:16:31 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: wsevent.c,v 1.34 2009/02/18 13:20:02 yamt Exp $ */ +/* $NetBSD: wsevent.c,v 1.35 2012/05/24 18:16:31 abs Exp $ */ /*- * Copyright (c) 2006, 2008 The NetBSD Foundation, Inc. @@ -104,7 +104,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: wsevent.c,v 1.34 2009/02/18 13:20:02 yamt Exp $); +__KERNEL_RCSID(0, $NetBSD: wsevent.c,v 1.35 2012/05/24 18:16:31 abs Exp $); #include opt_compat_netbsd.h #include opt_modular.h @@ -158,6 +158,7 @@ wsevent_init(struct wseventvar *ev, stru #endif return; } + /* For binary compat. New code must call WSxxxIO_SETVERSION */ ev-version = 0; ev-get = ev-put = 0; ev-q = kmem_alloc(WSEVENT_QSIZE * sizeof(*ev-q), KM_SLEEP);
CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/common
Module Name:xsrc Committed By: abs Date: Wed May 16 09:01:38 UTC 2012 Modified Files: xsrc/external/mit/xorg-server/dist/hw/xfree86/common: compiler.h Log Message: Add vax to the list of non inb() users To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 \ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.8 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.9 --- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.8 Tue Aug 2 07:15:03 2011 +++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h Wed May 16 09:01:37 2012 @@ -1370,7 +1370,7 @@ static __inline__ void stl_u(unsigned lo # else /* ix86 */ #if !defined(__SUNPRO_C) -#if !defined(FAKEIT) !defined(__mc68000__) !defined(__arm__) !defined(__sh__) !defined(__hppa__) !defined(__s390__) !defined(__m32r__) +#if !defined(FAKEIT) !defined(__mc68000__) !defined(__arm__) !defined(__sh__) !defined(__hppa__) !defined(__s390__) !defined(__m32r__) !defined(__vax__) # ifdef GCCUSESGAS /* @@ -1479,7 +1479,7 @@ inl(unsigned short port) # endif /* GCCUSESGAS */ -#else /* !defined(FAKEIT) !defined(__mc68000__) !defined(__arm__) !defined(__sh__) !defined(__hppa__) !defined(__m32r__) */ +#else /* !defined(FAKEIT) !defined(__mc68000__) !defined(__arm__) !defined(__sh__) !defined(__hppa__) !defined(__m32r__) !defined(__vax__) */ static __inline__ void outb(unsigned short port, unsigned char val)
CVS commit: src/x11/Xserver
Module Name:src
Committed By: abs
Date: Tue May 15 14:29:29 UTC 2012
Modified Files:
src/x11/Xserver: Makefile.common
Log Message:
Missed defining XSERVER_XVAX
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/x11/Xserver/Makefile.common
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/x11/Xserver/Makefile.common
diff -u src/x11/Xserver/Makefile.common:1.35 src/x11/Xserver/Makefile.common:1.36
--- src/x11/Xserver/Makefile.common:1.35 Sun Feb 8 00:50:07 2009
+++ src/x11/Xserver/Makefile.common Tue May 15 14:29:29 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.35 2009/02/08 00:50:07 abs Exp $
+# $NetBSD: Makefile.common,v 1.36 2012/05/15 14:29:29 abs Exp $
# These define parts of the Xserver tree that are to be
# conditionally compiled for different platforms. See
@@ -79,6 +79,10 @@ XSERVER_XSUNMONO= yes
XSERVER_XSUN24= yes
.endif
+.if ${MACHINE} == vax
+XSERVER_XVAX= yes
+.endif
+
# Does this server need Xfont/fontbase libraries?
XSERVER_NEEDS_XFONT?= no
@@ -127,3 +131,5 @@ XSERVER_XSUNMONO?= no
XSERVER_XSUN24?= no
# Does this platform build Xvfb X server?
XSERVER_XVFB?= yes
+# Does this platform build Xvax X server?
+XSERVER_XVAX?= no
CVS commit: src
Module Name:src
Committed By: abs
Date: Mon May 14 08:42:04 UTC 2012
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
src/external/mit/xorg/server/xorg-server: Makefile.common
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile
src/x11/Xserver/Xserver: Makefile
Added Files:
src/distrib/sets/lists/xserver: md.vax
Log Message:
Enable wsfb X server on vax. Likely to be keyboard and mouse issues, but
with three additional lines of an ioctl() case in the kernel 'startx' will
display the traditional three xterms
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.8 src/distrib/sets/lists/xserver/md.vax
cvs rdiff -u -r1.61 -r1.62 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.24 -r1.25 \
src/external/mit/xorg/server/xorg-server/Makefile.common
cvs rdiff -u -r1.32 -r1.33 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
cvs rdiff -u -r1.18 -r1.19 src/x11/Xserver/Xserver/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/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.61 src/external/mit/xorg/server/drivers/Makefile:1.62
--- src/external/mit/xorg/server/drivers/Makefile:1.61 Wed Apr 4 01:23:27 2012
+++ src/external/mit/xorg/server/drivers/Makefile Mon May 14 08:42:04 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2012/04/04 01:23:27 bsh Exp $
+# $NetBSD: Makefile,v 1.62 2012/05/14 08:42:04 abs Exp $
# xf86-input drivers
@@ -263,6 +263,11 @@ SUBDIR+= \
.endif # ${MACHINE} == sparc
.endif # ${MACHINE} == sparc || ${MACHINE} == sparc64
+.if ${MACHINE} == vax
+SUBDIR+= \
+ xf86-video-wsfb
+.endif # ${MACHINE} == vax
+
.if ${MACHINE} == zaurus
SUBDIR+= \
xf86-video-wsfb
Index: src/external/mit/xorg/server/xorg-server/Makefile.common
diff -u src/external/mit/xorg/server/xorg-server/Makefile.common:1.24 src/external/mit/xorg/server/xorg-server/Makefile.common:1.25
--- src/external/mit/xorg/server/xorg-server/Makefile.common:1.24 Wed Apr 4 01:23:27 2012
+++ src/external/mit/xorg/server/xorg-server/Makefile.common Mon May 14 08:42:04 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24 2012/04/04 01:23:27 bsh Exp $
+# $NetBSD: Makefile.common,v 1.25 2012/05/14 08:42:04 abs Exp $
# These define parts of the Xserver tree that are to be
# conditionally compiled for different platforms. See
@@ -30,6 +30,7 @@
${MACHINE} == shark || \
${MACHINE} == sparc || \
${MACHINE} == sparc64 || \
+${MACHINE} == vax || \
${MACHINE} == zaurus
XSERVER_NEEDS_XFONT= yes
XSERVER_XFREE86= yes
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.32 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.33
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.32 Wed Apr 4 01:23:27 2012
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Mon May 14 08:42:04 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2012/04/04 01:23:27 bsh Exp $
+# $NetBSD: Makefile,v 1.33 2012/05/14 08:42:04 abs Exp $
.include ../../../Makefile.serverlib
.include ../../../Makefile.servermod
@@ -99,6 +99,13 @@ CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSES
.endfor
.endif
+.if ${MACHINE} == vax
+SRCS.bsd+= ppc_video.c pm_noop.c agp_noop.c
+.for _FN in ${SRCS.bsd}
+CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
+.endfor
+.endif
+
# some platforms will probably need ioperm_noop.c
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bus
Index: src/x11/Xserver/Xserver/Makefile
diff -u src/x11/Xserver/Xserver/Makefile:1.18 src/x11/Xserver/Xserver/Makefile:1.19
--- src/x11/Xserver/Xserver/Makefile:1.18 Sun Jul 30 03:25:43 2006
+++ src/x11/Xserver/Xserver/Makefile Mon May 14 08:42:03 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/07/30 03:25:43 tsutsui Exp $
+# $NetBSD: Makefile,v 1.19 2012/05/14 08:42:03 abs Exp $
.include bsd.own.mk
@@ -80,6 +80,10 @@ SUBDIR+= Xsun24
SUBDIR+= Xvfb
.endif
+.if ${XSERVER_XVAX} != no
+SUBDIR+= Xvax
+.endif
+
.include Makefile.Xserver
.include bsd.subdir.mk
Added files:
Index: src/distrib/sets/lists/xserver/md.vax
diff -u /dev/null src/distrib/sets/lists/xserver/md.vax:1.8
--- /dev/null Mon May 14 08:42:04 2012
+++ src/distrib/sets/lists/xserver/md.vax Mon May 14 08:42:04 2012
@@ -0,0 +1,110 @@
+# $NetBSD: md.vax,v 1.8 2012/05/14 08:42:04 abs Exp $
+./usr/X11R7/bin/X -unknown- xorg
+./usr/X11R7/bin/Xorg -unknown- xorg
+./usr/X11R7/bin/cvt -unknown- xorg
+./usr/X11R7/bin/gtf -unknown- xorg
+./usr/X11R7/lib/X11/doc/README.modes -unknown- xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.1 -unknown- xorg
CVS commit: src/sys/arch/vax
Module Name:src
Committed By: abs
Date: Mon May 14 08:44:14 UTC 2012
Modified Files:
src/sys/arch/vax/boot/boot: Makefile
src/sys/arch/vax/vsa: spx.c
Log Message:
From the why was this not done before box:
Implement WSDISPLAYIO_LINEBYTES so xwsfb works
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/vax/boot/boot/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/vax/vsa/spx.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/vax/boot/boot/Makefile
diff -u src/sys/arch/vax/boot/boot/Makefile:1.38 src/sys/arch/vax/boot/boot/Makefile:1.39
--- src/sys/arch/vax/boot/boot/Makefile:1.38 Sat Jan 22 19:19:24 2011
+++ src/sys/arch/vax/boot/boot/Makefile Mon May 14 08:44:13 2012
@@ -1,9 +1,12 @@
-# $NetBSD: Makefile,v 1.38 2011/01/22 19:19:24 joerg Exp $
+# $NetBSD: Makefile,v 1.39 2012/05/14 08:44:13 abs Exp $
S= ${.CURDIR}/../../../..
.include bsd.own.mk
+COPTS.boot.c = -O2 -fno-reorder-blocks
+COPTS.devopen.c = -O2 -fno-reorder-blocks
+
PROG= boot
DEVS= hp.c ctu.c ra.c mfm.c if_qe.c if_le.c if_ze.c if_de.c if_ni.c
SRCS= srt0.S boot.c devopen.c conf.c autoconf.c netio.c rom.c romread.S \
Index: src/sys/arch/vax/vsa/spx.c
diff -u src/sys/arch/vax/vsa/spx.c:1.5 src/sys/arch/vax/vsa/spx.c:1.6
--- src/sys/arch/vax/vsa/spx.c:1.5 Wed Jan 11 21:26:13 2012
+++ src/sys/arch/vax/vsa/spx.c Mon May 14 08:44:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: spx.c,v 1.5 2012/01/11 21:26:13 macallan Exp $ */
+/* $NetBSD: spx.c,v 1.6 2012/05/14 08:44:13 abs Exp $ */
/*
* SPX/LCSPX/SPXg/SPXgt accelerated framebuffer driver for NetBSD/VAX
* Copyright (c) 2005 Blaz Antonic
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: spx.c,v 1.5 2012/01/11 21:26:13 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: spx.c,v 1.6 2012/05/14 08:44:13 abs Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1023,6 +1023,10 @@ spx_ioctl(void *v, void *vs, u_long cmd,
WSDISPLAYIO_VIDEO_ON : WSDISPLAYIO_VIDEO_OFF;
break;
+ case WSDISPLAYIO_LINEBYTES:
+ *(u_int *)data = spx_xsize;
+ break;
+
default:
return EPASSTHROUGH;
}
CVS commit: src/sys/arch/vax/boot/boot
Module Name:src
Committed By: abs
Date: Mon May 14 10:05:51 UTC 2012
Modified Files:
src/sys/arch/vax/boot/boot: Makefile
Log Message:
Revert hax to fix boot blocks for gcc 4.5, accudently committed in last
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/vax/boot/boot/Makefile
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/vax/boot/boot/Makefile
diff -u src/sys/arch/vax/boot/boot/Makefile:1.39 src/sys/arch/vax/boot/boot/Makefile:1.40
--- src/sys/arch/vax/boot/boot/Makefile:1.39 Mon May 14 08:44:13 2012
+++ src/sys/arch/vax/boot/boot/Makefile Mon May 14 10:05:50 2012
@@ -1,12 +1,9 @@
-# $NetBSD: Makefile,v 1.39 2012/05/14 08:44:13 abs Exp $
+# $NetBSD: Makefile,v 1.40 2012/05/14 10:05:50 abs Exp $
S= ${.CURDIR}/../../../..
.include bsd.own.mk
-COPTS.boot.c = -O2 -fno-reorder-blocks
-COPTS.devopen.c = -O2 -fno-reorder-blocks
-
PROG= boot
DEVS= hp.c ctu.c ra.c mfm.c if_qe.c if_le.c if_ze.c if_de.c if_ni.c
SRCS= srt0.S boot.c devopen.c conf.c autoconf.c netio.c rom.c romread.S \
CVS commit: src
Module Name:src
Committed By: abs
Date: Tue Jan 24 17:37:34 UTC 2012
Modified Files:
src: Makefile
Log Message:
s/is the not root/is not the root/ in a comment - from Snader_LB
To generate a diff of this commit:
cvs rdiff -u -r1.290 -r1.291 src/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/Makefile
diff -u src/Makefile:1.290 src/Makefile:1.291
--- src/Makefile:1.290 Sun Jan 22 03:53:32 2012
+++ src/Makefile Tue Jan 24 17:37:34 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.290 2012/01/22 03:53:32 tsutsui Exp $
+# $NetBSD: Makefile,v 1.291 2012/01/24 17:37:34 abs Exp $
#
# This is the top-level makefile for building NetBSD. For an outline of
@@ -48,7 +48,7 @@
# installworld:
# Install the distribution from DESTDIR to INSTALLWORLDDIR (which
# defaults to the root directory). Ensures that INSTALLWORLDDIR
-# is the not root directory if cross compiling.
+# is not the root directory if cross compiling.
# release:
# Does a `make distribution', and then tars up the DESTDIR files
# into ${RELEASEDIR}/${RELEASEMACHINEDIR}, in release(7) format.
CVS commit: src/sys/arch/x86
Module Name:src
Committed By: abs
Date: Thu Dec 15 09:38:21 UTC 2011
Modified Files:
src/sys/arch/x86/include: mtrr.h specialreg.h
src/sys/arch/x86/x86: mtrr_i686.c
Log Message:
Increase MTRR_I686_NVAR_MAX from 8 to 16. Avoids
FIXME: more than 8 MTRRs (10) message on booting Thinkpad W520 and
similar. While here replace a magic number with MTRR_I686_NVAR_MAX * 2
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/x86/include/mtrr.h
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/x86/include/specialreg.h
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/x86/x86/mtrr_i686.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/x86/include/mtrr.h
diff -u src/sys/arch/x86/include/mtrr.h:1.4 src/sys/arch/x86/include/mtrr.h:1.5
--- src/sys/arch/x86/include/mtrr.h:1.4 Tue Jul 1 15:27:34 2008
+++ src/sys/arch/x86/include/mtrr.h Thu Dec 15 09:38:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mtrr.h,v 1.4 2008/07/01 15:27:34 mrg Exp $ */
+/* $NetBSD: mtrr.h,v 1.5 2011/12/15 09:38:21 abs Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#define MTRR_I686_FIXED_IDX16K 1
#define MTRR_I686_FIXED_IDX4K 3
-#define MTRR_I686_NVAR_MAX 8 /* could be upto 255? */
+#define MTRR_I686_NVAR_MAX 16 /* could be upto 255? */
#define MTRR_I686_64K_START 0x0
#define MTRR_I686_16K_START 0x8
Index: src/sys/arch/x86/include/specialreg.h
diff -u src/sys/arch/x86/include/specialreg.h:1.54 src/sys/arch/x86/include/specialreg.h:1.55
--- src/sys/arch/x86/include/specialreg.h:1.54 Fri Dec 9 10:08:47 2011
+++ src/sys/arch/x86/include/specialreg.h Thu Dec 15 09:38:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: specialreg.h,v 1.54 2011/12/09 10:08:47 cegger Exp $ */
+/* $NetBSD: specialreg.h,v 1.55 2011/12/15 09:38:21 abs Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -381,6 +381,22 @@
#define MSR_MTRRphysMask6 0x20d
#define MSR_MTRRphysBase7 0x20e
#define MSR_MTRRphysMask7 0x20f
+#define MSR_MTRRphysBase8 0x210
+#define MSR_MTRRphysMask8 0x211
+#define MSR_MTRRphysBase9 0x212
+#define MSR_MTRRphysMask9 0x213
+#define MSR_MTRRphysBase10 0x214
+#define MSR_MTRRphysMask10 0x215
+#define MSR_MTRRphysBase11 0x216
+#define MSR_MTRRphysMask11 0x217
+#define MSR_MTRRphysBase12 0x218
+#define MSR_MTRRphysMask12 0x219
+#define MSR_MTRRphysBase13 0x21a
+#define MSR_MTRRphysMask13 0x21b
+#define MSR_MTRRphysBase14 0x21c
+#define MSR_MTRRphysMask14 0x21d
+#define MSR_MTRRphysBase15 0x21e
+#define MSR_MTRRphysMask15 0x21f
#define MSR_MTRRfix64K_0 0x250
#define MSR_MTRRfix16K_8 0x258
#define MSR_MTRRfix16K_A 0x259
Index: src/sys/arch/x86/x86/mtrr_i686.c
diff -u src/sys/arch/x86/x86/mtrr_i686.c:1.24 src/sys/arch/x86/x86/mtrr_i686.c:1.25
--- src/sys/arch/x86/x86/mtrr_i686.c:1.24 Tue Jan 18 17:44:15 2011
+++ src/sys/arch/x86/x86/mtrr_i686.c Thu Dec 15 09:38:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mtrr_i686.c,v 1.24 2011/01/18 17:44:15 jmcneill Exp $ */
+/* $NetBSD: mtrr_i686.c,v 1.25 2011/12/15 09:38:21 abs Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mtrr_i686.c,v 1.24 2011/01/18 17:44:15 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: mtrr_i686.c,v 1.25 2011/12/15 09:38:21 abs Exp $);
#include opt_multiprocessor.h
@@ -83,6 +83,22 @@ mtrr_raw[] = {
{ MSR_MTRRphysMask6, 0 },
{ MSR_MTRRphysBase7, 0 },
{ MSR_MTRRphysMask7, 0 },
+ { MSR_MTRRphysBase8, 0 },
+ { MSR_MTRRphysMask8, 0 },
+ { MSR_MTRRphysBase9, 0 },
+ { MSR_MTRRphysMask9, 0 },
+ { MSR_MTRRphysBase10, 0 },
+ { MSR_MTRRphysMask10, 0 },
+ { MSR_MTRRphysBase11, 0 },
+ { MSR_MTRRphysMask11, 0 },
+ { MSR_MTRRphysBase12, 0 },
+ { MSR_MTRRphysMask12, 0 },
+ { MSR_MTRRphysBase13, 0 },
+ { MSR_MTRRphysMask13, 0 },
+ { MSR_MTRRphysBase14, 0 },
+ { MSR_MTRRphysMask14, 0 },
+ { MSR_MTRRphysBase15, 0 },
+ { MSR_MTRRphysMask15, 0 },
{ MSR_MTRRfix64K_0, 0 },
{ MSR_MTRRfix16K_8, 0 },
{ MSR_MTRRfix16K_A, 0 },
@@ -305,8 +321,8 @@ i686_mtrr_init_first(void)
MTRR_I686_NVAR_MAX, i686_mtrr_vcnt);
else if (i686_mtrr_vcnt MTRR_I686_NVAR_MAX) {
for (i = MTRR_I686_NVAR_MAX - i686_mtrr_vcnt; i; i--) {
- mtrr_raw[16 - (i*2)].msraddr = 0;
- mtrr_raw[17 - (i*2)].msraddr = 0;
+ mtrr_raw[(MTRR_I686_NVAR_MAX - i) * 2].msraddr = 0;
+ mtrr_raw[(MTRR_I686_NVAR_MAX - i) * 2 + 1].msraddr = 0;
}
}
CVS commit: src/lib/libm
Module Name:src
Committed By: abs
Date: Thu Dec 9 22:52:59 UTC 2010
Modified Files:
src/lib/libm: Makefile
src/lib/libm/noieee_src: n_floor.c
Added Files:
src/lib/libm/noieee_src: n_lround.c n_lroundf.c
Log Message:
Add noieee versions for lround(), lroundf(), lrint(), lrintf(),
llrint() and llrintf(). Code copied from round(), roundf() and
rint() and modified for return values. Its possible this may not
do the right things in edge cases, but if so its likely to have
the same issues as the existing round(), roundf() and rint().
All this used by vax (only), and should allow xnest to complete
build.
To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 src/lib/libm/Makefile
cvs rdiff -u -r1.6 -r1.7 src/lib/libm/noieee_src/n_floor.c
cvs rdiff -u -r0 -r1.1 src/lib/libm/noieee_src/n_lround.c \
src/lib/libm/noieee_src/n_lroundf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.98 src/lib/libm/Makefile:1.99
--- src/lib/libm/Makefile:1.98 Wed Sep 15 16:11:29 2010
+++ src/lib/libm/Makefile Thu Dec 9 22:52:59 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.98 2010/09/15 16:11:29 christos Exp $
+# $NetBSD: Makefile,v 1.99 2010/12/09 22:52:59 abs Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -163,7 +163,7 @@
n_lgamma.c n_j0.c n_j1.c n_jn.c n_log.c n_log10.c n_log1p.c \
n_log__L.c n_pow.c n_sinh.c n_tanh.c \
n_sincos.c n_tan.c \
- n_round.c n_roundf.c
+ n_round.c n_roundf.c n_lround.c n_lroundf.c
# n_sqrt.c n_argred.c n_infnan.c n_atan2.c n_cabs.c n_cbrt.c n_support.c
Index: src/lib/libm/noieee_src/n_floor.c
diff -u src/lib/libm/noieee_src/n_floor.c:1.6 src/lib/libm/noieee_src/n_floor.c:1.7
--- src/lib/libm/noieee_src/n_floor.c:1.6 Thu May 13 20:35:40 2004
+++ src/lib/libm/noieee_src/n_floor.c Thu Dec 9 22:52:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: n_floor.c,v 1.6 2004/05/13 20:35:40 mhitch Exp $ */
+/* $NetBSD: n_floor.c,v 1.7 2010/12/09 22:52:59 abs Exp $ */
/*
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
@@ -144,3 +144,75 @@
return (t - s);
}
#endif /* not national */
+
+long
+lrint(double x)
+{
+ double s;
+ volatile double t;
+ const double one = 1.0;
+
+#if !defined(__vax__)!defined(tahoe)
+ if (x != x)/* NaN */
+ return (x);
+#endif /* !defined(__vax__)!defined(tahoe) */
+ if (copysign(x,one) = L) /* already an integer */
+ return (x);
+ s = copysign(L,x);
+ t = x + s;/* x+s rounded to integer */
+ return (t - s);
+}
+
+long long
+llrint(double x)
+{
+ double s;
+ volatile double t;
+ const double one = 1.0;
+
+#if !defined(__vax__)!defined(tahoe)
+ if (x != x)/* NaN */
+ return (x);
+#endif /* !defined(__vax__)!defined(tahoe) */
+ if (copysign(x,one) = L) /* already an integer */
+ return (x);
+ s = copysign(L,x);
+ t = x + s;/* x+s rounded to integer */
+ return (t - s);
+}
+
+long
+lrintf(float x)
+{
+ float s;
+ volatile float t;
+ const float one = 1.0;
+
+#if !defined(__vax__)!defined(tahoe)
+ if (x != x)/* NaN */
+ return (x);
+#endif /* !defined(__vax__)!defined(tahoe) */
+ if (copysign(x,one) = L) /* already an integer */
+ return (x);
+ s = copysign(L,x);
+ t = x + s;/* x+s rounded to integer */
+ return (t - s);
+}
+
+long long
+llrintf(float x)
+{
+ float s;
+ volatile float t;
+ const float one = 1.0;
+
+#if !defined(__vax__)!defined(tahoe)
+ if (x != x)/* NaN */
+ return (x);
+#endif /* !defined(__vax__)!defined(tahoe) */
+ if (copysign(x,one) = L) /* already an integer */
+ return (x);
+ s = copysign(L,x);
+ t = x + s;/* x+s rounded to integer */
+ return (t - s);
+}
Added files:
Index: src/lib/libm/noieee_src/n_lround.c
diff -u /dev/null src/lib/libm/noieee_src/n_lround.c:1.1
--- /dev/null Thu Dec 9 22:52:59 2010
+++ src/lib/libm/noieee_src/n_lround.c Thu Dec 9 22:52:59 2010
@@ -0,0 +1,53 @@
+/*-
+ * Copyright (c) 2003, Steven G. Kargl
+ * 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 unmodified, 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 AUTHOR ``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 AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
CVS commit: src/etc/etc.macppc
Module Name:src Committed By: abs Date: Wed Dec 1 22:06:19 UTC 2010 Modified Files: src/etc/etc.macppc: MAKEDEV.conf Log Message: Add wd2 and wd3 to the default device set - noted by Donald Lee on port-macppc To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/etc/etc.macppc/MAKEDEV.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/etc.macppc/MAKEDEV.conf diff -u src/etc/etc.macppc/MAKEDEV.conf:1.8 src/etc/etc.macppc/MAKEDEV.conf:1.9 --- src/etc/etc.macppc/MAKEDEV.conf:1.8 Sat Sep 13 11:46:18 2008 +++ src/etc/etc.macppc/MAKEDEV.conf Wed Dec 1 22:06:19 2010 @@ -1,7 +1,7 @@ -# $NetBSD: MAKEDEV.conf,v 1.8 2008/09/13 11:46:18 tsutsui Exp $ +# $NetBSD: MAKEDEV.conf,v 1.9 2010/12/01 22:06:19 abs Exp $ all_md) - makedev wscons sd0 sd1 sd2 st0 st1 cd0 cd1 wd0 wd1 + makedev wscons sd0 sd1 sd2 st0 st1 cd0 cd1 wd0 wd1 wd2 wd3 makedev ss0 ch0 uk0 uk1 makedev mlx0 ld0 ld1 ld2 ld3 makedev tty00 tty01 tty10 @@ -22,7 +22,7 @@ floppy) makedev std sd0 sd1 sd2 tty00 tty01 opty - makedev st0 st1 cd0 cd1 wd0 wd1 md0 + makedev st0 st1 cd0 cd1 wd0 wd1 wd2 wd3 md0 makedev ttyE0 wsmouse0 wskbd0 ttyEcfg makedev raid0 raid1 raid2 raid3 raid4 raid5 raid6 raid7 ;;
CVS commit: src/share/mk
Module Name:src
Committed By: abs
Date: Wed Dec 30 12:34:14 UTC 2009
Modified Files:
src/share/mk: bsd.lib.mk
Log Message:
Add brief line on SHLIB_MAJOR, SHLIB_MINOR and SHLIB_TEENY in comments
section - addresses PR bin/39693
To generate a diff of this commit:
cvs rdiff -u -r1.301 -r1.302 src/share/mk/bsd.lib.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.301 src/share/mk/bsd.lib.mk:1.302
--- src/share/mk/bsd.lib.mk:1.301 Sat Dec 12 21:33:50 2009
+++ src/share/mk/bsd.lib.mk Wed Dec 30 12:34:13 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.301 2009/12/12 21:33:50 mrg Exp $
+# $NetBSD: bsd.lib.mk,v 1.302 2009/12/30 12:34:13 abs Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include bsd.init.mk
@@ -141,6 +141,8 @@
# Data-driven table using make variables to control how shared libraries
# are built for different platforms and object formats.
# OBJECT_FMT: currently either ELF or a.out, from bsd.own.mk
+# SHLIB_MAJOR, SHLIB_MINOR, SHLIB_TEENY: Major, minor, and teeny version
+# numbers of shared library
# SHLIB_SOVERSION: version number to be compiled into a shared library
# via -soname. Usualy ${SHLIB_MAJOR} on ELF.
# NetBSD/pmax used to use ${SHLIB_MAJOR}[.${SHLIB_MINOR}
CVS commit: src/share/mk
Module Name:src
Committed By: abs
Date: Wed Dec 30 20:45:46 UTC 2009
Modified Files:
src/share/mk: bsd.README
Log Message:
Add note on SHLIB_{MAJOR,MINOR,TEENY}
To generate a diff of this commit:
cvs rdiff -u -r1.262 -r1.263 src/share/mk/bsd.README
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.262 src/share/mk/bsd.README:1.263
--- src/share/mk/bsd.README:1.262 Wed Dec 23 18:02:25 2009
+++ src/share/mk/bsd.README Wed Dec 30 20:45:46 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.262 2009/12/23 18:02:25 tron Exp $
+# $NetBSD: bsd.README,v 1.263 2009/12/30 20:45:46 abs Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make include files for the NetBSD
@@ -978,6 +978,10 @@
SHLIBINSTALLDIR Target directory for shared libraries if ${USE_SHLIBDIR}
is not no.
+SHLIB_MAJOR
+SHLIB_MINOR
+SHLIB_TEENY Major, minor, and teeny version numbers of shared library
+
USE_SHLIBDIR If not no, use ${SHLIBINSTALLDIR} instead of ${LIBDIR}
as the path to install shared libraries to.
USE_SHLIBDIR must be defined before bsd.own.mk is included.
CVS commit: src/usr.sbin/acpitools/acpidump
Module Name:src
Committed By: abs
Date: Sun Dec 27 21:42:22 UTC 2009
Modified Files:
src/usr.sbin/acpitools/acpidump: Makefile
Log Message:
Put MAN= acpidump.8 back outside the i386/amd64 block so its in the
MI manpages, and non i386/amd64 setlists are correct again
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/acpitools/acpidump/Makefile
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/acpitools/acpidump/Makefile
diff -u src/usr.sbin/acpitools/acpidump/Makefile:1.4 src/usr.sbin/acpitools/acpidump/Makefile:1.5
--- src/usr.sbin/acpitools/acpidump/Makefile:1.4 Tue Dec 22 08:44:03 2009
+++ src/usr.sbin/acpitools/acpidump/Makefile Sun Dec 27 21:42:22 2009
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.4 2009/12/22 08:44:03 cegger Exp $
+# $NetBSD: Makefile,v 1.5 2009/12/27 21:42:22 abs Exp $
# $FreeBSD: src/usr.sbin/acpi/acpidump/Makefile,v 1.7 2003/08/28 03:33:07 njl Exp $
.if (${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64)
CPPFLAGS+=-I${.CURDIR}/../../../sys
CPPFLAGS+=-I${.CURDIR}/..
PROG= acpidump
-MAN= acpidump.8
SRCS= acpi.c acpi_user.c acpidump.c
.endif
+MAN= acpidump.8
.include bsd.prog.mk
CVS commit: src/distrib/evbsh3/rom/ramdiskcommon
Module Name:src Committed By: abs Date: Sun Nov 29 20:56:01 UTC 2009 Modified Files: src/distrib/evbsh3/rom/ramdiskcommon: ramdiskbin.conf Log Message: remove edlabel reference from a commented out line To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/evbsh3/rom/ramdiskcommon/ramdiskbin.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/evbsh3/rom/ramdiskcommon/ramdiskbin.conf diff -u src/distrib/evbsh3/rom/ramdiskcommon/ramdiskbin.conf:1.3 src/distrib/evbsh3/rom/ramdiskcommon/ramdiskbin.conf:1.4 --- src/distrib/evbsh3/rom/ramdiskcommon/ramdiskbin.conf:1.3 Sun May 11 19:02:45 2003 +++ src/distrib/evbsh3/rom/ramdiskcommon/ramdiskbin.conf Sun Nov 29 20:56:01 2009 @@ -1,4 +1,4 @@ -# $NetBSD: ramdiskbin.conf,v 1.3 2003/05/11 19:02:45 ragge Exp $ +# $NetBSD: ramdiskbin.conf,v 1.4 2009/11/29 20:56:01 abs Exp $ srcdirs bin sbin libexec usr.bin usr.sbin gnu/usr.bin @@ -12,7 +12,7 @@ # /sbin progs dmesg ifconfig init mknod mount mount_ffs mount_kernfs mount_procfs newfs progs ping ping6 rcorder reboot route shutdown swapctl ttyflags umount -#progs atactl badsect bim ccdconfig clri disklabel dump dump_lfs edlabel +#progs atactl badsect bim ccdconfig clri disklabel dump dump_lfs #progs fastboot fsck fsck_ext3fs fsck_ffs fsck_lfs fsck_msdos fsdb #progs fsirand ldconfig lmcctl modload modunload mount_cd9660 mount_ext2fs #progs mount_fdesc mount_filecore mount_lfs mount_msdos
CVS commit: src/sys/arch/atari/dev
Module Name:src
Committed By: abs
Date: Wed Nov 25 20:40:41 UTC 2009
Modified Files:
src/sys/arch/atari/dev: kbd.c
Log Message:
Fix a missed proc - lwp change, only compiled if NWSKBD
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/atari/dev/kbd.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/atari/dev/kbd.c
diff -u src/sys/arch/atari/dev/kbd.c:1.39 src/sys/arch/atari/dev/kbd.c:1.40
--- src/sys/arch/atari/dev/kbd.c:1.39 Fri Jul 3 14:00:41 2009
+++ src/sys/arch/atari/dev/kbd.c Wed Nov 25 20:40:41 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: kbd.c,v 1.39 2009/07/03 14:00:41 tsutsui Exp $ */
+/* $NetBSD: kbd.c,v 1.40 2009/11/25 20:40:41 abs Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kbd.c,v 1.39 2009/07/03 14:00:41 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: kbd.c,v 1.40 2009/11/25 20:40:41 abs Exp $);
#include mouse.h
#include ite.h
@@ -810,7 +810,7 @@
}
static int
-kbd_ioctl(void *c, u_long cmd, void *data, int flag, struct proc *p)
+kbd_ioctl(void *c, u_long cmd, void *data, int flag, struct lwp *p)
{
struct wskbd_bell_data *kd;
CVS commit: src/sys/arch/atari/conf
Module Name:src Committed By: abs Date: Mon Nov 23 00:18:38 UTC 2009 Modified Files: src/sys/arch/atari/conf: ATARITT GENERIC.in Log Message: Do not include FPU_EMULATE in ATARITT only config To generate a diff of this commit: cvs rdiff -u -r1.93 -r1.94 src/sys/arch/atari/conf/ATARITT cvs rdiff -u -r1.80 -r1.81 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/ATARITT diff -u src/sys/arch/atari/conf/ATARITT:1.93 src/sys/arch/atari/conf/ATARITT:1.94 --- src/sys/arch/atari/conf/ATARITT:1.93 Fri Mar 6 23:38:41 2009 +++ src/sys/arch/atari/conf/ATARITT Mon Nov 23 00:18:38 2009 @@ -1,5 +1,5 @@ # -# $NetBSD: ATARITT,v 1.93 2009/03/06 23:38:41 abs Exp $ +# $NetBSD: ATARITT,v 1.94 2009/11/23 00:18:38 abs Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. @@ -12,7 +12,6 @@ options HZ=64 # Set the clock-rate (48/64/96) options INSECURE # disable kernel security levels options M68030 # support for 030 -options FPU_EMULATE # Support for MC68881/MC68882 emulator options INET # IP + ICMP + TCP + UDP options INET6 # IPV6 options PPP_BSDCOMP # BSD-Compress compression support for PPP Index: src/sys/arch/atari/conf/GENERIC.in diff -u src/sys/arch/atari/conf/GENERIC.in:1.80 src/sys/arch/atari/conf/GENERIC.in:1.81 --- src/sys/arch/atari/conf/GENERIC.in:1.80 Fri Mar 6 23:38:07 2009 +++ src/sys/arch/atari/conf/GENERIC.in Mon Nov 23 00:18:37 2009 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC.in,v 1.80 2009/03/06 23:38:07 abs Exp $ +# $NetBSD: GENERIC.in,v 1.81 2009/11/23 00:18:37 abs Exp $ # # Generic atari # @@ -50,8 +50,10 @@ # #if defined(TT030_KERNEL) || defined(FALCON_KERNEL) options M68030 # support for 030 -options FPU_EMULATE # Support for MC68881/MC68882 emulator #endif /* TT030_KERNEL || FALCON_KERNEL */ +#if defined(FALCON_KERNEL) +options FPU_EMULATE # Support for MC68881/MC68882 emulator +#endif /* FALCON_KERNEL */ #if (defined(FALCON_KERNEL) !defined(SMALL030_KERNEL)) || \ defined(HADES_KERNEL) || defined(MILAN_KERNEL) options M68040 # support for 040
CVS commit: src/distrib/common
Module Name:src
Committed By: abs
Date: Wed Oct 21 11:35:19 UTC 2009
Modified Files:
src/distrib/common: mktermcap
Log Message:
update to generate something closer to common/termcap
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/distrib/common/mktermcap
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/mktermcap
diff -u src/distrib/common/mktermcap:1.4 src/distrib/common/mktermcap:1.5
--- src/distrib/common/mktermcap:1.4 Mon Dec 22 18:58:22 2008
+++ src/distrib/common/mktermcap Wed Oct 21 11:35:19 2009
@@ -1,11 +1,13 @@
#!/bin/sh
-# $NetBSD: mktermcap,v 1.4 2008/12/22 18:58:22 christos Exp $
+# $NetBSD: mktermcap,v 1.5 2009/10/21 11:35:19 abs Exp $
+#
+# Note - output has been further adjusted by hand to save space
-TARGET=termcap.mini
+TARGET=termcap
+# x68k pulls in vt220
echo # \$NetBSD\$ ${TARGET}
-for t in wsvt25m vt100 vt220 xterm ansi
+for t in wsvt25m vt100 xterm ansi dumb hp300h iris-ansi iris-ansi-ap sun x68k
do
getent termcap -rp $t
- echo
-done ${TARGET}
+done | sed 's/^ //' | grep . ${TARGET}
CVS commit: src/distrib
Module Name:src Committed By: abs Date: Sun Sep 20 19:29:27 UTC 2009 Modified Files: src/distrib/acorn26/instkernel: Makefile list src/distrib/acorn32/ramdisk: Makefile list src/distrib/alpha/instkernel/ramdisk: Makefile list src/distrib/bebox/floppies/ramdisk: list src/distrib/cats/ramdisk: Makefile list src/distrib/evbarm/instkernel/ramdisk: Makefile list src/distrib/evbmips/instkernel/ramdisk: Makefile list src/distrib/evbppc/ramdisk: list src/distrib/landisk/ramdisk: Makefile list src/distrib/mac68k/instkernel/ramdisk: Makefile list src/distrib/mipsco/ramdisk: list src/distrib/pmax/ramdisk: Makefile list src/distrib/sgimips/ramdisk: Makefile list src/distrib/shark/instkernel/ramdisk: Makefile list src/distrib/x68k/floppies/ramdisk: Makefile list src/distrib/zaurus/ramdisk: Makefile list Removed Files: src/distrib/acorn26/instkernel: dot.hdprofile src/distrib/acorn32/ramdisk: dot.hdprofile src/distrib/alpha/instkernel/ramdisk: dot.hdprofile src/distrib/amiga/floppies/upgr: dot.hdprofile src/distrib/bebox/floppies/ramdisk: dot.hdprofile src/distrib/cats/ramdisk: dot.hdprofile src/distrib/evbarm/instkernel/ramdisk: dot.hdprofile src/distrib/evbmips/instkernel/ramdisk: dot.hdprofile src/distrib/evbppc/ramdisk: dot.hdprofile src/distrib/landisk/ramdisk: dot.hdprofile src/distrib/mac68k/instkernel/ramdisk: dot.hdprofile src/distrib/mipsco/ramdisk: dot.hdprofile src/distrib/pmax/ramdisk: dot.hdprofile src/distrib/sgimips/ramdisk: dot.hdprofile src/distrib/shark/instkernel/ramdisk: dot.hdprofile src/distrib/x68k/floppies/ramdisk: dot.hdprofile src/distrib/zaurus/ramdisk: dot.hdprofile Log Message: Alas poor dot.hdprofile. I knew him... not at all Horatio. (Remove) To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/distrib/acorn26/instkernel/Makefile cvs rdiff -u -r1.2 -r0 src/distrib/acorn26/instkernel/dot.hdprofile cvs rdiff -u -r1.10 -r1.11 src/distrib/acorn26/instkernel/list cvs rdiff -u -r1.17 -r1.18 src/distrib/acorn32/ramdisk/Makefile \ src/distrib/acorn32/ramdisk/list cvs rdiff -u -r1.2 -r0 src/distrib/acorn32/ramdisk/dot.hdprofile cvs rdiff -u -r1.24 -r1.25 src/distrib/alpha/instkernel/ramdisk/Makefile cvs rdiff -u -r1.5 -r0 src/distrib/alpha/instkernel/ramdisk/dot.hdprofile cvs rdiff -u -r1.31 -r1.32 src/distrib/alpha/instkernel/ramdisk/list cvs rdiff -u -r1.8 -r0 src/distrib/amiga/floppies/upgr/dot.hdprofile cvs rdiff -u -r1.5 -r0 src/distrib/bebox/floppies/ramdisk/dot.hdprofile cvs rdiff -u -r1.12 -r1.13 src/distrib/bebox/floppies/ramdisk/list cvs rdiff -u -r1.13 -r1.14 src/distrib/cats/ramdisk/Makefile cvs rdiff -u -r1.3 -r0 src/distrib/cats/ramdisk/dot.hdprofile cvs rdiff -u -r1.14 -r1.15 src/distrib/cats/ramdisk/list cvs rdiff -u -r1.6 -r1.7 src/distrib/evbarm/instkernel/ramdisk/Makefile cvs rdiff -u -r1.2 -r0 src/distrib/evbarm/instkernel/ramdisk/dot.hdprofile cvs rdiff -u -r1.11 -r1.12 src/distrib/evbarm/instkernel/ramdisk/list cvs rdiff -u -r1.3 -r1.4 src/distrib/evbmips/instkernel/ramdisk/Makefile cvs rdiff -u -r1.1 -r0 src/distrib/evbmips/instkernel/ramdisk/dot.hdprofile cvs rdiff -u -r1.6 -r1.7 src/distrib/evbmips/instkernel/ramdisk/list cvs rdiff -u -r1.1 -r0 src/distrib/evbppc/ramdisk/dot.hdprofile cvs rdiff -u -r1.8 -r1.9 src/distrib/evbppc/ramdisk/list cvs rdiff -u -r1.4 -r1.5 src/distrib/landisk/ramdisk/Makefile cvs rdiff -u -r1.1 -r0 src/distrib/landisk/ramdisk/dot.hdprofile cvs rdiff -u -r1.8 -r1.9 src/distrib/landisk/ramdisk/list cvs rdiff -u -r1.30 -r1.31 src/distrib/mac68k/instkernel/ramdisk/Makefile cvs rdiff -u -r1.5 -r0 src/distrib/mac68k/instkernel/ramdisk/dot.hdprofile cvs rdiff -u -r1.22 -r1.23 src/distrib/mac68k/instkernel/ramdisk/list cvs rdiff -u -r1.2 -r0 src/distrib/mipsco/ramdisk/dot.hdprofile cvs rdiff -u -r1.10 -r1.11 src/distrib/mipsco/ramdisk/list cvs rdiff -u -r1.39 -r1.40 src/distrib/pmax/ramdisk/Makefile cvs rdiff -u -r1.7 -r0 src/distrib/pmax/ramdisk/dot.hdprofile cvs rdiff -u -r1.21 -r1.22 src/distrib/pmax/ramdisk/list cvs rdiff -u -r1.12 -r1.13 src/distrib/sgimips/ramdisk/Makefile cvs rdiff -u -r1.3 -r0 src/distrib/sgimips/ramdisk/dot.hdprofile cvs rdiff -u -r1.11 -r1.12 src/distrib/sgimips/ramdisk/list cvs rdiff -u -r1.15 -r1.16 src/distrib/shark/instkernel/ramdisk/Makefile cvs rdiff -u -r1.2 -r0 src/distrib/shark/instkernel/ramdisk/dot.hdprofile cvs rdiff -u -r1.14 -r1.15 src/distrib/shark/instkernel/ramdisk/list cvs rdiff -u -r1.31 -r1.32 src/distrib/x68k/floppies/ramdisk/Makefile cvs rdiff -u -r1.11 -r0 src/distrib/x68k/floppies/ramdisk/dot.hdprofile cvs rdiff -u -r1.22 -r1.23 src/distrib/x68k/floppies/ramdisk/list cvs rdiff -u -r1.4 -r1.5 src/distrib/zaurus/ramdisk/Makefile cvs rdiff -u -r1.1 -r0 src/distrib/zaurus/ramdisk/dot.hdprofile cvs rdiff -u -r1.7
CVS commit: src/distrib
Module Name:src
Committed By: abs
Date: Sun Sep 20 19:41:36 UTC 2009
Modified Files:
src/distrib/common: services
src/distrib/sun2/miniroot: Makefile list
src/distrib/sun2/ramdisk: Makefile list
src/distrib/sun3/miniroot: Makefile list
src/distrib/sun3/ramdisk: Makefile list
src/distrib/x68k/floppies/ramdisk: Makefile list
Removed Files:
src/distrib/sun2/ramdisk: services
src/distrib/sun3/ramdisk: services
src/distrib/x68k/floppies/ramdisk: services
Log Message:
Move sun2, sun3 x68k across to the common distrib etc/services, and
while here reduce it from 1180 to 794 bytes (whitespace comment cleanup)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/common/services
cvs rdiff -u -r1.28 -r1.29 src/distrib/sun2/miniroot/Makefile
cvs rdiff -u -r1.10 -r1.11 src/distrib/sun2/miniroot/list
cvs rdiff -u -r1.21 -r1.22 src/distrib/sun2/ramdisk/Makefile
cvs rdiff -u -r1.8 -r1.9 src/distrib/sun2/ramdisk/list
cvs rdiff -u -r1.1 -r0 src/distrib/sun2/ramdisk/services
cvs rdiff -u -r1.39 -r1.40 src/distrib/sun3/miniroot/Makefile
cvs rdiff -u -r1.19 -r1.20 src/distrib/sun3/miniroot/list
cvs rdiff -u -r1.36 -r1.37 src/distrib/sun3/ramdisk/Makefile
cvs rdiff -u -r1.4 -r1.5 src/distrib/sun3/ramdisk/list
cvs rdiff -u -r1.1 -r0 src/distrib/sun3/ramdisk/services
cvs rdiff -u -r1.32 -r1.33 src/distrib/x68k/floppies/ramdisk/Makefile
cvs rdiff -u -r1.23 -r1.24 src/distrib/x68k/floppies/ramdisk/list
cvs rdiff -u -r1.1 -r0 src/distrib/x68k/floppies/ramdisk/services
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/services
diff -u src/distrib/common/services:1.3 src/distrib/common/services:1.4
--- src/distrib/common/services:1.3 Fri Apr 11 12:54:35 2008
+++ src/distrib/common/services Sun Sep 20 19:41:35 2009
@@ -1,47 +1,47 @@
-# $NetBSD: services,v 1.3 2008/04/11 12:54:35 rafal Exp $
-# A minimal /etc/services file for install floppies.
-ftp-data 20/tcp
-ftp-data 20/udp
-ftp 21/tcp
-ftp 21/udp
-bootps 67/tcp
-bootps 67/udp
-bootpc 68/tcp
-bootpc 68/udp
-tftp 69/tcp
-tftp 69/udp
-http 80/tcp
-sunrpc 111/tcp
-sunrpc 111/udp
-sftp115/tcp
-sftp115/udp
-mftp349/tcp
-mftp349/udp
-shell 514/tcp # aka rsh
-kshell 544/tcp
-kshell 544/udp
-dhcpv6-client 546/tcp
-dhcpv6-client 546/udp
-dhcpv6-server 547/tcp
-dhcpv6-server 547/udp
-ftp-agent 574/tcp
-ftp-agent 574/udp
-dhcp-failover 647/tcp
-dhcp-failover 647/udp
-ftps-data 989/tcp
-ftps-data 989/udp
-ftps990/tcp
-ftps990/udp
-tftp-mcast 1758/tcp
-tftp-mcast 1758/udp
-nfs 2049/tcp
-nfs 2049/udp
-tftps 3713/tcp
-tftps 3713/udp
-kftp-data 6620/tcp
-kftp-data 6620/udp
-kftp6621/tcp
-kftp6621/udp
-mcftp 6622/tcp
-mcftp 6622/udp
+# $NetBSD: services,v 1.4 2009/09/20 19:41:35 abs Exp $
+# Minimal /etc/services file for install
+ftp-data 20/tcp
+ftp-data 20/udp
+ftp 21/tcp
+ftp 21/udp
+bootps 67/tcp
+bootps 67/udp
+bootpc 68/tcp
+bootpc 68/udp
+tftp 69/tcp
+tftp 69/udp
+http 80/tcp
+sunrpc 111/tcp
+sunrpc 111/udp
+sftp 115/tcp
+sftp 115/udp
+mftp 349/tcp
+mftp 349/udp
+shell 514/tcp
+kshell 544/tcp
+kshell 544/udp
+dhcpv6-client 546/tcp
+dhcpv6-client 546/udp
+dhcpv6-server 547/tcp
+dhcpv6-server 547/udp
+ftp-agent 574/tcp
+ftp-agent 574/udp
+dhcp-failover 647/tcp
+dhcp-failover 647/udp
+ftps-data 989/tcp
+ftps-data 989/udp
+ftps 990/tcp
+ftps 990/udp
+tftp-mcast 1758/tcp
+tftp-mcast 1758/udp
+nfs 2049/tcp
+nfs 2049/udp
+tftps 3713/tcp
+tftps 3713/udp
+kftp-data 6620/tcp
+kftp-data 6620/udp
+kftp 6621/tcp
+kftp 6621/udp
+mcftp 6622/tcp
+mcftp 6622/udp
Index: src/distrib/sun2/miniroot/Makefile
diff -u src/distrib/sun2/miniroot/Makefile:1.28 src/distrib/sun2/miniroot/Makefile:1.29
--- src/distrib/sun2/miniroot/Makefile:1.28 Sun Jan 25 22:08:39 2009
+++ src/distrib/sun2/miniroot/Makefile Sun Sep 20 19:41:35 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2009/01/25 22:08:39 abs Exp $
+# $NetBSD: Makefile,v 1.29 2009/09/20 19:41:35 abs Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -29,8 +29,8 @@
${DESTDIR}/etc/disktab ${DESTDIR}/etc/group \
${DESTDIR}/etc/master.passwd ${DESTDIR}/etc/netconfig \
${DESTDIR}/etc/passwd \
- ${NETBSDSRCDIR}/distrib/common/protocols \
- ${DESTDIR}/etc/pwd.db ${NETBSDSRCDIR}/distrib/common/services \
+ ${DISTRIBDIR}/common/protocols \
+ ${DESTDIR}/etc/pwd.db ${DISTRIBDIR}/common/services \
${DESTDIR}/etc/spwd.db \
${DESTDIR}/usr/mdec/bootxx ${DESTDIR}/usr/mdec/bootyy \
${DESTDIR}/usr/mdec/netboot ${DESTDIR}/usr/mdec/tapeboot
CVS commit: src/distrib
Module Name:src
Committed By: abs
Date: Sun Sep 20 22:44:06 UTC 2009
Modified Files:
src/distrib/alpha/instkernel/ramdisk: install.sh
src/distrib/bebox/floppies/ramdisk: install.tmpl
src/distrib/miniroot: install.sh
Log Message:
remove references to disktab.{preinstall,shadow}
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/alpha/instkernel/ramdisk/install.sh
cvs rdiff -u -r1.7 -r1.8 src/distrib/bebox/floppies/ramdisk/install.tmpl
cvs rdiff -u -r1.24 -r1.25 src/distrib/miniroot/install.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/alpha/instkernel/ramdisk/install.sh
diff -u src/distrib/alpha/instkernel/ramdisk/install.sh:1.5 src/distrib/alpha/instkernel/ramdisk/install.sh:1.6
--- src/distrib/alpha/instkernel/ramdisk/install.sh:1.5 Wed Sep 16 10:40:02 2009
+++ src/distrib/alpha/instkernel/ramdisk/install.sh Sun Sep 20 22:44:06 2009
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: install.sh,v 1.5 2009/09/16 10:40:02 abs Exp $
+# $NetBSD: install.sh,v 1.6 2009/09/20 22:44:06 abs Exp $
#
# Copyright (c) 1997 Perry E. Metzger
# Copyright (c) 1994 Christopher G. Demetriou
@@ -303,7 +303,7 @@
fragsize=1024
blocksize=8192
-cat /etc/disktab.preinstall $DT
+echo # $DT $DT
echo $DT
echo $labelname|NetBSD installation generated:\\ $DT
echo :dt=${type}:ty=winchester:\\ $DT
Index: src/distrib/bebox/floppies/ramdisk/install.tmpl
diff -u src/distrib/bebox/floppies/ramdisk/install.tmpl:1.7 src/distrib/bebox/floppies/ramdisk/install.tmpl:1.8
--- src/distrib/bebox/floppies/ramdisk/install.tmpl:1.7 Fri Apr 23 02:48:12 2004
+++ src/distrib/bebox/floppies/ramdisk/install.tmpl Sun Sep 20 22:44:06 2009
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: install.tmpl,v 1.7 2004/04/23 02:48:12 simonb Exp $
+# $NetBSD: install.tmpl,v 1.8 2009/09/20 22:44:06 abs Exp $
#
# Copyright (c) 1997 Perry E. Metzger
# Copyright (c) 1994 Christopher G. Demetriou
@@ -306,7 +306,7 @@
fragsize=1024
blocksize=8192
-cat /etc/disktab.preinstall $DT
+echo # $DT $DT
echo $DT
echo $labelname|NetBSD installation generated:\\ $DT
echo :dt=${type}:ty=winchester:\\ $DT
Index: src/distrib/miniroot/install.sh
diff -u src/distrib/miniroot/install.sh:1.24 src/distrib/miniroot/install.sh:1.25
--- src/distrib/miniroot/install.sh:1.24 Wed Apr 30 13:10:48 2008
+++ src/distrib/miniroot/install.sh Sun Sep 20 22:44:06 2009
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: install.sh,v 1.24 2008/04/30 13:10:48 martin Exp $
+# $NetBSD: install.sh,v 1.25 2009/09/20 22:44:06 abs Exp $
#
# Copyright (c) 1996,1997,1999,2000,2006 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -108,9 +108,9 @@
# just re-mount the root with read-write enabled.
md_makerootwritable
-# Install the shadowed disktab file; lets us write to it for temporary
+# Create a disktab file; lets us write to it for temporary
# purposes without mounting the miniroot read-write.
-cp /etc/disktab.shadow /tmp/disktab.shadow
+echo # disktab /tmp/disktab.shadow
test $md_view_labels_possible md_view_labels
CVS commit: src/distrib
Module Name:src
Committed By: abs
Date: Sun Sep 20 22:50:51 UTC 2009
Modified Files:
src/distrib/amd64/ramdisks/ramdisk: Makefile
src/distrib/cats/ramdisk: Makefile
src/distrib/hp700/ramdisk: Makefile
src/distrib/i386/ramdisks/ramdisk-big: Makefile
src/distrib/ibmnws/netboot/ramdisk: Makefile
src/distrib/macppc/floppies/ramdisk: Makefile
src/distrib/ofppc/ramdisks/ramdisk: Makefile
src/distrib/rs6000/ramdisk: Makefile
src/distrib/x68k/floppies/ramdisk: Makefile
src/distrib/zaurus/ramdisk: Makefile
Added Files:
src/distrib/common: list.inet6
Removed Files:
src/distrib/amd64/ramdisks/ramdisk: list.inet6
src/distrib/cats/ramdisk: list.inet6
src/distrib/hp700/ramdisk: list.inet6
src/distrib/i386/ramdisks/ramdisk-big: list.inet6
src/distrib/ibmnws/netboot/ramdisk: list.inet6
src/distrib/macppc/floppies/ramdisk: list.inet6
src/distrib/ofppc/ramdisks/ramdisk: list.inet6
src/distrib/rs6000/ramdisk: list.inet6
src/distrib/x68k/floppies/ramdisk: list.inet6
src/distrib/zaurus/ramdisk: list.inet6
Log Message:
Ten identical list.inet6 files, or one common/list.inet6?
Not a difficult choice.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/ramdisks/ramdisk/Makefile
cvs rdiff -u -r1.1 -r0 src/distrib/amd64/ramdisks/ramdisk/list.inet6
cvs rdiff -u -r1.16 -r1.17 src/distrib/cats/ramdisk/Makefile
cvs rdiff -u -r1.2 -r0 src/distrib/cats/ramdisk/list.inet6
cvs rdiff -u -r0 -r1.1 src/distrib/common/list.inet6
cvs rdiff -u -r1.6 -r1.7 src/distrib/hp700/ramdisk/Makefile
cvs rdiff -u -r1.1 -r0 src/distrib/hp700/ramdisk/list.inet6
cvs rdiff -u -r1.3 -r1.4 src/distrib/i386/ramdisks/ramdisk-big/Makefile
cvs rdiff -u -r1.1 -r0 src/distrib/i386/ramdisks/ramdisk-big/list.inet6
cvs rdiff -u -r1.5 -r1.6 src/distrib/ibmnws/netboot/ramdisk/Makefile
cvs rdiff -u -r1.2 -r0 src/distrib/ibmnws/netboot/ramdisk/list.inet6
cvs rdiff -u -r1.34 -r1.35 src/distrib/macppc/floppies/ramdisk/Makefile
cvs rdiff -u -r1.2 -r0 src/distrib/macppc/floppies/ramdisk/list.inet6
cvs rdiff -u -r1.2 -r1.3 src/distrib/ofppc/ramdisks/ramdisk/Makefile
cvs rdiff -u -r1.1 -r0 src/distrib/ofppc/ramdisks/ramdisk/list.inet6
cvs rdiff -u -r1.2 -r1.3 src/distrib/rs6000/ramdisk/Makefile
cvs rdiff -u -r1.1 -r0 src/distrib/rs6000/ramdisk/list.inet6
cvs rdiff -u -r1.35 -r1.36 src/distrib/x68k/floppies/ramdisk/Makefile
cvs rdiff -u -r1.2 -r0 src/distrib/x68k/floppies/ramdisk/list.inet6
cvs rdiff -u -r1.7 -r1.8 src/distrib/zaurus/ramdisk/Makefile
cvs rdiff -u -r1.1 -r0 src/distrib/zaurus/ramdisk/list.inet6
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/ramdisks/ramdisk/Makefile
diff -u src/distrib/amd64/ramdisks/ramdisk/Makefile:1.3 src/distrib/amd64/ramdisks/ramdisk/Makefile:1.4
--- src/distrib/amd64/ramdisks/ramdisk/Makefile:1.3 Sun Sep 20 22:46:11 2009
+++ src/distrib/amd64/ramdisks/ramdisk/Makefile Sun Sep 20 22:50:50 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/09/20 22:46:11 abs Exp $
+# $NetBSD: Makefile,v 1.4 2009/09/20 22:50:50 abs Exp $
IMAGE= ramdisk.fs
IMAGESIZE= 5000k
@@ -9,5 +9,5 @@
.include ${.CURDIR}/../common/Makefile.ramdisk
.if ${USE_INET6} != no
-LISTS+= ${.CURDIR}/list.inet6
+LISTS+= ${DISTRIBDIR}/common/list.inet6
.endif
Index: src/distrib/cats/ramdisk/Makefile
diff -u src/distrib/cats/ramdisk/Makefile:1.16 src/distrib/cats/ramdisk/Makefile:1.17
--- src/distrib/cats/ramdisk/Makefile:1.16 Sun Sep 20 22:46:11 2009
+++ src/distrib/cats/ramdisk/Makefile Sun Sep 20 22:50:50 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2009/09/20 22:46:11 abs Exp $
+# $NetBSD: Makefile,v 1.17 2009/09/20 22:50:50 abs Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -22,7 +22,7 @@
${NETBSDSRCDIR}/distrib/common/termcap.mini
.if ${USE_INET6} != no
-LISTS+= ${.CURDIR}/list.inet6
+LISTS+= ${DISTRIBDIR}/common/list.inet6
.endif
# Use stubs to eliminate some large stuff from libc
Index: src/distrib/hp700/ramdisk/Makefile
diff -u src/distrib/hp700/ramdisk/Makefile:1.6 src/distrib/hp700/ramdisk/Makefile:1.7
--- src/distrib/hp700/ramdisk/Makefile:1.6 Sun Sep 20 19:49:08 2009
+++ src/distrib/hp700/ramdisk/Makefile Sun Sep 20 22:50:50 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/09/20 19:49:08 abs Exp $
+# $NetBSD: Makefile,v 1.7 2009/09/20 22:50:50 abs Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -24,7 +24,7 @@
SMALLPROG_INET6=1
.if ${USE_INET6} != no
-LISTS+= ${.CURDIR}/list.inet6
+LISTS+= ${DISTRIBDIR}/common/list.inet6
.endif
# Use stubs to eliminate some large stuff from libc
Index: src/distrib/i386/ramdisks/ramdisk-big/Makefile
diff -u src/distrib/i386/ramdisks/ramdisk-big/Makefile:1.3
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: abs
Date: Sat Sep 19 13:33:17 UTC 2009
Modified Files:
src/distrib/utils/sysinst: Makefile
Log Message:
Add cobalt hp700 hpcarm landisk ofppc to ALL_MACHINES list
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/distrib/utils/sysinst/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/Makefile
diff -u src/distrib/utils/sysinst/Makefile:1.12 src/distrib/utils/sysinst/Makefile:1.13
--- src/distrib/utils/sysinst/Makefile:1.12 Fri Nov 21 15:39:29 2008
+++ src/distrib/utils/sysinst/Makefile Sat Sep 19 13:33:17 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/11/21 15:39:29 ad Exp $
+# $NetBSD: Makefile,v 1.13 2009/09/19 13:33:17 abs Exp $
#
# sysinst is usually built when the crunched install binary is built,
# but can be built here as a normal program for testing.
@@ -6,6 +6,7 @@
SUBDIR = arch/${MACHINE}
.if ALL_MACHINES
+
SUBDIR = arch/acorn26
SUBDIR += arch/acorn32
SUBDIR += arch/alpha
@@ -15,19 +16,24 @@
SUBDIR += arch/atari
SUBDIR += arch/bebox
SUBDIR += arch/cats
+SUBDIR += arch/cobalt
SUBDIR += arch/evbarm
SUBDIR += arch/evbmips
SUBDIR += arch/evbppc
SUBDIR += arch/ews4800mips
SUBDIR += arch/hp300
+SUBDIR += arch/hp700
+SUBDIR += arch/hpcarm
SUBDIR += arch/hpcmips
SUBDIR += arch/i386
+SUBDIR += arch/landisk
SUBDIR += arch/mac68k
SUBDIR += arch/macppc
SUBDIR += arch/mipsco
SUBDIR += arch/mvme68k
SUBDIR += arch/news68k
SUBDIR += arch/newsmips
+SUBDIR += arch/ofppc
SUBDIR += arch/playstation2
SUBDIR += arch/pmax
SUBDIR += arch/prep
@@ -39,6 +45,7 @@
SUBDIR += arch/vax
SUBDIR += arch/x68k
SUBDIR += arch/zaurus
+
# XXX notyet SUBDIR += arch/iyonix
.endif
CVS commit: src/distrib
Module Name:src
Committed By: abs
Date: Fri Sep 18 09:25:00 UTC 2009
Modified Files:
src/distrib/amiga/floppies/inst-common: Makefile.inc
src/distrib/bebox/floppies/bootfloppy-common: Makefile.inc
src/distrib/bebox/floppies/ramdisk: Makefile Makefile.inc
src/distrib/evbsh3/rom/ramdiskeb: Makefile
src/distrib/evbsh3/rom/ramdiskel: Makefile
src/distrib/vax/inst-common: Makefile.inc
Added Files:
src/distrib/common: list2sh.awk runlist.sh
Removed Files:
src/distrib/amiga/floppies: list2sh.awk runlist.sh
src/distrib/bebox/floppies: list2sh.awk runlist.sh
src/distrib/evbsh3/rom: list2sh.awk runlist.sh
src/distrib/vax: list2sh.awk runlist.sh
Log Message:
Merge four separate copies of list2sh.awk runlist.sh (three identical
and one with slightly less options). Release build verified on amiga,
bebox and evbsh3. Vax build fails for unrelated reason.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r0 src/distrib/amiga/floppies/list2sh.awk \
src/distrib/amiga/floppies/runlist.sh
cvs rdiff -u -r1.22 -r1.23 \
src/distrib/amiga/floppies/inst-common/Makefile.inc
cvs rdiff -u -r1.1 -r0 src/distrib/bebox/floppies/list2sh.awk \
src/distrib/bebox/floppies/runlist.sh
cvs rdiff -u -r1.11 -r1.12 \
src/distrib/bebox/floppies/bootfloppy-common/Makefile.inc
cvs rdiff -u -r1.12 -r1.13 src/distrib/bebox/floppies/ramdisk/Makefile
cvs rdiff -u -r1.10 -r1.11 src/distrib/bebox/floppies/ramdisk/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/distrib/common/list2sh.awk \
src/distrib/common/runlist.sh
cvs rdiff -u -r1.1 -r0 src/distrib/evbsh3/rom/list2sh.awk \
src/distrib/evbsh3/rom/runlist.sh
cvs rdiff -u -r1.8 -r1.9 src/distrib/evbsh3/rom/ramdiskeb/Makefile
cvs rdiff -u -r1.8 -r1.9 src/distrib/evbsh3/rom/ramdiskel/Makefile
cvs rdiff -u -r1.3 -r0 src/distrib/vax/list2sh.awk
cvs rdiff -u -r1.2 -r0 src/distrib/vax/runlist.sh
cvs rdiff -u -r1.15 -r1.16 src/distrib/vax/inst-common/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amiga/floppies/inst-common/Makefile.inc
diff -u src/distrib/amiga/floppies/inst-common/Makefile.inc:1.22 src/distrib/amiga/floppies/inst-common/Makefile.inc:1.23
--- src/distrib/amiga/floppies/inst-common/Makefile.inc:1.22 Sun Oct 26 07:25:33 2003
+++ src/distrib/amiga/floppies/inst-common/Makefile.inc Fri Sep 18 09:24:59 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.22 2003/10/26 07:25:33 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.23 2009/09/18 09:24:59 abs Exp $
# TOP is assumed to be defined by Makefile including this one.
@@ -26,8 +26,8 @@
mount -t ffs ${VND_DEV} ${MOUNT_POINT}
${TOOL_MTREE} -def ${MTREECONF} -p ${MOUNT_POINT}/ -u
TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
- KERNOBJDIR=${KERNOBJDIR} \
- TARGDIR=${MOUNT_POINT} ${HOST_SH} ${TOP}/runlist.sh ${LISTS}
+ KERNOBJDIR=${KERNOBJDIR} TARGDIR=${MOUNT_POINT} ${HOST_SH} \
+ ${NETBSDSRCDIR}/distrib/common/runlist.sh ${LISTS}
@echo
@df -i ${MOUNT_POINT}
@echo
Index: src/distrib/bebox/floppies/bootfloppy-common/Makefile.inc
diff -u src/distrib/bebox/floppies/bootfloppy-common/Makefile.inc:1.11 src/distrib/bebox/floppies/bootfloppy-common/Makefile.inc:1.12
--- src/distrib/bebox/floppies/bootfloppy-common/Makefile.inc:1.11 Fri Apr 3 22:36:34 2009
+++ src/distrib/bebox/floppies/bootfloppy-common/Makefile.inc Fri Sep 18 09:24:59 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.11 2009/04/03 22:36:34 perry Exp $
+# $NetBSD: Makefile.inc,v 1.12 2009/09/18 09:24:59 abs Exp $
# TOP is assumed to be defined by Makefile including this one.
@@ -41,8 +41,8 @@
newfs -B be -m 0 -o space -i ${INO_BYTES} -c 80 ${VND_RDEV} ${DISKTYPE}
mount ${VND_DEV} ${MOUNT_POINT}
TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
- KERNOBJDIR=${KERNOBJDIR} \
- TARGDIR=${MOUNT_POINT} ${HOST_SH} ${TOP}/runlist.sh ${LISTS}
+ KERNOBJDIR=${KERNOBJDIR} TARGDIR=${MOUNT_POINT} ${HOST_SH} \
+ ${NETBSDSRCDIR}/distrib/common/runlist.sh ${LISTS}
@echo
@df -i ${MOUNT_POINT}
@echo
Index: src/distrib/bebox/floppies/ramdisk/Makefile
diff -u src/distrib/bebox/floppies/ramdisk/Makefile:1.12 src/distrib/bebox/floppies/ramdisk/Makefile:1.13
--- src/distrib/bebox/floppies/ramdisk/Makefile:1.12 Sat Oct 25 22:27:34 2008
+++ src/distrib/bebox/floppies/ramdisk/Makefile Fri Sep 18 09:24:59 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/10/25 22:27:34 apb Exp $
+# $NetBSD: Makefile,v 1.13 2009/09/18 09:24:59 abs Exp $
TOP= ${.CURDIR}/..
@@ -43,8 +43,8 @@
mount ${VND_DEV} ${MOUNT_POINT}
${TOOL_MTREE} -def ${.CURDIR}/${MTREECONF} -p ${MOUNT_POINT}/ -u
TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
- KERNOBJDIR=${KERNOBJDIR} TARGDIR=${MOUNT_POINT} \
- ${HOST_SH} ${TOP}/runlist.sh ${.CURDIR}/${LISTS}
+ KERNOBJDIR=${KERNOBJDIR} TARGDIR=${MOUNT_POINT} ${HOST_SH} \
+
CVS commit: src/distrib
Module Name:src Committed By: abs Date: Fri Sep 18 10:49:09 UTC 2009 Modified Files: src/distrib/acorn26/instkernel: list src/distrib/acorn32/ramdisk: list src/distrib/alpha/instkernel/ramdisk: list src/distrib/cats/ramdisk: list src/distrib/evbarm/instkernel/ramdisk: list src/distrib/evbmips/instkernel/ramdisk: list src/distrib/miniroot: list src/distrib/mipsco/ramdisk: list src/distrib/prep/floppies/ramdisk: list src/distrib/shark/instkernel/ramdisk: list src/distrib/sparc64/instfs: list src/distrib/sun2/miniroot: list src/distrib/sun3/miniroot: list src/distrib/zaurus/ramdisk: list Log Message: Of the arious list files 28 said PROG usr/bin/gzipusr/bin/gzcat usr/bin/gunzip while 14 picked PROG usr/bin/gzipusr/bin/gunzip usr/bin/gzcat Make them all choose the former. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/distrib/acorn26/instkernel/list cvs rdiff -u -r1.16 -r1.17 src/distrib/acorn32/ramdisk/list cvs rdiff -u -r1.30 -r1.31 src/distrib/alpha/instkernel/ramdisk/list cvs rdiff -u -r1.13 -r1.14 src/distrib/cats/ramdisk/list cvs rdiff -u -r1.10 -r1.11 src/distrib/evbarm/instkernel/ramdisk/list cvs rdiff -u -r1.5 -r1.6 src/distrib/evbmips/instkernel/ramdisk/list cvs rdiff -u -r1.27 -r1.28 src/distrib/miniroot/list cvs rdiff -u -r1.9 -r1.10 src/distrib/mipsco/ramdisk/list cvs rdiff -u -r1.12 -r1.13 src/distrib/prep/floppies/ramdisk/list cvs rdiff -u -r1.13 -r1.14 src/distrib/shark/instkernel/ramdisk/list cvs rdiff -u -r1.11 -r1.12 src/distrib/sparc64/instfs/list cvs rdiff -u -r1.9 -r1.10 src/distrib/sun2/miniroot/list cvs rdiff -u -r1.18 -r1.19 src/distrib/sun3/miniroot/list cvs rdiff -u -r1.6 -r1.7 src/distrib/zaurus/ramdisk/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/acorn26/instkernel/list diff -u src/distrib/acorn26/instkernel/list:1.9 src/distrib/acorn26/instkernel/list:1.10 --- src/distrib/acorn26/instkernel/list:1.9 Wed Apr 29 18:20:00 2009 +++ src/distrib/acorn26/instkernel/list Fri Sep 18 10:49:08 2009 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.9 2009/04/29 18:20:00 tsutsui Exp $ +# $NetBSD: list,v 1.10 2009/09/18 10:49:08 abs Exp $ SRCDIRS bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin @@ -43,7 +43,7 @@ PROG sbin/umount PROG usr/bin/ftp -PROG usr/bin/gzip usr/bin/gunzip usr/bin/gzcat +PROG usr/bin/gzip usr/bin/gzcat usr/bin/gunzip PROG usr/bin/less usr/bin/more PROG usr/bin/sed PROG usr/bin/tip Index: src/distrib/acorn32/ramdisk/list diff -u src/distrib/acorn32/ramdisk/list:1.16 src/distrib/acorn32/ramdisk/list:1.17 --- src/distrib/acorn32/ramdisk/list:1.16 Wed Apr 29 18:20:02 2009 +++ src/distrib/acorn32/ramdisk/list Fri Sep 18 10:49:08 2009 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.16 2009/04/29 18:20:02 tsutsui Exp $ +# $NetBSD: list,v 1.17 2009/09/18 10:49:08 abs Exp $ SRCDIRS bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin @@ -43,7 +43,7 @@ PROG sbin/umount PROG usr/bin/ftp -PROG usr/bin/gzip usr/bin/gunzip usr/bin/gzcat +PROG usr/bin/gzip usr/bin/gzcat usr/bin/gunzip PROG usr/bin/less usr/bin/more PROG usr/bin/sed PROG usr/bin/tip Index: src/distrib/alpha/instkernel/ramdisk/list diff -u src/distrib/alpha/instkernel/ramdisk/list:1.30 src/distrib/alpha/instkernel/ramdisk/list:1.31 --- src/distrib/alpha/instkernel/ramdisk/list:1.30 Wed Apr 29 18:22:47 2009 +++ src/distrib/alpha/instkernel/ramdisk/list Fri Sep 18 10:49:08 2009 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.30 2009/04/29 18:22:47 tsutsui Exp $ +# $NetBSD: list,v 1.31 2009/09/18 10:49:08 abs Exp $ SRCDIRS bin sbin usr.bin/less usr.bin usr.sbin @@ -43,7 +43,7 @@ PROG sbin/umount PROG usr/bin/ftp -PROG usr/bin/gzip usr/bin/gunzip usr/bin/gzcat +PROG usr/bin/gzip usr/bin/gzcat usr/bin/gunzip PROG usr/bin/less usr/bin/more PROG usr/bin/sed PROG usr/bin/tip Index: src/distrib/cats/ramdisk/list diff -u src/distrib/cats/ramdisk/list:1.13 src/distrib/cats/ramdisk/list:1.14 --- src/distrib/cats/ramdisk/list:1.13 Wed Apr 29 18:20:02 2009 +++ src/distrib/cats/ramdisk/list Fri Sep 18 10:49:08 2009 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.13 2009/04/29 18:20:02 tsutsui Exp $ +# $NetBSD: list,v 1.14 2009/09/18 10:49:08 abs Exp $ # usr.bin/less has to be first, otherwise the ramdisk.mk generation fails SRCDIRS usr.bin/less bin sbin usr.bin usr.sbin gnu/usr.bin @@ -47,7 +47,7 @@ PROG sbin/umount PROG usr/bin/ftp -PROG usr/bin/gzip usr/bin/gunzip usr/bin/gzcat +PROG usr/bin/gzip usr/bin/gzcat usr/bin/gunzip PROG usr/bin/less usr/bin/more PROG usr/bin/sed PROG usr/bin/tip Index: src/distrib/evbarm/instkernel/ramdisk/list diff -u src/distrib/evbarm/instkernel/ramdisk/list:1.10 src/distrib/evbarm/instkernel/ramdisk/list:1.11 --- src/distrib/evbarm/instkernel/ramdisk/list:1.10 Wed Apr 29 18:20:02 2009 +++
CVS commit: src/distrib/alpha/instkernel/ramdisk
Module Name:src Committed By: abs Date: Wed Sep 16 10:40:02 UTC 2009 Modified Files: src/distrib/alpha/instkernel/ramdisk: install.sh Log Message: The ramdisk includes dmesg, so use it in preference to /kern/msgbuf To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/distrib/alpha/instkernel/ramdisk/install.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/alpha/instkernel/ramdisk/install.sh diff -u src/distrib/alpha/instkernel/ramdisk/install.sh:1.4 src/distrib/alpha/instkernel/ramdisk/install.sh:1.5 --- src/distrib/alpha/instkernel/ramdisk/install.sh:1.4 Fri Apr 23 02:48:12 2004 +++ src/distrib/alpha/instkernel/ramdisk/install.sh Wed Sep 16 10:40:02 2009 @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: install.sh,v 1.4 2004/04/23 02:48:12 simonb Exp $ +# $NetBSD: install.sh,v 1.5 2009/09/16 10:40:02 abs Exp $ # # Copyright (c) 1997 Perry E. Metzger # Copyright (c) 1994 Christopher G. Demetriou @@ -176,7 +176,7 @@ getresp n case $resp in y*|Y*) - more /kern/msgbuf + dmesg | more ;; *) echo
