CVS commit: [netbsd-9] src/distrib
Module Name:src
Committed By: martin
Date: Sun Aug 15 08:44:39 UTC 2021
Modified Files:
src/distrib/sun2/miniroot [netbsd-9]: install.md
src/distrib/sun3/miniroot [netbsd-9]: install.md
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1335):
distrib/sun3/miniroot/install.md: revision 1.8
distrib/sun3/miniroot/install.md: revision 1.9
distrib/sun2/miniroot/install.md: revision 1.8
distrib/sun2/miniroot/install.md: revision 1.9
Don't try to add swap on miniroot.
Check if /tmp is writable to see whether the rootdev is already mounted.
Creating a dummy /tmp/root_writable file and after mountroot and
checking it on the second installation could be problematic if
users retry to installation after reboot without reinstalling miniroot.
Taken from amiga.
To generate a diff of this commit:
cvs rdiff -u -r1.5.2.1 -r1.5.2.2 src/distrib/sun2/miniroot/install.md
cvs rdiff -u -r1.5.2.1 -r1.5.2.2 src/distrib/sun3/miniroot/install.md
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sun2/miniroot/install.md
diff -u src/distrib/sun2/miniroot/install.md:1.5.2.1 src/distrib/sun2/miniroot/install.md:1.5.2.2
--- src/distrib/sun2/miniroot/install.md:1.5.2.1 Mon Dec 14 17:26:37 2020
+++ src/distrib/sun2/miniroot/install.md Sun Aug 15 08:44:39 2021
@@ -1,4 +1,4 @@
-# $NetBSD: install.md,v 1.5.2.1 2020/12/14 17:26:37 martin Exp $
+# $NetBSD: install.md,v 1.5.2.2 2021/08/15 08:44:39 martin Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -49,12 +49,10 @@ md_set_term() {
md_makerootwritable() {
# Just remount the root device read-write.
- if [ ! -e /tmp/root_writable ]; then
+ if ! cp /dev/null /tmp/.root_writable >/dev/null 2>&1; then
echo "Remounting root read-write..."
mi_mount_kernfs
mount -u -t ffs /kern/rootdev /
- swapctl -a /kern/rootdev
- cp /dev/null /tmp/root_writable
fi
}
Index: src/distrib/sun3/miniroot/install.md
diff -u src/distrib/sun3/miniroot/install.md:1.5.2.1 src/distrib/sun3/miniroot/install.md:1.5.2.2
--- src/distrib/sun3/miniroot/install.md:1.5.2.1 Mon Dec 14 17:26:37 2020
+++ src/distrib/sun3/miniroot/install.md Sun Aug 15 08:44:39 2021
@@ -1,4 +1,4 @@
-# $NetBSD: install.md,v 1.5.2.1 2020/12/14 17:26:37 martin Exp $
+# $NetBSD: install.md,v 1.5.2.2 2021/08/15 08:44:39 martin Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -49,12 +49,10 @@ md_set_term() {
md_makerootwritable() {
# Just remount the root device read-write.
- if [ ! -e /tmp/root_writable ]; then
+ if ! cp /dev/null /tmp/.root_writable >/dev/null 2>&1; then
echo "Remounting root read-write..."
mi_mount_kernfs
mount -u /kern/rootdev /
- swapctl -a /kern/rootdev
- cp /dev/null /tmp/root_writable
fi
}
CVS commit: [netbsd-9] src/distrib/notes/hp300
Module Name:src Committed By: martin Date: Sun Aug 15 08:41:47 UTC 2021 Modified Files: src/distrib/notes/hp300 [netbsd-9]: hardware Log Message: Pull up following revision(s) (requested by tsutsui in ticket #1334): distrib/notes/hp300/hardware: revision 1.25 distrib/notes/hp300/hardware: revision 1.26 HP9000/360 can have up to 16 MB RAM, not 48 MB. Per Service Information Manual HP 9000 Series 300 Computers Models 360/370. Mention that emulated disks by HPDisk and HPDrive work. Also add more HP-IB disk models per recent changes. To generate a diff of this commit: cvs rdiff -u -r1.20.14.1 -r1.20.14.2 src/distrib/notes/hp300/hardware 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/hp300/hardware diff -u src/distrib/notes/hp300/hardware:1.20.14.1 src/distrib/notes/hp300/hardware:1.20.14.2 --- src/distrib/notes/hp300/hardware:1.20.14.1 Mon Dec 28 20:15:16 2020 +++ src/distrib/notes/hp300/hardware Sun Aug 15 08:41:47 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: hardware,v 1.20.14.1 2020/12/28 20:15:16 martin Exp $ +.\" $NetBSD: hardware,v 1.20.14.2 2021/08/15 08:41:47 martin Exp $ . .Nx*M \*V will run on most HP 9000/300- and 400-series machines. @@ -31,7 +31,7 @@ CPUs .br .Em "Requires Human Interface board" .It -360 (25 MHz 68030, with 4 MB RAM built-in, up to 48 MB RAM) +360 (25 MHz 68030, with 4 MB RAM built-in, up to 16 MB RAM) .br .Em "Requires System Interface board" .It @@ -73,8 +73,14 @@ up to 128 MB RAM) HP-IB devices .(bullet -compact .Em rd ; -CS80 disks: 2200, 2203, 7912, 7914, 7933, 7936, 7937, 7945, 7946, -7957, 7958, and 7959 +CS80 disks: 2200, 2202, 2203, 7908, 7911, 7912, 7914, 7933, 7936, 7937, 7941, +7945, 7946, 7957, 7958, and 7959 +.br +.Em "Emulated CS80 disks by" +.Lk http://www.dalton.ax/hpdisk/ HPDisk +.Em and +.Lk https://www.hp9845.net/9845/projects/hpdrive/ HPDrive +.Em "also work." .It .Em rd ; CS80 floppy disks: 9122, 9134 (possibly others)
CVS commit: [netbsd-9] src/distrib
Module Name:src
Committed By: martin
Date: Fri Jun 25 19:08:46 UTC 2021
Modified Files:
src/distrib/miniroot [netbsd-9]: install.sub
src/distrib/sun2/miniroot [netbsd-9]: Makefile
src/distrib/sun3/miniroot [netbsd-9]: Makefile
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1310):
distrib/sun3/miniroot/Makefile: revision 1.50
distrib/miniroot/install.sub: revision 1.61
distrib/miniroot/install.sub: revision 1.62
distrib/sun2/miniroot/Makefile: revision 1.40
Replace RELEASE and VERSION strings proplery.
sun2 and sun3 don't use MI src/distrib/miniroot/list so this should
have been sync'ed with it.
http://cvsweb.netbsd.org/bsdweb.cgi/src/distrib/miniroot/list#rev1.36
> Use proper release version strings ("9.1" rather than "91") in banners.
>
> Also define and use "MACHINE" variable to describe port names
> (no uname(1) or sysctl(8) in miniroot binary list by default).
Should be pulled up to netbsd-9.
Remove netstat(1) calls to print resolver info on upgrade using miniroot.
netstat(1) was removed from miniroot 25 years ago.
http://cvsweb.netbsd.org/bsdweb.cgi/src/distrib/miniroot/list#rev1.5
The modules and rescue sets are also required on upgrade.
Should be pulled up to netbsd-9 and netbsd-8.
To generate a diff of this commit:
cvs rdiff -u -r1.48.2.5 -r1.48.2.6 src/distrib/miniroot/install.sub
cvs rdiff -u -r1.36 -r1.36.14.1 src/distrib/sun2/miniroot/Makefile
cvs rdiff -u -r1.47 -r1.47.2.1 src/distrib/sun3/miniroot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/miniroot/install.sub
diff -u src/distrib/miniroot/install.sub:1.48.2.5 src/distrib/miniroot/install.sub:1.48.2.6
--- src/distrib/miniroot/install.sub:1.48.2.5 Sat Jun 5 10:40:08 2021
+++ src/distrib/miniroot/install.sub Fri Jun 25 19:08:46 2021
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: install.sub,v 1.48.2.5 2021/06/05 10:40:08 martin Exp $
+# $NetBSD: install.sub,v 1.48.2.6 2021/06/25 19:08:46 martin Exp $
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -40,7 +40,7 @@ RELEASE=10.0# updated by distrib/min
export RELEASE
ALLSETS="base comp etc games man misc modules rescue text" # default install sets
-UPGRSETS="base comp games man misc text" # default upgrade sets
+UPGRSETS="base comp games man misc modules rescue text" # default upgrade sets
THESETS= # one of the above
local_sets_dir="" # Path searched for sets by install_sets
@@ -606,12 +606,8 @@ fi
echo ""
if [ "${_resolver_enabled:-FALSE}" = "TRUE" ]; then
- netstat -r
- echo ""
echo "Resolver enabled."
else
- netstat -rn
- echo ""
echo "Resolver not enabled."
fi
Index: src/distrib/sun2/miniroot/Makefile
diff -u src/distrib/sun2/miniroot/Makefile:1.36 src/distrib/sun2/miniroot/Makefile:1.36.14.1
--- src/distrib/sun2/miniroot/Makefile:1.36 Tue Jan 24 18:04:05 2017
+++ src/distrib/sun2/miniroot/Makefile Fri Jun 25 19:08:46 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2017/01/24 18:04:05 christos Exp $
+# $NetBSD: Makefile,v 1.36.14.1 2021/06/25 19:08:46 martin Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -50,7 +50,9 @@ HACKSRC= ${DISTRIBDIR}/utils/libhack
${CRUNCHBIN}: libhack.o
install.sub: ${DISTRIBDIR}/miniroot/install.sub
- ${TOOL_SED} -e "/^VERSION=/s/=.*/=${DISTRIBREV}/" < $? > $@
+ ${TOOL_SED} -e "/^VERSION=/s/=.*/=${DISTRIBREV}/" \
+ -e "/^RELEASE=/s/=.*/=${DISTRIBVER}/" \
+ -e "/^MACHINE=/s/=.*/=${MACHINE}/" < $? > $@
CLEANFILES+= install.sub
Index: src/distrib/sun3/miniroot/Makefile
diff -u src/distrib/sun3/miniroot/Makefile:1.47 src/distrib/sun3/miniroot/Makefile:1.47.2.1
--- src/distrib/sun3/miniroot/Makefile:1.47 Sun Jul 28 10:29:49 2019
+++ src/distrib/sun3/miniroot/Makefile Fri Jun 25 19:08:46 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2019/07/28 10:29:49 martin Exp $
+# $NetBSD: Makefile,v 1.47.2.1 2021/06/25 19:08:46 martin Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -53,7 +53,9 @@ HACK_CURSES=yes
${CRUNCHBIN}: libhack.o
install.sub: ${DISTRIBDIR}/miniroot/install.sub
- ${TOOL_SED} -e "/^VERSION=/s/=.*/=${DISTRIBREV}/" < $? > $@
+ ${TOOL_SED} -e "/^VERSION=/s/=.*/=${DISTRIBREV}/" \
+ -e "/^RELEASE=/s/=.*/=${DISTRIBVER}/" \
+ -e "/^MACHINE=/s/=.*/=${MACHINE}/" < $? > $@
CLEANFILES+= install.sub
CVS commit: [netbsd-9] src/distrib/miniroot
Module Name:src
Committed By: martin
Date: Sat Jun 5 10:40:09 UTC 2021
Modified Files:
src/distrib/miniroot [netbsd-9]: install.sub
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1281):
distrib/miniroot/install.sub: revision 1.60
Handle recent ifconfig(8) outputs in the miniroot installation script.
- Remove netmask slash notation for IP addresses,
which has been changed between NetBSD 7.x and 8.0:
http://cvsweb.netbsd.org/bsdweb.cgi/src/sbin/ifconfig/af_inet.c#rev1.24
- Ignore inet6 entries, which miniroot scripts don't support
Should be pulled up to netbsd-9 and netbsd-8.
To generate a diff of this commit:
cvs rdiff -u -r1.48.2.4 -r1.48.2.5 src/distrib/miniroot/install.sub
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/miniroot/install.sub
diff -u src/distrib/miniroot/install.sub:1.48.2.4 src/distrib/miniroot/install.sub:1.48.2.5
--- src/distrib/miniroot/install.sub:1.48.2.4 Mon Dec 14 17:26:36 2020
+++ src/distrib/miniroot/install.sub Sat Jun 5 10:40:08 2021
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: install.sub,v 1.48.2.4 2020/12/14 17:26:36 martin Exp $
+# $NetBSD: install.sub,v 1.48.2.5 2021/06/05 10:40:08 martin Exp $
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -403,8 +403,9 @@ configure_ifs() {
fi
set -- $(ifconfig $_interface_name | sed -n '
- /^[ ]*inet/{
+ /^[ ]*inet /{
s/inet//
+ s,/[0-9]*,,
s/--> [0-9.][0-9.]*//
s/netmask//
s/broadcast//
CVS commit: [netbsd-9] src/distrib/notes
Module Name:src Committed By: martin Date: Wed May 12 13:06:23 UTC 2021 Modified Files: src/distrib/notes/amd64 [netbsd-9]: contents src/distrib/notes/sparc64 [netbsd-9]: contents Log Message: Sets are not actually gzip'd To generate a diff of this commit: cvs rdiff -u -r1.7.4.2 -r1.7.4.3 src/distrib/notes/amd64/contents cvs rdiff -u -r1.7.4.2 -r1.7.4.3 src/distrib/notes/sparc64/contents 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/amd64/contents diff -u src/distrib/notes/amd64/contents:1.7.4.2 src/distrib/notes/amd64/contents:1.7.4.3 --- src/distrib/notes/amd64/contents:1.7.4.2 Mon Nov 25 05:50:18 2019 +++ src/distrib/notes/amd64/contents Wed May 12 13:06:23 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: contents,v 1.7.4.2 2019/11/25 05:50:18 msaitoh Exp $ +.\" $NetBSD: contents,v 1.7.4.3 2021/05/12 13:06:23 martin Exp $ .\" .\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -245,7 +245,7 @@ This includes the modular X.Org server. .\" . .Pp -The \*M binary distribution sets are distributed as gzipped tar files +The \*M binary distribution sets are distributed as compressed tar files named with the extension .Sy .\*[setsuffix] .Pq e.g., Pa base.\*[setsuffix] . Index: src/distrib/notes/sparc64/contents diff -u src/distrib/notes/sparc64/contents:1.7.4.2 src/distrib/notes/sparc64/contents:1.7.4.3 --- src/distrib/notes/sparc64/contents:1.7.4.2 Mon Nov 25 05:50:16 2019 +++ src/distrib/notes/sparc64/contents Wed May 12 13:06:23 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: contents,v 1.7.4.2 2019/11/25 05:50:16 msaitoh Exp $ +.\" $NetBSD: contents,v 1.7.4.3 2021/05/12 13:06:23 martin Exp $ .\" .\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -295,7 +295,7 @@ This includes the modular Xorg and Xvfb .\" XXX: should be in notes/common . .Pp -The \*M binary distribution sets are distributed as gzipped tar files +The \*M binary distribution sets are distributed as compressed tar files named with the extension .Sy .\*[setsuffix] , e.g.,
CVS commit: [netbsd-9] src/distrib/notes/common
Module Name:src
Committed By: martin
Date: Fri Apr 30 13:57:00 UTC 2021
Modified Files:
src/distrib/notes/common [netbsd-9]: netboot
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1262):
distrib/notes/common/netboot: revision 1.39
For netboot via DHCP, "next-server" in dhcpd.conf(5) is mandatory.
Pointed out by Anders Gustafsson on port-hp300@.
https://mail-index.netbsd.org/port-hp300/2021/04/21/msg000201.html
Should be pulled up to netbsd-8 and netbsd-9.
XXX: kernel should use the dhcpd/bootp server address for nfsroot
if the specified next-server (siaddr) is 0.0.0.0?
To generate a diff of this commit:
cvs rdiff -u -r1.36.18.2 -r1.36.18.3 src/distrib/notes/common/netboot
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/netboot
diff -u src/distrib/notes/common/netboot:1.36.18.2 src/distrib/notes/common/netboot:1.36.18.3
--- src/distrib/notes/common/netboot:1.36.18.2 Wed Nov 27 13:36:55 2019
+++ src/distrib/notes/common/netboot Fri Apr 30 13:57:00 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: netboot,v 1.36.18.2 2019/11/27 13:36:55 msaitoh Exp $
+.\" $NetBSD: netboot,v 1.36.18.3 2021/04/30 13:57:00 martin Exp $
.\"
.\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -345,16 +345,15 @@ group {
.\}
#
-# If your DHCP server is not your NFS server, supply the
-# address of the NFS server. Since we assume you run everything
-# on one server, this is not needed.
+# The host address of the NFS server. This is mandatory for
+# NetBSD kernels even it's the same host as the DHCP server.
.if \n[macppc] \{\
#
# macppc machines will look for their bootloader,
# ofwboot.xcf, on the next-server as well.
.\}
#
-# next-server server.test.net;
+next-server server.test.net;
}
#you may paste another "host" entry here for additional
#clients on this network
CVS commit: [netbsd-9] src/distrib/notes/hp300
Module Name:src Committed By: martin Date: Mon Dec 28 20:15:16 UTC 2020 Modified Files: src/distrib/notes/hp300 [netbsd-9]: hardware Log Message: Pull up following revision(s) (requested by tsutsui in ticket #1163): distrib/notes/hp300/hardware: revision 1.21 distrib/notes/hp300/hardware: revision 1.22 distrib/notes/hp300/hardware: revision 1.23 distrib/notes/hp300/hardware: revision 1.24 Fix typo. Move HP332 to "Supported hardware" list, as reported by Chris Hanson. Now Xserver works on hp425e built-in EVRX framebuffer. Add A1659A CRX framebuffer to "Supported hardware" list. Also remove SGC support from "Unsupported hardware" list. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.20.14.1 src/distrib/notes/hp300/hardware 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/hp300/hardware diff -u src/distrib/notes/hp300/hardware:1.20 src/distrib/notes/hp300/hardware:1.20.14.1 --- src/distrib/notes/hp300/hardware:1.20 Sat Mar 25 23:33:11 2017 +++ src/distrib/notes/hp300/hardware Mon Dec 28 20:15:16 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: hardware,v 1.20 2017/03/25 23:33:11 tsutsui Exp $ +.\" $NetBSD: hardware,v 1.20.14.1 2020/12/28 20:15:16 martin Exp $ . .Nx*M \*V will run on most HP 9000/300- and 400-series machines. @@ -21,6 +21,8 @@ CPUs .br .Em "Requires Human Interface board" .It +332 (16 MHz 68030, optional 68882, up to 8 MB RAM) +.It 340 (16 MHz 68030, up to 16 MB RAM) .It 345 (50 MHz 68030 with 32 KB L2 cache, up to 128 MB RAM, built-in SCSI) @@ -63,7 +65,7 @@ up to 128 MB RAM) .Ql SERVICE/NORMAL .Em "switch on the back panel is turned to" .Ql SERVICE -.Em "potision." +.Em "position." .It 433s, 433t, 433dl (33 MHz 68040 with built-in SCSI, up to 128 MB RAM) .bullet) @@ -175,6 +177,8 @@ A1096A monochrome Hyperion (1280x1024, 1 .It A1416A Kathmandu (a.k.a. Color VRX) (1280x1024 @ 60 hz, 8 bits, DIO-II) .It +A1659A CRX (1280x1024 @ 72 hz, 8 bits, SGC) +.It 98705 Tigershark PersonalVRX DIO-II graphics device .br .Em "Untested" @@ -184,8 +188,6 @@ internal video on models 362/382 (A1474- .Em "No X server support" .It 425e built-in EVRX framebuffer -.br -.Em "No X server support" .bullet) .It HP-HIL devices @@ -245,14 +247,10 @@ CPUs .(bullet -compact 310 (10 MHz 68010, with built-in monochrome framebuffer, rs232 (25 pin), hil, and slow hpib) -.It -332 (16? MHz 68030, with no floating point unit) .bullet) .It Graphics Devices .(bullet -compact -SGC support for some rare configurations of 4XXt and 4XXdl workstations -.It 98702 TurboVRX DIO-II graphics device .bullet) .It
CVS commit: [netbsd-9] src/distrib
Module Name:src
Committed By: martin
Date: Mon Dec 14 17:26:37 UTC 2020
Modified Files:
src/distrib/amiga/miniroot [netbsd-9]: install.md
src/distrib/hp300/miniroot [netbsd-9]: install.md
src/distrib/mac68k/miniroot [netbsd-9]: install.md
src/distrib/miniroot [netbsd-9]: install.sub list
src/distrib/mvme68k/miniroot [netbsd-9]: install.md
src/distrib/sun2/miniroot [netbsd-9]: install.md
src/distrib/sun3/miniroot [netbsd-9]: install.md
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1151):
distrib/miniroot/install.sub: revision 1.54
distrib/miniroot/install.sub: revision 1.55
distrib/miniroot/install.sub: revision 1.56
distrib/miniroot/install.sub: revision 1.57
distrib/miniroot/install.sub: revision 1.58
distrib/miniroot/install.sub: revision 1.59
distrib/hp300/miniroot/install.md: revision 1.20
distrib/miniroot/list: revision 1.36
distrib/mvme68k/miniroot/install.md: revision 1.9
distrib/mvme68k/miniroot/install.md: revision 1.10
distrib/sun3/miniroot/install.md: revision 1.6
distrib/sun3/miniroot/install.md: revision 1.7
distrib/sun2/miniroot/install.md: revision 1.6
distrib/sun2/miniroot/install.md: revision 1.7
distrib/amiga/miniroot/install.md: revision 1.31
distrib/mac68k/miniroot/install.md: revision 1.6
distrib/mac68k/miniroot/install.md: revision 1.7
distrib/mac68k/miniroot/install.md: revision 1.8
distrib/hp300/miniroot/install.md: revision 1.18
distrib/hp300/miniroot/install.md: revision 1.19
distrib/miniroot/install.sub: revision 1.53
test ! -n "$foo" is just a quaint way of saying test -z "$foo"
and test ! -z "$foo" is really just test -n "$foo" so let's just
use the simple (and more obvious) forms.
NFCI.
-
Add modules set for default sets on miniroot installation.
Should be pulled up to netbsd-9 and netbsd-8.
-
The kernel and X sets should be specified in MD miniroot scripts.
Otherwise they are not listed at least on ftp installation.
The problem was reported by Martin Trusler on port-hp300@:
https://mail-index.netbsd.org/port-hp300/2020/11/21/msg000174.html
Should be pulled up to netbsd-9 and netbsd-8.
-
Appease awk warnings on suppressing dmesg timestamps.
awk: warning: escape sequence `\[' treated as plain `['
source line number 1
context is
{ h=$0; >>> gsub("^[ <<<
awk: warning: escape sequence `\]' treated as plain `]'
source line number 1
Should be pulled up to netbsd-9.
-
Explicitly sort set names fetched via ftp nlist.
Several binary sets are stored as symbolic links on releases and
it seems some ftpd doesn't sort nlist outputs by name in such case.
Worth to pullup to netbsd-9 and netbsd-8.
-
Use proper release version strings ("9.1" rather than "91") in banners.
Also define and use "MACHINE" variable to describe port names
(no uname(1) or sysctl(8) in miniroot binary list by default).
I guess the short format like "91" by ${DISTRIBREV} was used only
for split sets for floppies in 1990's releases.
Worth to pullup to netbsd-9.
-
Inform the default installation directory in the official ftp server.
-
Fetch files via ftp using auto-fetching with URL per each binary set.
On slower machines, it takes more than five minutes to get a large
set binary and it could cause timeout of ftp control session, so
getting multiple binary sets in a single ftp session always fails.
Briefly tested on HP 9000/425e with 9.1 tree and ftp.netbsd.org binaries.
No particular comments on tech-install@ and port-hp300@.
Maybe should be pulled up to netbsd-9.
-
Add missing md_get_partition_range() that causes installation failure.
Also reported by Martin Trusler on testing hp300 miniroot.
Should be pulled up to netbsd-9 and netbsd-8.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.30.2.1 src/distrib/amiga/miniroot/install.md
cvs rdiff -u -r1.17 -r1.17.2.1 src/distrib/hp300/miniroot/install.md
cvs rdiff -u -r1.5 -r1.5.2.1 src/distrib/mac68k/miniroot/install.md
cvs rdiff -u -r1.48.2.3 -r1.48.2.4 src/distrib/miniroot/install.sub
cvs rdiff -u -r1.35 -r1.35.46.1 src/distrib/miniroot/list
cvs rdiff -u -r1.8 -r1.8.2.1 src/distrib/mvme68k/miniroot/install.md
cvs rdiff -u -r1.5 -r1.5.2.1 src/distrib/sun2/miniroot/install.md
cvs rdiff -u -r1.5 -r1.5.2.1 src/distrib/sun3/miniroot/install.md
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amiga/miniroot/install.md
diff -u src/distrib/amiga/miniroot/install.md:1.30 src/distrib/amiga/miniroot/install.md:1.30.2.1
--- src/distrib/amiga/miniroot/install.md:1.30 Wed Apr 10 14:52:53 2019
+++ src/distrib/amiga/miniroot/install.md Mon Dec 14 17:26:37 2020
@@ -1,4 +1,4 @@
-# $NetBSD: install.md,v 1.30 2019/04/10 14:52:53 christos Exp $
+# $NetBSD: install.md,v
CVS commit: [netbsd-9] src/distrib/notes/common
Module Name:src
Committed By: martin
Date: Fri Oct 23 08:32:27 UTC 2020
Modified Files:
src/distrib/notes/common [netbsd-9]: main
Log Message:
Comment out (and fix typo in) dedication for 9.0 release
To generate a diff of this commit:
cvs rdiff -u -r1.551.2.9 -r1.551.2.10 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.551.2.9 src/distrib/notes/common/main:1.551.2.10
--- src/distrib/notes/common/main:1.551.2.9 Wed Aug 5 14:29:59 2020
+++ src/distrib/notes/common/main Fri Oct 23 08:32:27 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: main,v 1.551.2.9 2020/08/05 14:29:59 martin Exp $
+.\" $NetBSD: main,v 1.551.2.10 2020/10/23 08:32:27 martin Exp $
.\"
.\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -515,28 +515,28 @@ possible,
would not exist.
.
.if \n[FOR_RELEASE] \{\
-.Ss "Dedication"
-.Pp
-.
-.Nx
-9.0 is dedicated to the memory of Matthias Drochner, who
-passed away in August 2018 and Eric Schnoebelen, who
-passed away in March 2019.
-.Pp
-Matthias' technical contributions are too many to list here in full.
-He was a long term contributor and commited more than 3000 changes all
-over the
-.Nx
-source tree and lately was especially active in keeping some of our most weired
-ancient VME architectures in shape.
-.Pp
-Eric was a long term pkgsrc developer and well known community member.
-.Pp
-Beyond their technical contributions, Eric and Matthias were always
-helpful and friendly.
-Their example encouraged users to contribute to the project and share their
-work with the community.
-.Pp
+.\" .Ss "Dedication"
+.\" .Pp
+.\" .
+.\" .Nx
+.\" 9.0 is dedicated to the memory of Matthias Drochner, who
+.\" passed away in August 2018 and Eric Schnoebelen, who
+.\" passed away in March 2019.
+.\" .Pp
+.\" Matthias' technical contributions are too many to list here in full.
+.\" He was a long term contributor and commited more than 3000 changes all
+.\" over the
+.\" .Nx
+.\" source tree and lately was especially active in keeping some of our most weird
+.\" ancient VME architectures in shape.
+.\" .Pp
+.\" Eric was a long term pkgsrc developer and well known community member.
+.\" .Pp
+.\" Beyond their technical contributions, Eric and Matthias were always
+.\" helpful and friendly.
+.\" Their example encouraged users to contribute to the project and share their
+.\" work with the community.
+.\" .Pp
.\} \" \n[FOR_RELEASE]
.ie \n[RELEASE_BRANCH] .Ss Changes Between The NetBSD \n[oldvers] \
and \n[major] Releases
CVS commit: [netbsd-9] src/distrib/sets/lists/xcomp
Module Name:src Committed By: martin Date: Thu Oct 22 11:26:42 UTC 2020 Modified Files: src/distrib/sets/lists/xcomp [netbsd-9]: mi Log Message: Apply patch, requested by maya in ticket #1118: distrib/sets/lists/xcomp/mi (patch) Update for freetype 2.10.4. To generate a diff of this commit: cvs rdiff -u -r1.210 -r1.210.2.1 src/distrib/sets/lists/xcomp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xcomp/mi diff -u src/distrib/sets/lists/xcomp/mi:1.210 src/distrib/sets/lists/xcomp/mi:1.210.2.1 --- src/distrib/sets/lists/xcomp/mi:1.210 Sun Jul 21 12:15:13 2019 +++ src/distrib/sets/lists/xcomp/mi Thu Oct 22 11:26:42 2020 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.210 2019/07/21 12:15:13 rjs Exp $ +# $NetBSD: mi,v 1.210.2.1 2020/10/22 11:26:42 martin Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -570,6 +570,9 @@ ./usr/X11R7/include/freetype2/freetype/config/ftmodule.h -unknown- xorg ./usr/X11R7/include/freetype2/freetype/config/ftoption.h -unknown- xorg ./usr/X11R7/include/freetype2/freetype/config/ftstdlib.h -unknown- xorg +./usr/X11R7/include/freetype2/freetype/config/integer-types.h -unknown- xorg +./usr/X11R7/include/freetype2/freetype/config/mac-support.h -unknown- xorg +./usr/X11R7/include/freetype2/freetype/config/public-macros.h -unknown- xorg ./usr/X11R7/include/freetype2/freetype/freetype.h -unknown- xorg ./usr/X11R7/include/freetype2/freetype/ftadvanc.h -unknown- xorg ./usr/X11R7/include/freetype2/freetype/ftautoh.h -unknown- obsolete
CVS commit: [netbsd-9] src/distrib/notes
Module Name:src
Committed By: martin
Date: Wed Aug 5 14:29:59 UTC 2020
Modified Files:
src/distrib/notes/common [netbsd-9]: main
src/distrib/notes/evbarm [netbsd-9]: hardware xfer
Log Message:
Pull up following revision(s) (requested by nia in ticket #1036):
distrib/notes/evbarm/hardware: revision 1.22
distrib/notes/evbarm/xfer: revision 1.5
distrib/notes/evbarm/hardware: revision 1.17
distrib/notes/common/main: revision 1.563
Note support for TI AM335x SoC
List all supported Amlogic SoCs
Remove duplicate word
Remove Arm OABI -> EABI change notice
To generate a diff of this commit:
cvs rdiff -u -r1.551.2.8 -r1.551.2.9 src/distrib/notes/common/main
cvs rdiff -u -r1.10.66.2 -r1.10.66.3 src/distrib/notes/evbarm/hardware
cvs rdiff -u -r1.2.48.1 -r1.2.48.2 src/distrib/notes/evbarm/xfer
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.551.2.8 src/distrib/notes/common/main:1.551.2.9
--- src/distrib/notes/common/main:1.551.2.8 Sun Jan 26 11:19:36 2020
+++ src/distrib/notes/common/main Wed Aug 5 14:29:59 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: main,v 1.551.2.8 2020/01/26 11:19:36 martin Exp $
+.\" $NetBSD: main,v 1.551.2.9 2020/08/05 14:29:59 martin Exp $
.\"
.\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -822,61 +822,6 @@ A number of things have been removed fro
See the
.Dq Components removed from NetBSD
section near the beginning of this document for a list.
-.if \n[arm] \{\
-.Ss2 Important note regarding ABI change on ARM ports
-.Pp
-In
-.Nx
-7.0, most ARM ports (all but acorn32, and epoc32) have switched
-to the official standard ABI
-.Pq EABI5
-which is recommended by ARM for ELF binaries.
-.Pp
-Backwards compatibility is provided for binaries using the previous ABI
-.Pq oabi .
-A
-.Nx
-\*V
-kernel with the
-.Dv COMPAT_NETBSD32
-option enabled will allow you to execute oabi binaries.
-This option is enabled in the kernels distributed with this release.
-.Pp
-However, new binaries can not be mixed with old libraries, and shared
-libraries are incompatible.
-.Pp
-.Ic sysinst
-does not provide an automatic mechanism to partlially upgrade an old
-installation.
-There are two ways to handle the transition:
-.(enum
-.Pp
-Do a complete update.
-.Pp
-This means updating your system with
-.Ic sysinst ,
-then deleting and recompiling all other binaries, whether they were
-installed locally or through pkgsrc.
-This is the preferred, cleanest approach.
-.It
-Move your old binaries and libraries to
-.Pa /compat/netbsd32
-and replace them one by one.
-.Pp
-For example, move all of
-.Pa /usr/pkg
-to
-.Pa /compat/netbsd32/usr/pkg
-and add
-.Pa /compat/netbsd32/usr/pkg/bin
-to the end of your PATH.
-Most binaries should still run, and can be replaced over time with
-recompiled packages, which will install to
-.Pa /usr/pkg
-again.
-.enum)
-.
-.\}
.Ss "Using online NetBSD documentation"
.Pp
Documentation is available if you installed the manual
Index: src/distrib/notes/evbarm/hardware
diff -u src/distrib/notes/evbarm/hardware:1.10.66.2 src/distrib/notes/evbarm/hardware:1.10.66.3
--- src/distrib/notes/evbarm/hardware:1.10.66.2 Sun Jul 26 11:07:56 2020
+++ src/distrib/notes/evbarm/hardware Wed Aug 5 14:29:59 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: hardware,v 1.10.66.2 2020/07/26 11:07:56 martin Exp $
+.\" $NetBSD: hardware,v 1.10.66.3 2020/08/05 14:29:59 martin Exp $
.\"
.\" Copyright (c) 2001-2020 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -38,7 +38,7 @@ Broadcom BCM2836 (e.g. Raspberry Pi 2)
.It
Samsung Exynos 5422 (e.g. ODROID-XU3/XU-4)
.It
-Texas Instruments OMAP3 (e.g. BeagleBoard, BeagleBone Black...)
+Texas Instruments AM335x and OMAP3 (e.g. BeagleBoard, BeagleBone Black...)
.It
Xilinx Zynq (e.g. Zedboard, Parallella...)
.It
@@ -54,7 +54,7 @@ are also supported.
.It
Allwinner H5, H6, A64 (e.g. PINE64, Pinebook, NanoPi A64, OLinuXino...)
.It
-Amlogic S905 (e.g. ODROID-C2, Le Potato, NanoPi K2...)
+Amlogic S905, S805X, S905D, S905W, S905X (e.g. ODROID-C2, Le Potato, NanoPi K2...)
.It
Broadcom BCM2837 (e.g. Raspberry Pi 3)
.It
Index: src/distrib/notes/evbarm/xfer
diff -u src/distrib/notes/evbarm/xfer:1.2.48.1 src/distrib/notes/evbarm/xfer:1.2.48.2
--- src/distrib/notes/evbarm/xfer:1.2.48.1 Mon Jul 20 18:32:55 2020
+++ src/distrib/notes/evbarm/xfer Wed Aug 5 14:29:59 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: xfer,v 1.2.48.1 2020/07/20 18:32:55 martin Exp $
+.\" $NetBSD: xfer,v 1.2.48.2 2020/08/05 14:29:59 martin Exp $
.\"
.\" Copyright (c) 2020 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -42,7 +42,7 @@ to decompress .gz files.
.Pp
ARM devices generally also ship with a vendor-specific U-Boot
bootloader, which may be replaced with a board-specific "mainline"
-U-Boot image from pkgsrc for an an optimal NetBSD experience.
CVS commit: [netbsd-9] src/distrib/notes/evbarm
Module Name:src Committed By: martin Date: Sun Jul 26 11:07:56 UTC 2020 Modified Files: src/distrib/notes/evbarm [netbsd-9]: contents hardware Log Message: Pull up following revision(s) (requested by nia in ticket #1030): distrib/notes/evbarm/hardware: revision 1.15 distrib/notes/evbarm/contents: revision 1.11 Fix location of device trees more 9.0 hardware To generate a diff of this commit: cvs rdiff -u -r1.4.4.3 -r1.4.4.4 src/distrib/notes/evbarm/contents cvs rdiff -u -r1.10.66.1 -r1.10.66.2 src/distrib/notes/evbarm/hardware 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/evbarm/contents diff -u src/distrib/notes/evbarm/contents:1.4.4.3 src/distrib/notes/evbarm/contents:1.4.4.4 --- src/distrib/notes/evbarm/contents:1.4.4.3 Mon Jul 20 18:32:55 2020 +++ src/distrib/notes/evbarm/contents Sun Jul 26 11:07:56 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: contents,v 1.4.4.3 2020/07/20 18:32:55 martin Exp $ +.\" $NetBSD: contents,v 1.4.4.4 2020/07/26 11:07:56 martin Exp $ .\" .\" Copyright (c) 1999-2020 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -61,8 +61,6 @@ operating system for a range of 64-bit d A gzipped writable image containing the complete 32-bit .Nx operating system for Raspberry Pi variants only (includes RPI kernels). -. It Pa *.dtb.gz -Gzipped board-specific device trees. . tag) \" binary/gzimg/ . It Pa kernel/ . (tag netbsd.gz -compact \" binary/kernel @@ -76,6 +74,8 @@ do not need board-specific kernels. A gzipped ARMv6 kernel which supports the Raspberry Pi 1 only. . It Pa netbsd-RPI2.gz A gzipped ARMv6 kernel which supports the Raspberry Pi 2 only. +. It Pa *.dtb.gz +Gzipped board-specific device trees. . tag) \" binary/kernel/ . . It Pa sets/ Index: src/distrib/notes/evbarm/hardware diff -u src/distrib/notes/evbarm/hardware:1.10.66.1 src/distrib/notes/evbarm/hardware:1.10.66.2 --- src/distrib/notes/evbarm/hardware:1.10.66.1 Mon Jul 20 18:32:55 2020 +++ src/distrib/notes/evbarm/hardware Sun Jul 26 11:07:56 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: hardware,v 1.10.66.1 2020/07/20 18:32:55 martin Exp $ +.\" $NetBSD: hardware,v 1.10.66.2 2020/07/26 11:07:56 martin Exp $ .\" .\" Copyright (c) 2001-2020 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -40,6 +40,8 @@ Samsung Exynos 5422 (e.g. ODROID-XU3/XU- .It Texas Instruments OMAP3 (e.g. BeagleBoard, BeagleBone Black...) .It +Xilinx Zynq (e.g. Zedboard, Parallella...) +.It NVIDIA Tegra K1 .El .Ss2 64-bit SoCs supported by GENERIC64 kernels @@ -56,6 +58,8 @@ Amlogic S905 (e.g. ODROID-C2, Le Potato, .It Broadcom BCM2837 (e.g. Raspberry Pi 3) .It +Marvell ThunderX +.It Rockchip RK3328, RK3328 (e.g. Pinebook Pro, RockPro64, Firefly...) .It NVIDIA Tegra X1
CVS commit: [netbsd-9] src/distrib/notes/evbarm
Module Name:src Committed By: martin Date: Sun Jul 26 11:05:57 UTC 2020 Modified Files: src/distrib/notes/evbarm [netbsd-9]: upgrade Log Message: Pull up following revision(s) (requested by nia in ticket #1029): distrib/notes/evbarm/upgrade: revision 1.3 distrib/notes/evbarm/upgrade: revision 1.4 distrib/notes/evbarm/upgrade: revision 1.5 Initial evbarm upgrade instructions - need work clarify upgrades to upgrade instructions To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.50.1 src/distrib/notes/evbarm/upgrade 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/evbarm/upgrade diff -u src/distrib/notes/evbarm/upgrade:1.2 src/distrib/notes/evbarm/upgrade:1.2.50.1 --- src/distrib/notes/evbarm/upgrade:1.2 Thu Apr 23 01:56:49 2009 +++ src/distrib/notes/evbarm/upgrade Sun Jul 26 11:05:57 2020 @@ -1,3 +1,86 @@ -.\" $NetBSD: upgrade,v 1.2 2009/04/23 01:56:49 snj Exp $ +.\" $NetBSD: upgrade,v 1.2.50.1 2020/07/26 11:05:57 martin Exp $ +.\" +.\" Copyright (c) 2020 The NetBSD Foundation, Inc. +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\"notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\"notice, this list of conditions and the following disclaimer in the +.\"documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +.\" POSSIBILITY OF SUCH DAMAGE. +.\" . -.so ../common/upgrade +.Pp +The easiest way to upgrade to +.Nx +\*M +\*V +is by using the sysutils/sysupgrade package from pkgsrc. +.Pp +First, edit +.Pa /usr/pkg/etc/sysupgrade.conf . +Make sure RELEASEDIR and ARCHIVE_EXTENSION are correct: +.Bd -literal +# Replace evbarm-aarch64 with evbarm-earmv7hf on a 32-bit system, evbarm-earmv6hf on the original RPI +RELEASEDIR="https://cdn.netbsd.org/pub/NetBSD/NetBSD-\*V/evbarm-aarch64/; +ARCHIVE_EXTENSION=tar.xz +.Ed +.Pp +Make sure +.Pa /boot +is mounted, and copy the new board-specific +.Pa *.dts +device tree file into place. +Note that the device tree files are sorted into SoC-type subdirectories in +.Pa /boot/dtb , +e.g. allwinner, amlogic, broadcom, freescale, nvidia, rockchip. +.Pp +For example, for the Allwinner-based PINE A64 LTS: +.Bd -literal +$ ftp https://cdn.netbsd.org/pub/NetBSD/NetBSD-\*V/evbarm-aarch64/binary/kernel/sun50i-a64-pine64-lts.dtb.gz +$ gunzip sun50i-a64-pine64-lts.dtb.gz +# cp sun50i-a64-pine64-lts.dtb /boot/dtb/allwinner/ +.Ed +Also copy +.Pa bootaa64.efi +if applicable: +.Bd -literal +$ ftp https://cdn.netbsd.org/pub/NetBSD/NetBSD-\*V/evbarm-aarch64/installation/misc/bootaa64.efi +# cp bootaa64.efi /boot/EFI/BOOT/bootaa64.efi +.Ed +.Pp +Finally: +.Bd -literal +# sysupgrade fetch +# sysupgrade kernel +# sysupgrade modules +# reboot +# sysupgrade sets +# sysupgrade etcupdate +# sysupgrade postinstall +# reboot +.Ed +.Pp +This is the most careful possible path with sysupgrade that makes sure +the kernel and userland are always fully compatible, by making sure the +kernel and boot files are newer than the userland. +It is also possible to: +.Bd -literal +# sysupgrade auto +# reboot +.Ed
CVS commit: [netbsd-9] src/distrib/notes/evbarm
Module Name:src
Committed By: martin
Date: Mon Jul 20 18:32:55 UTC 2020
Modified Files:
src/distrib/notes/evbarm [netbsd-9]: Makefile contents hardware install
prep xfer
Log Message:
Pull up following revision(s) (requested by nia in ticket #1022):
distrib/notes/evbarm/install: revision 1.14
distrib/notes/evbarm/hardware: revision 1.11
distrib/notes/evbarm/hardware: revision 1.12
distrib/notes/evbarm/hardware: revision 1.13
distrib/notes/evbarm/hardware: revision 1.14
distrib/notes/evbarm/Makefile: revision 1.3
distrib/notes/evbarm/xfer: revision 1.3
distrib/notes/evbarm/xfer: revision 1.4
distrib/notes/evbarm/prep: revision 1.12
distrib/notes/evbarm/contents: revision 1.9
distrib/notes/evbarm/contents: revision 1.10
distrib/notes/evbarm/install: revision 1.11
distrib/notes/evbarm/install: revision 1.12
distrib/notes/evbarm/install: revision 1.13
First attempt at modernising the evbarm install guide and hardware lists
- Install instructions mostly based on wiki pages
- Supported hardware lists mostly based on GENERIC and GENERIC64 kernels
s/boards/devices/
Briefly explain how to pkgsrc u-boot. Pointed out by maya.
more modernization of evbarm install instructions
safe estimation of required storage
more contents
more hardware
missing e.g.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.102.1 src/distrib/notes/evbarm/Makefile
cvs rdiff -u -r1.4.4.2 -r1.4.4.3 src/distrib/notes/evbarm/contents
cvs rdiff -u -r1.10 -r1.10.66.1 src/distrib/notes/evbarm/hardware
cvs rdiff -u -r1.9.64.1 -r1.9.64.2 src/distrib/notes/evbarm/install
cvs rdiff -u -r1.11 -r1.11.34.1 src/distrib/notes/evbarm/prep
cvs rdiff -u -r1.2 -r1.2.48.1 src/distrib/notes/evbarm/xfer
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/evbarm/Makefile
diff -u src/distrib/notes/evbarm/Makefile:1.2 src/distrib/notes/evbarm/Makefile:1.2.102.1
--- src/distrib/notes/evbarm/Makefile:1.2 Sun Jul 21 08:14:48 2002
+++ src/distrib/notes/evbarm/Makefile Mon Jul 20 18:32:55 2020
@@ -1,5 +1,3 @@
-# $NetBSD: Makefile,v 1.2 2002/07/21 08:14:48 lukem Exp $
-
-MERGED_SRCS+= ${COMMON}/xfer
+# $NetBSD: Makefile,v 1.2.102.1 2020/07/20 18:32:55 martin Exp $
.include
Index: src/distrib/notes/evbarm/contents
diff -u src/distrib/notes/evbarm/contents:1.4.4.2 src/distrib/notes/evbarm/contents:1.4.4.3
--- src/distrib/notes/evbarm/contents:1.4.4.2 Mon Nov 25 05:50:20 2019
+++ src/distrib/notes/evbarm/contents Mon Jul 20 18:32:55 2020
@@ -1,6 +1,6 @@
-.\" $NetBSD: contents,v 1.4.4.2 2019/11/25 05:50:20 msaitoh Exp $
+.\" $NetBSD: contents,v 1.4.4.3 2020/07/20 18:32:55 martin Exp $
.\"
-.\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc.
+.\" Copyright (c) 1999-2020 The NetBSD Foundation, Inc.
.\" All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
@@ -45,66 +45,81 @@ The
file contains underlined text using the
.Xr more 1
conventions for indicating italic and bold display.
-.
-.\" MD binary and installation directories ---
-.
. It Pa binary/
-.
. (tag kernel/ -compact \" binary/
-.
+. It Pa gzimg/
+. (tag armv7.img.gz -compact \" binary/gzimg
+. It Pa armv7.img.gz
+A gzipped writable image containing the complete
+.Nx
+operating system for a range of 32-bit devices (includes a GENERIC kernel).
+. It Pa arm64.img.gz
+A gzipped writable image containing the complete
+.Nx
+operating system for a range of 64-bit devices (includes a GENERIC64 kernel).
+. It Pa rpi.img.gz
+A gzipped writable image containing the complete 32-bit
+.Nx
+operating system for Raspberry Pi variants only (includes RPI kernels).
+. It Pa *.dtb.gz
+Gzipped board-specific device trees.
+. tag) \" binary/gzimg/
. It Pa kernel/
-.
. (tag netbsd.gz -compact \" binary/kernel
. It Pa netbsd-GENERIC.gz
-A gzipped
-.Nx
-kernel containing code for everything supported in this release.
-.
+A gzipped ARMv7 kernel which supports a range of 32-bit devices that
+do not need board-specific kernels.
+. It Pa netbsd-GENERIC64.gz
+A gzipped AArch64 kernel which supports a range of 64-bit devices that
+do not need board-specific kernels.
+. It Pa netbsd-RPI.gz
+A gzipped ARMv6 kernel which supports the Raspberry Pi 1 only.
+. It Pa netbsd-RPI2.gz
+A gzipped ARMv6 kernel which supports the Raspberry Pi 2 only.
. tag) \" binary/kernel/
.
. It Pa sets/
-.
\*M binary distribution sets;
see below.
.
. tag) \" binary/
-.
. It Pa installation/
.
. (tag miniroot/ -compact \" installation/
.
-. It Pa misc/
+. It Pa miniroot/
+.
+\*M kernel modules providing memory disk
+root file systems for expert usage.
.
-Miscellaneous \*M installation utilities; see
-installation section below.
+. It Pa misc/
+. (tag bootaa64.efi -compact \"
CVS commit: [netbsd-9] src/distrib/atari/floppies/install
Module Name:src
Committed By: martin
Date: Tue Jun 30 18:18:12 UTC 2020
Modified Files:
src/distrib/atari/floppies/install [netbsd-9]: list
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #972):
distrib/atari/floppies/install/list: revision 1.23
Provide wdboot as a link of sdboot for Milan also in sysinst.
See the following commit log for details:
https://mail-index.netbsd.org/source-changes/2018/03/04/msg092779.html
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.22.6.1 src/distrib/atari/floppies/install/list
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/atari/floppies/install/list
diff -u src/distrib/atari/floppies/install/list:1.22 src/distrib/atari/floppies/install/list:1.22.6.1
--- src/distrib/atari/floppies/install/list:1.22 Sat Nov 25 09:40:17 2017
+++ src/distrib/atari/floppies/install/list Tue Jun 30 18:18:12 2020
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.22 2017/11/25 09:40:17 tsutsui Exp $
+# $NetBSD: list,v 1.22.6.1 2020/06/30 18:18:12 martin Exp $
PROG bin/cat
PROG bin/chmod
@@ -77,5 +77,6 @@ COPY ${DESTDIR}/usr/mdec/milan/bootxx us
COPY ${DESTDIR}/usr/mdec/milan/boot.atari usr/mdec/milan/boot.atari
COPY ${DESTDIR}/usr/mdec/milan/fdboot usr/mdec/milan/fdboot
COPY ${DESTDIR}/usr/mdec/milan/sdboot usr/mdec/milan/sdboot
+LINK usr/mdec/milan/sdboot usr/mdec/milan/wdboot
COPY ${DESTDIR}/usr/mdec/milan/sdb00t.ahdi usr/mdec/milan/sdb00t.ahdi
COPY ${DESTDIR}/usr/mdec/milan/xxboot.ahdi usr/mdec/milan/xxboot.ahdi
CVS commit: [netbsd-9] src/distrib/amd64
Module Name:src
Committed By: martin
Date: Sun May 31 10:21:35 UTC 2020
Modified Files:
src/distrib/amd64 [netbsd-9]: Makefile
src/distrib/amd64/installimage [netbsd-9]: Makefile
Removed Files:
src/distrib/amd64/uefi-installimage [netbsd-9]: Makefile
Makefile.bootimage Makefile.installimage boot.cfg.in etc.rc
etc.ttys install.sh spec.inst
Log Message:
Pull up following revision(s) (requested by maya in ticket #933):
distrib/amd64/uefi-installimage/spec.inst: file removal
distrib/amd64/uefi-installimage/etc.rc: file removal
distrib/amd64/uefi-installimage/Makefile.bootimage: file removal
distrib/amd64/uefi-installimage/Makefile.installimage: file removal
distrib/amd64/uefi-installimage/install.sh: file removal
distrib/amd64/uefi-installimage/etc.ttys: file removal
distrib/amd64/Makefile: revision 1.14
distrib/amd64/uefi-installimage/boot.cfg.in: file removal
distrib/amd64/uefi-installimage/Makefile: file removal
distrib/amd64/installimage/Makefile: revision 1.11
rename amd64 uefi-installimage to be just installimage.
Works for both purposes, no confusing name.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.12.1 src/distrib/amd64/Makefile
cvs rdiff -u -r1.10 -r1.10.2.1 src/distrib/amd64/installimage/Makefile
cvs rdiff -u -r1.6.2.1 -r0 src/distrib/amd64/uefi-installimage/Makefile
cvs rdiff -u -r1.11.2.2 -r0 \
src/distrib/amd64/uefi-installimage/Makefile.bootimage
cvs rdiff -u -r1.2.18.1 -r0 \
src/distrib/amd64/uefi-installimage/Makefile.installimage
cvs rdiff -u -r1.2 -r0 src/distrib/amd64/uefi-installimage/boot.cfg.in
cvs rdiff -u -r1.1 -r0 src/distrib/amd64/uefi-installimage/etc.rc \
src/distrib/amd64/uefi-installimage/etc.ttys \
src/distrib/amd64/uefi-installimage/install.sh \
src/distrib/amd64/uefi-installimage/spec.inst
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/Makefile
diff -u src/distrib/amd64/Makefile:1.13 src/distrib/amd64/Makefile:1.13.12.1
--- src/distrib/amd64/Makefile:1.13 Sun May 21 15:28:37 2017
+++ src/distrib/amd64/Makefile Sun May 31 10:21:34 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2017/05/21 15:28:37 riastradh Exp $
+# $NetBSD: Makefile,v 1.13.12.1 2020/05/31 10:21:34 martin Exp $
.include
@@ -14,7 +14,6 @@ SUBDIR+= .WAIT
SUBDIR+= cdroms
SUBDIR+= liveimage
SUBDIR+= installimage
-SUBDIR+= uefi-installimage
TARGETS+= release
iso_image:
@@ -25,6 +24,5 @@ live_image:
install_image:
${MAKEDIRTARGET} installimage install_image
- ${MAKEDIRTARGET} uefi-installimage install_image
.include
Index: src/distrib/amd64/installimage/Makefile
diff -u src/distrib/amd64/installimage/Makefile:1.10 src/distrib/amd64/installimage/Makefile:1.10.2.1
--- src/distrib/amd64/installimage/Makefile:1.10 Sat Dec 15 18:03:16 2018
+++ src/distrib/amd64/installimage/Makefile Sun May 31 10:21:34 2020
@@ -1,16 +1,21 @@
-# $NetBSD: Makefile,v 1.10 2018/12/15 18:03:16 gson Exp $
+# $NetBSD: Makefile,v 1.10.2.1 2020/05/31 10:21:34 martin Exp $
.include
INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-install # gives ${IMGBASE}.img
-INSTIMAGEMB?= 1450 # for all installation binaries
+INSTIMAGEMB?= 1550 # for all installation binaries
PRIMARY_BOOT= bootxx_ffsv1
SECONDARY_BOOT= boot
SECONDARY_BOOT_ARG= # unnecessary
+EFIBOOT= ${WORKDIR}/usr/mdec/bootx64.efi
+EFIBOOT+= ${WORKDIR}/usr/mdec/bootia32.efi
+#EFIBOOT= ${.OBJDIR}/../../../sys/arch/i386/stand/efiboot/bootx64/bootx64.efi
+#EFIBOOT+= ${.OBJDIR}/../../../sys/arch/i386/stand/efiboot/bootia32/bootia32.efi
USE_MBR= yes
+USE_GPT= yes
CLEANFILES+= boot.cfg
@@ -35,4 +40,4 @@ IMGFILE_EXTRA=\
${SYSINSTDIR}/sysinstmsgs.pl .\
${SYSINSTDIR}/sysinst .
-.include "${DISTRIBDIR}/common/bootimage/Makefile.installimage"
+.include "${NETBSDSRCDIR}/distrib/common/bootimage//Makefile.installimage"
CVS commit: [netbsd-9] src/distrib
Module Name:src
Committed By: martin
Date: Fri Apr 24 17:40:54 UTC 2020
Modified Files:
src/distrib/common [netbsd-9]: Makefile.bootcd
src/distrib/vax/cdroms/installcd [netbsd-9]: Makefile
Log Message:
Pull up following revision(s) (requested by maya in ticket #849):
distrib/vax/cdroms/installcd/Makefile: revision 1.19
distrib/common/Makefile.bootcd: revision 1.43
Do not populate /dev on CD images by default, instead rely on init
doing the tmpfs / MAKEDEV magic.
On images for machines with serious ram shortage (where the additional
tmpfs hurts, like VAX) override this with CDDEV_POPULATE=true.
Should fix PR port-amd64/54776.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.41.2.1 src/distrib/common/Makefile.bootcd
cvs rdiff -u -r1.17 -r1.17.2.1 src/distrib/vax/cdroms/installcd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.41 src/distrib/common/Makefile.bootcd:1.41.2.1
--- src/distrib/common/Makefile.bootcd:1.41 Fri Sep 28 15:03:34 2018
+++ src/distrib/common/Makefile.bootcd Fri Apr 24 17:40:54 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.41 2018/09/28 15:03:34 martin Exp $
+# $NetBSD: Makefile.bootcd,v 1.41.2.1 2020/04/24 17:40:54 martin Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -22,6 +22,8 @@
# stuff to put on CD (use in Makefiles)
# CDEXTRA_SKIP A list of file exclusion paths to exclude when copying
# directories of extra stuff in CDEXTRA AND CDBUILDEXTRA
+# CDDEV_POPULATE Set to 'true' to fully populate /dev on the CD (and
+# safe a tmpfs union mount)
# BOOT Defaults to $DESTDIR/usr/mdec/boot
# BOOTXX_CD9660 Defaults to $DESTDIR/usr/mdec/bootxx_cd9660
# CDBOOTOPTIONS Options for installboot, eg -o console=com0,speed=9600
@@ -44,6 +46,7 @@ BOOT?= ${DESTDIR}/usr/mdec/boot
BOOTXX_CD9660?= ${DESTDIR}/usr/mdec/bootxx_cd9660
CDRELEASE?= false
CDSOURCE?= false
+CDDEV_POPULATE?=false
.if ${CDRELEASE} == false
CDROMS_RELEASEDIR?= ${MACHINE}/installation/cdrom
.else
@@ -269,15 +272,21 @@ copy-releasedir:
fi
.endif
+.if ${CDDEV_POPULATE} != true
+DELDEV=-e '/^\.\/dev\/.*type=char/d'
+.endif
+
image:
@echo Preparing spec files for makefs...
${RM} -f ${WORKSPEC}
if [ -d cdrom/etc/mtree ]; then\
cat cdrom/etc/mtree/* |\
${TOOL_SED} -e 's/ size=[0-9]*//' \
+ ${DELDEV} \
-e '/^\.\/etc\/gettytab/d' > ${WORKSPEC}; \
fi
- if [ -r cdrom/dev/MAKEDEV ]; then \
+ if [ -r cdrom/dev/MAKEDEV ] &&\
+ ${CDDEV_POPULATE} == true; then \
${HOST_SH} cdrom/dev/MAKEDEV -s init | \
${TOOL_SED} -e '/^\. type=dir/d' \
-e 's,^\.,./dev,' >> ${WORKSPEC}; \
Index: src/distrib/vax/cdroms/installcd/Makefile
diff -u src/distrib/vax/cdroms/installcd/Makefile:1.17 src/distrib/vax/cdroms/installcd/Makefile:1.17.2.1
--- src/distrib/vax/cdroms/installcd/Makefile:1.17 Fri Sep 28 15:05:23 2018
+++ src/distrib/vax/cdroms/installcd/Makefile Fri Apr 24 17:40:53 2020
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2018/09/28 15:05:23 martin Exp $
+# $NetBSD: Makefile,v 1.17.2.1 2020/04/24 17:40:53 martin Exp $
CDBASE= vaxcd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$MACHINE
CDRELEASE_NODEBUG= true
+CDDEV_POPULATE= true # populate /dev on the CD
CDKERNELS= ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-GENERIC.gz netbsd.gz
CDRELEASE_NOISOS=true
CD_SETS= base etc # no modules for VAX
CVS commit: [netbsd-9] src/distrib
Module Name:src
Committed By: martin
Date: Fri Apr 24 17:19:50 UTC 2020
Modified Files:
src/distrib/amd64/uefi-installimage [netbsd-9]: Makefile
Makefile.bootimage Makefile.installimage
src/distrib/common/bootimage [netbsd-9]: Makefile.bootimage
Makefile.installimage
src/distrib/hpcarm [netbsd-9]: Makefile
src/distrib/zaurus [netbsd-9]: Makefile
Added Files:
src/distrib/common/bootimage [netbsd-9]: diskproto.mbrfat.in
src/distrib/hpcarm/liveimage [netbsd-9]: Makefile fstab.in spec.in
src/distrib/zaurus/liveimage [netbsd-9]: Makefile fstab.in spec.in
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #846):
distrib/hpcarm/Makefile: revision 1.7
distrib/amd64/uefi-installimage/Makefile: revision 1.7
distrib/common/bootimage/Makefile.installimage: revision 1.6
distrib/hpcarm/liveimage/spec.in: revision 1.1
distrib/common/bootimage/Makefile.bootimage: revision 1.23
distrib/common/bootimage/Makefile.bootimage: revision 1.24
distrib/zaurus/liveimage/Makefile: revision 1.1
distrib/amd64/uefi-installimage/Makefile.installimage: revision 1.3
distrib/zaurus/Makefile: revision 1.3
distrib/hpcarm/liveimage/Makefile: revision 1.1
distrib/zaurus/liveimage/spec.in: revision 1.1
distrib/common/bootimage/diskproto.mbrfat.in: revision 1.1
distrib/amd64/uefi-installimage/Makefile.bootimage: revision 1.13
distrib/hpcarm/liveimage/fstab.in: revision 1.1
distrib/zaurus/liveimage/fstab.in: revision 1.1
Merge amd64's UEFI logic back into the generic bootimage handling.
Add "live-image with a FAT partition for bootstrap files" support.
See PR/55075 for more details.
Add "build.sh live-image" support for zaurus.
Tested on SL-C3000 and SL-C700.
See also PR/55075 for live-image with FAT partition support.
Add "build.sh live-image" support for hpcarm.
Tested on WS003SH.
See also PR/55075 for live-image with FAT partition support.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.2.1 src/distrib/amd64/uefi-installimage/Makefile
cvs rdiff -u -r1.11.2.1 -r1.11.2.2 \
src/distrib/amd64/uefi-installimage/Makefile.bootimage
cvs rdiff -u -r1.2 -r1.2.18.1 \
src/distrib/amd64/uefi-installimage/Makefile.installimage
cvs rdiff -u -r1.21.2.1 -r1.21.2.2 \
src/distrib/common/bootimage/Makefile.bootimage
cvs rdiff -u -r1.5 -r1.5.14.1 \
src/distrib/common/bootimage/Makefile.installimage
cvs rdiff -u -r0 -r1.1.4.2 src/distrib/common/bootimage/diskproto.mbrfat.in
cvs rdiff -u -r1.6 -r1.6.64.1 src/distrib/hpcarm/Makefile
cvs rdiff -u -r0 -r1.1.4.2 src/distrib/hpcarm/liveimage/Makefile \
src/distrib/hpcarm/liveimage/fstab.in \
src/distrib/hpcarm/liveimage/spec.in
cvs rdiff -u -r1.2 -r1.2.48.1 src/distrib/zaurus/Makefile
cvs rdiff -u -r0 -r1.1.4.2 src/distrib/zaurus/liveimage/Makefile \
src/distrib/zaurus/liveimage/fstab.in \
src/distrib/zaurus/liveimage/spec.in
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/uefi-installimage/Makefile
diff -u src/distrib/amd64/uefi-installimage/Makefile:1.6 src/distrib/amd64/uefi-installimage/Makefile:1.6.2.1
--- src/distrib/amd64/uefi-installimage/Makefile:1.6 Sat Dec 15 18:03:17 2018
+++ src/distrib/amd64/uefi-installimage/Makefile Fri Apr 24 17:19:49 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2018/12/15 18:03:17 gson Exp $
+# $NetBSD: Makefile,v 1.6.2.1 2020/04/24 17:19:49 martin Exp $
.include
@@ -40,4 +40,4 @@ IMGFILE_EXTRA=\
${SYSINSTDIR}/sysinstmsgs.pl .\
${SYSINSTDIR}/sysinst .
-.include "${.CURDIR}/Makefile.installimage"
+.include "${NETBSDSRCDIR}/distrib/common/bootimage//Makefile.installimage"
Index: src/distrib/amd64/uefi-installimage/Makefile.bootimage
diff -u src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.11.2.1 src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.11.2.2
--- src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.11.2.1 Sun Nov 17 07:04:37 2019
+++ src/distrib/amd64/uefi-installimage/Makefile.bootimage Fri Apr 24 17:19:49 2020
@@ -1,500 +0,0 @@
-# $NetBSD: Makefile.bootimage,v 1.11.2.1 2019/11/17 07:04:37 martin Exp $
-#
-# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. 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
CVS commit: [netbsd-9] src/distrib
Module Name:src Committed By: msaitoh Date: Tue Jan 28 10:20:28 UTC 2020 Modified Files: src/distrib/acorn32/ramdisk [netbsd-9]: dot.profile src/distrib/alpha/instkernel/ramdisk [netbsd-9]: dot.profile src/distrib/amd64/ramdisks/common [netbsd-9]: dot.profile src/distrib/arc/ramdisk [netbsd-9]: dot.profile src/distrib/atari/floppies/common [netbsd-9]: dot.profile src/distrib/bebox/ramdisk [netbsd-9]: dot.profile src/distrib/cats/ramdisk [netbsd-9]: dot.profile src/distrib/cobalt/ramdisk [netbsd-9]: dot.profile src/distrib/dreamcast/ramdisk [netbsd-9]: dot.profile src/distrib/emips/miniroot [netbsd-9]: dot.profile src/distrib/emips/ramdisk [netbsd-9]: dot.profile src/distrib/evbarm/instkernel/ramdisk [netbsd-9]: dot.profile src/distrib/evbmips/instkernel/ramdisk [netbsd-9]: dot.profile src/distrib/evbppc/ramdisk [netbsd-9]: dot.profile src/distrib/evbsh3/instkernel/ramdisk [netbsd-9]: dot.profile src/distrib/ews4800mips/floppies/ramdisk [netbsd-9]: dot.profile src/distrib/hp300/ramdisk [netbsd-9]: dot.profile src/distrib/hpcarm/miniroot [netbsd-9]: dot.profile src/distrib/hpcmips/miniroot [netbsd-9]: dot.profile src/distrib/hpcsh/miniroot [netbsd-9]: dot.profile src/distrib/hppa/ramdisk [netbsd-9]: dot.profile src/distrib/i386/ramdisks/common [netbsd-9]: dot.profile src/distrib/landisk/ramdisk [netbsd-9]: dot.profile src/distrib/luna68k/ramdisk [netbsd-9]: dot.profile src/distrib/mac68k/instkernel/ramdisk [netbsd-9]: dot.profile src/distrib/macppc/floppies/ramdisk [netbsd-9]: dot.profile src/distrib/mipsco/ramdisk [netbsd-9]: dot.profile src/distrib/mvme68k/miniroot [netbsd-9]: dot.profile src/distrib/news68k/floppies/ramdisk [netbsd-9]: dot.profile src/distrib/newsmips/floppies/ramdisk [netbsd-9]: dot.profile src/distrib/ofppc/ramdisks/common [netbsd-9]: dot.profile src/distrib/playstation2/miniroot [netbsd-9]: dot.profile src/distrib/pmax/miniroot [netbsd-9]: dot.profile src/distrib/pmax/ramdisk [netbsd-9]: dot.profile src/distrib/prep/floppies/ramdisk [netbsd-9]: dot.profile src/distrib/riscv/ramdisk [netbsd-9]: dot.profile src/distrib/rs6000/ramdisk [netbsd-9]: dot.profile src/distrib/sandpoint/ramdisk [netbsd-9]: dot.profile src/distrib/sgimips/miniroot [netbsd-9]: dot.profile src/distrib/sgimips/ramdisk [netbsd-9]: dot.profile src/distrib/shark/instkernel/ramdisk [netbsd-9]: dot.profile src/distrib/sparc/miniroot [netbsd-9]: dot.profile src/distrib/sparc64/instfs [netbsd-9]: dot.profile src/distrib/vax/ramdisk [netbsd-9]: dot.profile src/distrib/x68k/floppies/ramdisk [netbsd-9]: dot.profile src/distrib/zaurus/ramdisk [netbsd-9]: dot.profile Log Message: Pull up following revision(s) (requested by martin in ticket #669): distrib/playstation2/miniroot/dot.profile: revision 1.5 distrib/sparc64/instfs/dot.profile: revision 1.8 distrib/hpcarm/miniroot/dot.profile: revision 1.3 distrib/emips/miniroot/dot.profile: revision 1.2 distrib/x68k/floppies/ramdisk/dot.profile: revision 1.16 distrib/zaurus/ramdisk/dot.profile: revision 1.4 distrib/i386/ramdisks/common/dot.profile: revision 1.7 distrib/cobalt/ramdisk/dot.profile: revision 1.2 distrib/hpcsh/miniroot/dot.profile: revision 1.5 distrib/evbarm/instkernel/ramdisk/dot.profile: revision 1.3 distrib/riscv/ramdisk/dot.profile: revision 1.2 distrib/sandpoint/ramdisk/dot.profile: revision 1.2 distrib/landisk/ramdisk/dot.profile: revision 1.3 distrib/amd64/ramdisks/common/dot.profile: revision 1.4 distrib/macppc/floppies/ramdisk/dot.profile: revision 1.14 distrib/mipsco/ramdisk/dot.profile: revision 1.3 distrib/evbmips/instkernel/ramdisk/dot.profile: revision 1.2 distrib/acorn32/ramdisk/dot.profile: revision 1.4 distrib/cats/ramdisk/dot.profile: revision 1.5 distrib/vax/ramdisk/dot.profile: revision 1.10 distrib/pmax/miniroot/dot.profile: revision 1.3 distrib/sparc/miniroot/dot.profile: revision 1.16 distrib/hpcmips/miniroot/dot.profile: revision 1.8 distrib/prep/floppies/ramdisk/dot.profile: revision 1.3 distrib/news68k/floppies/ramdisk/dot.profile: revision 1.8 distrib/alpha/instkernel/ramdisk/dot.profile: revision 1.11 distrib/ofppc/ramdisks/common/dot.profile: revision 1.2 distrib/mac68k/instkernel/ramdisk/dot.profile: revision 1.9 distrib/hp300/ramdisk/dot.profile: revision 1.7 distrib/ews4800mips/floppies/ramdisk/dot.profile: revision 1.2 distrib/emips/ramdisk/dot.profile: revision 1.3
CVS commit: [netbsd-9] src/distrib/evbmips/instkernel/ramdisk
Module Name:src
Committed By: msaitoh
Date: Tue Jan 28 09:08:10 UTC 2020
Modified Files:
src/distrib/evbmips/instkernel/ramdisk [netbsd-9]: Makefile
Log Message:
Pull up following revision(s) (requested by martin in ticket #666):
distrib/evbmips/instkernel/ramdisk/Makefile: revision 1.14
PR install/54777: add dhcpcd to the install ramdisk
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.14.1 \
src/distrib/evbmips/instkernel/ramdisk/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/evbmips/instkernel/ramdisk/Makefile
diff -u src/distrib/evbmips/instkernel/ramdisk/Makefile:1.13 src/distrib/evbmips/instkernel/ramdisk/Makefile:1.13.14.1
--- src/distrib/evbmips/instkernel/ramdisk/Makefile:1.13 Tue Jan 24 18:04:02 2017
+++ src/distrib/evbmips/instkernel/ramdisk/Makefile Tue Jan 28 09:08:10 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2017/01/24 18:04:02 christos Exp $
+# $NetBSD: Makefile,v 1.13.14.1 2020/01/28 09:08:10 msaitoh Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -33,6 +33,7 @@ HACKSRC= ${DISTRIBDIR}/utils/libhack
${CRUNCHBIN}: libhack.o
.include "${DISTRIBDIR}/common/Makefile.crunch"
+.include "${DISTRIBDIR}/common/Makefile.dhcpcd"
.include "${DISTRIBDIR}/common/Makefile.makedev"
.include "${DISTRIBDIR}/common/Makefile.image"
CVS commit: [netbsd-9] src/distrib/miniroot
Module Name:src
Committed By: martin
Date: Tue Jan 21 15:26:47 UTC 2020
Modified Files:
src/distrib/miniroot [netbsd-9]: install.sub
Log Message:
Pull up following revision(s) (requested by kre in ticket #632):
distrib/miniroot/install.sub: revision 1.52
The idiom
set $whatever
while [ $# - gt 10 ]; do shift 10; done
eval echo \$$#
fails when $# turns out to be 10 (or any multiple), it would need
to be instead
while [ $# -ge 10 ]; do shift 9; done
but there hasn't been a shell that cannot handle ${10} (etc) correctly
in a very long time, so let's just use that instead (properly quoted,
in case IFS happens to contain a digit for some bizarre reason).
We should also "set -f" / "set +f" (or better, restore the prev setting of -f)
around the "set $whatever" part, but if that was ever going to cause a problem
here, it would have already, so leave that for now.
To generate a diff of this commit:
cvs rdiff -u -r1.48.2.2 -r1.48.2.3 src/distrib/miniroot/install.sub
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/miniroot/install.sub
diff -u src/distrib/miniroot/install.sub:1.48.2.2 src/distrib/miniroot/install.sub:1.48.2.3
--- src/distrib/miniroot/install.sub:1.48.2.2 Tue Jan 21 11:30:28 2020
+++ src/distrib/miniroot/install.sub Tue Jan 21 15:26:46 2020
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: install.sub,v 1.48.2.2 2020/01/21 11:30:28 martin Exp $
+# $NetBSD: install.sub,v 1.48.2.3 2020/01/21 15:26:46 martin Exp $
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -114,8 +114,7 @@ cutlast () {
read _a; set -- $_a
IFS="$_oifs"
if [ "$1" = "" ]; then return; fi
- while [ "$#" -gt 10 ]; do shift 10; done
- eval echo \$$#
+ eval echo '"${'"$#"'}"'
}
firstchar () {
@@ -135,8 +134,7 @@ basename () {
IFS="/"
set -- $1
IFS="$_oifs"
- while [ "$#" -gt 10 ]; do shift 10; done
- eval echo \$$#
+ eval echo '"${'"$#"'}"'
}
dir_has_sets() {
CVS commit: [netbsd-9] src/distrib/miniroot
Module Name:src
Committed By: martin
Date: Tue Jan 21 11:30:28 UTC 2020
Modified Files:
src/distrib/miniroot [netbsd-9]: install.sub
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #622):
distrib/miniroot/install.sub: revision 1.50
distrib/miniroot/install.sub: revision 1.51
Fix miniroot installation failure on network configuration. PR/54833
No particular comment in the PR.
Should be pulled up to netbsd-9.
Fix "[: SMALL test, no fallback usage" error on miniroot installation.
Avoid and replace use of '-a', '(' and ')' operatos marked obsolescent
by modern POSIX.1-2017:
https://pubs.opengroup.org/onlinepubs/9699919799/utilities/test.html#tag_20_128_16
as suggested by kre@ in PR/54835.
Should be pulled up to netbsd-9.
To generate a diff of this commit:
cvs rdiff -u -r1.48.2.1 -r1.48.2.2 src/distrib/miniroot/install.sub
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/miniroot/install.sub
diff -u src/distrib/miniroot/install.sub:1.48.2.1 src/distrib/miniroot/install.sub:1.48.2.2
--- src/distrib/miniroot/install.sub:1.48.2.1 Sun Nov 17 07:04:35 2019
+++ src/distrib/miniroot/install.sub Tue Jan 21 11:30:28 2020
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: install.sub,v 1.48.2.1 2019/11/17 07:04:35 martin Exp $
+# $NetBSD: install.sub,v 1.48.2.2 2020/01/21 11:30:28 martin Exp $
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -429,7 +429,7 @@ configure_ifs() {
# Get netmask
resp="" # force one iteration
- while [ -n "${resp}" ]; do
+ while [ -z "${resp}" ]; do
echo -n "Netmask? [$_interface_mask] "
getresp "$_interface_mask"
_interface_mask=$resp
@@ -1531,7 +1531,7 @@ unmount_fs()
_fstab=$1
fi
- if [ ! \( -f $_fstab -a -s $_fstab \) ]; then
+ if ! [ -f "${_fstab}" ] || ! [ -s "${_fstab}" ]; then
echo "fstab empty" > /dev/tty
return
fi
CVS commit: [netbsd-9] src/distrib/notes
Module Name:src
Committed By: msaitoh
Date: Wed Jan 8 07:53:30 UTC 2020
Modified Files:
src/distrib/notes [netbsd-9]: Makefile.inc
Log Message:
Pull up following revision(s) (requested by martin in ticket #608):
distrib/notes/Makefile.inc: revision 1.53
PR install/54836: fix broken conditional, passing the wrong set name suffix
to groff.
To generate a diff of this commit:
cvs rdiff -u -r1.43.18.5 -r1.43.18.6 src/distrib/notes/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/Makefile.inc
diff -u src/distrib/notes/Makefile.inc:1.43.18.5 src/distrib/notes/Makefile.inc:1.43.18.6
--- src/distrib/notes/Makefile.inc:1.43.18.5 Mon Dec 9 13:00:22 2019
+++ src/distrib/notes/Makefile.inc Wed Jan 8 07:53:30 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.43.18.5 2019/12/09 13:00:22 martin Exp $
+# $NetBSD: Makefile.inc,v 1.43.18.6 2020/01/08 07:53:30 msaitoh Exp $
#
# Ross Harvey
@@ -29,7 +29,7 @@ whatis: .OPTIONAL
PRESET= ${GFLAGS} -U -dM=${M} -dV=${DISTRIBVER} -d.CURDIR=${.CURDIR} -r${M}=1
PRESET+= -rmajor=${DISTRIBVER:C/\..*$//}
-.if ${USE_XZ_SETS}
+.if ${USE_XZ_SETS:Uno} == "yes"
PRESET+= -dsetsuffix=tar.xz
.else
PRESET+= -dsetsuffix=tgz
CVS commit: [netbsd-9] src/distrib/notes/common
Module Name:src Committed By: martin Date: Mon Dec 9 16:20:11 UTC 2019 Modified Files: src/distrib/notes/common [netbsd-9]: legal.common Log Message: Pull up the following changes, requested by uwe in ticket #536: distrib/notes/common/legal.common upto 1.124 (adapted) Sync with reality and sort. To generate a diff of this commit: cvs rdiff -u -r1.98.12.1 -r1.98.12.2 src/distrib/notes/common/legal.common 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/legal.common diff -u src/distrib/notes/common/legal.common:1.98.12.1 src/distrib/notes/common/legal.common:1.98.12.2 --- src/distrib/notes/common/legal.common:1.98.12.1 Thu Nov 21 19:28:39 2019 +++ src/distrib/notes/common/legal.common Mon Dec 9 16:20:11 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: legal.common,v 1.98.12.1 2019/11/21 19:28:39 martin Exp $ +.\" $NetBSD: legal.common,v 1.98.12.2 2019/12/09 16:20:11 martin Exp $ .\" .\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -55,9 +55,6 @@ This product includes software developed NetBSD Project. See https://www.NetBSD.org/ for information about NetBSD. .It -This product includes software developed by Intel Corporation and -its contributors. -.It This product includes cryptographic software written by Eric Young (e...@cryptsoft.com) .It @@ -66,55 +63,41 @@ Eric Young (e...@mincom.oz.au) .It This product includes software designed by William Allen Simpson. .It -This product includes software developed at Ludd, University of -Lulea, Sweden and its contributors. +This product includes software developed at Ludd, University of Lule\(oa. .It -This product includes software developed at Ludd, University of Lulea. +This product includes software developed at Ludd, University of +Lule\(oa, Sweden and its contributors. .It This product includes software developed at the Information Technology Division, US Naval Research Laboratory. .It -This product includes software developed by -David Jones and Gordon Ross -.It -This product includes software developed by -Hellmuth Michaelis and Joerg Wunsch -.It -This product includes software developed by -Internet Research Institute, Inc. -.It -This product includes software developed by -Leo Weppelman and Waldi Ravens. -.It -This product includes software developed by Mika Kortelainen -.It This product includes software developed by Aaron Brown and Harvard University. .It This product includes software developed by Adam Ciarcinski for the NetBSD project. .It +This product includes software developed by Adam Glass. +.It This product includes software developed by Adam Glass and Charles M. Hannum. .It -This product includes software developed by Adam Glass. +This product includes software developed by Alex Zepeda. .It This product includes software developed by Alex Zepeda, and Colin Wood for the NetBSD Projet. .It -This product includes software developed by Alex Zepeda. -.It This product includes software developed by Allen Briggs. .It This product includes software developed by Amancio Hasty and Roger Hardiman .It -This product includes software developed by Berkeley Software Design, Inc. +This product includes software developed by Ben Gray. .It -This product includes software developed by Bill Paul. +This product includes software developed by Berkeley Software Design, +Inc. .It -This product includes software developed by Bodo Moeller. -(If available, substitute umlauted o for oe) +This product includes software developed by Bill Paul. .It This product includes software developed by Boris Popov. .It @@ -126,30 +109,35 @@ This product includes software developed .It This product includes software developed by Charles Hannum. .It +This product includes software developed by Charles M. Hannum. +.It This product includes software developed by Charles M. Hannum, by the University of Vermont and State Agricultural College and Garrett A. Wollman, by William F. Jolitz, and by the University of California, Berkeley, Lawrence Berkeley Laboratory, and its contributors. .It -This product includes software developed by Charles M. Hannum. +This product includes software developed by Christian E. Hopps. .It This product includes software developed by Christian E. Hopps, Ezra Story, Kari Mettinen, Markus Wild, Lutz Vieweg and Michael Teske. .It -This product includes software developed by Christian E. Hopps. +This product includes software developed by Christopher G. Demetriou. .It This product includes software developed by Christopher G. Demetriou for the NetBSD Project. .It -This product includes software developed by Christopher G. Demetriou. -.It This product includes software developed by Chuck Silvers. .It +This product includes software developed by Cisco Systems, Inc. +.It +This product includes software developed by Colin Wood.
CVS commit: [netbsd-9] src/distrib/notes
Module Name:src
Committed By: martin
Date: Mon Dec 9 13:00:23 UTC 2019
Modified Files:
src/distrib/notes [netbsd-9]: Makefile.inc
src/distrib/notes/common [netbsd-9]: macros
Log Message:
Pull up the following revisions, requested by uwe in ticket #523:
distrib/notes/Makefile.inc up to 1.52
distrib/notes/common/macros up to 1.54
Improve table of contents.
To generate a diff of this commit:
cvs rdiff -u -r1.43.18.4 -r1.43.18.5 src/distrib/notes/Makefile.inc
cvs rdiff -u -r1.43.6.1 -r1.43.6.2 src/distrib/notes/common/macros
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/Makefile.inc
diff -u src/distrib/notes/Makefile.inc:1.43.18.4 src/distrib/notes/Makefile.inc:1.43.18.5
--- src/distrib/notes/Makefile.inc:1.43.18.4 Wed Nov 27 16:07:30 2019
+++ src/distrib/notes/Makefile.inc Mon Dec 9 13:00:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.43.18.4 2019/11/27 16:07:30 martin Exp $
+# $NetBSD: Makefile.inc,v 1.43.18.5 2019/12/09 13:00:22 martin Exp $
#
# Ross Harvey
@@ -13,12 +13,13 @@ MKTOCS?=yes
M?= ${.CURDIR:T}
COMMON= ${.CURDIR}/../common
-MAIN= ${COMMON}/main ${COMMON}/macros ${EXTRA}
+MAIN= ${COMMON}/main ${EXTRA}
TARG= INSTALL
TARGS= ${TARG}.ps ${TARG}.txt ${TARG}.html ${TARG}.more
TOCS= ${TARG}.PostScript.toc ${TARG}.ASCII.toc ${TARG}.HTML.toc \
${TARG}.more.toc
-SRCS= ${MAIN} whatis ${COMMON}/contents hardware xfer prep \
+SRCS= ${MAIN} ${COMMON}/macros \
+ whatis ${COMMON}/contents hardware xfer prep \
${.CURDIR}/install ${COMMON}/postinstall upgrade \
${COMMON}/legal.common ${COMMON}/netboot \
${COMMON}/sysinst \
@@ -102,35 +103,26 @@ ${TARG}.more: ${SRCS} ${TOC.more} ${DIST
${TOOL_GROFF} ${ARGS_MORE} -mdoc ${MAIN} > $@
-# Rules to build the table of contents (.toc) files.
-# They are generated twice to take into account the
-# space taken by the TOC itself.
-#
-
-TOCPROC= 2>&1 >/dev/null |\
- ${TOOL_SED} -n -e 's/"//g' \
- -e '/^\.Ti/{s/ \([A-Za-z]\)/ "\1/; s/ *$$/"/; p; }'
+# Rules to build the table of contents (.toc) files. For the
+# PostScript version it's generated twice to take into account the
+# space taken by the TOC itself. Other versions are not paginated.
${TARG}.PostScript.toc: ${SRCS}
- ${TOOL_GROFF} -dTOC=1 ${ARGS_PS} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
+ ${TOOL_GROFF} -dTOC=1 ${ARGS_PS} -mdoc ${MAIN} > /dev/null
mv -f $@.tmp $@
- ${TOOL_GROFF} -dTOC=1 ${ARGS_PS} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
+ ${TOOL_GROFF} -dTOC=1 ${ARGS_PS} -mdoc ${MAIN} > /dev/null
mv -f $@.tmp $@
${TARG}.ASCII.toc: ${SRCS}
- ${TOOL_GROFF} -dTOC=1 ${ARGS_TXT} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
- mv -f $@.tmp $@
- ${TOOL_GROFF} -dTOC=1 ${ARGS_TXT} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
+ ${TOOL_GROFF} -dTOC=1 ${ARGS_TXT} -mdoc ${MAIN} > /dev/null
mv -f $@.tmp $@
${TARG}.HTML.toc: ${SRCS}
- ${TOOL_GROFF} -dTOC=1 ${ARGS_HTML} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
+ ${TOOL_GROFF} -dTOC=1 ${ARGS_HTML} -mdoc ${MAIN} > /dev/null
mv -f $@.tmp $@
${TARG}.more.toc: ${SRCS}
- ${TOOL_GROFF} -dTOC=1 ${ARGS_MORE} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
- mv -f $@.tmp $@
- ${TOOL_GROFF} -dTOC=1 ${ARGS_MORE} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
+ ${TOOL_GROFF} -dTOC=1 ${ARGS_MORE} -mdoc ${MAIN} > /dev/null
mv -f $@.tmp $@
Index: src/distrib/notes/common/macros
diff -u src/distrib/notes/common/macros:1.43.6.1 src/distrib/notes/common/macros:1.43.6.2
--- src/distrib/notes/common/macros:1.43.6.1 Wed Nov 27 13:36:55 2019
+++ src/distrib/notes/common/macros Mon Dec 9 13:00:22 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: macros,v 1.43.6.1 2019/11/27 13:36:55 msaitoh Exp $
+.\" $NetBSD: macros,v 1.43.6.2 2019/12/09 13:00:22 martin Exp $
.\"
.\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -309,42 +309,102 @@
.\" XXX To should be unnecessary if we handle parseable/callable.
.\" .Tc import the TOC
.\" .Ti depth page "item" (internal) output an entry
-.if dTOC \{
+.ds toc-file INSTALL.\*[format].toc
+.if dTOC \{\
+.tm ...writing \*[toc-file].tmp
+.open toc-tmp \*[toc-file].tmp
+.de mktoc
+.nr mktoc-level \\$1
+.shift
+.write toc-tmp .Ti \\n[mktoc-level] \\n% "\\$*"
+..
.rn Ss Ss-toc
.de Ss
.Ss-toc \\$@
-.tm .Ti 0 \\n% "\\$*"
+.mktoc 0 \\$@
..
.rn Ss2 Ss2-toc
.de Ss2
.Ss2-toc \\$@
-.tm .Ti 1 \\n% "\\$*"
+.mktoc 1 \\$@
..
.\}
.de Te
-.ie rHTML \\$2
-.el \\$2
-.if dTOC \.tm .Ti \\$1 \\n% \\$2
+.nr Te-toc-level \\$1
+.shift
+.ie rHTML \\$*
+.el \\$*
+.if dTOC .mktoc \\n[Te-toc-level] \\$@
..
.de To
-.if rHTML
-.if dTOC \.tm .Ti \\$1 \\n% \\$2
+.nr To-toc-level \\$1
+.shift
+.if rHTML
+.if dTOC .mktoc \\n[To-toc-level] \\$@
+..
+.
+.\" .Tc and .Ti for PostScript
+.
+.ie '\*[format]'PostScript' \{\
+.de Ti
+.nr Ti-toc-level \\$1
+.nr Ti-page \\$2
+.shift 2
+.nr Ti-indent (\\n[Tc-saved-indent]+(3n*\\n[Ti-toc-level]))
+.in \\n[Ti-indent]u
CVS commit: [netbsd-9] src/distrib/notes/common
Module Name:src
Committed By: martin
Date: Mon Dec 9 12:55:16 UTC 2019
Modified Files:
src/distrib/notes/common [netbsd-9]: extract-contrib-string.pl
Log Message:
Pull up the following revisions, requested by uwe in ticket #522:
distrib/notes/common/extract-contrib-string.pl upto 1.24
Various fixes and some more special cases.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.64.1 \
src/distrib/notes/common/extract-contrib-string.pl
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/extract-contrib-string.pl
diff -u src/distrib/notes/common/extract-contrib-string.pl:1.14 src/distrib/notes/common/extract-contrib-string.pl:1.14.64.1
--- src/distrib/notes/common/extract-contrib-string.pl:1.14 Mon May 26 08:11:41 2008
+++ src/distrib/notes/common/extract-contrib-string.pl Mon Dec 9 12:55:16 2019
@@ -31,7 +31,7 @@
# Extract BSD-mandated copyright messages for NetBSD documentation
#
# Usage:
-# 1) find /usr/src -type f -print \
+# 1) find src xsrc -type f -print \
#| perl extract-contrib-string.pl
#>x
#
@@ -49,8 +49,9 @@
# -? display help/usage message
-$ack_line1="[aA]ll( commercial)?( marketing or)? advertising materials mentioning( features)?";
-$ack_line2="display the following( acknowledge?ment)?";
+$ack_line1='([aA]ll( commercial)?( marketing or)? advertising materials mentioning( features)?'
+. '|\d\. Redistributions of any form whatsoever)';
+$ack_line2='(display the( following)?( acknowledge?ment)?|acknowledge?ment:$)';
$ack_endline=
'(\d\.\s*(Neither the name'
. '|The name of the company nor the name' # Wasn't my idea
@@ -59,11 +60,16 @@ $ack_endline=
. '|The names? (of )?.* nor the names? of'
. '|The names? (of )?.* or any of it\'?s members'
. '|Redistributions of any form whatsoever'
-. '|The names .*"OpenSSL Toolkit.*" and .*"OpenSSL Project.*" must not be used))'
+. '|The names .*"OpenSSL Toolkit.*" and .*"OpenSSL Project.*" must not be used'
+. "|Urbana-Champaign Independent Media Center's name"
+. '))'
+.'|(^Neither the name)'
.'|(THIS SOFTWARE IS PROVIDED)'
+.'|(ALL WARRANTIES WITH REGARD)'
.'|(The word \'cryptographic\' can be left out if)'
.'|(may be used to endorse)'
.'|(@end cartouche)'
+.'|()'
.'|(Redistribution and use in source and binary forms)'
.'|(may not be used to endorse)'
.'|(\.IP 4)'
@@ -114,7 +120,7 @@ while(<>) {
line:
while() {
- if (0 and /$ack_line2/i){
+ if (0 and /$ack_line2/in){
print "?> $_" if $debug;
if ($fn !~ m,$known_bad_clause_3_wording,) {
@@ -128,29 +134,39 @@ while(<>) {
# special case perl script generating a license (openssl's
# mkerr.pl) - ignore the quoted license, there is another one
# inside:
- if (/^\"\s\*.*$ack_line1.*\\n\"\,/) {
- while(!/$ack_endline/i) {
+ if (/^\"\s\*.*$ack_line1.*\\n\"\,/n) {
+ while(!/$ack_endline/in) {
print "S> $_" if $debug;
$_ = ;
}
}
- if (/$ack_line1/i
- or (/$ack_line2/ and $fn =~ m,$known_bad_clause_3_wording,)) {
+ if (/$ack_line1/in
+ or (/$ack_line2/n and $fn =~ m,$known_bad_clause_3_wording,)) {
print "1> $_" if $debug;
$_=
unless $fn =~ m,$known_bad_clause_3_wording,;
- if (/$ack_line2/i or $fn =~ m,$known_bad_clause_3_wording,){
+ if (/$ack_line2/in or $fn =~ m,$known_bad_clause_3_wording,){
print "2> $_" if $debug;
$msg="";
- $msg = $_ if ($fn =~ m,$known_bad_clause_3_wording, and /``/);
+
+ if ($fn =~ m,$known_bad_clause_3_wording, and /``/) {
+ $msg = $_;
+ }
+ elsif (/:\s+This product/) {
+ # src/sys/lib/libkern/rngtest.c - bad clause 3 wording
+ # that is not like others, so special case it here
+ $msg = $_;
+ $msg =~ s/^.*:\s+(This product.*)$/$1/;
+ }
+
$cnt=0;
$_=;
- while(!/$ack_endline/i) {
+ while(!/$ack_endline/in) {
print "C> $_" if $debug;
@@ -177,6 +193,11 @@ while(<>) {
$msg =~ s/''.*$//o;
}
+ # XXX: pcap - add to known_bad_clause_3_wording but
+ # that code seems to have problems. Easier to add a
+ # hack here, shouldn't affect good clause 3.
+ $msg =~ s/''\s+Neither the name.*$//;
+
# *roff
while ($msg =~ /^\.\\"\s*/) {
$msg =~ s/^\.\\"\s*//o;
@@ -216,7 +237,7 @@ while(<>) {
$msg =~ s/^REM\s*//g; # BASIC?!?
$msg =~ s/\nREM\s*/\n/g; # BASIC?!?
$msg =~ s/^dnl\s*//g; # m4
- $msg =~ s/\dnl\s*/\n/g; # m4
+ $msg =~ s/\ndnl\s*/\n/g; # m4
$msg =~ s/^\s+-\s+//g; # seen in docbook files
$msg =~ s/\n\s+-\s+/ /g; #
$msg =~ s/^[#\\\|";]+\s*//g; # sh etc.
@@ -235,6 +256,14 @@ while(<>) {
$msg =~ s/''\s*$//;
$msg =~ s/^\"//o;
$msg =~ s/\"$//o;
+ $msg =~ s/\"\.$/./o;
+
+ # Fix ISO-646-SE spelling of Lule\(oa
+ $msg =~
CVS commit: [netbsd-9] src/distrib/utils/embedded/conf
Module Name:src
Committed By: martin
Date: Sun Dec 8 14:35:10 UTC 2019
Modified Files:
src/distrib/utils/embedded/conf [netbsd-9]: evbarm.conf
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #511):
distrib/utils/embedded/conf/evbarm.conf: revision 1.34
Remove the pretty much useless 128MB swap partition from the arm images.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.33.2.1 src/distrib/utils/embedded/conf/evbarm.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/embedded/conf/evbarm.conf
diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.33 src/distrib/utils/embedded/conf/evbarm.conf:1.33.2.1
--- src/distrib/utils/embedded/conf/evbarm.conf:1.33 Tue Jun 11 10:50:57 2019
+++ src/distrib/utils/embedded/conf/evbarm.conf Sun Dec 8 14:35:10 2019
@@ -1,15 +1,14 @@
-# $NetBSD: evbarm.conf,v 1.33 2019/06/11 10:50:57 mrg Exp $
+# $NetBSD: evbarm.conf,v 1.33.2.1 2019/12/08 14:35:10 martin Exp $
# evbarm shared config
#
image=$HOME/${board}.img
MACHINE=evbarm
-swap=256
extra=48 # spare space
init=32
boot=$((192 - ${init}))
-ffsoffset=$(( (${init} + ${boot} + ${swap}) / 2 ))m
+ffsoffset=$(( (${init} + ${boot}) / 2 ))m
size=0 # autocompute
msdosid=12
@@ -20,14 +19,12 @@ make_label_evbarm() {
# compute all sizes in terms of sectors
local totalsize=$(( ${newsize} * 1024 * 2 / 512 ))
- local swapsize=$(( ${swap} * 1024 ))
local bootsize=$(( ${boot} * 1024 ))
local bootoffset=$(( ${init} * 1024 ))
- local swapoffset=$(( ${bootoffset} + ${bootsize} ))
- local asize=$(( ${totalsize} - ${swapsize} - ${bootsize} - ${bootoffset} ))
- local aoffset=$(( ${swapoffset} + ${swapsize} ))
+ local asize=$(( ${totalsize} - ${bootsize} - ${bootoffset} ))
+ local aoffset=$(( ${bootoffset} + ${bootsize} ))
local bps=512
local spt=32
@@ -57,7 +54,6 @@ drivedata: 0
8 partitions:
# size offsetfstype [fsize bsize cpg/sgs]
a: ${asize} ${aoffset}4.2BSD ${fsize} ${bsize} 0 #
- b: ${swapsize} ${swapoffset} swap #
c: ${totalsize} 0 unused 0 0 #
e: ${bootsize} ${bootoffset} MSDOS#
EOF
@@ -68,7 +64,6 @@ make_fstab_evbarm_normal() {
# NetBSD /etc/fstab
# See /usr/share/examples/fstab/ for more examples.
ROOT.a / ffs rw,noatime 1 1
-ROOT.b none swap sw 0 0
ROOT.e /boot msdos rw 1 1
kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw
@@ -85,7 +80,6 @@ make_fstab_evbarm_minwrites() {
# NetBSD /etc/fstab
# See /usr/share/examples/fstab/ for more examples.
ROOT.a / ffs rw,log,noatime,nodevmtime 1 1
-ROOT.b none swap sw 0 0
ROOT.e /boot msdos rw 1 1
kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw
@@ -137,6 +131,8 @@ dev_exists() {
rc_configured=YES
hostname=${board}
+no_swap=YES
+savecore=NO
sshd=YES
dhcpcd=YES
ntpd=YES
CVS commit: [netbsd-9] src/distrib/notes/sparc
Module Name:src Committed By: martin Date: Sun Dec 8 12:50:44 UTC 2019 Modified Files: src/distrib/notes/sparc [netbsd-9]: contents Log Message: Pull up following revision(s) (requested by uwe in ticket #495): distrib/notes/sparc/contents: revision 1.26 It's KRUPS not GENERIC-KRUPS. To generate a diff of this commit: cvs rdiff -u -r1.23.4.2 -r1.23.4.3 src/distrib/notes/sparc/contents 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/sparc/contents diff -u src/distrib/notes/sparc/contents:1.23.4.2 src/distrib/notes/sparc/contents:1.23.4.3 --- src/distrib/notes/sparc/contents:1.23.4.2 Mon Nov 25 05:50:15 2019 +++ src/distrib/notes/sparc/contents Sun Dec 8 12:50:44 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: contents,v 1.23.4.2 2019/11/25 05:50:15 msaitoh Exp $ +.\" $NetBSD: contents,v 1.23.4.3 2019/12/08 12:50:44 martin Exp $ .\" .\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -240,7 +240,7 @@ kernel, which supports only UltraSPARC s This set contains a .Nx*M \*V -.Li GENERIC-KRUPS +.Li KRUPS kernel, which supports the JavaStation-NC, named .Pa /netbsd . .It Sy kern-MRCOFFEE
CVS commit: [netbsd-9] src/distrib/cdrom
Module Name:src
Committed By: martin
Date: Thu Dec 5 10:28:07 UTC 2019
Added Files:
src/distrib/cdrom [netbsd-9]: NetBSD-9.0.mk
Log Message:
Pull up the following revision:
distrib/cdrom/NetBSD-9.0.mk 1.1
Add a clone of -current for 9.0. First time this makes a difference
(for macppc ppc 601) for all still relevant use cases.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1.2.2 src/distrib/cdrom/NetBSD-9.0.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/distrib/cdrom/NetBSD-9.0.mk
diff -u /dev/null src/distrib/cdrom/NetBSD-9.0.mk:1.1.2.2
--- /dev/null Thu Dec 5 10:28:07 2019
+++ src/distrib/cdrom/NetBSD-9.0.mk Thu Dec 5 10:28:07 2019
@@ -0,0 +1,69 @@
+# $NetBSD: NetBSD-9.0.mk,v 1.1.2.2 2019/12/05 10:28:07 martin Exp $
+#
+# Configuration file for NetBSD-9.0
+
+# sysinst expects the architectures at top level
+RELEASE_SUBDIR= # empty
+
+# BOOTFILE.alpha is absolute
+BOOTFILE.alpha= ${EXTFILEDIR}/alpha.bootxx
+EXTFILES.alpha= alpha.bootxx:alpha/binary/sets/base.tgz,./usr/mdec/bootxx_cd9660
+INTFILES.alpha= netbsd.alpha:alpha/installation/instkernel/netbsd.gz,link \
+ boot:alpha/binary/sets/base.tgz,./usr/mdec/boot
+
+# cats needs an a.out kernel to boot from
+INTFILES.cats= netbsd.cats:cats/binary/kernel/netbsd-INSTALL.aout.gz
+
+# BOOTFILE.i386 is relative to CD staging root
+BOOTFILE.i386= boot.i386
+INTFILES.i386= boot.i386:i386/binary/sets/base.tgz,./usr/mdec/bootxx_cd9660 \
+ boot:i386/binary/sets/base.tgz,./usr/mdec/boot \
+ netbsd:i386/binary/kernel/netbsd-INSTALL.gz,link
+
+# BOOTFILE.amd64 is relative to CD staging root
+BOOTFILE.amd64= boot.amd64
+INTFILES.amd64= boot.amd64:amd64/binary/sets/base.tgz,./usr/mdec/bootxx_cd9660 \
+ boot:amd64/binary/sets/base.tgz,./usr/mdec/boot \
+ netbsd:amd64/binary/kernel/netbsd-INSTALL.gz,link
+
+# macppc has external bootblock generation tool
+EXTFILES.macppc= macppc.bootxx:macppc/binary/sets/base.tgz,./usr/mdec/bootxx \
+ macppc.ofwboot:macppc/binary/sets/base.tgz,./usr/mdec/ofwboot
+INTFILES.macppc= ofwboot.xcf:macppc/installation/ofwboot.xcf,link \
+ ofwboot:macppc/binary/sets/base.tgz,./usr/mdec/ofwboot \
+ netbsd.macppc:macppc/binary/kernel/netbsd-INSTALL.gz,link \
+ netbsd.601:macppc/binary/kernel/netbsd-INSTALL_601.gz,link
+
+# BOOTFILE.pmax is absolute
+BOOTFILE.pmax= ${EXTFILEDIR}/pmax.bootxx
+EXTFILES.pmax= pmax.bootxx:pmax/binary/sets/base.tgz,./usr/mdec/bootxx_cd9660
+INTFILES.pmax= netbsd.pmax:pmax/binary/kernel/netbsd-INSTALL.gz,link \
+ boot.pmax:pmax/binary/sets/base.tgz,./usr/mdec/boot.pmax
+
+# sgimips needs the compressed kernels with short names in /, the various
+# boot files that go into the volume header and the bootblock.h file
+# to grep for the volume header size
+EXTFILES.sgimips= sgimips.bootblock.h:sgimips/binary/sets/comp.tgz,./usr/include/sys/bootblock.h
+INTFILES.sgimips= aoutboot:sgimips/binary/sets/base.tgz,./usr/mdec/aoutboot \
+ ip2xboot:sgimips/binary/sets/base.tgz,./usr/mdec/ip2xboot \
+ ip3xboot:sgimips/binary/sets/base.tgz,./usr/mdec/ip3xboot \
+ ip2x:sgimips/binary/kernel/netbsd-INSTALL32_IP2x.gz,link \
+ ip3x:sgimips/binary/kernel/netbsd-INSTALL32_IP3x.gz,link
+
+
+# BOOTFILE.sparc is absolute
+BOOTFILE.sparc= ${EXTFILEDIR}/sparc-boot.fs
+EXTFILES.sparc= sparc-boot.fs:sparc/installation/bootfs/boot.fs.gz
+INTFILES.sparc= installation/bootfs/instfs.tgz:sparc/installation/bootfs/instfs.tgz,link
+INTDIRS.sparc= installation/bootfs
+MKISOFS_ARGS.sparc= -hide-hfs ./installation -hide-joliet ./installation
+
+# BOOTFILE.sparc64 is absolute
+BOOTFILE.sparc64= ${EXTFILEDIR}/sparc64-boot.fs
+EXTFILES.sparc64= sparc64-boot.fs:sparc64/installation/misc/boot.fs.gz
+
+# BOOTFILE.vax is absolute
+BOOTFILE.vax= ${EXTFILEDIR}/vax.xxboot
+EXTFILES.vax= vax.xxboot:vax/binary/sets/base.tgz,./usr/mdec/xxboot
+INTFILES.vax= netbsd.vax:vax/installation/netboot/install.ram.gz,link \
+ boot.vax:vax/binary/sets/base.tgz,./usr/mdec/boot
CVS commit: [netbsd-9] src/distrib/notes/common
Module Name:src Committed By: martin Date: Mon Dec 2 15:08:52 UTC 2019 Modified Files: src/distrib/notes/common [netbsd-9]: main Log Message: remove duplicate word To generate a diff of this commit: cvs rdiff -u -r1.551.2.6 -r1.551.2.7 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.551.2.6 src/distrib/notes/common/main:1.551.2.7 --- src/distrib/notes/common/main:1.551.2.6 Mon Dec 2 15:02:53 2019 +++ src/distrib/notes/common/main Mon Dec 2 15:08:52 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: main,v 1.551.2.6 2019/12/02 15:02:53 martin Exp $ +.\" $NetBSD: main,v 1.551.2.7 2019/12/02 15:08:52 martin Exp $ .\" .\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -531,7 +531,7 @@ ancient VME architectures in shape. Eric was a long term pkgsrc developer and well known community member. .Pp Beyond their technical contributions, Eric and Matthias were always -always helpful and friendly. +helpful and friendly. Their example encouraged users to contribute to the project and share their work with the community. .Pp
CVS commit: [netbsd-9] src/distrib/notes/common
Module Name:src Committed By: martin Date: Mon Dec 2 15:02:53 UTC 2019 Modified Files: src/distrib/notes/common [netbsd-9]: main Log Message: Add dedication to Eric Schnoebelen. To generate a diff of this commit: cvs rdiff -u -r1.551.2.5 -r1.551.2.6 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.551.2.5 src/distrib/notes/common/main:1.551.2.6 --- src/distrib/notes/common/main:1.551.2.5 Sun Dec 1 12:17:16 2019 +++ src/distrib/notes/common/main Mon Dec 2 15:02:53 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: main,v 1.551.2.5 2019/12/01 12:17:16 martin Exp $ +.\" $NetBSD: main,v 1.551.2.6 2019/12/02 15:02:53 martin Exp $ .\" .\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -518,7 +518,8 @@ would not exist. . .Nx 9.0 is dedicated to the memory of Matthias Drochner, who -passed away in August 2018. +passed away in August 2018 and Eric Schnoebelen, who +passed away in March 2019. .Pp Matthias' technical contributions are too many to list here in full. He was a long term contributor and commited more than 3000 changes all @@ -527,8 +528,11 @@ over the source tree and lately was especially active in keeping some of our most weired ancient VME architectures in shape. .Pp -Beyond that he was always helpful and friendly. His -example encouraged users to contribute to the project and share their +Eric was a long term pkgsrc developer and well known community member. +.Pp +Beyond their technical contributions, Eric and Matthias were always +always helpful and friendly. +Their example encouraged users to contribute to the project and share their work with the community. .Pp .\} \" \n[FOR_RELEASE]
CVS commit: [netbsd-9] src/distrib/notes/common
Module Name:src
Committed By: martin
Date: Sun Dec 1 12:17:16 UTC 2019
Modified Files:
src/distrib/notes/common [netbsd-9]: main
Log Message:
Add dedication for Matthias Drochner.
To generate a diff of this commit:
cvs rdiff -u -r1.551.2.4 -r1.551.2.5 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.551.2.4 src/distrib/notes/common/main:1.551.2.5
--- src/distrib/notes/common/main:1.551.2.4 Wed Nov 27 14:28:40 2019
+++ src/distrib/notes/common/main Sun Dec 1 12:17:16 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: main,v 1.551.2.4 2019/11/27 14:28:40 martin Exp $
+.\" $NetBSD: main,v 1.551.2.5 2019/12/01 12:17:16 martin Exp $
.\"
.\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -512,6 +512,26 @@ possible,
.Nx
would not exist.
.
+.if \n[FOR_RELEASE] \{\
+.Ss "Dedication"
+.Pp
+.
+.Nx
+9.0 is dedicated to the memory of Matthias Drochner, who
+passed away in August 2018.
+.Pp
+Matthias' technical contributions are too many to list here in full.
+He was a long term contributor and commited more than 3000 changes all
+over the
+.Nx
+source tree and lately was especially active in keeping some of our most weired
+ancient VME architectures in shape.
+.Pp
+Beyond that he was always helpful and friendly. His
+example encouraged users to contribute to the project and share their
+work with the community.
+.Pp
+.\} \" \n[FOR_RELEASE]
.ie \n[RELEASE_BRANCH] .Ss Changes Between The NetBSD \n[oldvers] \
and \n[major] Releases
.el .Ss Changes Between The NetBSD \n[oldvers] and \
