CVS commit: src/distrib/notes/common
Module Name:src Committed By: abs Date: Thu Dec 14 20:46:45 UTC 2023 Modified Files: src/distrib/notes/common: main Log Message: Add note about zfs mount behaviour change in NetBSD 10 To generate a diff of this commit: cvs rdiff -u -r1.570 -r1.571 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes/common
Module Name:src Committed By: abs Date: Thu Dec 14 20:46:45 UTC 2023 Modified Files: src/distrib/notes/common: main Log Message: Add note about zfs mount behaviour change in NetBSD 10 To generate a diff of this commit: cvs rdiff -u -r1.570 -r1.571 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/main diff -u src/distrib/notes/common/main:1.570 src/distrib/notes/common/main:1.571 --- src/distrib/notes/common/main:1.570 Fri Dec 16 16:58:14 2022 +++ src/distrib/notes/common/main Thu Dec 14 20:46:45 2023 @@ -1,4 +1,4 @@ -.\" $NetBSD: main,v 1.570 2022/12/16 16:58:14 martin Exp $ +.\" $NetBSD: main,v 1.571 2023/12/14 20:46:45 abs Exp $ .\" .\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -811,6 +811,16 @@ and thus all issues that are fixed by .Ic postinstall by default will be handled. .Pp +In +.Nx 9 +and earlier, filesystems listed in +.Pa /etc/fstab +would be mounted before non legacy +.Ic zfs +filesystems. Starting from +.Nx 10 +this order has been reversed. +.Pp If you have ever run a version of .Nx -current between April 18, 2020 and September 23, 2022 (the version numbers
CVS commit: src/lib/libcrypt
Module Name:src Committed By: abs Date: Sun May 29 10:51:41 UTC 2022 Modified Files: src/lib/libcrypt: crypt-argon2.c Log Message: Free strdup'd value in libargon decode_option error paths If its worth freeing in the success path, its worth freeing in the error path... (given we don't _exit or similar) To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/lib/libcrypt/crypt-argon2.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libcrypt
Module Name:src Committed By: abs Date: Sun May 29 10:51:41 UTC 2022 Modified Files: src/lib/libcrypt: crypt-argon2.c Log Message: Free strdup'd value in libargon decode_option error paths If its worth freeing in the success path, its worth freeing in the error path... (given we don't _exit or similar) To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/lib/libcrypt/crypt-argon2.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/libcrypt/crypt-argon2.c diff -u src/lib/libcrypt/crypt-argon2.c:1.16 src/lib/libcrypt/crypt-argon2.c:1.17 --- src/lib/libcrypt/crypt-argon2.c:1.16 Sun Feb 13 13:32:03 2022 +++ src/lib/libcrypt/crypt-argon2.c Sun May 29 10:51:41 2022 @@ -328,6 +328,7 @@ decode_option(argon2_context *ctx, argon } break; default: +free(in); return -1; } @@ -337,8 +338,10 @@ decode_option(argon2_context *ctx, argon sl = ctx->saltlen; - if (from_base64(ctx->salt, &sl, a) == NULL) + if (from_base64(ctx->salt, &sl, a) == NULL) { +free(in); return -1; +} ctx->saltlen = sl;
CVS commit: src/lib/libcrypt
Module Name:src Committed By: abs Date: Sun May 29 10:58:09 UTC 2022 Modified Files: src/lib/libcrypt: crypt-argon2.c Log Message: Avoid null SEGV if libargon passed string with too few $ Seen on netbsd-9 built xscreensaver running on a current system. Whatever triggered this should also be fixed, but in the meantime we can improve the behaviour from "Segmentation Fault" To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/lib/libcrypt/crypt-argon2.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libcrypt
Module Name:src Committed By: abs Date: Sun May 29 10:58:09 UTC 2022 Modified Files: src/lib/libcrypt: crypt-argon2.c Log Message: Avoid null SEGV if libargon passed string with too few $ Seen on netbsd-9 built xscreensaver running on a current system. Whatever triggered this should also be fixed, but in the meantime we can improve the behaviour from "Segmentation Fault" To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/lib/libcrypt/crypt-argon2.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/libcrypt/crypt-argon2.c diff -u src/lib/libcrypt/crypt-argon2.c:1.17 src/lib/libcrypt/crypt-argon2.c:1.18 --- src/lib/libcrypt/crypt-argon2.c:1.17 Sun May 29 10:51:41 2022 +++ src/lib/libcrypt/crypt-argon2.c Sun May 29 10:58:09 2022 @@ -335,13 +335,17 @@ decode_option(argon2_context *ctx, argon } a = strsep(&inp, "$"); + if (a == null) { + free(in); + return -1; + } sl = ctx->saltlen; if (from_base64(ctx->salt, &sl, a) == NULL) { -free(in); + free(in); return -1; -} + } ctx->saltlen = sl;
Re: CVS commit: src/usr.sbin/sysinst/arch
On Fri, 17 Jun 2022 at 15:31, Izumi Tsutsui wrote: > > > > Modified Files: > > > src/usr.sbin/sysinst/arch/atari: Makefile > > > src/usr.sbin/sysinst/arch/hp300: Makefile > > > src/usr.sbin/sysinst/arch/luna68k: Makefile > > > src/usr.sbin/sysinst/arch/news68k: Makefile > > > src/usr.sbin/sysinst/arch/newsmips: Makefile > > > src/usr.sbin/sysinst/arch/x68k: Makefile > > > > > > Log Message: > > > Pull SMALLPROG stuff to disable unnecessary partitioning methods etc. > > > > I'm a bit concerned about the CHECK_ENTROPY part. This has a good chance > > of resulting in a inferior user experience, so is that really worth > > saving a few bytes? > > - ramdiskbin with CHECK_ENTROPY requires extra 7000 bytes, at least on > m68k, so poor tier-II ports that have size restrictions on install media > or use slow floppies rather prefer smaller binaries > - CHECK_ENTROPY has been added after netbsd-9 was branched so I guess > ordinary release users won't notice differences > - actually sysinst(8) itself has been broken on several these ports > hp300 (PR/55197), luna68k (PR/55058), and x68k (PR/55384 etc.) > since netbsd-9, so it would be much more important to bring them > installable state for better user experience > - src/distrib/atari/floppies/common/Makefile.images already has > NO_PROGRESS due to 1440KB restriction, and users (including me) > will rather prefer to restore progress bar on ftp for better experience > - if you would like to discuss about pros and cons without numbers, > maybe it would be worth to try installation on various emulators > and describe actual experiences Just wondering - might it be worth an option for a SMALLPROG built sysinst to be able to exec the version on an installed filesystem - could allow the SMALLPROG built sysinst to exclude check_entropy() and even config_menu, at the cost of the extra faff to switch between the versions (I'm assuming a full-fat sysinst could gain a '--from-install-path X' or similar to know how to get back to the base version. Of course, we could take a page from the sun miniroot install and have a OHGODITSSOSMALLPROG version which just knows enough to partition and disk, get the miniroot kernel+fs image written to the swap partition and then reboot into it. This would need kexec, or something like pivot_root and the ability to free the in memory filesystem (which would be cool features to have generally). Anyway, random ideas, and thanks again to tsutsui@ for all the work on m68k NetBSD :) David
Re: CVS commit: src/tests/fs/vfs
On Wed, 2 Feb 2022 at 14:47, Robert Elz wrote: > > Date:Wed, 2 Feb 2022 07:11:45 + > From:David Holland > Message-ID: > > | v7fs isn't a compat interface for old users, > > That's sad, I could do with something just for me! Sounds like we need a compat_kre(8) - assuming it would be more correct to provide the appropriate trailing slash behaviour for all filesystems in that mode? :-p > | it's a compat interface for old disk images :-) > > And makefs -t v7fs fits into that purpose how? > > So maybe it is for us truly old fogies (can we have v6fs as well? > Then I'd really feel at home.) Can I have a v7fs as root, and > boot from it? Maybe? - Throw together a bootxx_v7fs - Leave /dev with just MAKEDEV so the system will mount a mfs /dev - Convert symlinks to hard links or file copies when setting up - Then it's just the 14 character filename component limit: excluding drm firmware, kernel modules and X config most filename components are 14 characters or less - but there are a few libraries in /lib with longer filenames - lib/libcrypto.so.14 lib/libtermcap.so.0 lib/libterminfo.so.1 and lib/libpthread.so.1 are likely to be problematic So, we just need an optional flag when mounting v7fs to truncate any looked up filename component to 14 characters, then we're good to go. Actually, I'm a little concerned about how close it could be to being possible! :) > Does sysinst support it? It would be under the --spinal-tap option David
Re: CVS commit: src/tests/fs/vfs
On Wed, 2 Feb 2022 at 17:24, Robert Elz wrote: > > Date:Wed, 2 Feb 2022 15:26:21 + > From: David Brownlee > Message-ID: > > > | So, we just need an optional flag when mounting v7fs to truncate any > | looked up filename component to 14 characters > > That's not, or shouldn't be, necessary - that always happened, the limit was > what was stored in the directory, not on the length of the pathname components > passed to namei. > > Further, v7fs (systems of that vintage) had no concept at all of a maximum > pathname length (provided there was available ram to store the string). > (Apologies for continuing further down this rabbit hole :) Oops, my earliest unix experience was on a BSD4.3 variant, so I was spoiled by ffs and didn't realise the (in this context) helpful v7fs behaviour with overlong filename components. As a quick test extracting rescue.tar.xz into a v7fs and chrooting into rescue/sh works, and rsyncing enough to get /bin/sh chrooting also works (extracting base.tar.xz runs into issues - PR bin/56690) Actually, there were enough other issues found in PR bin/56690 that I would have to regretfully recommend against v7fs for production NetBSD systems (ahem :) David
CVS commit: src/lib/librefuse
Module Name:src Committed By: abs Date: Fri Apr 21 19:29:32 UTC 2023 Modified Files: src/lib/librefuse: fuse.h Log Message: Fix incorrect test for FUSE_USE_VERSION 34 (Thanks to Mark Davies for report) To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/lib/librefuse/fuse.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/librefuse
Module Name:src Committed By: abs Date: Fri Apr 21 19:29:32 UTC 2023 Modified Files: src/lib/librefuse: fuse.h Log Message: Fix incorrect test for FUSE_USE_VERSION 34 (Thanks to Mark Davies for report) To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/lib/librefuse/fuse.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/librefuse/fuse.h diff -u src/lib/librefuse/fuse.h:1.34 src/lib/librefuse/fuse.h:1.35 --- src/lib/librefuse/fuse.h:1.34 Sat Jan 22 08:09:39 2022 +++ src/lib/librefuse/fuse.h Fri Apr 21 19:29:31 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: fuse.h,v 1.34 2022/01/22 08:09:39 pho Exp $ */ +/* $NetBSD: fuse.h,v 1.35 2023/04/21 19:29:31 abs Exp $ */ /* * Copyright © 2007 Alistair Crooks. All rights reserved. @@ -637,7 +637,7 @@ fuse_new(struct fuse_args *args, const s # define fuse_parse_cmdline fuse_parse_cmdline_v30 /* = FUSE 3.4 = */ -# elif FUSE_USE_VERSION >= 34 +# elif FUSE_USE_VERSION == 34 /* Types */ # define _FUSE_OP_VERSION__ 34 # define fuse_fill_dir_t fuse_fill_dir_t_v30
CVS commit: src/distrib/amd64
Module Name:src Committed By: abs Date: Mon Jan 16 15:00:03 UTC 2023 Modified Files: src/distrib/amd64/cdroms: install.sh src/distrib/amd64/installimage: install.sh src/distrib/amd64/installimage-bios: install.sh Log Message: Enable basic command line editing in amd64 installer shells When a user selects "exist installer" or hits ^Z in sysinst, the calling install.sh runs a shell, plus shows a message indicating they can type "exit" to return to the installer. Add -E to the arguments to this shell, to enable command line editing, (primarily for arrow keys, but basic emacs sequences will also work) At this point this is only on amd64, as this is the port which is least likely to be installing on particularly esoteric terminal hardware, and is also likely to have the highest proportion of less experienced users To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/distrib/amd64/cdroms/install.sh cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/installimage/install.sh cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/installimage-bios/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/amd64/cdroms/install.sh diff -u src/distrib/amd64/cdroms/install.sh:1.4 src/distrib/amd64/cdroms/install.sh:1.5 --- src/distrib/amd64/cdroms/install.sh:1.4 Thu May 28 09:51:31 2015 +++ src/distrib/amd64/cdroms/install.sh Mon Jan 16 15:00:03 2023 @@ -1,5 +1,5 @@ #! /bin/sh -m -# $NetBSD: install.sh,v 1.4 2015/05/28 09:51:31 martin Exp $ +# $NetBSD: install.sh,v 1.5 2023/01/16 15:00:03 abs Exp $ # # - # Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -100,7 +100,7 @@ do tput clear echo "You have stopped sysinst, return to it by" \ "typing 'exit' or ^D." - ${SHELL} -i + ${SHELL} -i -E cmd="fg" else cmd="" @@ -112,4 +112,4 @@ done echo "TERM=${TERM}" > ${termfile} echo echo "To return to the installer, quit this shell by typing 'exit' or ^D." -exec ${SHELL} +exec ${SHELL} -E Index: src/distrib/amd64/installimage/install.sh diff -u src/distrib/amd64/installimage/install.sh:1.3 src/distrib/amd64/installimage/install.sh:1.4 --- src/distrib/amd64/installimage/install.sh:1.3 Mon Jan 3 12:10:17 2022 +++ src/distrib/amd64/installimage/install.sh Mon Jan 16 15:00:03 2023 @@ -1,5 +1,5 @@ #! /bin/sh -m -# $NetBSD: install.sh,v 1.3 2022/01/03 12:10:17 martin Exp $ +# $NetBSD: install.sh,v 1.4 2023/01/16 15:00:03 abs Exp $ # # - # Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -100,7 +100,7 @@ do tput clear echo "You have stopped sysinst, return to it by" \ "typing 'exit' or ^D." - ${SHELL} -i + ${SHELL} -i -E cmd="fg" else cmd="" @@ -112,4 +112,4 @@ done echo "TERM=${TERM}" > ${termfile} echo echo "To return to the installer, quit this shell by typing 'exit' or ^D." -exec ${SHELL} +exec ${SHELL} -E Index: src/distrib/amd64/installimage-bios/install.sh diff -u src/distrib/amd64/installimage-bios/install.sh:1.2 src/distrib/amd64/installimage-bios/install.sh:1.3 --- src/distrib/amd64/installimage-bios/install.sh:1.2 Mon Jan 3 12:10:17 2022 +++ src/distrib/amd64/installimage-bios/install.sh Mon Jan 16 15:00:03 2023 @@ -1,5 +1,5 @@ #! /bin/sh -m -# $NetBSD: install.sh,v 1.2 2022/01/03 12:10:17 martin Exp $ +# $NetBSD: install.sh,v 1.3 2023/01/16 15:00:03 abs Exp $ # # - # Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -100,7 +100,7 @@ do tput clear echo "You have stopped sysinst, return to it by" \ "typing 'exit' or ^D." - ${SHELL} -i + ${SHELL} -i -E cmd="fg" else cmd="" @@ -112,4 +112,4 @@ done echo "TERM=${TERM}" > ${termfile} echo echo "To return to the installer, quit this shell by typing 'exit' or ^D." -exec ${SHELL} +exec ${SHELL} -E
CVS commit: src/distrib/amd64
Module Name:src Committed By: abs Date: Mon Jan 16 15:00:03 UTC 2023 Modified Files: src/distrib/amd64/cdroms: install.sh src/distrib/amd64/installimage: install.sh src/distrib/amd64/installimage-bios: install.sh Log Message: Enable basic command line editing in amd64 installer shells When a user selects "exist installer" or hits ^Z in sysinst, the calling install.sh runs a shell, plus shows a message indicating they can type "exit" to return to the installer. Add -E to the arguments to this shell, to enable command line editing, (primarily for arrow keys, but basic emacs sequences will also work) At this point this is only on amd64, as this is the port which is least likely to be installing on particularly esoteric terminal hardware, and is also likely to have the highest proportion of less experienced users To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/distrib/amd64/cdroms/install.sh cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/installimage/install.sh cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/installimage-bios/install.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/distrib/amd64
On Tue, 17 Jan 2023 at 08:57, Robert Elz wrote: > > Date:Tue, 17 Jan 2023 08:13:12 +0100 > From:Martin Husemann > Message-ID: <20230117071312.ga18...@mail.duskware.de> > > | what is missing in this > | environment so it does not work by default? > > The shell started this way is not a login shell, so does > not read any of the standard login scripts, and I assume > also does not have ENV set to a suitable startup script > either. Adding an explicit -E seemed like the simplest and smallest (not adding an additional file to the image) way to trigger this behaviour (and also clearest to anyone reading through). (Happy to be adjusted by someone with better sh fu :) So essentially I think there are two questions (referencing martin's reply) 1) Should this be amd64 only: No. I wanted to start with amd64 to establish a baseline, and then work towards ports with very limited install space & memory 2) Is this the best mechanism: There is an argument that any interactive shell should default to -E in the absence of some other trigger, whether login, single user, install sh (not -DSMALL), or just typing sh (or some subset, such as with an explicit '-i' or interactive with '-l') Some other systems (and shells) do this, but I feel there would need to be a clear and coherent way to not trigger the behaviour. David
Re: CVS commit: src/sys/dev/wscons
On Tue, 24 Jan 2023 at 14:51, Christos Zoulas wrote: > > In article , > Valery Ushakov wrote: > >On Wed, Jan 18, 2023 at 12:02:17 -0500, Christos Zoulas wrote: > > > >> Module Name: src > >> Committed By:christos > >> Date:Wed Jan 18 17:02:17 UTC 2023 > >> > >> Modified Files: > >> src/sys/dev/wscons: wsemul_vt100_subr.c > >> > >> Log Message: > >> Add rin, indn, vpa, hpa, and cbt terminfo capabilities (Crystal Kolipe) > > > >They probably need to be added to the terminfo description too. > > I guess :-) Once we add them older kernels will break, but it is unlikely > that older kernels will have new terminfo. There would need to be a new terminfo entry (whether the capabilities are added to wsvt25, and an older compat added, or a new wsvt25plus entry added), as otherwise a remote session from a newer system into an older will have issues due to missing capabilities. Maybe just update the manpage to note when the new capabilities were added and leave it for a release or so :) David
CVS commit: src/sys/arch
Module Name:src Committed By: abs Date: Thu Feb 9 13:16:05 UTC 2023 Modified Files: src/sys/arch/amd64/conf: GENERIC src/sys/arch/evbarm/conf: GENERIC src/sys/arch/i386/conf: GENERIC src/sys/arch/ia64/conf: GENERIC src/sys/arch/landisk/conf: GENERIC src/sys/arch/prep/conf: GENERIC src/sys/arch/riscv/conf: GENERIC src/sys/arch/rs6000/conf: GENERIC src/sys/arch/shark/conf: GENERIC src/sys/arch/sparc64/conf: GENERIC src/sys/arch/zaurus/conf: GENERIC Log Message: Ensure GENERIC.local is always at the end of GENERIC Where a GENERIC config had an existing inclusion of GENERIC.local, ensure it is always at the end of the file, with a consistent comment: # Pull in optional local configuration cinclude "arch/landisk/conf/GENERIC.local" This allows GENERIC.local to correctly override all options (This pass does not affect any GENERIC which did not already have an include of GENERIC.local) To generate a diff of this commit: cvs rdiff -u -r1.599 -r1.600 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.115 -r1.116 src/sys/arch/evbarm/conf/GENERIC cvs rdiff -u -r1.1244 -r1.1245 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.12 -r1.13 src/sys/arch/ia64/conf/GENERIC cvs rdiff -u -r1.74 -r1.75 src/sys/arch/landisk/conf/GENERIC cvs rdiff -u -r1.198 -r1.199 src/sys/arch/prep/conf/GENERIC cvs rdiff -u -r1.21 -r1.22 src/sys/arch/riscv/conf/GENERIC cvs rdiff -u -r1.47 -r1.48 src/sys/arch/rs6000/conf/GENERIC cvs rdiff -u -r1.142 -r1.143 src/sys/arch/shark/conf/GENERIC cvs rdiff -u -r1.237 -r1.238 src/sys/arch/sparc64/conf/GENERIC cvs rdiff -u -r1.93 -r1.94 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.
CVS commit: src/sys/arch
Module Name:src Committed By: abs Date: Thu Feb 9 13:16:05 UTC 2023 Modified Files: src/sys/arch/amd64/conf: GENERIC src/sys/arch/evbarm/conf: GENERIC src/sys/arch/i386/conf: GENERIC src/sys/arch/ia64/conf: GENERIC src/sys/arch/landisk/conf: GENERIC src/sys/arch/prep/conf: GENERIC src/sys/arch/riscv/conf: GENERIC src/sys/arch/rs6000/conf: GENERIC src/sys/arch/shark/conf: GENERIC src/sys/arch/sparc64/conf: GENERIC src/sys/arch/zaurus/conf: GENERIC Log Message: Ensure GENERIC.local is always at the end of GENERIC Where a GENERIC config had an existing inclusion of GENERIC.local, ensure it is always at the end of the file, with a consistent comment: # Pull in optional local configuration cinclude "arch/landisk/conf/GENERIC.local" This allows GENERIC.local to correctly override all options (This pass does not affect any GENERIC which did not already have an include of GENERIC.local) To generate a diff of this commit: cvs rdiff -u -r1.599 -r1.600 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.115 -r1.116 src/sys/arch/evbarm/conf/GENERIC cvs rdiff -u -r1.1244 -r1.1245 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.12 -r1.13 src/sys/arch/ia64/conf/GENERIC cvs rdiff -u -r1.74 -r1.75 src/sys/arch/landisk/conf/GENERIC cvs rdiff -u -r1.198 -r1.199 src/sys/arch/prep/conf/GENERIC cvs rdiff -u -r1.21 -r1.22 src/sys/arch/riscv/conf/GENERIC cvs rdiff -u -r1.47 -r1.48 src/sys/arch/rs6000/conf/GENERIC cvs rdiff -u -r1.142 -r1.143 src/sys/arch/shark/conf/GENERIC cvs rdiff -u -r1.237 -r1.238 src/sys/arch/sparc64/conf/GENERIC cvs rdiff -u -r1.93 -r1.94 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.599 src/sys/arch/amd64/conf/GENERIC:1.600 --- src/sys/arch/amd64/conf/GENERIC:1.599 Thu Sep 29 10:10:05 2022 +++ src/sys/arch/amd64/conf/GENERIC Thu Feb 9 13:16:04 2023 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.599 2022/09/29 10:10:05 riastradh Exp $ +# $NetBSD: GENERIC,v 1.600 2023/02/09 13:16:04 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.599 $" +#ident "GENERIC-$Revision: 1.600 $" maxusers 64 # estimated number of users @@ -1136,10 +1136,6 @@ hvshutdown* at vmbus? # Hyper-V Guest S hvtimesync* at vmbus? # Hyper-V Time Synchronization Service #hvkvp* at vmbus? # Hyper-V Data Exchange Service -# Pull in optional local configuration -cinclude "arch/amd64/conf/GENERIC.local" - - # Pseudo-Devices pseudo-device crypto # /dev/crypto device @@ -1237,3 +1233,6 @@ options PAX_MPROTECT=1 # PaX mprotect( options PAX_MPROTECT_DEBUG=1 # PaX mprotect debug options PAX_ASLR=1 # PaX Address Space Layout Randomization options PAX_ASLR_DEBUG=1 # PaX ASLR debug + +# Pull in optional local configuration +cinclude "arch/amd64/conf/GENERIC.local" Index: src/sys/arch/evbarm/conf/GENERIC diff -u src/sys/arch/evbarm/conf/GENERIC:1.115 src/sys/arch/evbarm/conf/GENERIC:1.116 --- src/sys/arch/evbarm/conf/GENERIC:1.115 Fri Nov 11 20:31:30 2022 +++ src/sys/arch/evbarm/conf/GENERIC Thu Feb 9 13:16:04 2023 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC,v 1.115 2022/11/11 20:31:30 jmcneill Exp $ +# $NetBSD: GENERIC,v 1.116 2023/02/09 13:16:04 abs Exp $ # # GENERIC ARM (aarch32) kernel # @@ -627,4 +627,5 @@ bthub* at ubt? include "dev/bluetooth/bluetoothdevices.config" +# Pull in optional local configuration cinclude "arch/evbarm/conf/GENERIC.local" Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1244 src/sys/arch/i386/conf/GENERIC:1.1245 --- src/sys/arch/i386/conf/GENERIC:1.1244 Thu Dec 22 19:07:16 2022 +++ src/sys/arch/i386/conf/GENERIC Thu Feb 9 13:16:04 2023 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1244 2022/12/22 19:07:16 jakllsch Exp $ +# $NetBSD: GENERIC,v 1.1245 2023/02/09 13:16:04 abs Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1244 $" +#ident "GENERIC-$Revision: 1.1245 $" maxusers 64 # estimated number of users @@ -1420,11 +1420,6 @@ hvshutdown* at vmbus? # Hyper-V Guest S hvtimesync* at vmbus? # Hyper-V Time Synchronization Service #hvkvp* at vmbus? # Hyper-V Data Exchange Service - -# Pull in optional local configuration -cinclude "arch/i386/conf/GENERIC.local" - - # Pseudo-Devices pseudo-device crypto # /dev/crypto device @@ -1520,3 +1515,6 @@ options PAX_SEGVGUARD=0 # PaX Segmenta options PAX_MPROTECT=1 # PaX mprotect(2) restrictions options PAX_MPROTECT_DEBUG=1 # PaX mprotect debug options PAX_ASLR=1 # PaX Address Space Layout Rand
CVS commit: src/sys/arch
Module Name:src Committed By: abs Date: Thu Feb 9 14:09:50 UTC 2023 Modified Files: src/sys/arch/alpha/conf: GENERIC src/sys/arch/amd64/conf: ALL GENERIC XEN3_DOM0 XEN3_DOMU src/sys/arch/evbarm/conf: GENERIC GENERIC64 KOBO NETWALKER RPI src/sys/arch/evbmips/conf: CI20 OCTEON src/sys/arch/evbppc/conf: TWRP1025 src/sys/arch/i386/conf: ALL GENERIC GENERIC_TINY INSTALL_FLOPPY INSTALL_TINY XEN3PAE_DOM0 XEN3PAE_DOMU src/sys/arch/ia64/conf: GENERIC GENERIC.SKI src/sys/arch/landisk/conf: GENERIC src/sys/arch/macppc/conf: GENERIC POWERMAC_G5 src/sys/arch/mmeye/conf: MMTA MMTAICE MMTAROMNEW src/sys/arch/prep/conf: GENERIC INSTALL INSTALL_SMALL src/sys/arch/riscv/conf: GENERIC src/sys/arch/rs6000/conf: GENERIC src/sys/arch/shark/conf: GENERIC OFWGENCFG src/sys/arch/sparc64/conf: GENERIC src/sys/arch/usermode/conf: GENERIC.common src/sys/arch/zaurus/conf: GENERIC Log Message: Adjust _all_ cinclude of *.local files - Ensure always at end - Use tab rather than spaces - Add consistent comment "Pull in optional local configuration - always at end" The only functional change is that a local file which tried to override an existing setting (eg with "no foo") would have failed in some cases before, but now will work To generate a diff of this commit: cvs rdiff -u -r1.417 -r1.418 src/sys/arch/alpha/conf/GENERIC cvs rdiff -u -r1.176 -r1.177 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.600 -r1.601 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.197 -r1.198 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.99 -r1.100 src/sys/arch/amd64/conf/XEN3_DOMU cvs rdiff -u -r1.116 -r1.117 src/sys/arch/evbarm/conf/GENERIC cvs rdiff -u -r1.207 -r1.208 src/sys/arch/evbarm/conf/GENERIC64 cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/conf/KOBO cvs rdiff -u -r1.42 -r1.43 src/sys/arch/evbarm/conf/NETWALKER cvs rdiff -u -r1.95 -r1.96 src/sys/arch/evbarm/conf/RPI cvs rdiff -u -r1.32 -r1.33 src/sys/arch/evbmips/conf/CI20 cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbmips/conf/OCTEON cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbppc/conf/TWRP1025 cvs rdiff -u -r1.505 -r1.506 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1245 -r1.1246 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.170 -r1.171 src/sys/arch/i386/conf/GENERIC_TINY cvs rdiff -u -r1.56 -r1.57 src/sys/arch/i386/conf/INSTALL_FLOPPY cvs rdiff -u -r1.163 -r1.164 src/sys/arch/i386/conf/INSTALL_TINY cvs rdiff -u -r1.36 -r1.37 src/sys/arch/i386/conf/XEN3PAE_DOM0 cvs rdiff -u -r1.18 -r1.19 src/sys/arch/i386/conf/XEN3PAE_DOMU cvs rdiff -u -r1.13 -r1.14 src/sys/arch/ia64/conf/GENERIC cvs rdiff -u -r1.20 -r1.21 src/sys/arch/ia64/conf/GENERIC.SKI cvs rdiff -u -r1.75 -r1.76 src/sys/arch/landisk/conf/GENERIC cvs rdiff -u -r1.376 -r1.377 src/sys/arch/macppc/conf/GENERIC cvs rdiff -u -r1.55 -r1.56 src/sys/arch/macppc/conf/POWERMAC_G5 cvs rdiff -u -r1.54 -r1.55 src/sys/arch/mmeye/conf/MMTA cvs rdiff -u -r1.58 -r1.59 src/sys/arch/mmeye/conf/MMTAICE cvs rdiff -u -r1.55 -r1.56 src/sys/arch/mmeye/conf/MMTAROMNEW cvs rdiff -u -r1.199 -r1.200 src/sys/arch/prep/conf/GENERIC cvs rdiff -u -r1.65 -r1.66 src/sys/arch/prep/conf/INSTALL cvs rdiff -u -r1.20 -r1.21 src/sys/arch/prep/conf/INSTALL_SMALL cvs rdiff -u -r1.22 -r1.23 src/sys/arch/riscv/conf/GENERIC cvs rdiff -u -r1.48 -r1.49 src/sys/arch/rs6000/conf/GENERIC cvs rdiff -u -r1.143 -r1.144 src/sys/arch/shark/conf/GENERIC cvs rdiff -u -r1.49 -r1.50 src/sys/arch/shark/conf/OFWGENCFG cvs rdiff -u -r1.238 -r1.239 src/sys/arch/sparc64/conf/GENERIC cvs rdiff -u -r1.29 -r1.30 src/sys/arch/usermode/conf/GENERIC.common cvs rdiff -u -r1.94 -r1.95 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.
CVS commit: src/sys/arch
Module Name:src Committed By: abs Date: Thu Feb 9 14:09:50 UTC 2023 Modified Files: src/sys/arch/alpha/conf: GENERIC src/sys/arch/amd64/conf: ALL GENERIC XEN3_DOM0 XEN3_DOMU src/sys/arch/evbarm/conf: GENERIC GENERIC64 KOBO NETWALKER RPI src/sys/arch/evbmips/conf: CI20 OCTEON src/sys/arch/evbppc/conf: TWRP1025 src/sys/arch/i386/conf: ALL GENERIC GENERIC_TINY INSTALL_FLOPPY INSTALL_TINY XEN3PAE_DOM0 XEN3PAE_DOMU src/sys/arch/ia64/conf: GENERIC GENERIC.SKI src/sys/arch/landisk/conf: GENERIC src/sys/arch/macppc/conf: GENERIC POWERMAC_G5 src/sys/arch/mmeye/conf: MMTA MMTAICE MMTAROMNEW src/sys/arch/prep/conf: GENERIC INSTALL INSTALL_SMALL src/sys/arch/riscv/conf: GENERIC src/sys/arch/rs6000/conf: GENERIC src/sys/arch/shark/conf: GENERIC OFWGENCFG src/sys/arch/sparc64/conf: GENERIC src/sys/arch/usermode/conf: GENERIC.common src/sys/arch/zaurus/conf: GENERIC Log Message: Adjust _all_ cinclude of *.local files - Ensure always at end - Use tab rather than spaces - Add consistent comment "Pull in optional local configuration - always at end" The only functional change is that a local file which tried to override an existing setting (eg with "no foo") would have failed in some cases before, but now will work To generate a diff of this commit: cvs rdiff -u -r1.417 -r1.418 src/sys/arch/alpha/conf/GENERIC cvs rdiff -u -r1.176 -r1.177 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.600 -r1.601 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.197 -r1.198 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.99 -r1.100 src/sys/arch/amd64/conf/XEN3_DOMU cvs rdiff -u -r1.116 -r1.117 src/sys/arch/evbarm/conf/GENERIC cvs rdiff -u -r1.207 -r1.208 src/sys/arch/evbarm/conf/GENERIC64 cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/conf/KOBO cvs rdiff -u -r1.42 -r1.43 src/sys/arch/evbarm/conf/NETWALKER cvs rdiff -u -r1.95 -r1.96 src/sys/arch/evbarm/conf/RPI cvs rdiff -u -r1.32 -r1.33 src/sys/arch/evbmips/conf/CI20 cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbmips/conf/OCTEON cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbppc/conf/TWRP1025 cvs rdiff -u -r1.505 -r1.506 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1245 -r1.1246 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.170 -r1.171 src/sys/arch/i386/conf/GENERIC_TINY cvs rdiff -u -r1.56 -r1.57 src/sys/arch/i386/conf/INSTALL_FLOPPY cvs rdiff -u -r1.163 -r1.164 src/sys/arch/i386/conf/INSTALL_TINY cvs rdiff -u -r1.36 -r1.37 src/sys/arch/i386/conf/XEN3PAE_DOM0 cvs rdiff -u -r1.18 -r1.19 src/sys/arch/i386/conf/XEN3PAE_DOMU cvs rdiff -u -r1.13 -r1.14 src/sys/arch/ia64/conf/GENERIC cvs rdiff -u -r1.20 -r1.21 src/sys/arch/ia64/conf/GENERIC.SKI cvs rdiff -u -r1.75 -r1.76 src/sys/arch/landisk/conf/GENERIC cvs rdiff -u -r1.376 -r1.377 src/sys/arch/macppc/conf/GENERIC cvs rdiff -u -r1.55 -r1.56 src/sys/arch/macppc/conf/POWERMAC_G5 cvs rdiff -u -r1.54 -r1.55 src/sys/arch/mmeye/conf/MMTA cvs rdiff -u -r1.58 -r1.59 src/sys/arch/mmeye/conf/MMTAICE cvs rdiff -u -r1.55 -r1.56 src/sys/arch/mmeye/conf/MMTAROMNEW cvs rdiff -u -r1.199 -r1.200 src/sys/arch/prep/conf/GENERIC cvs rdiff -u -r1.65 -r1.66 src/sys/arch/prep/conf/INSTALL cvs rdiff -u -r1.20 -r1.21 src/sys/arch/prep/conf/INSTALL_SMALL cvs rdiff -u -r1.22 -r1.23 src/sys/arch/riscv/conf/GENERIC cvs rdiff -u -r1.48 -r1.49 src/sys/arch/rs6000/conf/GENERIC cvs rdiff -u -r1.143 -r1.144 src/sys/arch/shark/conf/GENERIC cvs rdiff -u -r1.49 -r1.50 src/sys/arch/shark/conf/OFWGENCFG cvs rdiff -u -r1.238 -r1.239 src/sys/arch/sparc64/conf/GENERIC cvs rdiff -u -r1.29 -r1.30 src/sys/arch/usermode/conf/GENERIC.common cvs rdiff -u -r1.94 -r1.95 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/alpha/conf/GENERIC diff -u src/sys/arch/alpha/conf/GENERIC:1.417 src/sys/arch/alpha/conf/GENERIC:1.418 --- src/sys/arch/alpha/conf/GENERIC:1.417 Thu Dec 22 11:05:54 2022 +++ src/sys/arch/alpha/conf/GENERIC Thu Feb 9 14:09:47 2023 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.417 2022/12/22 11:05:54 nat Exp $ +# $NetBSD: GENERIC,v 1.418 2023/02/09 14:09:47 abs Exp $ # # This machine description file is used to generate the default NetBSD # kernel. @@ -19,7 +19,7 @@ include "arch/alpha/conf/std.alpha" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -ident "GENERIC-$Revision: 1.417 $" +ident "GENERIC-$Revision: 1.418 $" maxusers 32 @@ -741,5 +741,5 @@ include "dev/veriexec.config" options PAX_MPROTECT=0 # PaX mprotect(2) restrictions options PAX_ASLR=0 # PaX Address Space Layout Randomization -# Pull in optional local configuration +# Pull in optional local configuration - always at end cinclude "arch/alpha/conf/GENERIC.local" Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.176 src/sys/arch/amd64/conf/ALL:1.177 --- src/sys/ar
CVS commit: src/distrib/i386
Module Name:src Committed By: abs Date: Sat Feb 11 17:52:19 UTC 2023 Modified Files: src/distrib/i386/cdroms: install.sh src/distrib/i386/installimage: install.sh Log Message: Enable basic command line editing in i386 installer shells (Following the pattern in amd64) When a user selects "exit installer" or hits ^Z in sysinst, the calling install.sh runs a shell, plus shows a message indicating they can type "exit" to return to the installer. Add -E to the arguments to this shell, to enable command line editing, (primarily for arrow keys, but basic emacs sequences will also work) To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/distrib/i386/cdroms/install.sh cvs rdiff -u -r1.2 -r1.3 src/distrib/i386/installimage/install.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/i386
Module Name:src Committed By: abs Date: Sat Feb 11 17:52:19 UTC 2023 Modified Files: src/distrib/i386/cdroms: install.sh src/distrib/i386/installimage: install.sh Log Message: Enable basic command line editing in i386 installer shells (Following the pattern in amd64) When a user selects "exit installer" or hits ^Z in sysinst, the calling install.sh runs a shell, plus shows a message indicating they can type "exit" to return to the installer. Add -E to the arguments to this shell, to enable command line editing, (primarily for arrow keys, but basic emacs sequences will also work) To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/distrib/i386/cdroms/install.sh cvs rdiff -u -r1.2 -r1.3 src/distrib/i386/installimage/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/i386/cdroms/install.sh diff -u src/distrib/i386/cdroms/install.sh:1.4 src/distrib/i386/cdroms/install.sh:1.5 --- src/distrib/i386/cdroms/install.sh:1.4 Thu May 28 09:51:31 2015 +++ src/distrib/i386/cdroms/install.sh Sat Feb 11 17:52:19 2023 @@ -1,5 +1,5 @@ #! /bin/sh -m -# $NetBSD: install.sh,v 1.4 2015/05/28 09:51:31 martin Exp $ +# $NetBSD: install.sh,v 1.5 2023/02/11 17:52:19 abs Exp $ # # - # Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -100,7 +100,7 @@ do tput clear echo "You have stopped sysinst, return to it by" \ "typing 'exit' or ^D." - ${SHELL} -i + ${SHELL} -i -E cmd="fg" else cmd="" @@ -112,4 +112,4 @@ done echo "TERM=${TERM}" > ${termfile} echo echo "To return to the installer, quit this shell by typing 'exit' or ^D." -exec ${SHELL} +exec ${SHELL} -E Index: src/distrib/i386/installimage/install.sh diff -u src/distrib/i386/installimage/install.sh:1.2 src/distrib/i386/installimage/install.sh:1.3 --- src/distrib/i386/installimage/install.sh:1.2 Sun Jun 3 21:42:45 2012 +++ src/distrib/i386/installimage/install.sh Sat Feb 11 17:52:19 2023 @@ -1,5 +1,5 @@ #! /bin/sh -m -# $NetBSD: install.sh,v 1.2 2012/06/03 21:42:45 joerg Exp $ +# $NetBSD: install.sh,v 1.3 2023/02/11 17:52:19 abs Exp $ # # - # Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -100,7 +100,7 @@ do tput clear echo "You have stopped sysinst, return to it by" \ "typing 'exit' or ^D." - ${SHELL} -i + ${SHELL} -i -E cmd="fg" else cmd="" @@ -112,4 +112,4 @@ done echo "TERM=${TERM}" > ${termfile} echo echo "To return to the installer, quit this shell by typing 'exit' or ^D." -exec ${SHELL} +exec ${SHELL} -E
CVS commit: src/sys/arch
Module Name:src Committed By: abs Date: Sun Feb 12 14:50:42 UTC 2023 Modified Files: src/sys/arch/acorn32/conf: GENERIC src/sys/arch/amiga/conf: GENERIC GENERIC.in src/sys/arch/amigappc/conf: GENERIC src/sys/arch/arc/conf: GENERIC src/sys/arch/bebox/conf: GENERIC src/sys/arch/cats/conf: GENERIC src/sys/arch/cesfic/conf: GENERIC src/sys/arch/cobalt/conf: GENERIC src/sys/arch/dreamcast/conf: GENERIC src/sys/arch/emips/conf: GENERIC src/sys/arch/epoc32/conf: GENERIC src/sys/arch/ews4800mips/conf: GENERIC src/sys/arch/hp300/conf: GENERIC src/sys/arch/hpcmips/conf: GENERIC src/sys/arch/hpcsh/conf: GENERIC src/sys/arch/hppa/conf: GENERIC src/sys/arch/ibmnws/conf: GENERIC src/sys/arch/iyonix/conf: GENERIC src/sys/arch/luna68k/conf: GENERIC src/sys/arch/mac68k/conf: GENERIC src/sys/arch/mipsco/conf: GENERIC src/sys/arch/mmeye/conf: GENERIC src/sys/arch/mvme68k/conf: GENERIC src/sys/arch/mvmeppc/conf: GENERIC src/sys/arch/netwinder/conf: GENERIC src/sys/arch/news68k/conf: GENERIC src/sys/arch/newsmips/conf: GENERIC src/sys/arch/next68k/conf: GENERIC src/sys/arch/ofppc/conf: GENERIC src/sys/arch/playstation2/conf: GENERIC src/sys/arch/pmax/conf: GENERIC src/sys/arch/sandpoint/conf: GENERIC src/sys/arch/sbmips/conf: GENERIC src/sys/arch/sparc/conf: GENERIC src/sys/arch/sun2/conf: GENERIC src/sys/arch/sun3/conf: GENERIC src/sys/arch/vax/conf: GENERIC src/sys/arch/x68k/conf: GENERIC Log Message: Add optoion GENERIC.local include to the end of ~all GENERIC configs This excludes atari, sgimips, evbmips, evbppc, evbsh3, and hpcarm all of which have somewhat specific kernel config file layouts To generate a diff of this commit: cvs rdiff -u -r1.136 -r1.137 src/sys/arch/acorn32/conf/GENERIC cvs rdiff -u -r1.337 -r1.338 src/sys/arch/amiga/conf/GENERIC cvs rdiff -u -r1.150 -r1.151 src/sys/arch/amiga/conf/GENERIC.in cvs rdiff -u -r1.44 -r1.45 src/sys/arch/amigappc/conf/GENERIC cvs rdiff -u -r1.202 -r1.203 src/sys/arch/arc/conf/GENERIC cvs rdiff -u -r1.168 -r1.169 src/sys/arch/bebox/conf/GENERIC cvs rdiff -u -r1.186 -r1.187 src/sys/arch/cats/conf/GENERIC cvs rdiff -u -r1.77 -r1.78 src/sys/arch/cesfic/conf/GENERIC cvs rdiff -u -r1.172 -r1.173 src/sys/arch/cobalt/conf/GENERIC cvs rdiff -u -r1.136 -r1.137 src/sys/arch/dreamcast/conf/GENERIC cvs rdiff -u -r1.26 -r1.27 src/sys/arch/emips/conf/GENERIC cvs rdiff -u -r1.17 -r1.18 src/sys/arch/epoc32/conf/GENERIC cvs rdiff -u -r1.66 -r1.67 src/sys/arch/ews4800mips/conf/GENERIC cvs rdiff -u -r1.210 -r1.211 src/sys/arch/hp300/conf/GENERIC cvs rdiff -u -r1.247 -r1.248 src/sys/arch/hpcmips/conf/GENERIC cvs rdiff -u -r1.116 -r1.117 src/sys/arch/hpcsh/conf/GENERIC cvs rdiff -u -r1.41 -r1.42 src/sys/arch/hppa/conf/GENERIC cvs rdiff -u -r1.56 -r1.57 src/sys/arch/ibmnws/conf/GENERIC cvs rdiff -u -r1.115 -r1.116 src/sys/arch/iyonix/conf/GENERIC cvs rdiff -u -r1.135 -r1.136 src/sys/arch/luna68k/conf/GENERIC cvs rdiff -u -r1.236 -r1.237 src/sys/arch/mac68k/conf/GENERIC cvs rdiff -u -r1.99 -r1.100 src/sys/arch/mipsco/conf/GENERIC cvs rdiff -u -r1.131 -r1.132 src/sys/arch/mmeye/conf/GENERIC cvs rdiff -u -r1.105 -r1.106 src/sys/arch/mvme68k/conf/GENERIC cvs rdiff -u -r1.32 -r1.33 src/sys/arch/mvmeppc/conf/GENERIC cvs rdiff -u -r1.144 -r1.145 src/sys/arch/netwinder/conf/GENERIC cvs rdiff -u -r1.140 -r1.141 src/sys/arch/news68k/conf/GENERIC cvs rdiff -u -r1.142 -r1.143 src/sys/arch/newsmips/conf/GENERIC cvs rdiff -u -r1.161 -r1.162 src/sys/arch/next68k/conf/GENERIC cvs rdiff -u -r1.178 -r1.179 src/sys/arch/ofppc/conf/GENERIC cvs rdiff -u -r1.13 -r1.14 src/sys/arch/playstation2/conf/GENERIC cvs rdiff -u -r1.206 -r1.207 src/sys/arch/pmax/conf/GENERIC cvs rdiff -u -r1.110 -r1.111 src/sys/arch/sandpoint/conf/GENERIC cvs rdiff -u -r1.113 -r1.114 src/sys/arch/sbmips/conf/GENERIC cvs rdiff -u -r1.272 -r1.273 src/sys/arch/sparc/conf/GENERIC cvs rdiff -u -r1.109 -r1.110 src/sys/arch/sun2/conf/GENERIC cvs rdiff -u -r1.189 -r1.190 src/sys/arch/sun3/conf/GENERIC cvs rdiff -u -r1.218 -r1.219 src/sys/arch/vax/conf/GENERIC cvs rdiff -u -r1.207 -r1.208 src/sys/arch/x68k/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: abs Date: Sun Feb 12 14:50:42 UTC 2023 Modified Files: src/sys/arch/acorn32/conf: GENERIC src/sys/arch/amiga/conf: GENERIC GENERIC.in src/sys/arch/amigappc/conf: GENERIC src/sys/arch/arc/conf: GENERIC src/sys/arch/bebox/conf: GENERIC src/sys/arch/cats/conf: GENERIC src/sys/arch/cesfic/conf: GENERIC src/sys/arch/cobalt/conf: GENERIC src/sys/arch/dreamcast/conf: GENERIC src/sys/arch/emips/conf: GENERIC src/sys/arch/epoc32/conf: GENERIC src/sys/arch/ews4800mips/conf: GENERIC src/sys/arch/hp300/conf: GENERIC src/sys/arch/hpcmips/conf: GENERIC src/sys/arch/hpcsh/conf: GENERIC src/sys/arch/hppa/conf: GENERIC src/sys/arch/ibmnws/conf: GENERIC src/sys/arch/iyonix/conf: GENERIC src/sys/arch/luna68k/conf: GENERIC src/sys/arch/mac68k/conf: GENERIC src/sys/arch/mipsco/conf: GENERIC src/sys/arch/mmeye/conf: GENERIC src/sys/arch/mvme68k/conf: GENERIC src/sys/arch/mvmeppc/conf: GENERIC src/sys/arch/netwinder/conf: GENERIC src/sys/arch/news68k/conf: GENERIC src/sys/arch/newsmips/conf: GENERIC src/sys/arch/next68k/conf: GENERIC src/sys/arch/ofppc/conf: GENERIC src/sys/arch/playstation2/conf: GENERIC src/sys/arch/pmax/conf: GENERIC src/sys/arch/sandpoint/conf: GENERIC src/sys/arch/sbmips/conf: GENERIC src/sys/arch/sparc/conf: GENERIC src/sys/arch/sun2/conf: GENERIC src/sys/arch/sun3/conf: GENERIC src/sys/arch/vax/conf: GENERIC src/sys/arch/x68k/conf: GENERIC Log Message: Add optoion GENERIC.local include to the end of ~all GENERIC configs This excludes atari, sgimips, evbmips, evbppc, evbsh3, and hpcarm all of which have somewhat specific kernel config file layouts To generate a diff of this commit: cvs rdiff -u -r1.136 -r1.137 src/sys/arch/acorn32/conf/GENERIC cvs rdiff -u -r1.337 -r1.338 src/sys/arch/amiga/conf/GENERIC cvs rdiff -u -r1.150 -r1.151 src/sys/arch/amiga/conf/GENERIC.in cvs rdiff -u -r1.44 -r1.45 src/sys/arch/amigappc/conf/GENERIC cvs rdiff -u -r1.202 -r1.203 src/sys/arch/arc/conf/GENERIC cvs rdiff -u -r1.168 -r1.169 src/sys/arch/bebox/conf/GENERIC cvs rdiff -u -r1.186 -r1.187 src/sys/arch/cats/conf/GENERIC cvs rdiff -u -r1.77 -r1.78 src/sys/arch/cesfic/conf/GENERIC cvs rdiff -u -r1.172 -r1.173 src/sys/arch/cobalt/conf/GENERIC cvs rdiff -u -r1.136 -r1.137 src/sys/arch/dreamcast/conf/GENERIC cvs rdiff -u -r1.26 -r1.27 src/sys/arch/emips/conf/GENERIC cvs rdiff -u -r1.17 -r1.18 src/sys/arch/epoc32/conf/GENERIC cvs rdiff -u -r1.66 -r1.67 src/sys/arch/ews4800mips/conf/GENERIC cvs rdiff -u -r1.210 -r1.211 src/sys/arch/hp300/conf/GENERIC cvs rdiff -u -r1.247 -r1.248 src/sys/arch/hpcmips/conf/GENERIC cvs rdiff -u -r1.116 -r1.117 src/sys/arch/hpcsh/conf/GENERIC cvs rdiff -u -r1.41 -r1.42 src/sys/arch/hppa/conf/GENERIC cvs rdiff -u -r1.56 -r1.57 src/sys/arch/ibmnws/conf/GENERIC cvs rdiff -u -r1.115 -r1.116 src/sys/arch/iyonix/conf/GENERIC cvs rdiff -u -r1.135 -r1.136 src/sys/arch/luna68k/conf/GENERIC cvs rdiff -u -r1.236 -r1.237 src/sys/arch/mac68k/conf/GENERIC cvs rdiff -u -r1.99 -r1.100 src/sys/arch/mipsco/conf/GENERIC cvs rdiff -u -r1.131 -r1.132 src/sys/arch/mmeye/conf/GENERIC cvs rdiff -u -r1.105 -r1.106 src/sys/arch/mvme68k/conf/GENERIC cvs rdiff -u -r1.32 -r1.33 src/sys/arch/mvmeppc/conf/GENERIC cvs rdiff -u -r1.144 -r1.145 src/sys/arch/netwinder/conf/GENERIC cvs rdiff -u -r1.140 -r1.141 src/sys/arch/news68k/conf/GENERIC cvs rdiff -u -r1.142 -r1.143 src/sys/arch/newsmips/conf/GENERIC cvs rdiff -u -r1.161 -r1.162 src/sys/arch/next68k/conf/GENERIC cvs rdiff -u -r1.178 -r1.179 src/sys/arch/ofppc/conf/GENERIC cvs rdiff -u -r1.13 -r1.14 src/sys/arch/playstation2/conf/GENERIC cvs rdiff -u -r1.206 -r1.207 src/sys/arch/pmax/conf/GENERIC cvs rdiff -u -r1.110 -r1.111 src/sys/arch/sandpoint/conf/GENERIC cvs rdiff -u -r1.113 -r1.114 src/sys/arch/sbmips/conf/GENERIC cvs rdiff -u -r1.272 -r1.273 src/sys/arch/sparc/conf/GENERIC cvs rdiff -u -r1.109 -r1.110 src/sys/arch/sun2/conf/GENERIC cvs rdiff -u -r1.189 -r1.190 src/sys/arch/sun3/conf/GENERIC cvs rdiff -u -r1.218 -r1.219 src/sys/arch/vax/conf/GENERIC cvs rdiff -u -r1.207 -r1.208 src/sys/arch/x68k/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/acorn32/conf/GENERIC diff -u src/sys/arch/acorn32/conf/GENERIC:1.136 src/sys/arch/acorn32/conf/GENERIC:1.137 --- src/sys/arch/acorn32/conf/GENERIC:1.136 Thu Sep 29 10:10:05 2022 +++ src/sys/arch/acorn32/conf/GENERIC Sun Feb 12 14:50:37 2023 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.136 2022/09/29 10:10:05 riastradh Exp $ +# $NetBSD: GENERIC,v 1.137 2023/02/12 14:50:37 abs Exp $ # # GENERIC --- NetBSD/acorn32 complete configuration # @@ -22,7 +22,7 @@ include "arch/acorn3
CVS commit: src/distrib/i386/installimage
Module Name:src Committed By: abs Date: Sun Feb 12 19:18:41 UTC 2023 Modified Files: src/distrib/i386/installimage: install.sh Log Message: Switch install.sh to use /usr/sbin/sysinst for sysinst rather than ./sysinst Matches i386/cdroms/install.sh and amd64/installimage/install.sh resultant install image verified to still run sysinst correctly To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/i386/installimage/install.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/i386/installimage
Module Name:src Committed By: abs Date: Sun Feb 12 19:18:41 UTC 2023 Modified Files: src/distrib/i386/installimage: install.sh Log Message: Switch install.sh to use /usr/sbin/sysinst for sysinst rather than ./sysinst Matches i386/cdroms/install.sh and amd64/installimage/install.sh resultant install image verified to still run sysinst correctly To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/i386/installimage/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/i386/installimage/install.sh diff -u src/distrib/i386/installimage/install.sh:1.3 src/distrib/i386/installimage/install.sh:1.4 --- src/distrib/i386/installimage/install.sh:1.3 Sat Feb 11 17:52:19 2023 +++ src/distrib/i386/installimage/install.sh Sun Feb 12 19:18:41 2023 @@ -1,5 +1,5 @@ #! /bin/sh -m -# $NetBSD: install.sh,v 1.3 2023/02/11 17:52:19 abs Exp $ +# $NetBSD: install.sh,v 1.4 2023/02/12 19:18:41 abs Exp $ # # - # Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -87,7 +87,7 @@ fi # run the installation or upgrade script. cd / -cmd=./sysinst +cmd=/usr/sbin/sysinst while [ -n "${cmd}" ] do
CVS commit: src/distrib
Module Name:src Committed By: abs Date: Sun Feb 12 19:27:21 UTC 2023 Modified Files: src/distrib/evbarm/installimage: install.sh src/distrib/sparc64/cdroms/installcd: install.sh src/distrib/vax/cdroms/installcd: install.sh Log Message: Enable basic command line editing in evbarm, sparc64 and vax installer shells (Following the pattern in amd64) When a user selects "exit installer" or hits ^Z in sysinst, the calling install.sh runs a shell, plus shows a message indicating they can type "exit" to return to the installer. Add -E to the arguments to this shell, to enable command line editing, (primarily for arrow keys, but basic emacs sequences will also work) With the change of all the install.sh scripts in amd64, evbarm, i386, sparc64 and vax are identical apart from NetBSD RCD tags and the sysctl -nx kern.consdev check (some of the latter are definitely either wrong, or have an incorrect comment attached. Will return to later) To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/distrib/evbarm/installimage/install.sh cvs rdiff -u -r1.4 -r1.5 src/distrib/sparc64/cdroms/installcd/install.sh cvs rdiff -u -r1.2 -r1.3 src/distrib/vax/cdroms/installcd/install.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib
Module Name:src Committed By: abs Date: Sun Feb 12 19:27:21 UTC 2023 Modified Files: src/distrib/evbarm/installimage: install.sh src/distrib/sparc64/cdroms/installcd: install.sh src/distrib/vax/cdroms/installcd: install.sh Log Message: Enable basic command line editing in evbarm, sparc64 and vax installer shells (Following the pattern in amd64) When a user selects "exit installer" or hits ^Z in sysinst, the calling install.sh runs a shell, plus shows a message indicating they can type "exit" to return to the installer. Add -E to the arguments to this shell, to enable command line editing, (primarily for arrow keys, but basic emacs sequences will also work) With the change of all the install.sh scripts in amd64, evbarm, i386, sparc64 and vax are identical apart from NetBSD RCD tags and the sysctl -nx kern.consdev check (some of the latter are definitely either wrong, or have an incorrect comment attached. Will return to later) To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/distrib/evbarm/installimage/install.sh cvs rdiff -u -r1.4 -r1.5 src/distrib/sparc64/cdroms/installcd/install.sh cvs rdiff -u -r1.2 -r1.3 src/distrib/vax/cdroms/installcd/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/evbarm/installimage/install.sh diff -u src/distrib/evbarm/installimage/install.sh:1.1 src/distrib/evbarm/installimage/install.sh:1.2 --- src/distrib/evbarm/installimage/install.sh:1.1 Thu May 28 15:23:43 2020 +++ src/distrib/evbarm/installimage/install.sh Sun Feb 12 19:27:20 2023 @@ -1,5 +1,5 @@ #! /bin/sh -m -# $NetBSD: install.sh,v 1.1 2020/05/28 15:23:43 jmcneill Exp $ +# $NetBSD: install.sh,v 1.2 2023/02/12 19:27:20 abs Exp $ # # - # Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -87,7 +87,7 @@ fi # run the installation or upgrade script. cd / -cmd=./sysinst +cmd=/usr/sbin/sysinst while [ -n "${cmd}" ] do @@ -100,7 +100,7 @@ do tput clear echo "You have stopped sysinst, return to it by" \ "typing 'exit' or ^D." - ${SHELL} -i + ${SHELL} -i -E cmd="fg" else cmd="" @@ -112,4 +112,4 @@ done echo "TERM=${TERM}" > ${termfile} echo echo "To return to the installer, quit this shell by typing 'exit' or ^D." -exec ${SHELL} +exec ${SHELL} -E Index: src/distrib/sparc64/cdroms/installcd/install.sh diff -u src/distrib/sparc64/cdroms/installcd/install.sh:1.4 src/distrib/sparc64/cdroms/installcd/install.sh:1.5 --- src/distrib/sparc64/cdroms/installcd/install.sh:1.4 Thu May 28 09:51:31 2015 +++ src/distrib/sparc64/cdroms/installcd/install.sh Sun Feb 12 19:27:20 2023 @@ -1,5 +1,5 @@ #! /bin/sh -m -# $NetBSD: install.sh,v 1.4 2015/05/28 09:51:31 martin Exp $ +# $NetBSD: install.sh,v 1.5 2023/02/12 19:27:20 abs Exp $ # # - # Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -100,7 +100,7 @@ do tput clear echo "You have stopped sysinst, return to it by" \ "typing 'exit' or ^D." - ${SHELL} -i + ${SHELL} -i -E cmd="fg" else cmd="" @@ -112,4 +112,4 @@ done echo "TERM=${TERM}" > ${termfile} echo echo "To return to the installer, quit this shell by typing 'exit' or ^D." -exec ${SHELL} +exec ${SHELL} -E Index: src/distrib/vax/cdroms/installcd/install.sh diff -u src/distrib/vax/cdroms/installcd/install.sh:1.2 src/distrib/vax/cdroms/installcd/install.sh:1.3 --- src/distrib/vax/cdroms/installcd/install.sh:1.2 Thu May 28 09:51:31 2015 +++ src/distrib/vax/cdroms/installcd/install.sh Sun Feb 12 19:27:20 2023 @@ -1,5 +1,5 @@ #! /bin/sh -m -# $NetBSD: install.sh,v 1.2 2015/05/28 09:51:31 martin Exp $ +# $NetBSD: install.sh,v 1.3 2023/02/12 19:27:20 abs Exp $ # # - # Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -100,7 +100,7 @@ do tput clear echo "You have stopped sysinst, return to it by" \ "typing 'exit' or ^D." - ${SHELL} -i + ${SHELL} -i -E cmd="fg" else cmd="" @@ -112,4 +112,4 @@ done echo "TERM=${TERM}" > ${termfile} echo echo "To return to the installer, quit this shell by typing 'exit' or ^D." -exec ${SHELL} +exec ${SHELL} -E
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: abs Date: Sun Feb 12 20:14:32 UTC 2023 Modified Files: src/usr.sbin/sysinst: menus.mi Log Message: Add "-i -E" to /bin/sh called from sysinst This enables command line editing (primarily for arrow keys, but basic emacs sequences will also work) In the event that the shell has been compiled without command line editing features (for memory contrained install environments) the -E is ignored To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/usr.sbin/sysinst/menus.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: abs Date: Sun Feb 12 20:14:32 UTC 2023 Modified Files: src/usr.sbin/sysinst: menus.mi Log Message: Add "-i -E" to /bin/sh called from sysinst This enables command line editing (primarily for arrow keys, but basic emacs sequences will also work) In the event that the shell has been compiled without command line editing features (for memory contrained install environments) the -E is ignored To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/usr.sbin/sysinst/menus.mi 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/menus.mi diff -u src/usr.sbin/sysinst/menus.mi:1.27 src/usr.sbin/sysinst/menus.mi:1.28 --- src/usr.sbin/sysinst/menus.mi:1.27 Fri Jul 22 16:51:14 2022 +++ src/usr.sbin/sysinst/menus.mi Sun Feb 12 20:14:32 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: menus.mi,v 1.27 2022/07/22 16:51:14 christos Exp $ */ +/* $NetBSD: menus.mi,v 1.28 2023/02/12 20:14:32 abs Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -270,7 +270,7 @@ menu utility, title MSG_NetBSD_VERSION_U exitstring MSG_exit_menu_generic; display action { toplevel(); }; option MSG_Run_bin_sh, - action (endwin) { system("/bin/sh"); }; + action (endwin) { system("/bin/sh -i -E"); }; option MSG_Set_timezone, action { set_timezone(); }; option MSG_Configure_network,
Re: CVS commit: src/distrib/i386/installimage
On Tue, 14 Feb 2023 at 14:45, Martin Husemann wrote: > On Tue, Feb 14, 2023 at 11:39:23PM +0900, Izumi Tsutsui wrote: > > > Module Name:src > > > Committed By: abs > > > Date: Sun Feb 12 19:18:41 UTC 2023 > > > > > > Modified Files: > > > src/distrib/i386/installimage: install.sh > > > > > > Log Message: > > > Switch install.sh to use /usr/sbin/sysinst for sysinst rather than > ./sysinst > > > > > > Matches i386/cdroms/install.sh and amd64/installimage/install.sh > > > > Then maybe you should also update Makefile and spec files > > that prepared the ./sysinst binary. > > > https://github.com/NetBSD/src/commit/a32111f404058f1cc54d20b36a289a4d9bbb02c3 > OK, thanks - was not aware of that, will take a look Also are you *sure* this install medium has /usr/sbin/sysinst ? > (I don't know and haven't checked, but found it not always obvious to > answer) > I tested that both the img and floppy i386 installer loaded sysinst after the change, just in case :)
CVS commit: src/distrib/amiga/stand
Module Name:src Committed By: abs Date: Thu Mar 23 13:56:24 UTC 2023 Modified Files: src/distrib/amiga/stand: Makefile rdbinfo.uue xstreamtodev.uue Added Files: src/distrib/amiga/stand: device-streams-2.2.1-src.tar.gz.uue device-streams-2.2.1.lha.uue device-streams.README.md update xdevtostream.uue Removed Files: src/distrib/amiga/stand: device-streams.tar.gz.uue Log Message: Update device-streams binaries from Roc Vallès - Split device-streams.tar.gz.uue into seperate source and binaries device-streams-2.2.1-src.tar.gz and device-streams-2.2.1.lha to match upstream - Add device-streams.README.md from upstream - Add simple 'update' script to help updating next time - Binaries now avoid 32 bit file offset issues (they use 64 bit offsets where supported, and otherwise avoid corrupting data due to 32 bit limits) - Binaries now built with updated bebbo/amiga-gcc toolchain Pullup: netbsd-10, netbsd-9 and possibly netbsd-8 To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/distrib/amiga/stand/Makefile cvs rdiff -u -r0 -r1.1 \ src/distrib/amiga/stand/device-streams-2.2.1-src.tar.gz.uue \ src/distrib/amiga/stand/device-streams-2.2.1.lha.uue \ src/distrib/amiga/stand/device-streams.README.md \ src/distrib/amiga/stand/update src/distrib/amiga/stand/xdevtostream.uue cvs rdiff -u -r1.1 -r0 src/distrib/amiga/stand/device-streams.tar.gz.uue cvs rdiff -u -r1.1 -r1.2 src/distrib/amiga/stand/rdbinfo.uue \ src/distrib/amiga/stand/xstreamtodev.uue Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/amiga/stand/bootblock/boot
Module Name:src Committed By: abs Date: Sat Mar 25 20:14:26 UTC 2023 Modified Files: src/sys/arch/amiga/stand/bootblock/boot: console.c libstubs.h libstubs.s version Log Message: Fix NetBSD/amiga bootblocks for Kickstart 3.2 - from Karoly Balogh Kickstart 3.2 changed to not initialize console.device before bootstrap, so the previous NetBSD bootblocks would crash when they tried to initialise console output. With this change if the call to the OpenDevice() stub fails, the code now calls FindResident() and InitResident() before retrying the OpenDevice(). Many thanks to Karoly Balogh for tracking this down (and also for knowing just who to poke to get insight into the 3.2 changes :) To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/amiga/stand/bootblock/boot/console.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/amiga/stand/bootblock/boot/libstubs.h cvs rdiff -u -r1.10 -r1.11 src/sys/arch/amiga/stand/bootblock/boot/libstubs.s cvs rdiff -u -r1.2 -r1.3 src/sys/arch/amiga/stand/bootblock/boot/version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/amiga/stand/bootblock/boot
Module Name:src Committed By: abs Date: Sat Mar 25 20:14:26 UTC 2023 Modified Files: src/sys/arch/amiga/stand/bootblock/boot: console.c libstubs.h libstubs.s version Log Message: Fix NetBSD/amiga bootblocks for Kickstart 3.2 - from Karoly Balogh Kickstart 3.2 changed to not initialize console.device before bootstrap, so the previous NetBSD bootblocks would crash when they tried to initialise console output. With this change if the call to the OpenDevice() stub fails, the code now calls FindResident() and InitResident() before retrying the OpenDevice(). Many thanks to Karoly Balogh for tracking this down (and also for knowing just who to poke to get insight into the 3.2 changes :) To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/amiga/stand/bootblock/boot/console.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/amiga/stand/bootblock/boot/libstubs.h cvs rdiff -u -r1.10 -r1.11 src/sys/arch/amiga/stand/bootblock/boot/libstubs.s cvs rdiff -u -r1.2 -r1.3 src/sys/arch/amiga/stand/bootblock/boot/version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amiga/stand/bootblock/boot/console.c diff -u src/sys/arch/amiga/stand/bootblock/boot/console.c:1.15 src/sys/arch/amiga/stand/bootblock/boot/console.c:1.16 --- src/sys/arch/amiga/stand/bootblock/boot/console.c:1.15 Sun Dec 18 12:02:37 2016 +++ src/sys/arch/amiga/stand/bootblock/boot/console.c Sat Mar 25 20:14:26 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: console.c,v 1.15 2016/12/18 12:02:37 mlelstv Exp $ */ +/* $NetBSD: console.c,v 1.16 2023/03/25 20:14:26 abs Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -138,8 +138,20 @@ consinit(void *consptr) { goto err; mc->cnior->buf = (void *)mc->w; - if (OpenDevice("console.device", 0, mc->cnior, 0)) - goto err; + mc->cnior->length = 136; /* sizeof(struct Window) */ + if (OpenDevice("console.device", 0, mc->cnior, 0)) { + /* Kickstart 3.2 decided not to initialize console.device +before bootstrap, so we have to do it ourselves. */ + void *res = FindResident("console.device"); + if (!res) + goto err; + + if (!InitResident(res, 0)) + goto err; + + if (OpenDevice("console.device", 0, mc->cnior, 0)) + goto err; + } mc->tmior = (struct TimerIO *)CreateIORequest(mc->cnmp, sizeof(struct TimerIO)); if (!mc->tmior) Index: src/sys/arch/amiga/stand/bootblock/boot/libstubs.h diff -u src/sys/arch/amiga/stand/bootblock/boot/libstubs.h:1.7 src/sys/arch/amiga/stand/bootblock/boot/libstubs.h:1.8 --- src/sys/arch/amiga/stand/bootblock/boot/libstubs.h:1.7 Sat Oct 17 11:18:18 2009 +++ src/sys/arch/amiga/stand/bootblock/boot/libstubs.h Sat Mar 25 20:14:26 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: libstubs.h,v 1.7 2009/10/17 11:18:18 mlelstv Exp $ */ +/* $NetBSD: libstubs.h,v 1.8 2023/03/25 20:14:26 abs Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -65,6 +65,7 @@ void CloseDevice(struct AmigaIO *); #endif void *FindResident(const char *); +void *InitResident(const char *, u_int32_t); void *OpenResource(const char *); u_int32_t CachePreDMA(u_int32_t, u_int32_t *, int); Index: src/sys/arch/amiga/stand/bootblock/boot/libstubs.s diff -u src/sys/arch/amiga/stand/bootblock/boot/libstubs.s:1.10 src/sys/arch/amiga/stand/bootblock/boot/libstubs.s:1.11 --- src/sys/arch/amiga/stand/bootblock/boot/libstubs.s:1.10 Sat Oct 17 11:18:18 2009 +++ src/sys/arch/amiga/stand/bootblock/boot/libstubs.s Sat Mar 25 20:14:26 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: libstubs.s,v 1.10 2009/10/17 11:18:18 mlelstv Exp $ */ +/* $NetBSD: libstubs.s,v 1.11 2023/03/25 20:14:26 abs Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -208,6 +208,16 @@ ENTRY_NOPROFILE(FindResident) movl %d0,%a0 | Comply with ELF ABI rts +ENTRY_NOPROFILE(InitResident) + movl %a6,%sp@- + movl %pc@(_C_LABEL(SysBase):w),%a6 + movl %sp@(8),%a1 + movl %sp@(12),%d1 + jsr %a6@(-0x66) + movl %sp@+,%a6 + movl %d0,%a0 | Comply with ELF ABI + rts + ENTRY_NOPROFILE(OpenResource) movl %a6,%sp@- movl %pc@(_C_LABEL(SysBase):w),%a6 Index: src/sys/arch/amiga/stand/bootblock/boot/version diff -u src/sys/arch/amiga/stand/bootblock/boot/version:1.2 src/sys/arch/amiga/stand/bootblock/boot/version:1.3 --- src/sys/arch/amiga/stand/bootblock/boot/version:1.2 Thu Feb 25 03:42:14 2021 +++ src/sys/arch/amiga/stand/bootblock/boot/version Sat Mar 25 20:14:26 2023 @@ -1,4 +1,4 @@ -$NetBSD: version,v 1.2 2021/02/25 03:42:14 rin Exp $ +$NetBSD: version,v 1.3 2023/03/25 20:14:26 abs Exp $ NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE. The format of this file is important - make sure the entries are appended on end, last item @@ -12,3 +12,4 @@ is taken as the current. 2.4: Moved default command into fixed location for easy patching 3.0: Initial 2 stage amiga bootblocks 3.1: Add support for FFSv2 +3.2: Fix booting with some "modern" Kickstart versions
Re: CVS commit: src
On Sat, 12 Aug 2023 at 16:16, Andrius V wrote: > > Hi, > > Sorry, didn't notice the email until today. To answer your question > why it is not enabled in GENERIC by default, I am not sure > (Taylor(?)), it was commented since the day one both on i386 and > amd64. > > However, I have some doubts if it is very relevant driver to enable > it. From the context perspective, viadrmums is also a legacy driver, > Linux have already removed it in the latest kernel source code, and > new https://cgit.freedesktop.org/openchrome/drm-openchrome/ was > developed, but haven't made it to official kernel yet (and hard to > tell when and if it will happen at all)). VIA integrated graphics > drivers development was a always a bit of a sad story: lack of > interest, manpower/skills, lack of VIA participation, the hardware is > pretty obscure and under-performing, and likely more suitable for non > graphics related tasks. Myself I used it mainly for NAS and testing > platform, thus I need only basic graphics support. Nevertheless, if it > doesn't affect the development much and it does seem to be work in the > machines I own, I can enable it. Some of us are all about the legacy hardware :) Seriously, one of the areas in which NetBSD's reputation is relatively better is in older x86 hardware, so if enabling it is likely to give a better experience for some set of hardware while being very unlikely to make things worse, I'd support enabling it David
CVS commit: src/sys
Module Name:src Committed By: abs Date: Sun Sep 10 14:04:28 UTC 2023 Modified Files: src/sys/conf: files src/sys/dev/ic: ahcisata_core.c ahcisatavar.h src/sys/dev/pci: ahcisata_pci.c Log Message: Rework AHCISATA_EXTRA_DELAY for kern/56737 - Remove AHCI_QUIRK_EXTRA_DELAY as issue appears to be drive and not controller related - Replace AHCISATA_EXTRA_DELAY with AHCISATA_REMOVE_EXTRA_DELAY, so defaulting to enabling the extra delay, as the downside of slower probing on systems which do not need it is less than having other systems intermittently fail to probe and attach drives - Also allow disabling extra delay with AHCISATA_EXTRA_DELAY_MS = 0 We should return to this code to work out which of the extra delays are needed, and how long they need to be. It may be that faster systems are more likely to trigger the issue (I've only seen it on a 13th gen i7-13700, though only tested on a limited set) XXX pullup -10 To generate a diff of this commit: cvs rdiff -u -r1.1308 -r1.1309 src/sys/conf/files cvs rdiff -u -r1.107 -r1.108 src/sys/dev/ic/ahcisata_core.c cvs rdiff -u -r1.27 -r1.28 src/sys/dev/ic/ahcisatavar.h cvs rdiff -u -r1.69 -r1.70 src/sys/dev/pci/ahcisata_pci.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/conf/files diff -u src/sys/conf/files:1.1308 src/sys/conf/files:1.1309 --- src/sys/conf/files:1.1308 Sun Sep 3 19:38:58 2023 +++ src/sys/conf/files Sun Sep 10 14:04:28 2023 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1308 2023/09/03 19:38:58 andvar Exp $ +# $NetBSD: files,v 1.1309 2023/09/10 14:04:28 abs Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20171118 @@ -1062,7 +1062,7 @@ device njata: ata, ata_piobm, wdc_common file dev/ic/ninjaata32.c njata # AHCI-compatible SATA controllers -defflag opt_ahcisata.h AHCISATA_EXTRA_DELAY +defflag opt_ahcisata.h AHCISATA_REMOVE_EXTRA_DELAY defparam opt_ahcisata.h AHCISATA_EXTRA_DELAY_MS define ahcisata_core file dev/ic/ahcisata_core.c ahcisata_core Index: src/sys/dev/ic/ahcisata_core.c diff -u src/sys/dev/ic/ahcisata_core.c:1.107 src/sys/dev/ic/ahcisata_core.c:1.108 --- src/sys/dev/ic/ahcisata_core.c:1.107 Mon Aug 1 07:37:18 2022 +++ src/sys/dev/ic/ahcisata_core.c Sun Sep 10 14:04:28 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: ahcisata_core.c,v 1.107 2022/08/01 07:37:18 mlelstv Exp $ */ +/* $NetBSD: ahcisata_core.c,v 1.108 2023/09/10 14:04:28 abs Exp $ */ /* * Copyright (c) 2006 Manuel Bouyer. @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.107 2022/08/01 07:37:18 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.108 2023/09/10 14:04:28 abs Exp $"); #include #include @@ -119,15 +119,11 @@ static const struct scsipi_bustype ahci_ #define AHCISATA_EXTRA_DELAY_MS 500 /* XXX need to adjust */ #endif -#ifdef AHCISATA_EXTRA_DELAY +#if !defined(AHCISATA_REMOVE_EXTRA_DELAY) && AHCISATA_EXTRA_DELAY_MS > 0 #define AHCISATA_DO_EXTRA_DELAY(sc, chp, msg, flags) \ ata_delay(chp, AHCISATA_EXTRA_DELAY_MS, msg, flags) #else -#define AHCISATA_DO_EXTRA_DELAY(sc, chp, msg, flags) \ -do {\ - if ((sc)->sc_ahci_quirks & AHCI_QUIRK_EXTRA_DELAY) \ - ata_delay(chp, AHCISATA_EXTRA_DELAY_MS, msg, flags); \ -} while (0) +#define AHCISATA_DO_EXTRA_DELAY(sc, chp, msg, flags) do { } while (0) #endif const struct ata_bustype ahci_ata_bustype = { Index: src/sys/dev/ic/ahcisatavar.h diff -u src/sys/dev/ic/ahcisatavar.h:1.27 src/sys/dev/ic/ahcisatavar.h:1.28 --- src/sys/dev/ic/ahcisatavar.h:1.27 Fri Nov 19 23:46:55 2021 +++ src/sys/dev/ic/ahcisatavar.h Sun Sep 10 14:04:28 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: ahcisatavar.h,v 1.27 2021/11/19 23:46:55 rin Exp $ */ +/* $NetBSD: ahcisatavar.h,v 1.28 2023/09/10 14:04:28 abs Exp $ */ /* * Copyright (c) 2006 Manuel Bouyer. @@ -59,7 +59,6 @@ struct ahci_softc { #define AHCI_PCI_QUIRK_BAD64 __BIT(1) /* broken 64-bit DMA */ #define AHCI_QUIRK_BADPMP __BIT(2) /* broken PMP support, ignore */ #define AHCI_QUIRK_BADNCQ __BIT(3) /* possibly broken NCQ support, ignore */ -#define AHCI_QUIRK_EXTRA_DELAY __BIT(4) /* needs extra delay */ uint32_t sc_ahci_cap; /* copy of AHCI_CAP */ int sc_ncmds; /* number of command slots */ Index: src/sys/dev/pci/ahcisata_pci.c diff -u src/sys/dev/pci/ahcisata_pci.c:1.69 src/sys/dev/pci/ahcisata_pci.c:1.70 --- src/sys/dev/pci/ahcisata_pci.c:1.69 Mon Jul 31 11:24:32 2023 +++ src/sys/dev/pci/ahcisata_pci.c Sun Sep 10 14:04:28 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: ahcisata_pci.c,v 1.69 2023/07/31 11:24:32 tnn Exp $ */ +/* $NetBSD: ahcisata_pci.c,v 1.70 2023/09/10 14:04:28 abs Exp $ */ /* * Copyright (c) 2006 Manuel Bouyer. @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.69 2023/07/31 11:24:32 tnn Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.70 2023/09/10 14:04:28 abs Exp $"); #ifdef _KERNEL_OPT #include "o
CVS commit: src/sys
Module Name:src Committed By: abs Date: Sun Sep 10 14:04:28 UTC 2023 Modified Files: src/sys/conf: files src/sys/dev/ic: ahcisata_core.c ahcisatavar.h src/sys/dev/pci: ahcisata_pci.c Log Message: Rework AHCISATA_EXTRA_DELAY for kern/56737 - Remove AHCI_QUIRK_EXTRA_DELAY as issue appears to be drive and not controller related - Replace AHCISATA_EXTRA_DELAY with AHCISATA_REMOVE_EXTRA_DELAY, so defaulting to enabling the extra delay, as the downside of slower probing on systems which do not need it is less than having other systems intermittently fail to probe and attach drives - Also allow disabling extra delay with AHCISATA_EXTRA_DELAY_MS = 0 We should return to this code to work out which of the extra delays are needed, and how long they need to be. It may be that faster systems are more likely to trigger the issue (I've only seen it on a 13th gen i7-13700, though only tested on a limited set) XXX pullup -10 To generate a diff of this commit: cvs rdiff -u -r1.1308 -r1.1309 src/sys/conf/files cvs rdiff -u -r1.107 -r1.108 src/sys/dev/ic/ahcisata_core.c cvs rdiff -u -r1.27 -r1.28 src/sys/dev/ic/ahcisatavar.h cvs rdiff -u -r1.69 -r1.70 src/sys/dev/pci/ahcisata_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc
Module Name:src Committed By: abs Date: Thu Oct 5 08:19:27 UTC 2023 Modified Files: src/etc/defaults: rc.conf src/etc/rc.d: npf Log Message: Add support to npf_rules to rc.conf - Allows overriding default from /etc/npf.conf - Indicate rules file used in output - Drop check for file presence in script - rely on npf exiting with error To generate a diff of this commit: cvs rdiff -u -r1.166 -r1.167 src/etc/defaults/rc.conf cvs rdiff -u -r1.7 -r1.8 src/etc/rc.d/npf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/defaults/rc.conf diff -u src/etc/defaults/rc.conf:1.166 src/etc/defaults/rc.conf:1.167 --- src/etc/defaults/rc.conf:1.166 Wed Sep 27 01:27:32 2023 +++ src/etc/defaults/rc.conf Thu Oct 5 08:19:27 2023 @@ -1,4 +1,4 @@ -# $NetBSD: rc.conf,v 1.166 2023/09/27 01:27:32 riastradh Exp $ +# $NetBSD: rc.conf,v 1.167 2023/10/05 08:19:27 abs Exp $ # # /etc/defaults/rc.conf -- # default configuration of /etc/rc.conf @@ -181,7 +181,7 @@ securelevel="" # securelevel to set ifconfig_wait_dad_flags="-w 15 -W 5" mdnsd=NO -npf=NO +npf=NO npf_rules="/etc/npf.conf" npfd=NO npfd_flags="" ipfilter=NO ipfilter_flags="" # uses /etc/ipf.conf ipnat=NO # uses /etc/ipnat.conf Index: src/etc/rc.d/npf diff -u src/etc/rc.d/npf:1.7 src/etc/rc.d/npf:1.8 --- src/etc/rc.d/npf:1.7 Tue Sep 8 12:52:18 2020 +++ src/etc/rc.d/npf Thu Oct 5 08:19:27 2023 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: npf,v 1.7 2020/09/08 12:52:18 martin Exp $ +# $NetBSD: npf,v 1.8 2023/10/05 08:19:27 abs Exp $ # # Public Domain. # @@ -14,8 +14,6 @@ $_rc_subr_loaded . /etc/rc.subr name="npf" rcvar=$name -config="/etc/npf.conf" - start_cmd="npf_start" stop_cmd="npf_stop" @@ -23,19 +21,11 @@ reload_cmd="npf_reload" status_cmd="npf_status" extra_commands="reload status" -npf_cfg_check() -{ - if [ ! -f ${config} ]; then - warn "${config} is not readable; failed." - exit 1 - fi -} npf_start() { - echo "Enabling NPF." - npf_cfg_check - /sbin/npfctl reload + echo "Enabling NPF $npf_rules" + /sbin/npfctl reload "$npf_rules" # The npf_boot script has enabled npf already. if [ "$autoboot" != "yes" ]; then @@ -52,9 +42,8 @@ npf_stop() npf_reload() { - echo "Reloading NPF ruleset." - npf_cfg_check - /sbin/npfctl reload + echo "Reloading NPF ruleset $npf_rules" + /sbin/npfctl reload "$npf_rules" } npf_status()
CVS commit: src/etc
Module Name:src Committed By: abs Date: Thu Oct 5 08:19:27 UTC 2023 Modified Files: src/etc/defaults: rc.conf src/etc/rc.d: npf Log Message: Add support to npf_rules to rc.conf - Allows overriding default from /etc/npf.conf - Indicate rules file used in output - Drop check for file presence in script - rely on npf exiting with error To generate a diff of this commit: cvs rdiff -u -r1.166 -r1.167 src/etc/defaults/rc.conf cvs rdiff -u -r1.7 -r1.8 src/etc/rc.d/npf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: abs Date: Tue Oct 10 16:44:16 UTC 2023 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add entry for ASMEDIA 0x0624 - ASM1062 + JMB575 Port Multiplier To generate a diff of this commit: cvs rdiff -u -r1.1495 -r1.1496 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: abs Date: Tue Oct 10 16:44:16 UTC 2023 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add entry for ASMEDIA 0x0624 - ASM1062 + JMB575 Port Multiplier To generate a diff of this commit: cvs rdiff -u -r1.1495 -r1.1496 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1495 src/sys/dev/pci/pcidevs:1.1496 --- src/sys/dev/pci/pcidevs:1.1495 Sun Oct 8 08:04:41 2023 +++ src/sys/dev/pci/pcidevs Tue Oct 10 16:44:16 2023 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1495 2023/10/08 08:04:41 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1496 2023/10/10 16:44:16 abs Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -1510,6 +1510,7 @@ product ASMEDIA ASM1061_01 0x0601 ASM106 product ASMEDIA ASM1061_02 0x0602 ASM1061 AHCI SATA III Controller product ASMEDIA ASM1061_11 0x0611 ASM1061 AHCI SATA III Controller product ASMEDIA ASM1061_12 0x0612 ASM1061 AHCI SATA III Controller +product ASMEDIA ASM1062_JMB575 0x0624 ASM1062 + JMB575 Port Multiplier product ASMEDIA ASM106X 0x0625 ASM106x AHCI SATA III Controller product ASMEDIA ASM1042 0x1042 ASM1042 USB 3.0 Host Controller product ASMEDIA ASM1083 0x1080 ASM1083/1085 PCIe-PCI Bridge
CVS commit: src/sys/dev/pci
Module Name:src Committed By: abs Date: Tue Oct 10 16:45:54 UTC 2023 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: Regenerate for ASMEDIA 0x0624 To generate a diff of this commit: cvs rdiff -u -r1.1476 -r1.1477 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1475 -r1.1476 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: abs Date: Tue Oct 10 16:45:54 UTC 2023 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: Regenerate for ASMEDIA 0x0624 To generate a diff of this commit: cvs rdiff -u -r1.1476 -r1.1477 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1475 -r1.1476 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: src/sys/dev/pci
Module Name:src Committed By: abs Date: Tue Oct 10 16:46:56 UTC 2023 Modified Files: src/sys/dev/pci: ahcisata_pci.c Log Message: Add support for ASMEDIA 0x0624 ... an AHCI SATA adaptor which identifies itself as an IDE storage device To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/sys/dev/pci/ahcisata_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: abs Date: Tue Oct 10 16:46:56 UTC 2023 Modified Files: src/sys/dev/pci: ahcisata_pci.c Log Message: Add support for ASMEDIA 0x0624 ... an AHCI SATA adaptor which identifies itself as an IDE storage device To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/sys/dev/pci/ahcisata_pci.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/ahcisata_pci.c diff -u src/sys/dev/pci/ahcisata_pci.c:1.70 src/sys/dev/pci/ahcisata_pci.c:1.71 --- src/sys/dev/pci/ahcisata_pci.c:1.70 Sun Sep 10 14:04:28 2023 +++ src/sys/dev/pci/ahcisata_pci.c Tue Oct 10 16:46:56 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: ahcisata_pci.c,v 1.70 2023/09/10 14:04:28 abs Exp $ */ +/* $NetBSD: ahcisata_pci.c,v 1.71 2023/10/10 16:46:56 abs Exp $ */ /* * Copyright (c) 2006 Manuel Bouyer. @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.70 2023/09/10 14:04:28 abs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.71 2023/10/10 16:46:56 abs Exp $"); #ifdef _KERNEL_OPT #include "opt_ahcisata_pci.h" @@ -198,6 +198,8 @@ static const struct ahci_pci_quirk ahci_ AHCI_PCI_QUIRK_FORCE }, { PCI_VENDOR_ASMEDIA, PCI_PRODUCT_ASMEDIA_ASM1061_12, AHCI_PCI_QUIRK_FORCE }, + { PCI_VENDOR_ASMEDIA, PCI_PRODUCT_ASMEDIA_ASM1062_JMB575, + AHCI_PCI_QUIRK_FORCE }, { PCI_VENDOR_AMD, PCI_PRODUCT_AMD_HUDSON_SATA, AHCI_PCI_QUIRK_FORCE }, { PCI_VENDOR_AMD, PCI_PRODUCT_AMD_HUDSON_SATA_AHCI,
CVS commit: src/sys/dev/tc
Module Name:src Committed By: abs Date: Mon Dec 6 16:00:07 UTC 2021 Modified Files: src/sys/dev/tc: cfb.c mfb.c sfb.c tfb.c xcfb.c Log Message: Add WSDISPLAYIO_GET_FBINFO support to most TURBOchannel framebuffers This adds WSDISPLAYIO_GET_FBINFO to cfb, mfb, sfb, tfb and xcfb TURBOchannel framebuffers as used by pmax and alpha It does not add support to px and pxg (they handle ioctls in common code in stic.c and more careful wiring is required) These changes allow an Xswfb X server to use the framebuffer directly, albeit without any special acceleration A subsequent change will re-enable X server building on pmax, and also hopefully switch alpha from Xorg 1.10 to 1.20 To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/sys/dev/tc/cfb.c src/sys/dev/tc/tfb.c cvs rdiff -u -r1.63 -r1.64 src/sys/dev/tc/mfb.c cvs rdiff -u -r1.88 -r1.89 src/sys/dev/tc/sfb.c cvs rdiff -u -r1.59 -r1.60 src/sys/dev/tc/xcfb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/tc
Module Name:src Committed By: abs Date: Mon Dec 6 16:00:07 UTC 2021 Modified Files: src/sys/dev/tc: cfb.c mfb.c sfb.c tfb.c xcfb.c Log Message: Add WSDISPLAYIO_GET_FBINFO support to most TURBOchannel framebuffers This adds WSDISPLAYIO_GET_FBINFO to cfb, mfb, sfb, tfb and xcfb TURBOchannel framebuffers as used by pmax and alpha It does not add support to px and pxg (they handle ioctls in common code in stic.c and more careful wiring is required) These changes allow an Xswfb X server to use the framebuffer directly, albeit without any special acceleration A subsequent change will re-enable X server building on pmax, and also hopefully switch alpha from Xorg 1.10 to 1.20 To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/sys/dev/tc/cfb.c src/sys/dev/tc/tfb.c cvs rdiff -u -r1.63 -r1.64 src/sys/dev/tc/mfb.c cvs rdiff -u -r1.88 -r1.89 src/sys/dev/tc/sfb.c cvs rdiff -u -r1.59 -r1.60 src/sys/dev/tc/xcfb.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/tc/cfb.c diff -u src/sys/dev/tc/cfb.c:1.65 src/sys/dev/tc/cfb.c:1.66 --- src/sys/dev/tc/cfb.c:1.65 Sat Aug 7 16:19:16 2021 +++ src/sys/dev/tc/cfb.c Mon Dec 6 16:00:07 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: cfb.c,v 1.65 2021/08/07 16:19:16 thorpej Exp $ */ +/* $NetBSD: cfb.c,v 1.66 2021/12/06 16:00:07 abs Exp $ */ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cfb.c,v 1.65 2021/08/07 16:19:16 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cfb.c,v 1.66 2021/12/06 16:00:07 abs Exp $"); #include #include @@ -363,6 +363,11 @@ cfbioctl(void *v, void *vs, u_long cmd, *(u_int *)data = WSDISPLAY_TYPE_CFB; return (0); + case WSDISPLAYIO_GET_FBINFO: { + struct wsdisplayio_fbinfo *fbi = data; + return wsdisplayio_get_fbinfo(sc->sc_ri, fbi); + } + case WSDISPLAYIO_GINFO: #define wsd_fbip ((struct wsdisplay_fbinfo *)data) wsd_fbip->height = ri->ri_height; Index: src/sys/dev/tc/tfb.c diff -u src/sys/dev/tc/tfb.c:1.65 src/sys/dev/tc/tfb.c:1.66 --- src/sys/dev/tc/tfb.c:1.65 Sat Aug 7 16:19:16 2021 +++ src/sys/dev/tc/tfb.c Mon Dec 6 16:00:07 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: tfb.c,v 1.65 2021/08/07 16:19:16 thorpej Exp $ */ +/* $NetBSD: tfb.c,v 1.66 2021/12/06 16:00:07 abs Exp $ */ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: tfb.c,v 1.65 2021/08/07 16:19:16 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tfb.c,v 1.66 2021/12/06 16:00:07 abs Exp $"); #include #include @@ -397,6 +397,11 @@ tfbioctl(void *v, void *vs, u_long cmd, *(u_int *)data = WSDISPLAY_TYPE_TX; return (0); + case WSDISPLAYIO_GET_FBINFO: { + struct wsdisplayio_fbinfo *fbi = data; + return wsdisplayio_get_fbinfo(sc->sc_ri, fbi); + } + case WSDISPLAYIO_GINFO: #define wsd_fbip ((struct wsdisplay_fbinfo *)data) wsd_fbip->height = ri->ri_height; Index: src/sys/dev/tc/mfb.c diff -u src/sys/dev/tc/mfb.c:1.63 src/sys/dev/tc/mfb.c:1.64 --- src/sys/dev/tc/mfb.c:1.63 Sat Aug 7 16:19:16 2021 +++ src/sys/dev/tc/mfb.c Mon Dec 6 16:00:07 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: mfb.c,v 1.63 2021/08/07 16:19:16 thorpej Exp $ */ +/* $NetBSD: mfb.c,v 1.64 2021/12/06 16:00:07 abs Exp $ */ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.63 2021/08/07 16:19:16 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.64 2021/12/06 16:00:07 abs Exp $"); #include #include @@ -327,6 +327,11 @@ mfbioctl(void *v, void *vs, u_long cmd, *(u_int *)data = WSDISPLAY_TYPE_MFB; return (0); + case WSDISPLAYIO_GET_FBINFO: { + struct wsdisplayio_fbinfo *fbi = data; + return wsdisplayio_get_fbinfo(sc->sc_ri, fbi); + } + case WSDISPLAYIO_GINFO: #define wsd_fbip ((struct wsdisplay_fbinfo *)data) wsd_fbip->height = ri->ri_height; Index: src/sys/dev/tc/sfb.c diff -u src/sys/dev/tc/sfb.c:1.88 src/sys/dev/tc/sfb.c:1.89 --- src/sys/dev/tc/sfb.c:1.88 Sat Aug 7 16:19:16 2021 +++ src/sys/dev/tc/sfb.c Mon Dec 6 16:00:07 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: sfb.c,v 1.88 2021/08/07 16:19:16 thorpej Exp $ */ +/* $NetBSD: sfb.c,v 1.89 2021/12/06 16:00:07 abs Exp $ */ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sfb.c,v 1.88 2021/08/07 16:19:16 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sfb.c,v 1.89 2021/12/06 16:00:07 abs Exp $"); #include #include @@ -397,6 +397,11 @@ sfbioctl(void *v, void *vs, u_long cmd, *(u_int *)data = WSDISPLAY_TYPE_SFB; return (0); + case WSDISPLAYIO_GET_FBINFO: { + struct wsdisplayio_fbinfo *fbi = data; + return wsdisplayio_get_fbinfo(sc->sc_ri, fbi); + } + case WSDISPLAYIO_GINFO: #define wsd_fbip ((struct wsdisplay_fbinfo *)data) wsd_fbip->height = ri->ri_height; Index: src/s
CVS commit: src/sys/dev/tc
Module Name:src Committed By: abs Date: Mon Dec 6 17:43:50 UTC 2021 Modified Files: src/sys/dev/tc: sfbplus.c Log Message: Add WSDISPLAYIO_GET_FBINFO support to sfbplus TURBOchannel framebuffer Missed in previous change to cfb, mfb, sfb, tfb and xcfb To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/sys/dev/tc/sfbplus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/tc
Module Name:src Committed By: abs Date: Mon Dec 6 17:43:50 UTC 2021 Modified Files: src/sys/dev/tc: sfbplus.c Log Message: Add WSDISPLAYIO_GET_FBINFO support to sfbplus TURBOchannel framebuffer Missed in previous change to cfb, mfb, sfb, tfb and xcfb To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/sys/dev/tc/sfbplus.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/tc/sfbplus.c diff -u src/sys/dev/tc/sfbplus.c:1.41 src/sys/dev/tc/sfbplus.c:1.42 --- src/sys/dev/tc/sfbplus.c:1.41 Sat Aug 7 16:19:16 2021 +++ src/sys/dev/tc/sfbplus.c Mon Dec 6 17:43:50 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: sfbplus.c,v 1.41 2021/08/07 16:19:16 thorpej Exp $ */ +/* $NetBSD: sfbplus.c,v 1.42 2021/12/06 17:43:50 abs Exp $ */ /*- * Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sfbplus.c,v 1.41 2021/08/07 16:19:16 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sfbplus.c,v 1.42 2021/12/06 17:43:50 abs Exp $"); #include #include @@ -431,6 +431,11 @@ sfbioctl(void *v, void *vs, u_long cmd, *(u_int *)data = WSDISPLAY_TYPE_SFBP; return (0); + case WSDISPLAYIO_GET_FBINFO: { + struct wsdisplayio_fbinfo *fbi = data; + return wsdisplayio_get_fbinfo(sc->sc_ri, fbi); + } + case WSDISPLAYIO_GINFO: #define wsd_fbip ((struct wsdisplay_fbinfo *)data) wsd_fbip->height = ri->ri_height;
CVS commit: src
Module Name:src Committed By: abs Date: Mon Dec 6 17:52:00 UTC 2021 Modified Files: src/external/mit/xorg/server/drivers: Makefile src/external/mit/xorg/server/drivers/xf86-input-keyboard: Makefile src/external/mit/xorg/server/xorg-server.old/hw/xfree86/xorgos: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile src/share/mk: bsd.own.mk bsd.x11.mk Added Files: src/distrib/sets/lists/xdebug: md.pmax src/distrib/sets/lists/xserver: md.pmax Log Message: Add Xwsfb X server to pmax build With the previous tweak to TURBOchannel framebuffers in sys/dev/tc this should allows pmax to once again run X11. TODO: Investigate pullup to -9 To generate a diff of this commit: cvs rdiff -u -r0 -r1.3 src/distrib/sets/lists/xdebug/md.pmax cvs rdiff -u -r0 -r1.13 src/distrib/sets/lists/xserver/md.pmax cvs rdiff -u -r1.103 -r1.104 src/external/mit/xorg/server/drivers/Makefile cvs rdiff -u -r1.19 -r1.20 \ src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/mit/xorg/server/xorg-server.old/hw/xfree86/xorgos/Makefile cvs rdiff -u -r1.49 -r1.50 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile cvs rdiff -u -r1.1268 -r1.1269 src/share/mk/bsd.own.mk cvs rdiff -u -r1.141 -r1.142 src/share/mk/bsd.x11.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: abs Date: Mon Dec 6 17:52:00 UTC 2021 Modified Files: src/external/mit/xorg/server/drivers: Makefile src/external/mit/xorg/server/drivers/xf86-input-keyboard: Makefile src/external/mit/xorg/server/xorg-server.old/hw/xfree86/xorgos: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile src/share/mk: bsd.own.mk bsd.x11.mk Added Files: src/distrib/sets/lists/xdebug: md.pmax src/distrib/sets/lists/xserver: md.pmax Log Message: Add Xwsfb X server to pmax build With the previous tweak to TURBOchannel framebuffers in sys/dev/tc this should allows pmax to once again run X11. TODO: Investigate pullup to -9 To generate a diff of this commit: cvs rdiff -u -r0 -r1.3 src/distrib/sets/lists/xdebug/md.pmax cvs rdiff -u -r0 -r1.13 src/distrib/sets/lists/xserver/md.pmax cvs rdiff -u -r1.103 -r1.104 src/external/mit/xorg/server/drivers/Makefile cvs rdiff -u -r1.19 -r1.20 \ src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/mit/xorg/server/xorg-server.old/hw/xfree86/xorgos/Makefile cvs rdiff -u -r1.49 -r1.50 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile cvs rdiff -u -r1.1268 -r1.1269 src/share/mk/bsd.own.mk cvs rdiff -u -r1.141 -r1.142 src/share/mk/bsd.x11.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/mit/xorg/server/drivers/Makefile diff -u src/external/mit/xorg/server/drivers/Makefile:1.103 src/external/mit/xorg/server/drivers/Makefile:1.104 --- src/external/mit/xorg/server/drivers/Makefile:1.103 Sat Aug 28 08:56:10 2021 +++ src/external/mit/xorg/server/drivers/Makefile Mon Dec 6 17:51:59 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.103 2021/08/28 08:56:10 maya Exp $ +# $NetBSD: Makefile,v 1.104 2021/12/06 17:51:59 abs Exp $ .include @@ -337,10 +337,11 @@ SUBDIR+= \ .endif # ${MACHINE} == "sparc" .endif # ${MACHINE} == "sparc" || ${MACHINE} == "sparc64" -.if ${MACHINE} == "vax" +.if ${MACHINE} == "pmax" || \ +${MACHINE} == "vax" SUBDIR+= \ xf86-video-wsfb -.endif # ${MACHINE} == "vax" +.endif # ${MACHINE} == "pmax" || ${MACHINE} == "vax" .if ${MACHINE} == "zaurus" SUBDIR+= \ Index: src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.19 src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.20 --- src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.19 Thu Jun 3 07:37:00 2021 +++ src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile Mon Dec 6 17:51:59 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2021/06/03 07:37:00 rin Exp $ +# $NetBSD: Makefile,v 1.20 2021/12/06 17:51:59 abs Exp $ DRIVER= xf86-input-keyboard DRIVER_NAME= kbd_drv @@ -17,6 +17,7 @@ CPPFLAGS+= -DPCVT_SUPPORT ${MACHINE} == "amiga" || \ ${MACHINE} == "evbarm" || \ ${MACHINE} == "mac68k" || \ +${MACHINE} == "pmax" || \ ${MACHINE} == "sgimips" || \ ${MACHINE} == "shark" || \ ${MACHINE} == "sparc" || \ Index: src/external/mit/xorg/server/xorg-server.old/hw/xfree86/xorgos/Makefile diff -u src/external/mit/xorg/server/xorg-server.old/hw/xfree86/xorgos/Makefile:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/hw/xfree86/xorgos/Makefile:1.2 --- src/external/mit/xorg/server/xorg-server.old/hw/xfree86/xorgos/Makefile:1.1.1.1 Fri Jun 10 03:42:14 2016 +++ src/external/mit/xorg/server/xorg-server.old/hw/xfree86/xorgos/Makefile Mon Dec 6 17:52:00 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2021/12/06 17:52:00 abs Exp $ .include "../../../Makefile.serverlib" .include "../../../Makefile.servermod" @@ -99,7 +99,8 @@ CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSES .endfor .endif -.if ${MACHINE} == "vax" +.if ${MACHINE} == "pmax" || \ +${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 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.49 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.50 --- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.49 Sun Mar 7 10:42:27 2021 +++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Mon Dec 6 17:51:59 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2021/03/07 10:42:27 rin Exp $ +# $NetBSD: Makefile,v 1.50 2021/12/06 17:51:59 abs Exp $ .include "../../../Makefile.serverlib" .include "../../../Makefile.servermod" @@ -108,7 +108,8 @@ CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSES .endfor .endif -.if ${MACHINE} == "vax" +.if ${MACHINE} == "pmax" || \ +${MACHINE} ==
Re: CVS commit: src/distrib/cdrom
On Sat, 21 Mar 2009, Izumi Tsutsui wrote: Module Name:src Committed By: tsutsui Date: Sat Mar 21 22:54:30 UTC 2009 Modified Files: src/distrib/cdrom: README Log Message: cdrtools-2.01.01a27 seems to have another problem on 5.0_RC3 environment (it complains "Implementation botch" etc.) to build mac68kcd here, but cdrtools-2.01 is confirmed working. Would it make sense to create a pkgsrc entry for the last known working cdrtools version? -- David/absolute -- www.NetBSD.org: No hype required --
Re: CVS commit: src/sys/dev/acpi
From: Jared D. McNeill Modified Files: src/sys/dev/acpi: pckbc_acpi.c Log Message: PR# port-i386/39671: panic while booting with an acpi kernel on a 790GX board If the firmware describes duplicate keyboard controller nodes, don't panic when the driver fails to map registers. Is tis suitable for a pullup to netbsd-5? Thanks :)
Re: CVS commit: src/sys/dev/acpi
On Sun, 30 Aug 2009, David Brownlee wrote: From: Jared D. McNeill Log Message: PR# port-i386/39671: panic while booting with an acpi kernel on a 790GX board If the firmware describes duplicate keyboard controller nodes, don't panic when the driver fails to map registers. Is tis suitable for a pullup to netbsd-5? Just a (very limited) testing report, have tested the patch on two netbsd-5 boxes, one which paniced and one which did not and they both boot fine with it :) -- David/absolute -- www.NetBSD.org: No hype required --
Re: CVS commit: src/distrib
On Mon, 21 Sep 2009, Izumi Tsutsui wrote: Can't it use src/distrib/common/mktermcap script? With the ~same set of terminals (actually dropping 'unknown'), mktermcap generates a 7723 byte termcap file, as opposed to the 6987 byte 'hand crafted' one. Its not really much different, but on very space constrained install media maybe thats enough to make a difference? I'm not certain which way to go... -- David/absolute -- www.NetBSD.org: No hype required --
Re: CVS commit: src/distrib
(CCing tech-install@, as it may be worth continuing there, please drop source-changes-d@ from any followup). To anyone tuning in on tech-install@, this is regarding merging 34 various mini termcap variants under distrib into a single ~7K version. On Mon, 21 Sep 2009, Izumi Tsutsui wrote: Can't it use src/distrib/common/mktermcap script? With the ~same set of terminals (actually dropping 'unknown'), mktermcap generates a 7723 byte termcap file, as opposed to the 6987 byte 'hand crafted' one. Its not really much different, but on very space constrained install media maybe thats enough to make a difference? I'm not certain which way to go... IMO, two fragments in ffs (that will be smaller after gzipped for install media which often has actuall size restrictions) might be worth to reduce maintenance cost in future because most these files (and installer itself) are rarely maintained as you see. I'm hoping to try to cleanup the unholy mess which is distrib a little. I'd like to provide more common ramdisk generation infrastructure so that most ports can just have a Makefile with half a dozen settings and an 'extras' list file, thus making things a little more maintainable. -- David/absolute -- www.NetBSD.org: No hype required --
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.
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.
Re: CVS commit: src
2010/1/26 Andrew Doran > > On Wed, Nov 18, 2009 at 11:35:15PM +, YAMAMOTO Takashi wrote: > > > > > On Wed, Nov 18, 2009 at 01:29:05AM +, YAMAMOTO Takashi wrote: > > >> > > >> > Module Name: src > > >> > Committed By: dyoung > > >> > Date: Tue Nov 17 18:36:07 UTC 2009 > > >> > > > >> > Modified Files: > > >> > src/distrib/sets/lists/comp: mi > > >> > src/share/man/man9: Makefile spl.9 > > >> > > > >> > Log Message: > > >> > Describe spllower(9) and splraise(9). > > >> > > >> these are MD implementation details which are not appropriate to be > > >> described in this page. please revert. > > >> adding xrefs to splraiseipl and makeiplcookie instead is probably > > >> a good idea. > > > > > > I see. I will describe spllower(9) and splraise(9) in an i386 page, > > > instead. > > > > imo, for internal functions like them, it's more appropriate to put > > comments in the source code than man pages. > > ... or in a book about the kernel. Section 9 describes how to use kernel > facilities, not how they work internally. By documenting this item you > give the impression of availability and stability, neither of which is > provided. I think its safe to say that the best place to keep implementation documentation is with the code (at least in the same tree) so it can track changes, and from there its a small step to shipping the documentation with the system. Whether that is in manpages which are specifically tagged as 'implementation specific and subject to change', in a different man section (9i?), or somewhere else in /usr/share which can be referenced by manpages is open to debate, though I think it would help if we had a policy so everyone knew what to expect. Ideally those contributing and using the documentation most should have the biggest say, but just to throw up a strawman how about: Implementation manpages: a) Go in section 9i b) Must all carry the line "implementation specific and subject to change", and "as of NetBSD x", eg: 5.99.23 c) Should reference source files which include relevant definitions d) Source files that include relevant definitions should include a well defined reference to the manpage with a note to keep updated e) Its fine for a manpage (9 or 9i) to include "this is documented futher/fully in source file ${foo}"
CVS commit: src/share/examples/apm
Module Name:src Committed By: abs Date: Tue Nov 2 21:55:38 UTC 2021 Modified Files: src/share/examples/apm: script Log Message: Adjust example path to kde/sounds Wherever sounds may be on a current NetBSD system, /usr/X11R6 is unlikely to be in that set... To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/share/examples/apm/script Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/examples/apm
Module Name:src Committed By: abs Date: Tue Nov 2 21:55:38 UTC 2021 Modified Files: src/share/examples/apm: script Log Message: Adjust example path to kde/sounds Wherever sounds may be on a current NetBSD system, /usr/X11R6 is unlikely to be in that set... To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/share/examples/apm/script Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/examples/apm/script diff -u src/share/examples/apm/script:1.6 src/share/examples/apm/script:1.7 --- src/share/examples/apm/script:1.6 Fri Jul 13 21:45:37 2018 +++ src/share/examples/apm/script Tue Nov 2 21:55:38 2021 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: script,v 1.6 2018/07/13 21:45:37 maya Exp $ +# $NetBSD: script,v 1.7 2021/11/02 21:55:38 abs Exp $ # # @@ -22,7 +22,7 @@ PATH=/usr/pkg/bin:/sbin:$PATH export PATH # Where some sound files are stored: -S=/usr/X11R6/share/kde/sounds +S=/usr/pkg/share/kde/sounds # What my network card's recognized as: if=ne0
CVS commit: src/distrib
Module Name:src Committed By: abs Date: Tue Nov 2 22:02:42 UTC 2021 Modified Files: src/distrib/alpha/rz25dist: Makefile src/distrib/amiga/miniroot: install.md src/distrib/sparc: install.md src/distrib/syspkg/notes: NOTES PROPOSAL Log Message: Update some distrib X11R6 references to X11R7 Some of these scripts and notes may no longer be relevant, but now they are at least not relevant while referring to the current X installation directory To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/distrib/alpha/rz25dist/Makefile cvs rdiff -u -r1.33 -r1.34 src/distrib/amiga/miniroot/install.md cvs rdiff -u -r1.24 -r1.25 src/distrib/sparc/install.md cvs rdiff -u -r1.1.1.1 -r1.2 src/distrib/syspkg/notes/NOTES cvs rdiff -u -r1.2 -r1.3 src/distrib/syspkg/notes/PROPOSAL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib
Module Name:src Committed By: abs Date: Tue Nov 2 22:02:42 UTC 2021 Modified Files: src/distrib/alpha/rz25dist: Makefile src/distrib/amiga/miniroot: install.md src/distrib/sparc: install.md src/distrib/syspkg/notes: NOTES PROPOSAL Log Message: Update some distrib X11R6 references to X11R7 Some of these scripts and notes may no longer be relevant, but now they are at least not relevant while referring to the current X installation directory To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/distrib/alpha/rz25dist/Makefile cvs rdiff -u -r1.33 -r1.34 src/distrib/amiga/miniroot/install.md cvs rdiff -u -r1.24 -r1.25 src/distrib/sparc/install.md cvs rdiff -u -r1.1.1.1 -r1.2 src/distrib/syspkg/notes/NOTES cvs rdiff -u -r1.2 -r1.3 src/distrib/syspkg/notes/PROPOSAL 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/rz25dist/Makefile diff -u src/distrib/alpha/rz25dist/Makefile:1.31 src/distrib/alpha/rz25dist/Makefile:1.32 --- src/distrib/alpha/rz25dist/Makefile:1.31 Tue Aug 5 15:40:58 2014 +++ src/distrib/alpha/rz25dist/Makefile Tue Nov 2 22:02:42 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2014/08/05 15:40:58 apb Exp $ +# $NetBSD: Makefile,v 1.32 2021/11/02 22:02:42 abs Exp $ .include "../../../Makefile.inc" @@ -82,7 +82,7 @@ diskimage.gz: mount-fs build-fs unmount- bin.tar.gz: mount-fs build-fs /bin/rm -f $@ (cd ${DESTDIR} ; find . | grep -v '^./etc' | \ - grep -v '^./usr/X11R6' | grep -v '^./netbsd' | \ + grep -v '^./usr/X11R7' | grep -v '^./netbsd' | \ grep -v '^./boot' | pax -w -d | ${TOOL_GZIP_N} -9) > $@ etc.tar.gz: mount-fs build-fs @@ -91,7 +91,7 @@ etc.tar.gz: mount-fs build-fs x11.tar.gz: mount-fs build-fs /bin/rm -f $@ - (cd ${DESTDIR} ; find ./usr/X11R6 | pax -w -d | ${TOOL_GZIP_N} -9) > $@ + (cd ${DESTDIR} ; find ./usr/X11R7 | pax -w -d | ${TOOL_GZIP_N} -9) > $@ .endif Index: src/distrib/amiga/miniroot/install.md diff -u src/distrib/amiga/miniroot/install.md:1.33 src/distrib/amiga/miniroot/install.md:1.34 --- src/distrib/amiga/miniroot/install.md:1.33 Sat Jun 26 00:28:19 2021 +++ src/distrib/amiga/miniroot/install.md Tue Nov 2 22:02:42 2021 @@ -1,4 +1,4 @@ -# $NetBSD: install.md,v 1.33 2021/06/26 00:28:19 tsutsui Exp $ +# $NetBSD: install.md,v 1.34 2021/11/02 22:02:42 abs Exp $ # # # Copyright (c) 1996,2006 The NetBSD Foundation, Inc. @@ -400,7 +400,7 @@ md_mv_aout_libs() md_mv_usr_lib $root || return 1 # If X11 is installed, move the those libraries as well - xlibdir="/usr/X11R6/lib" + xlibdir="/usr/X11R7/lib" if [ -d $root/$xlibdir/. ]; then mkdir -p $root/emul/aout/$xlibdir || return 1 md_mv_x_lib $root $xlibdir || return 1 Index: src/distrib/sparc/install.md diff -u src/distrib/sparc/install.md:1.24 src/distrib/sparc/install.md:1.25 --- src/distrib/sparc/install.md:1.24 Wed Apr 10 14:52:53 2019 +++ src/distrib/sparc/install.md Tue Nov 2 22:02:42 2021 @@ -1,4 +1,4 @@ -# $NetBSD: install.md,v 1.24 2019/04/10 14:52:53 christos Exp $ +# $NetBSD: install.md,v 1.25 2021/11/02 22:02:42 abs Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -350,7 +350,7 @@ md_mv_aout_libs() md_mv_usr_lib $root || return 1 # If X11 is installed, move the those libraries as well - xlibdir="/usr/X11R6/lib" + xlibdir="/usr/X11R7/lib" if [ -d $root/$xlibdir/. ]; then mkdir -p $root/emul/aout/$xlibdir || return 1 md_mv_x_lib $root $xlibdir || return 1 Index: src/distrib/syspkg/notes/NOTES diff -u src/distrib/syspkg/notes/NOTES:1.1.1.1 src/distrib/syspkg/notes/NOTES:1.2 --- src/distrib/syspkg/notes/NOTES:1.1.1.1 Mon Jan 7 22:46:16 2002 +++ src/distrib/syspkg/notes/NOTES Tue Nov 2 22:02:42 2021 @@ -42,7 +42,7 @@ to this, I will put together a more conc 2. Package Registration -Currently, packages are installed in /usr/pkg and /usr/X11R6, +Currently, packages are installed in /usr/pkg and /usr/X11R7, and all package registration is done by creating directories in /var/db/pkg. @@ -108,4 +108,4 @@ to this, I will put together a more conc would also be easy for an admin to tell if a system had been upgraded by looking at pkg_info output. -$Id: NOTES,v 1.1.1.1 2002/01/07 22:46:16 jwise Exp $ +$Id: NOTES,v 1.2 2021/11/02 22:02:42 abs Exp $ Index: src/distrib/syspkg/notes/PROPOSAL diff -u src/distrib/syspkg/notes/PROPOSAL:1.2 src/distrib/syspkg/notes/PROPOSAL:1.3 --- src/distrib/syspkg/notes/PROPOSAL:1.2 Sat Jan 17 05:30:01 2004 +++ src/distrib/syspkg/notes/PROPOSAL Tue Nov 2 22:02:42 2021 @@ -34,10 +34,10 @@ A. Working Plan misc -- items not falling into other categories secr -- items not exportable under US law text -- text processing tools - xbase -- general X11R6 binaries - xcomp -- X11R6 development items - xfont -- X11R6 fonts - xserver -- X11R6 servers for various video hardware + xbase -- general X11R7 binaries + xcomp -
CVS commit: xsrc/local/programs/x11-ssh-askpass
Module Name:xsrc Committed By: abs Date: Tue Nov 2 22:07:43 UTC 2021 Modified Files: xsrc/local/programs/x11-ssh-askpass: x11-ssh-askpass.man.in Log Message: Update x11-ssh-askman manpage app-defaults paths to X11R7 Now matches actual code To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ xsrc/local/programs/x11-ssh-askpass/x11-ssh-askpass.man.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/local/programs/x11-ssh-askpass
Module Name:xsrc Committed By: abs Date: Tue Nov 2 22:07:43 UTC 2021 Modified Files: xsrc/local/programs/x11-ssh-askpass: x11-ssh-askpass.man.in Log Message: Update x11-ssh-askman manpage app-defaults paths to X11R7 Now matches actual code To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ xsrc/local/programs/x11-ssh-askpass/x11-ssh-askpass.man.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/local/programs/x11-ssh-askpass/x11-ssh-askpass.man.in diff -u xsrc/local/programs/x11-ssh-askpass/x11-ssh-askpass.man.in:1.2 xsrc/local/programs/x11-ssh-askpass/x11-ssh-askpass.man.in:1.3 --- xsrc/local/programs/x11-ssh-askpass/x11-ssh-askpass.man.in:1.2 Sun Apr 3 13:42:33 2011 +++ xsrc/local/programs/x11-ssh-askpass/x11-ssh-askpass.man.in Tue Nov 2 22:07:43 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: x11-ssh-askpass.man.in,v 1.2 2011/04/03 13:42:33 wiz Exp $ +.\" $NetBSD: x11-ssh-askpass.man.in,v 1.3 2021/11/02 22:07:43 abs Exp $ .\" .\" x11-ssh-askpass.man .\" Created by Matthieu Herrb for OpenBSD @@ -45,7 +45,7 @@ are as follows: .Bl -dash -offset indent .It Configurable via the standard X resource mechanisms -.Pa /usr/X11R6/lib/X11/app-defaults , +.Pa /usr/X11R7/lib/X11/app-defaults , .Pa ~/.Xdefaults , .Xr xrdb 1 , etc. @@ -285,8 +285,8 @@ the string to display on the button. the font to use for this button label. .El .Sh FILES -.Bl -tag -width "/usr/X11R6/lib/X11/app-defaults/SshAskpass" -compact -.It Pa /usr/X11R6/lib/X11/app-defaults/SshAskpass +.Bl -tag -width "/usr/X11R7/lib/X11/app-defaults/SshAskpass" -compact +.It Pa /usr/X11R7/lib/X11/app-defaults/SshAskpass .El .Sh SEE ALSO .Xr ssh 1 ,
CVS commit: xsrc
Module Name:xsrc Committed By: abs Date: Tue Nov 2 22:09:17 UTC 2021 Modified Files: xsrc: Makefile Log Message: Update Makefile comment from X11R6 to X11R7 To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 xsrc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc
Module Name:xsrc Committed By: abs Date: Tue Nov 2 22:09:17 UTC 2021 Modified Files: xsrc: Makefile Log Message: Update Makefile comment from X11R6 to X11R7 To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 xsrc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/Makefile diff -u xsrc/Makefile:1.44 xsrc/Makefile:1.45 --- xsrc/Makefile:1.44 Fri Mar 18 15:56:09 2005 +++ xsrc/Makefile Tue Nov 2 22:09:17 2021 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.44 2005/03/18 15:56:09 tron Exp $ +# $NetBSD: Makefile,v 1.45 2021/11/02 22:09:17 abs Exp $ # # Targets & Variables # # build: Clean out xsrc, and build and install everything that goes -# under /usr/X11R6. +# under /usr/X11R7. # # DESTDIR -- Set to an alternative directory to install under. # UPDATE -- If set, don't make clean first, plus attempt to make
CVS commit: src/share/man/man7
Module Name:src Committed By: abs Date: Tue Nov 2 22:13:14 UTC 2021 Modified Files: src/share/man/man7: glob.7 Log Message: Update glob example from X11R6 to X11R7 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man7/glob.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man7/glob.7 diff -u src/share/man/man7/glob.7:1.3 src/share/man/man7/glob.7:1.4 --- src/share/man/man7/glob.7:1.3 Wed Jan 19 00:33:10 2011 +++ src/share/man/man7/glob.7 Tue Nov 2 22:13:14 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: glob.7,v 1.3 2011/01/19 00:33:10 uwe Exp $ +.\" $NetBSD: glob.7,v 1.4 2021/11/02 22:13:14 abs Exp $ .\" .\" $OpenBSD: glob.7,v 1.3 2009/12/26 15:24:54 schwarze Exp $ .\" @@ -16,7 +16,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd November 30, 2010 +.Dd November 2, 2021 .Dt GLOB 7 .Os .Sh NAME @@ -125,9 +125,9 @@ sequence. Thus, .Pa /usr/*/*/X11 would match -.Pa /usr/X11R6/lib/X11 +.Pa /usr/X11R7/lib/X11 and -.Pa /usr/X11R6/include/X11 +.Pa /usr/X11R7/include/X11 while .Pa /usr/*/X11 would not match either.
CVS commit: src/share/man/man7
Module Name:src Committed By: abs Date: Tue Nov 2 22:13:14 UTC 2021 Modified Files: src/share/man/man7: glob.7 Log Message: Update glob example from X11R6 to X11R7 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man7/glob.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: abs Date: Wed Mar 10 23:13:10 UTC 2010 Modified Files: src/distrib/atari/floppies/prepare: list src/distrib/mvme68k/miniroot: install.md list src/distrib/mvme68k/ramdisk: list rd.welcome src/distrib/notes/mvme68k: install src/distrib/sets/lists/base: ad.m68000 ad.m68k md.sparc md.sparc64 rescue.ad.m68k rescue.sparc rescue.sparc64 rescue.sun2 src/distrib/sets/lists/comp: md.atari md.mvme68k md.sparc md.sparc64 md.sun2 md.sun3 src/distrib/sun2/miniroot: list src/distrib/sun2/ramdisk: list src/distrib/sun3/miniroot: list src/distrib/sun3/ramdisk: list src/distrib/utils: Makefile src/rescue: Makefile src/sbin: Makefile Removed Files: src/rescue: list.edlabel src/sbin/edlabel: Makefile edlabel.c Log Message: Relegate edlabel to use in extremely memory constrained install ramdisks and prefer disklabel elsewhere. Based on discussion on affected port lists (port-sparc port-sparc64 port-sun3 port-sun2 port-atari port-mvme68k). All listed ports plus amd64 test built after change To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/distrib/atari/floppies/prepare/list cvs rdiff -u -r1.5 -r1.6 src/distrib/mvme68k/miniroot/install.md cvs rdiff -u -r1.20 -r1.21 src/distrib/mvme68k/miniroot/list cvs rdiff -u -r1.18 -r1.19 src/distrib/mvme68k/ramdisk/list cvs rdiff -u -r1.3 -r1.4 src/distrib/mvme68k/ramdisk/rd.welcome cvs rdiff -u -r1.21 -r1.22 src/distrib/notes/mvme68k/install cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/base/ad.m68000 cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/lists/base/ad.m68k cvs rdiff -u -r1.79 -r1.80 src/distrib/sets/lists/base/md.sparc cvs rdiff -u -r1.78 -r1.79 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/base/rescue.ad.m68k \ src/distrib/sets/lists/base/rescue.sparc \ src/distrib/sets/lists/base/rescue.sparc64 \ src/distrib/sets/lists/base/rescue.sun2 cvs rdiff -u -r1.55 -r1.56 src/distrib/sets/lists/comp/md.atari cvs rdiff -u -r1.33 -r1.34 src/distrib/sets/lists/comp/md.mvme68k cvs rdiff -u -r1.68 -r1.69 src/distrib/sets/lists/comp/md.sparc cvs rdiff -u -r1.53 -r1.54 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/lists/comp/md.sun2 cvs rdiff -u -r1.59 -r1.60 src/distrib/sets/lists/comp/md.sun3 cvs rdiff -u -r1.15 -r1.16 src/distrib/sun2/miniroot/list cvs rdiff -u -r1.10 -r1.11 src/distrib/sun2/ramdisk/list cvs rdiff -u -r1.24 -r1.25 src/distrib/sun3/miniroot/list cvs rdiff -u -r1.6 -r1.7 src/distrib/sun3/ramdisk/list cvs rdiff -u -r1.18 -r1.19 src/distrib/utils/Makefile cvs rdiff -u -r1.26 -r1.27 src/rescue/Makefile cvs rdiff -u -r1.1 -r0 src/rescue/list.edlabel cvs rdiff -u -r1.115 -r1.116 src/sbin/Makefile cvs rdiff -u -r1.18 -r0 src/sbin/edlabel/Makefile cvs rdiff -u -r1.17 -r0 src/sbin/edlabel/edlabel.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: abs Date: Wed Mar 10 23:13:10 UTC 2010 Modified Files: src/distrib/atari/floppies/prepare: list src/distrib/mvme68k/miniroot: install.md list src/distrib/mvme68k/ramdisk: list rd.welcome src/distrib/notes/mvme68k: install src/distrib/sets/lists/base: ad.m68000 ad.m68k md.sparc md.sparc64 rescue.ad.m68k rescue.sparc rescue.sparc64 rescue.sun2 src/distrib/sets/lists/comp: md.atari md.mvme68k md.sparc md.sparc64 md.sun2 md.sun3 src/distrib/sun2/miniroot: list src/distrib/sun2/ramdisk: list src/distrib/sun3/miniroot: list src/distrib/sun3/ramdisk: list src/distrib/utils: Makefile src/rescue: Makefile src/sbin: Makefile Removed Files: src/rescue: list.edlabel src/sbin/edlabel: Makefile edlabel.c Log Message: Relegate edlabel to use in extremely memory constrained install ramdisks and prefer disklabel elsewhere. Based on discussion on affected port lists (port-sparc port-sparc64 port-sun3 port-sun2 port-atari port-mvme68k). All listed ports plus amd64 test built after change To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/distrib/atari/floppies/prepare/list cvs rdiff -u -r1.5 -r1.6 src/distrib/mvme68k/miniroot/install.md cvs rdiff -u -r1.20 -r1.21 src/distrib/mvme68k/miniroot/list cvs rdiff -u -r1.18 -r1.19 src/distrib/mvme68k/ramdisk/list cvs rdiff -u -r1.3 -r1.4 src/distrib/mvme68k/ramdisk/rd.welcome cvs rdiff -u -r1.21 -r1.22 src/distrib/notes/mvme68k/install cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/base/ad.m68000 cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/lists/base/ad.m68k cvs rdiff -u -r1.79 -r1.80 src/distrib/sets/lists/base/md.sparc cvs rdiff -u -r1.78 -r1.79 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/base/rescue.ad.m68k \ src/distrib/sets/lists/base/rescue.sparc \ src/distrib/sets/lists/base/rescue.sparc64 \ src/distrib/sets/lists/base/rescue.sun2 cvs rdiff -u -r1.55 -r1.56 src/distrib/sets/lists/comp/md.atari cvs rdiff -u -r1.33 -r1.34 src/distrib/sets/lists/comp/md.mvme68k cvs rdiff -u -r1.68 -r1.69 src/distrib/sets/lists/comp/md.sparc cvs rdiff -u -r1.53 -r1.54 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/lists/comp/md.sun2 cvs rdiff -u -r1.59 -r1.60 src/distrib/sets/lists/comp/md.sun3 cvs rdiff -u -r1.15 -r1.16 src/distrib/sun2/miniroot/list cvs rdiff -u -r1.10 -r1.11 src/distrib/sun2/ramdisk/list cvs rdiff -u -r1.24 -r1.25 src/distrib/sun3/miniroot/list cvs rdiff -u -r1.6 -r1.7 src/distrib/sun3/ramdisk/list cvs rdiff -u -r1.18 -r1.19 src/distrib/utils/Makefile cvs rdiff -u -r1.26 -r1.27 src/rescue/Makefile cvs rdiff -u -r1.1 -r0 src/rescue/list.edlabel cvs rdiff -u -r1.115 -r1.116 src/sbin/Makefile cvs rdiff -u -r1.18 -r0 src/sbin/edlabel/Makefile cvs rdiff -u -r1.17 -r0 src/sbin/edlabel/edlabel.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/atari/floppies/prepare/list diff -u src/distrib/atari/floppies/prepare/list:1.8 src/distrib/atari/floppies/prepare/list:1.9 --- src/distrib/atari/floppies/prepare/list:1.8 Sun Feb 21 20:09:50 2010 +++ src/distrib/atari/floppies/prepare/list Wed Mar 10 23:13:09 2010 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.8 2010/02/21 20:09:50 tsutsui Exp $ +# $NetBSD: list,v 1.9 2010/03/10 23:13:09 abs Exp $ PROG bin/cat PROG bin/chmod @@ -44,6 +44,7 @@ SPECIAL gzip srcdir distrib/utils/x_gzip SPECIAL umount srcdir distrib/utils/x_umount +SPECIAL edlabel srcdir distrib/utils/edlabel # The installation scripts COPY ${CURDIR}/install.md install.md Index: src/distrib/mvme68k/miniroot/install.md diff -u src/distrib/mvme68k/miniroot/install.md:1.5 src/distrib/mvme68k/miniroot/install.md:1.6 --- src/distrib/mvme68k/miniroot/install.md:1.5 Fri May 2 18:31:11 2008 +++ src/distrib/mvme68k/miniroot/install.md Wed Mar 10 23:13:09 2010 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: install.md,v 1.5 2008/05/02 18:31:11 martin Exp $ +# $NetBSD: install.md,v 1.6 2010/03/10 23:13:09 abs Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. @@ -179,7 +179,7 @@ __md_prep_disklabel_1 echo -n "Press [Enter] to continue " getresp "" - edlabel /dev/r${_disk}c + disklabel -i -I /dev/r${_disk}c } md_copy_kernel() { Index: src/distrib/mvme68k/miniroot/list diff -u src/distrib/mvme68k/miniroot/list:1.20 src/distrib/mvme68k/miniroot/list:1.21 --- src/distrib/mvme68k/miniroot/list:1.20 Thu Feb 11 09:06:49 2010 +++ src/distrib/mvme68k/miniroot/list Wed Mar 10 23:13:09 2010 @@ -1,8 +1,7 @@ -# $NetBSD: list,v 1.20 2010/02/11 09:06:49 roy Exp $ +# $NetBSD: list,v 1.21 2010/03/10 23:13:09 abs Exp $ # mvme68k's extras PROG sbin/disklabel -PROG sbin/edlabel PROG sbin/mount_kernfs PROG usr/bin/basename Index: src/distrib/mvme68k/ramdisk/list diff -
CVS commit: src/distrib/utils/edlabel
Module Name:src Committed By: abs Date: Wed Mar 10 23:16:16 UTC 2010 Added Files: src/distrib/utils/edlabel: Makefile edlabel.c Log Message: Relegate edlabel to use in extremely memory constrained install ramdisks and prefer disklabel elsewhere. Based on discussion on affected port lists (port-sparc port-sparc64 port-sun3 port-sun2 port-atari port-mvme68k). All listed ports plus amd64 test built after change To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/distrib/utils/edlabel/Makefile \ src/distrib/utils/edlabel/edlabel.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/distrib/utils/edlabel/Makefile diff -u /dev/null src/distrib/utils/edlabel/Makefile:1.1 --- /dev/null Wed Mar 10 23:16:16 2010 +++ src/distrib/utils/edlabel/Makefile Wed Mar 10 23:16:16 2010 @@ -0,0 +1,10 @@ +# $NetBSD: Makefile,v 1.1 2010/03/10 23:16:16 abs Exp $ +# edlabel (Edit Disk LABEL) + +NOMAN= # defined + +PROG= edlabel +LDADD+=-lutil +DPADD+=${LIBUTIL} + +.include Index: src/distrib/utils/edlabel/edlabel.c diff -u /dev/null src/distrib/utils/edlabel/edlabel.c:1.1 --- /dev/null Wed Mar 10 23:16:16 2010 +++ src/distrib/utils/edlabel/edlabel.c Wed Mar 10 23:16:16 2010 @@ -0,0 +1,535 @@ +/* $NetBSD: edlabel.c,v 1.1 2010/03/10 23:16:16 abs Exp $ */ + +/* + * Copyright (c) 1995 Gordon W. Ross + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE 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 (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include +#include +#include +#define FSTYPENAMES +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +/* + * Machine dependent constants you want to retrieve only once... + */ +int rawpartition, maxpartitions; + +/* + * This is a data-driven program + */ +struct field { + const char *f_name; + int f_offset; + int f_type; /* 1:char, 2:short, 4:int, >4:string */ +}; + +/* Table describing fields in the head of a disklabel. */ +#define dloff(f) (int)(&((struct disklabel *)0)->f) +struct field label_head[] = { + { "type_num", dloff(d_type), 2 }, + { "sub_type", dloff(d_subtype), 2 }, + { " type_name", dloff(d_typename), 16 }, + { " pack_name", dloff(d_packname), 16 }, + { "bytes/sector", dloff(d_secsize), 4 }, + { " sectors/track", dloff(d_nsectors), 4 }, + { " tracks/cylinder", dloff(d_ntracks), 4 }, + { " cylinders", dloff(d_ncylinders), 4 }, + { "sectors/cylinder", dloff(d_secpercyl), 4 }, + /* Don't care about the others until later... */ + { .f_name = NULL }, +}; +#undef dloff + +void check_divisors(struct disklabel *); +u_short dkcksum(struct disklabel *); +void edit_geo(struct disklabel *); +void edit_head_all(struct disklabel *, int); +void edit_head_field(void *, struct field *, int); +void edit_partition(struct disklabel *, int, int); +void get_fstype(char *, u_int8_t *); +void get_val_cts(struct disklabel *, char *, u_int32_t *); +void label_modify(struct disklabel *, char *); +void label_print(struct disklabel *, char *); +void label_quit(struct disklabel *, char *); +void label_read(struct disklabel *, char *); +void label_write(struct disklabel *, char *); +void menu(void); +void print_val_cts(struct disklabel *, u_long val); + +char tmpbuf[64]; + +void +edit_head_field(void *v, struct field *f, int modify /* also modify */) +{ + u_int8_t *cp; + u_int tmp; + + cp = v; + cp += f->f_offset; + + printf("%s: ", f->f_name); + + /* Print current value... */ + switch (f->f_type) { + case 1: + tmp = *cp; + printf("%d", tmp); + break; + case 2: + tmp = *((u_int16_t *)cp); + printf("%d", tmp); + break; + case 4: + tmp = *((u_int32_t *)cp); + printf("%d", tmp); + break; + + default: + /* must be a string. */ +
CVS commit: src/distrib/utils/edlabel
Module Name:src Committed By: abs Date: Wed Mar 10 23:16:16 UTC 2010 Added Files: src/distrib/utils/edlabel: Makefile edlabel.c Log Message: Relegate edlabel to use in extremely memory constrained install ramdisks and prefer disklabel elsewhere. Based on discussion on affected port lists (port-sparc port-sparc64 port-sun3 port-sun2 port-atari port-mvme68k). All listed ports plus amd64 test built after change To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/distrib/utils/edlabel/Makefile \ src/distrib/utils/edlabel/edlabel.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src
On 28 January 2011 14:40, Izumi Tsutsui wrote: > > hpcmips chose and implemented painful fpemul to avoid such discussion, > IIRC :-) > If emips is going to be using softfloat it looks like it could be an opportunity for hpcmips machines of the same endian to gain some better suited pkgsrc binaries :) As a complete aside whatever is done to address this might be extended to mac68k which has a selection of machines with broken FPU emulation and as such require softfloat userlands. Currently someone just builds & provides softfloat userlands outside of the project...
Re: CVS commit: src/sys/arch/x86/x86
On 18 October 2011 10:07, Jukka Ruohonen wrote: > On Tue, Oct 18, 2011 at 08:43:46AM +0200, Marc Balmer wrote: >> Am 18.10.11 06:27, schrieb Jukka Ruohonen: >> > On Tue, Oct 18, 2011 at 12:07:45AM +, Jared D. McNeill wrote: >> >> Module Name: src >> >> Committed By: jmcneill >> >> Date: Tue Oct 18 00:07:45 UTC 2011 >> >> >> >> Modified Files: >> >> src/sys/arch/x86/x86: vmt.c >> >> >> >> Log Message: >> >> don't allow module autounload >> > >> > I wonder should autounloading be prohibited for all driver-class modules? >> >> Why? When the parent goes away, why not autounload a driver? > > I am not sure. But have we thought about all the consequences and corner- > cases? Unloading happens while modifying hardware state? Deferred calls > in the drivers? And so on? To me it also seems that if I manually load > a driver-module, I expect it to stay loaded until I unload it. Presumably whether to permit autounload should be an option that can be specified at manual module load time, then the default is less important.
Re: CVS commit: src/sys/arch/usermode
On 31 December 2011 15:41, Jared D. McNeill wrote: > No reason why it can't be used on other ports, but I wasn't sure the best > way to solve the bootstrap problem wrt the network stack. In usermode case, > it listens on a socket provided by the host OS. Could it not just listen on a port for connections? The console would not be visible until an interface had a valid IP, but other than that everything *should* Just Work... Alternatively could it be modelled similarly to NFS root, whereby the system uses dhcp obtained information (or data set in config) to determine how to make the console available. Another random thought - could it be attached *in addition* to an existing console, providing a way to view and manipulate a console remotely (providing the appropriate interface remains configured).
Re: CVS commit: src
On 12 February 2012 10:06, Jukka Ruohonen wrote: > On Sun, Feb 12, 2012 at 10:53:56AM +0100, Martin Husemann wrote: >> > tests/sys/kern/t_module.c >> > ... >> and >> test/sys/kern/posix_spawn/* >> >> I don't mind moving it there, if there is consensus. We can clean other stuff >> later. I don't like mixing it with tons of unrelated tests in a common >> directory though. > > As said, please follow the libc-structure, as it is the current convention; > > libc/sys -> tests/lib/libc/sys > libc/gen -> tests/lib/libc/gen > > and also > > lib/librt -> tests/lib/librt > > even though majority of this stuff is implenented inside the kernel. Could I suggest a tests/README which documents the current convention (and notes the exceptions which should be cleaned up), so the next new person committing tests has guidance to follow?
Re: CVS commit: src/sys/arch/arm/iomd
On 14 February 2012 21:09, Michael wrote: > Hello, > > On Tue, 14 Feb 2012 14:25:18 + > Nick Hudson wrote: > >> On Tuesday 14 February 2012 13:11:34 Izumi Tsutsui wrote: >> > skrll@ wrote: >> > > Module Name: src >> > > Committed By: skrll >> > > Date: Tue Feb 14 13:04:52 UTC 2012 >> > > >> > > Modified Files: >> > > src/sys/arch/arm/iomd: vidcvideo.c >> > > >> > > Log Message: >> > > Pass RI_NO_AUTO to rasops_init so that rasops doesn't attempt to allocate >> > > memory as we're too early in kernel startup for this. >> > >> > I always think we should make RI_NO_AUTO default and >> > RI_AUTO should be optional, because too many MD drivers >> > have been trapped by this silent panic... >> >> Can't argue with that. > > Yeah. I wish there was a way to know wether we can kmem_alloc() or not. Surely it must be possible to be able to query the kmem subsystem for whether its too soon for kmem_alloc()?
Re: CVS commit: src
On 3 July 2012 07:41, David Laight wrote: > On Mon, Jul 02, 2012 at 10:42:18PM +0000, David Brownlee wrote: >> 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 > > How do you detect the format of an existing disklabel? > > I remember looking at this a few years back and deciding it was all fubar. > IIRC there is a 'partition count' field, but that is used as an upper > bound for the number of used partitions, not the size of the table. > I sort of remember that the number of partition slots tended to depend > on LABELOFFSET - and was 16 if that would fit into the available space. > > vax might be the only system that has (emulated?) disks where the disk > controller doesn't return the actual disk geometry/size - requiring it > be stored in the label? The same way the compat code worked for i386 and other migrated ports - it just gets the first 8 partitions :)
Re: CVS commit: src/sys/dev/mscp
For "betters" read "numbers". This has just been a perfect day... On 10 July 2012 23:42, David Brownlee wrote: > Message fixed in repo, should have been: > > 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_attach() still iterates over each unit on a bus, > but mscp_dorsp() now detects if we have reached the last unit and does not > return a bogus additional unit. It also loses a few gotos and handles > noncontiguous unit betters better. > > > > On 10 July 2012 23:30, David Brownlee wrote: >> 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. >>
Re: CVS commit: src/sys/dev/mscp
Message fixed in repo, should have been: 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_attach() still iterates over each unit on a bus, but mscp_dorsp() now detects if we have reached the last unit and does not return a bogus additional unit. It also loses a few gotos and handles noncontiguous unit betters better. On 10 July 2012 23:30, David Brownlee wrote: > 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. >
Re: CVS commit: src/sys/arch/sparc
On 1 August 2012 13:42, Izumi Tsutsui wrote: > christos@ wrote: >> It is simple enough to arrange to be notified about autobuild failures. [...] > > See above. I'm afraid automated daily notifies which > won't stop until "real fix" are too annoying. > > If it's sent ~bi-weelky like our gnats, it's fine for me. Possibly an on-failure/on-resume with a weekly "current fails"? It could even collate the data nightly and include the details for all ports, so for example dreamcast-builds@ list gets an email like they below they can be pretty certain it was an MI change that broke something... | Subject: HEAD builds: dreamcast FAIL | | Build report for: HEAD 201209091130 | | dreamcast: FAIL (was OK) | | All ports: FAIL (was OK) | acorn26 acorn32 algor alpha amd64 amiga amigappc arc atari bebox | cats cesfic cobalt dreamcast emips evbarm evbsh3-sh3eb evbsh3-sh3el | ews4800mips hp300 hp700 hpcarm hpcmips hpcsh i386 ibmnws iyonix | landisk luna68k mac68k macppc mipsco mmeye mvme68k mvmeppc netwinder | news68k newsmips next68k ofppc pmax prep rs6000 sandpoint sbmips-mipseb | sbmips-mipsel shark sparc sparc64 sun2 sun3 x68k zaurus | | All ports: FAIL (unchanged) | evbmips-mips64eb evbmips-mips64el evbmips-mipseb evbmips-mipsel evbppc | sgimips vax
Re: CVS commit: src/sbin/mount_ptyfs
On 19 September 2012 08:25, matthew green wrote: > >> Module Name: src >> Committed By: christos >> Date: Tue Sep 18 21:35:43 UTC 2012 >> >> Modified Files: >> src/sbin/mount_ptyfs: mount_ptyfs.8 mount_ptyfs.c >> >> Log Message: >> remove -c and chroot option; they are always on now > > since -c is in a release (or will be?) how about making it > just ignored and not documented isntead of failing mounts? Make it spit something out to stderr for a release or so then lose...
Re: CVS commit: src/share/mk
On Thu, 14 Nov 2019 at 21:05, Christos Zoulas wrote: > > In article <2c05e1ed-8410-fa0f-d786-06ee6e1c4...@marples.name>, > Roy Marples wrote: > >On 14/11/2019 05:47, Martin Husemann wrote: > >> On Thu, Nov 14, 2019 at 03:53:02PM +1100, matthew green wrote: > >>> i'm not happy about this change. i wish that bsdtar was > >>> fixed to not be unfriendly, because it mostly is a better > >>> implementation. just these edge cases are rather .. > >>> problematic yet these issues are being ignored or > >>> rejected as being irrelevant. > >> > >> Me neither, especially as we now effectively have different command line > >> args passed from sysinst to tar depending on the tar invocation (and this > >> is all hard coded). I'll have to make it a define in sysinst depending > >> on the seleted tar variant :-/. > > > >Just for the record, I don't really care about different cmd line args, > >symlinks and security involved. > > > >My expectation is that a modern NetBSD tar can extract a modern tar > >archive from other sources. > > > >If it cannot do this we have failed. > > So I am trying to find some time to pursue the two issues I have > with upstream and understand if they will accept the following two > changes (or versions thereof): > > The first issue is that I prefer to have tar respect existing > symlinks (ones that it did not create by default -- without having > to specify extra flags) since to do this (in my opinion) does not > pose a security risk. Yes my implementation is Q+D, but it works. > > https://www.netbsd.org/~christos/track-symlinks.diff > > The second issue is that the way libarchive-tar overwrites existing > files is by removing them first, and writing them directly to the > final destination pathname. This creates a significant amount of > time where the file is either not available or not completely > written. Imagine trying to replace shared libraries or programs > frequently used. Pax-as-tar wrote the file to a temporary one first > and used rename(2) to atomically replace it. I've written a patch > to do the same for libarchive-tar: > > https://www.netbsd.org/~christos/libarchive-atomic.diff > > With those two patches we can put libarchive as tar back and we don't > need to make any other changes since behavioraly the old pax-as-tar > and libarchive-tar behave the same for those two cases that bothered us. > > I am inclined to just commit them and flip the default again. I could see an argument for having an option to turn off the extract-to-temp-and-rename behaviour (not that I'd use it), but I'd be very happy to see both above changes in as defaults and us back onto libarchive-tar Thanks for working on this! David
Re: CVS commit: src/sys/dev/ata
Just another data point - seeing this same panic on a T480 with the latest kernel from nyftp
Re: CVS commit: src/sys/dev/ata
Plus to confirm reverting just this commit from today's github copy of current (d5b32e03eac8b05d38a143ee0ec615efb2233201) boots fine on the T480 Thanks On Thu, 30 Apr 2020 at 00:12, Alexander Nasonov wrote: > > David Brownlee wrote: > > Just another data point - seeing this same panic on a T480 with the > > latest kernel from nyftp > > Same problem on T470. > > -- > Alex
Re: Freeze or panic during boot was: Re: CVS commit: src/sys/dev/ata
On Sat, 2 May 2020, 20:10 Jason Thorpe, wrote: > > > On May 1, 2020, at 1:07 PM, Ryo ONODERA wrote: > > > > Hi, > > > > Have you missed this thread? > > > > If the problem requires more time to investigate, > > could you consider to revert ata change for a while? > > > > Thank you. > > I backed it out, but would appreciate some help tracking down the issue > because no other problems were reported other than on these specific > machines. > The T480 is my main machine but I'm happy to boot any test kernels (to confirm, - current as of the 30th with just that one commit reverted runs fine) Thanks David >
Re: CVS commit: src
On Sun, 16 Aug 2020 at 08:13, Martin Husemann wrote: > > Hi Nia, > > I think you are mixing a few issues here into one discussion - which might > make sense from a user perspective, but does not help us to get forward. I think that the other issues provide important context. NetBSD's underlying implementation has a fundamental difference in blocking entropy behaviour - the specification matches in terms of "an implementation *may* block... ", but real world use will have some NetBSD boxes block indefinitely until user intervention, whereas other systems would not. Obviously there is no perfect choice, as other different systems have made different API behaviour choices, and in general have a less sophisticated approach to entropy usage, and NetBSD itself has to cater for boxes with and without hardware entropy. However a getentropy() where the *effective* behaviour from a user perspective matched Linux and the other BSDs but not Solaris would seem to be a reasonable option. As the Linux random(7) manpage even suggests "The getentropy(3) function provides a slightly more portable interface on top of getrandom(2)" David > From my POV the interacting-but-need-to-be-solved-individually issues > are: > > - The libc or kernel<->userland API. This is what the core decision was >about. The API is well (enough) defined, same on multiple OSes, >and provides all the flexibility we need. > > - Making entropy available "early enough" during the boot process. This >is a hard problem on *many* machines, but no big deal at all on modern >x86 and a few modern aarch64. >For me this is looks like still work in progress with no "good enough" >solution yet. I understood Taylor would like to improve this next. >I personally would define "early enough" as "during rc.d" and this makes >the problem relatively easily solvable for "real installations" (see >below) by just manually (or "someway") seeding the individual installations >entropy file. >IIUC Taylor would like to also enhance/add kernel parts providing entropy. > > - Related to above: how to deal with one-off setups like first boots of >install images or clones of virtual machines. >This will be solvable (probably by a combination of better scripting >and/or documented "best practices") once the point above is more or >less settled. > > - Finaly the grey area of "which variant of our API should applications >use" (and even more complex: libraries). This needs individual answers >on a case by case basis and might need some upstream battle - but we >should be able to give good guidance and clear rules once the items >above are cleared. > > Martin
re: CVS commit: src/sys/kern
I'm away from my machine, but I believe the simple test for this is to build.sh a kernel and see if nm shows pool_head On 26 Apr 2014 20:11, "matthew green" wrote: > > "David Brownlee" writes: > > 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" > > did this use to work? > > does it work if you build your kernel with GCC 4.5? > > it was recently noticed that GDB is no longer able to see > static symbols in netbsd.gdb images, and the preliminary > testing i've done so far for amd64 shows that GCC 4.5 works. > > > .mrg. >
Re: CVS commit: src
On 10 August 2014 21:25, Izumi Tsutsui wrote: > riz@ wrote: > >> Module Name: src >> Committed By: riz >> Date: Sun Aug 10 20:04:30 UTC 2014 >> >> Modified Files: >> src/distrib/newsmips/floppies/ramdisk: Makefile >> src/sys/arch/newsmips/conf: INSTALL >> >> Log Message: >> Bump the ramdisk size; the longer paths on the build cluster are >> likely enough to put this over the edge. >> >> >> To generate a diff of this commit: >> cvs rdiff -u -r1.31 -r1.32 src/distrib/newsmips/floppies/ramdisk/Makefile > >>> -IMAGESIZE= 2560k >>> +IMAGESIZE= 2660k > > Note sysinst(8) requires some spare space in /tmp during installation, > especially on using non-default settings on choosing installation sets etc. > on ports which don't use tmpfs or mfs during installation. > (100KB would be enough for this newsmips case though) Would it make sense to dd 100K of null data to a file & then delete in the build to ensure there is enough space in the final image?
Re: CVS commit: src/sbin/gpt
On 30 November 2015 at 13:34, Christos Zoulas wrote: > > On Nov 29, 11:22pm, jnem...@cue.bc.ca (John Nemeth) wrote: > -- Subject: Re: CVS commit: src/sbin/gpt > > | I have read the Makefile. I think there is confusion between > | the tool version and the crossbuilt version intended to go in the > | release being built. Obviously, the tool version will use the > | system headers, and that may be the one that I saw fail (I don't > | have the log anymore). > > The cross-built version is not affected either. In current it will just > use the ioctls and be happy. In older versions it will use what it had, > since it is not changed. > > | Maybe so, but one could just lift the source code from -current > | and plunk it on an older version of NetBSD and it would just work. > | Now, one can not do that. Having to update the kernel for a > | relatively small userland utility is kind of annoying. > > That's the only disadvantage. Even if you wanted to do this, I am > saying I would prefer that the pullup was done to the kernel to > support the missing ioctls. And we are talking only about NetBSD-6 > where the utility is not that useful, since NetBSD-7 has them. Are > you really planning to support gpt disks on NetBSD-6? Uh, 3TB disks have been available since 2010, which predates NetBSD-7 by a little bit - and certainly >2TB raid and ccd setups have been around for even longer. While netbsd-7's gpt handling may be much improved, I'm assuming netbsd-6's gpt support is not going to be dropped? :)
Re: CVS commit: src/distrib/dreamcast/ramdisk
On 18 September 2016 at 18:52, Christos Zoulas wrote: > On Sep 19, 1:29am, tsut...@ceres.dti.ne.jp (Izumi Tsutsui) wrote: > -- Subject: Re: CVS commit: src/distrib/dreamcast/ramdisk > > | christos@ wrote: > | > | > Module Name:src > | > Committed By: christos > | > Date: Sun Sep 18 15:38:05 UTC 2016 > | > > | > Modified Files: > | > src/distrib/dreamcast/ramdisk: list > | > > | > Log Message: > | > kill some useless programs (it is not like the dreamcast has a tape drive) > | > | - dmesg(8) is so useful for everyone > | - why drop swapctl(8) but keep disklabel(8)? > | (both are useful for me for wd support though) > > Don't we have kernfs and cat /kern/msgbuf? > I thought that disklabel is more useful that swapctl. Perhaps swapctl will > fit. Last I checked dmesg was smaller than options KERNFS (that would have been on an m68k port tho' :)
Re: CVS commit: src/sys
On 15 December 2017 at 14:24, Robert Elz wrote: > > Date:Fri, 15 Dec 2017 05:01:17 + > From:"Kengo NAKAHARA" > Message-ID: <20171215050117.241baf...@cvs.netbsd.org> > > | Fix pullup'ed mbuf leaks. > | The match function just requires enough mbuf length. > > This is still not correct. There are no mbuf leaks, I think you did > not understand maxv's point (if I remember it correctly). > > The problem isn't lost mbufs, it is that if code does a m_pullup() > (or m_ensure_contig() which is essentially the same thing) the > mbuf chain can be altered. > > What that means is that after a call of in_l2tp_match(m, ...) in the > calling function, the value of m has been lost - using the old one is > incorrect and anything might happen (up to and including a panic). > > This is why so many mbuf functions pass a struct mbuf ** instead of a > struct mbuf * so when the parameter is changed, it gets passed back to > the caller. This function probably needs something like that (the other > way is returning the updated m value, but I don't think that fits here.) > > Unfortunately, because of the way it gets called, this might not be an > easy change to make. > > The problem occurs way back in encap4_input() which does > > match = encap4_lookup(m,...); > > and then later > > encap_fillarg(m, match); > or > m_freem(m); > or > rip_input(m, off, proto); > > all of which use the 'm' that was passed to encap4_lookup(). > > encap4_lookup does .. > > prio = (*ep->func)(m, off, proto, ep->arg); > > where *ep->func is in_l2tp_match which does the m_pullup() or now > m_ensure_contig() instead which potentially changes what 'm' should > be (the old one may have been freed and replaced by a different one.) Just wondering, is there scope for a (rather heavy) debug option in which m_ensure_contig() always returns a new mbuf for valid input? David
Re: CVS commit: src/sys/kern
On Fri, 26 Oct 2018 at 19:41, Martin Husemann wrote: > > On Sat, Oct 27, 2018 at 05:39:30AM +1100, matthew green wrote: > > FWIW, i liked this because it let me know i had a problem to fix. > > perhaps the message could be reworded to be less scary, instead > > of removing it in most cases? > > It will always be followed by output from init/MAKEDEV when it creates > a /dev tmpfs (or fails to do so), so I don't think it is very usefull. (Sorry if this is a stupid question) - is it at all possible for the call to MAKEDEV to fail in such a way that its not run and no output is generated? David
Re: CVS commit: src/sys/kern
On Sat, 27 Oct 2018 at 07:40, Martin Husemann wrote: > > On Sat, Oct 27, 2018 at 12:26:56AM +0100, David Brownlee wrote: > > (Sorry if this is a stupid question) - is it at all possible for the > > call to MAKEDEV to fail in such a way that its not run and no output > > is generated? > > It can fail in various ways, and I am trying to reprove error reporting > in that situation. However, since we support the "no /dev/console" > situation in regular setups it is wrong to report an error for that. Absolutely in agreement it should not be an error message, but an informative message might be useful. Particularly if we're supporting MAKEDEV in locations other than /dev then possibly indicating which MAKEDEV is being called could be reasonable... Thanks David
Re: CVS commit: src/bin/sleep
On Fri, 25 Jan 2019 at 09:30, Valery Ushakov wrote: > > On Fri, Jan 25, 2019 at 10:43:10 +0700, Robert Elz wrote: > > > Date:Thu, 24 Jan 2019 16:18:49 +0100 > > From:Joerg Sonnenberger > > Message-ID: <20190124151849.ga10...@britannica.bec.de> > > > > | This is overcomplicated and fragile, IMO. Can we just go back to the old > > | code and switch the strtod to strtod_l with LC_C_LOCALE? That solves the > > | input problem. > > > > We could certainly do that, but while it is a little complicated, I do not > > really think it is fragile. Using a locale specific decimal radix in a > > script is fragile - but the only way to avoid that is either to effectively > > give up on non-C locales entirely for scripts, or drop all support for > > fractional numbers as args to any command. > > > > Note: the arg to "sleep" might come as ... > > echo -n "How many seconds do you want to sleep? " > > read secs > > sleep "${secs}" > > (with some error checking). > > > > I have no idea why sleep() was made to parse its arg in a locale > > specific way, but that was done long long ago, and was (according > > to the comments) done quite deliberately. > > > > I think changing that decison (rather than just avoiding the problem, > > as the current "fix" does) needs more discussion than a few comments > > on the source-changes-d list. > > As someone who actually have to ecnoutner locales in daily life and > not just think about them sitting in an ivory tower I don't understand > why do we even have this argument. Locale-specific argument to sleep > is pure madness, period (no pun intended). Granted, and no-one is arguing that sleep should not handle the standard '.' separator. The only question is what it should do if it is ever called with a locale specific separator instead - error or take Postel's law and "be liberal in what you accept". I think it might be nice to have a way to control behaviour like this in tools - maybe an environment variable for "disable various extensions and be more strict in what is accepted", but that is a separate bikeshed :) David
CVS commit: src/etc
Module Name:src Committed By: abs Date: Wed Sep 25 23:09:25 UTC 2019 Modified Files: src/etc/etc.aarch64: ttys src/etc/etc.algor: ttys src/etc/etc.alpha: ttys src/etc/etc.amd64: ttys src/etc/etc.amiga: ttys src/etc/etc.amigappc: ttys src/etc/etc.arc: ttys src/etc/etc.cesfic: ttys src/etc/etc.emips: ttys src/etc/etc.epoc32: ttys src/etc/etc.evbarm: ttys src/etc/etc.evbcf: ttys src/etc/etc.evbmips: ttys src/etc/etc.evbppc: ttys src/etc/etc.evbsh3: ttys src/etc/etc.ews4800mips: ttys src/etc/etc.hp300: ttys src/etc/etc.hpcmips: ttys src/etc/etc.hppa: ttys src/etc/etc.i386: ttys src/etc/etc.ia64: ttys src/etc/etc.iyonix: ttys src/etc/etc.landisk: ttys src/etc/etc.luna68k: ttys src/etc/etc.mipsco: ttys src/etc/etc.mmeye: ttys src/etc/etc.mvme68k: ttys src/etc/etc.mvmeppc: ttys src/etc/etc.netwinder: ttys src/etc/etc.news68k: ttys src/etc/etc.newsmips: ttys src/etc/etc.next68k: ttys src/etc/etc.or1k: ttys src/etc/etc.playstation2: ttys src/etc/etc.pmax: ttys src/etc/etc.riscv: ttys src/etc/etc.sandpoint: ttys src/etc/etc.sbmips: ttys src/etc/etc.sgimips: ttys src/etc/etc.shark: ttys src/etc/etc.sparc: ttys src/etc/etc.sparc64: ttys src/etc/etc.vax: ttys src/etc/etc.zaurus: ttys Log Message: Switch default console tty from /dev/console to /dev/constty With this switch processes (such as xconsole) can open /dev/console without breaking login on the text or serial console. This can be trivially triggered by enabling xdm in rc.conf and hitting Ctrl+Alt+F1 or equivalent once booted. The changes: - Add entry for /dev/console or /dev/constty if missing - If a port's had /dev/console 'on' switch it off and enable /dev/constty - If a port did not have /dev/console 'on', leave /dev/constty off Some ports had /dev/console off and /dev/ttyE0 enabled, presumably to avoid just this issue. It may make sense to adjust these also (but not in this pass) As discussed on current-users To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/etc/etc.aarch64/ttys cvs rdiff -u -r1.5 -r1.6 src/etc/etc.algor/ttys cvs rdiff -u -r1.12 -r1.13 src/etc/etc.alpha/ttys cvs rdiff -u -r1.6 -r1.7 src/etc/etc.amd64/ttys cvs rdiff -u -r1.24 -r1.25 src/etc/etc.amiga/ttys cvs rdiff -u -r1.3 -r1.4 src/etc/etc.amigappc/ttys cvs rdiff -u -r1.8 -r1.9 src/etc/etc.arc/ttys cvs rdiff -u -r1.5 -r1.6 src/etc/etc.cesfic/ttys cvs rdiff -u -r1.1 -r1.2 src/etc/etc.emips/ttys cvs rdiff -u -r1.1 -r1.2 src/etc/etc.epoc32/ttys cvs rdiff -u -r1.7 -r1.8 src/etc/etc.evbarm/ttys cvs rdiff -u -r1.2 -r1.3 src/etc/etc.evbcf/ttys cvs rdiff -u -r1.6 -r1.7 src/etc/etc.evbmips/ttys cvs rdiff -u -r1.6 -r1.7 src/etc/etc.evbppc/ttys cvs rdiff -u -r1.6 -r1.7 src/etc/etc.evbsh3/ttys cvs rdiff -u -r1.2 -r1.3 src/etc/etc.ews4800mips/ttys cvs rdiff -u -r1.16 -r1.17 src/etc/etc.hp300/ttys cvs rdiff -u -r1.11 -r1.12 src/etc/etc.hpcmips/ttys cvs rdiff -u -r1.1 -r1.2 src/etc/etc.hppa/ttys cvs rdiff -u -r1.20 -r1.21 src/etc/etc.i386/ttys cvs rdiff -u -r1.1 -r1.2 src/etc/etc.ia64/ttys cvs rdiff -u -r1.4 -r1.5 src/etc/etc.iyonix/ttys cvs rdiff -u -r1.3 -r1.4 src/etc/etc.landisk/ttys cvs rdiff -u -r1.8 -r1.9 src/etc/etc.luna68k/ttys cvs rdiff -u -r1.6 -r1.7 src/etc/etc.mipsco/ttys cvs rdiff -u -r1.7 -r1.8 src/etc/etc.mmeye/ttys cvs rdiff -u -r1.9 -r1.10 src/etc/etc.mvme68k/ttys cvs rdiff -u -r1.6 -r1.7 src/etc/etc.mvmeppc/ttys cvs rdiff -u -r1.8 -r1.9 src/etc/etc.netwinder/ttys cvs rdiff -u -r1.9 -r1.10 src/etc/etc.news68k/ttys cvs rdiff -u -r1.9 -r1.10 src/etc/etc.newsmips/ttys cvs rdiff -u -r1.10 -r1.11 src/etc/etc.next68k/ttys cvs rdiff -u -r1.1 -r1.2 src/etc/etc.or1k/ttys cvs rdiff -u -r1.6 -r1.7 src/etc/etc.playstation2/ttys cvs rdiff -u -r1.15 -r1.16 src/etc/etc.pmax/ttys cvs rdiff -u -r1.1 -r1.2 src/etc/etc.riscv/ttys cvs rdiff -u -r1.7 -r1.8 src/etc/etc.sandpoint/ttys cvs rdiff -u -r1.5 -r1.6 src/etc/etc.sbmips/ttys cvs rdiff -u -r1.10 -r1.11 src/etc/etc.sgimips/ttys cvs rdiff -u -r1.8 -r1.9 src/etc/etc.shark/ttys cvs rdiff -u -r1.16 -r1.17 src/etc/etc.sparc/ttys cvs rdiff -u -r1.11 -r1.12 src/etc/etc.sparc64/ttys cvs rdiff -u -r1.9 -r1.10 src/etc/etc.vax/ttys cvs rdiff -u -r1.3 -r1.4 src/etc/etc.zaurus/ttys 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.aarch64/ttys diff -u src/etc/etc.aarch64/ttys:1.1 src/etc/etc.aarch64/ttys:1.2 --- src/etc/etc.aarch64/ttys:1.1 Sun Aug 10 05:47:36 2014 +++ src/etc/etc.aarch64/ttys Wed Sep 25 23:09:19 2019 @@ -1,11 +1,11 @@ -# $NetBSD: ttys,v 1.1 2014/08/10 05:47:36 matt Exp $ +# $NetBSD: ttys,v 1.2 2019/09/25 23:09:19 abs Exp $ # # from: @(#)ttys 5.1 (Berkeley) 4/17/89 #
CVS commit: src/etc
Module Name:src Committed By: abs Date: Wed Sep 25 23:09:25 UTC 2019 Modified Files: src/etc/etc.aarch64: ttys src/etc/etc.algor: ttys src/etc/etc.alpha: ttys src/etc/etc.amd64: ttys src/etc/etc.amiga: ttys src/etc/etc.amigappc: ttys src/etc/etc.arc: ttys src/etc/etc.cesfic: ttys src/etc/etc.emips: ttys src/etc/etc.epoc32: ttys src/etc/etc.evbarm: ttys src/etc/etc.evbcf: ttys src/etc/etc.evbmips: ttys src/etc/etc.evbppc: ttys src/etc/etc.evbsh3: ttys src/etc/etc.ews4800mips: ttys src/etc/etc.hp300: ttys src/etc/etc.hpcmips: ttys src/etc/etc.hppa: ttys src/etc/etc.i386: ttys src/etc/etc.ia64: ttys src/etc/etc.iyonix: ttys src/etc/etc.landisk: ttys src/etc/etc.luna68k: ttys src/etc/etc.mipsco: ttys src/etc/etc.mmeye: ttys src/etc/etc.mvme68k: ttys src/etc/etc.mvmeppc: ttys src/etc/etc.netwinder: ttys src/etc/etc.news68k: ttys src/etc/etc.newsmips: ttys src/etc/etc.next68k: ttys src/etc/etc.or1k: ttys src/etc/etc.playstation2: ttys src/etc/etc.pmax: ttys src/etc/etc.riscv: ttys src/etc/etc.sandpoint: ttys src/etc/etc.sbmips: ttys src/etc/etc.sgimips: ttys src/etc/etc.shark: ttys src/etc/etc.sparc: ttys src/etc/etc.sparc64: ttys src/etc/etc.vax: ttys src/etc/etc.zaurus: ttys Log Message: Switch default console tty from /dev/console to /dev/constty With this switch processes (such as xconsole) can open /dev/console without breaking login on the text or serial console. This can be trivially triggered by enabling xdm in rc.conf and hitting Ctrl+Alt+F1 or equivalent once booted. The changes: - Add entry for /dev/console or /dev/constty if missing - If a port's had /dev/console 'on' switch it off and enable /dev/constty - If a port did not have /dev/console 'on', leave /dev/constty off Some ports had /dev/console off and /dev/ttyE0 enabled, presumably to avoid just this issue. It may make sense to adjust these also (but not in this pass) As discussed on current-users To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/etc/etc.aarch64/ttys cvs rdiff -u -r1.5 -r1.6 src/etc/etc.algor/ttys cvs rdiff -u -r1.12 -r1.13 src/etc/etc.alpha/ttys cvs rdiff -u -r1.6 -r1.7 src/etc/etc.amd64/ttys cvs rdiff -u -r1.24 -r1.25 src/etc/etc.amiga/ttys cvs rdiff -u -r1.3 -r1.4 src/etc/etc.amigappc/ttys cvs rdiff -u -r1.8 -r1.9 src/etc/etc.arc/ttys cvs rdiff -u -r1.5 -r1.6 src/etc/etc.cesfic/ttys cvs rdiff -u -r1.1 -r1.2 src/etc/etc.emips/ttys cvs rdiff -u -r1.1 -r1.2 src/etc/etc.epoc32/ttys cvs rdiff -u -r1.7 -r1.8 src/etc/etc.evbarm/ttys cvs rdiff -u -r1.2 -r1.3 src/etc/etc.evbcf/ttys cvs rdiff -u -r1.6 -r1.7 src/etc/etc.evbmips/ttys cvs rdiff -u -r1.6 -r1.7 src/etc/etc.evbppc/ttys cvs rdiff -u -r1.6 -r1.7 src/etc/etc.evbsh3/ttys cvs rdiff -u -r1.2 -r1.3 src/etc/etc.ews4800mips/ttys cvs rdiff -u -r1.16 -r1.17 src/etc/etc.hp300/ttys cvs rdiff -u -r1.11 -r1.12 src/etc/etc.hpcmips/ttys cvs rdiff -u -r1.1 -r1.2 src/etc/etc.hppa/ttys cvs rdiff -u -r1.20 -r1.21 src/etc/etc.i386/ttys cvs rdiff -u -r1.1 -r1.2 src/etc/etc.ia64/ttys cvs rdiff -u -r1.4 -r1.5 src/etc/etc.iyonix/ttys cvs rdiff -u -r1.3 -r1.4 src/etc/etc.landisk/ttys cvs rdiff -u -r1.8 -r1.9 src/etc/etc.luna68k/ttys cvs rdiff -u -r1.6 -r1.7 src/etc/etc.mipsco/ttys cvs rdiff -u -r1.7 -r1.8 src/etc/etc.mmeye/ttys cvs rdiff -u -r1.9 -r1.10 src/etc/etc.mvme68k/ttys cvs rdiff -u -r1.6 -r1.7 src/etc/etc.mvmeppc/ttys cvs rdiff -u -r1.8 -r1.9 src/etc/etc.netwinder/ttys cvs rdiff -u -r1.9 -r1.10 src/etc/etc.news68k/ttys cvs rdiff -u -r1.9 -r1.10 src/etc/etc.newsmips/ttys cvs rdiff -u -r1.10 -r1.11 src/etc/etc.next68k/ttys cvs rdiff -u -r1.1 -r1.2 src/etc/etc.or1k/ttys cvs rdiff -u -r1.6 -r1.7 src/etc/etc.playstation2/ttys cvs rdiff -u -r1.15 -r1.16 src/etc/etc.pmax/ttys cvs rdiff -u -r1.1 -r1.2 src/etc/etc.riscv/ttys cvs rdiff -u -r1.7 -r1.8 src/etc/etc.sandpoint/ttys cvs rdiff -u -r1.5 -r1.6 src/etc/etc.sbmips/ttys cvs rdiff -u -r1.10 -r1.11 src/etc/etc.sgimips/ttys cvs rdiff -u -r1.8 -r1.9 src/etc/etc.shark/ttys cvs rdiff -u -r1.16 -r1.17 src/etc/etc.sparc/ttys cvs rdiff -u -r1.11 -r1.12 src/etc/etc.sparc64/ttys cvs rdiff -u -r1.9 -r1.10 src/etc/etc.vax/ttys cvs rdiff -u -r1.3 -r1.4 src/etc/etc.zaurus/ttys Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.