CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Tue Aug 17 17:31:59 UTC 2021 Modified Files: src/distrib/sets/lists/debug: module.mi src/distrib/sets/lists/modules: mi Log Message: modules for if_wg, blake2s, libsodium To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/debug/module.mi cvs rdiff -u -r1.144 -r1.145 src/distrib/sets/lists/modules/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/debug/module.mi diff -u src/distrib/sets/lists/debug/module.mi:1.9 src/distrib/sets/lists/debug/module.mi:1.10 --- src/distrib/sets/lists/debug/module.mi:1.9 Mon May 17 00:07:42 2021 +++ src/distrib/sets/lists/debug/module.mi Tue Aug 17 13:31:58 2021 @@ -1,4 +1,4 @@ -# $NetBSD: module.mi,v 1.9 2021/05/17 04:07:42 yamaguchi Exp $ +# $NetBSD: module.mi,v 1.10 2021/08/17 17:31:58 christos Exp $ ./usr/libdata/debug/@MODULEDIR@ modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/accf_dataready modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/accf_dataready/accf_dataready.kmod.debug modules-base-kernel kmod,debug @@ -14,6 +14,8 @@ ./usr/libdata/debug/@MODULEDIR@/audio/audio.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/autofsmodules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/autofs/autofs.kmod.debug modules-base-kernel kmod,debug +./usr/libdata/debug/@MODULEDIR@/blake2smodules-base-kernel kmod,debug +./usr/libdata/debug/@MODULEDIR@/blake2s/blake2s.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/blowfishmodules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/blowfish/blowfish.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/bpfmodules-base-kernel kmod,debug @@ -224,6 +226,8 @@ ./usr/libdata/debug/@MODULEDIR@/if_urndis/if_urndis.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/if_vlanmodules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/if_vlan/if_vlan.kmod.debug modules-base-kernel kmod,debug +./usr/libdata/debug/@MODULEDIR@/if_wgmodules-base-kernel kmod,debug +./usr/libdata/debug/@MODULEDIR@/if_wg/if_wg.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/iicmodules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/iic/iic.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/ip_ecnmodules-base-kernel kmod,debug @@ -332,6 +336,8 @@ ./usr/libdata/debug/@MODULEDIR@/skipjack/skipjack.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/slcompress modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/slcompress/slcompress.kmod.debug modules-base-kernel kmod,debug +./usr/libdata/debug/@MODULEDIR@/sodiummodules-base-kernel kmod,solaris,debug +./usr/libdata/debug/@MODULEDIR@/sodium/sodium.kmod.debug modules-base-kernel kmod,solaris,debug ./usr/libdata/debug/@MODULEDIR@/solarismodules-base-kernel kmod,solaris,debug ./usr/libdata/debug/@MODULEDIR@/solaris/solaris.kmod.debug modules-base-kernel kmod,solaris,debug ./usr/libdata/debug/@MODULEDIR@/spdmemmodules-base-kernel kmod,debug Index: src/distrib/sets/lists/modules/mi diff -u src/distrib/sets/lists/modules/mi:1.144 src/distrib/sets/lists/modules/mi:1.145 --- src/distrib/sets/lists/modules/mi:1.144 Mon May 17 00:07:42 2021 +++ src/distrib/sets/lists/modules/mi Tue Aug 17 13:31:59 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.144 2021/05/17 04:07:42 yamaguchi Exp $ +# $NetBSD: mi,v 1.145 2021/08/17 17:31:59 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -23,6 +23,8 @@ ./@MODULEDIR@/audio/audio.kmod modules-base-kernel kmod ./@MODULEDIR@/autofsmodules-base-kernel kmod ./@MODULEDIR@/autofs/autofs.kmod modules-base-kernel kmod +./@MODULEDIR@/blake2smodules-base-kernel kmod +./@MODULEDIR@/blake2s/blake2s.kmod modules-base-kernel kmod ./@MODULEDIR@/blowfishmodules-base-kernel kmod ./@MODULEDIR@/blowfish/blowfish.kmod modules-base-kernel kmod ./@MODULEDIR@/bpfmodules-base-kernel kmod @@ -251,6 +253,8 @@ ./@MODULEDIR@/if_vioif/if_vioif.kmod base-obsolete obsolete ./@MODULEDIR@/if_vlanmodules-base-kernel kmod ./@MODULEDIR@/if_vlan/if_vlan.kmod modules-base-kernel kmod +./@MODULEDIR@/if_wgmodules-base-kernel kmod +./@MODULEDIR@/if_wg/if_wg.kmod modules-base-kernel kmod ./@MODULEDIR@/iicmodules-base-kernel kmod ./@MODULEDIR@/iic/iic.kmod modules-base-kernel kmod ./@MODULEDIR@/ip_ecnmodules-base-kernel kmod @@ -399,6 +403,8 @@ ./@MODULEDIR@/slcompress/slcompress.kmod modules-base-kernel kmod ./@MODULEDIR@/smbfsbase-obsolete obsolete ./@MODULEDIR@/smbfs/smbfs.kmod base-obsolete obsolete +./@MODULEDIR@/sodiummodules-base-kernel kmod
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Sat Aug 14 16:18:32 UTC 2021 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/debug: shl.mi Log Message: bump ldap libraries To generate a diff of this commit: cvs rdiff -u -r1.922 -r1.923 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.279 -r1.280 src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.922 src/distrib/sets/lists/base/shl.mi:1.923 --- src/distrib/sets/lists/base/shl.mi:1.922 Tue Jul 13 23:19:23 2021 +++ src/distrib/sets/lists/base/shl.mi Sat Aug 14 12:18:32 2021 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.922 2021/07/14 03:19:23 ozaki-r Exp $ +# $NetBSD: shl.mi,v 1.923 2021/08/14 16:18:32 christos Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -417,14 +417,14 @@ ./usr/lib/libkvm.so.6base-sys-shlib compatfile ./usr/lib/libkvm.so.6.0base-sys-shlib compatfile ./usr/lib/liblber.sobase-ldap-shlib ldap,compatfile -./usr/lib/liblber.so.3base-ldap-shlib ldap,compatfile -./usr/lib/liblber.so.3.3 base-ldap-shlib ldap,compatfile +./usr/lib/liblber.so.5base-ldap-shlib ldap,compatfile +./usr/lib/liblber.so.5.0 base-ldap-shlib ldap,compatfile ./usr/lib/libldap.sobase-ldap-shlib ldap,compatfile -./usr/lib/libldap.so.4base-ldap-shlib ldap,compatfile -./usr/lib/libldap.so.4.3 base-ldap-shlib ldap,compatfile +./usr/lib/libldap.so.5base-ldap-shlib ldap,compatfile +./usr/lib/libldap.so.5.0 base-ldap-shlib ldap,compatfile ./usr/lib/libldap_r.sobase-ldap-shlib ldap,compatfile -./usr/lib/libldap_r.so.4 base-ldap-shlib ldap,compatfile -./usr/lib/libldap_r.so.4.3 base-ldap-shlib ldap,compatfile +./usr/lib/libldap_r.so.5 base-ldap-shlib ldap,compatfile +./usr/lib/libldap_r.so.5.0 base-ldap-shlib ldap,compatfile ./usr/lib/liblsan.sobase-sys-shlib compatfile,cxx,gcc ./usr/lib/liblsan.so.1base-sys-shlib compatfile,obsolete ./usr/lib/liblsan.so.1.0 base-sys-shlib compatfile,obsolete Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.279 src/distrib/sets/lists/debug/shl.mi:1.280 --- src/distrib/sets/lists/debug/shl.mi:1.279 Tue Jul 13 23:19:24 2021 +++ src/distrib/sets/lists/debug/shl.mi Sat Aug 14 12:18:32 2021 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.279 2021/07/14 03:19:24 ozaki-r Exp $ +# $NetBSD: shl.mi,v 1.280 2021/08/14 16:18:32 christos Exp $ ./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils ./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir ./usr/libdata/debug/lib/libavl.so.0.0.debug comp-zfs-debug debug,dynamicroot,zfs @@ -148,9 +148,9 @@ ./usr/libdata/debug/usr/lib/libkdc.so.3.0.debug comp-krb5-debug debug,compatfile,kerberos ./usr/libdata/debug/usr/lib/libkrb5.so.27.0.debug comp-krb5-debug debug,compatfile,kerberos ./usr/libdata/debug/usr/lib/libkvm.so.6.0.debug comp-sys-debug debug,compatfile -./usr/libdata/debug/usr/lib/liblber.so.3.3.debug comp-ldap-debug debug,compatfile,ldap -./usr/libdata/debug/usr/lib/libldap.so.4.3.debug comp-ldap-debug debug,compatfile,ldap -./usr/libdata/debug/usr/lib/libldap_r.so.4.3.debug comp-ldap-debug debug,compatfile,ldap +./usr/libdata/debug/usr/lib/liblber.so.5.0.debug comp-ldap-debug debug,compatfile,ldap +./usr/libdata/debug/usr/lib/libldap.so.5.0.debug comp-ldap-debug debug,compatfile,ldap +./usr/libdata/debug/usr/lib/libldap_r.so.5.0.debug comp-ldap-debug debug,compatfile,ldap ./usr/libdata/debug/usr/lib/liblsan.so.1.0.debug comp-sys-debug debug,compatfile,obsolete ./usr/libdata/debug/usr/lib/liblsan.so.2.0.debug comp-sys-debug debug,compatfile,cxx,gcc ./usr/libdata/debug/usr/lib/liblua.so.5.3.debug comp-sys-debug debug,compatfile
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: martin Date: Thu Aug 12 15:06:39 UTC 2021 Modified Files: src/distrib/sets/lists/tests: mi Log Message: add directory for debug data for mkdep tests To generate a diff of this commit: cvs rdiff -u -r1.1110 -r1. src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.1110 src/distrib/sets/lists/tests/mi:1. --- src/distrib/sets/lists/tests/mi:1.1110 Wed Aug 11 20:42:26 2021 +++ src/distrib/sets/lists/tests/mi Thu Aug 12 15:06:39 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1110 2021/08/11 20:42:26 rillig Exp $ +# $NetBSD: mi,v 1. 2021/08/12 15:06:39 martin Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -197,6 +197,7 @@ ./usr/libdata/debug/usr/tests/usr.bin tests-usr.bin-debug compattestfile,atf ./usr/libdata/debug/usr/tests/usr.bin/cpio tests-usr.bin-debug compattestfile,atf ./usr/libdata/debug/usr/tests/usr.bin/id tests-usr.bin-debug compattestfile,atf +./usr/libdata/debug/usr/tests/usr.bin/mkdep tests-usr.bin-debug compattestfile,atf ./usr/libdata/debug/usr/tests/usr.bin/netpgpverify tests-usr.bin-debug compattestfile,atf ./usr/libdata/debug/usr/tests/usr.bin/tar tests-usr.bin-debug compattestfile,atf ./usr/libdata/debug/usr/tests/usr.sbin tests-usr.sbin-debug compattestfile,atf
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: martin Date: Thu Aug 12 13:27:42 UTC 2021 Modified Files: src/distrib/sets/lists/debug: mi Log Message: h_findcc.debug is not obsolete To generate a diff of this commit: cvs rdiff -u -r1.358 -r1.359 src/distrib/sets/lists/debug/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/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.358 src/distrib/sets/lists/debug/mi:1.359 --- src/distrib/sets/lists/debug/mi:1.358 Thu Aug 12 12:51:25 2021 +++ src/distrib/sets/lists/debug/mi Thu Aug 12 13:27:42 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.358 2021/08/12 12:51:25 martin Exp $ +# $NetBSD: mi,v 1.359 2021/08/12 13:27:42 martin Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib comp-sys-usr compatdir ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile @@ -2487,10 +2487,10 @@ ./usr/libdata/debug/usr/tests/syscall/t_unlink.debug tests-obsolete obsolete,compattestfile ./usr/libdata/debug/usr/tests/usr.bin/cpio/h_cpio.debug tests-usr.bin-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/usr.bin/id/h_id.debug tests-usr.bin-debug debug,atf,compattestfile +./usr/libdata/debug/usr/tests/usr.bin/mkdep/h_findcc.debug tests-usr.bin-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/usr.bin/tar/h_tar.debug tests-usr.bin-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/util/df/h_df.debug tests-obsolete obsolete,compattestfile ./usr/libdata/debug/usr/tests/util/id/h_id.debug tests-obsolete obsolete,compattestfile -./usr/libdata/debug/usr/tests/usr.bin/mkdep/h_findcc.debug tests-obsolete obsolete,compattestfile ./usr/libdata/debug/usr/tests/util/systrace/h_have_systrace.debug tests-obsolete obsolete,compattestfile ./usr/tests/lib/libc/tls/libh_tls_dynamic_g.a comp-c-debuglib atf,debuglib,compattestfile ./var/db/obsolete/debugbase-sys-root debug
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: martin Date: Thu Aug 12 12:51:25 UTC 2021 Modified Files: src/distrib/sets/lists/debug: mi Log Message: oops, fix h_findcc entry To generate a diff of this commit: cvs rdiff -u -r1.357 -r1.358 src/distrib/sets/lists/debug/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/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.357 src/distrib/sets/lists/debug/mi:1.358 --- src/distrib/sets/lists/debug/mi:1.357 Thu Aug 12 11:57:07 2021 +++ src/distrib/sets/lists/debug/mi Thu Aug 12 12:51:25 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.357 2021/08/12 11:57:07 martin Exp $ +# $NetBSD: mi,v 1.358 2021/08/12 12:51:25 martin Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib comp-sys-usr compatdir ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile @@ -2490,7 +2490,7 @@ ./usr/libdata/debug/usr/tests/usr.bin/tar/h_tar.debug tests-usr.bin-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/util/df/h_df.debug tests-obsolete obsolete,compattestfile ./usr/libdata/debug/usr/tests/util/id/h_id.debug tests-obsolete obsolete,compattestfile -./usr/tests/usr.bin/mkdep/h_findcc.debugtests-obsolete obsolete,compattestfile +./usr/libdata/debug/usr/tests/usr.bin/mkdep/h_findcc.debug tests-obsolete obsolete,compattestfile ./usr/libdata/debug/usr/tests/util/systrace/h_have_systrace.debug tests-obsolete obsolete,compattestfile ./usr/tests/lib/libc/tls/libh_tls_dynamic_g.a comp-c-debuglib atf,debuglib,compattestfile ./var/db/obsolete/debugbase-sys-root debug
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: martin Date: Thu Aug 12 11:57:07 UTC 2021 Modified Files: src/distrib/sets/lists/debug: mi Log Message: Add new mkdep test helper h_findcc To generate a diff of this commit: cvs rdiff -u -r1.356 -r1.357 src/distrib/sets/lists/debug/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/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.356 src/distrib/sets/lists/debug/mi:1.357 --- src/distrib/sets/lists/debug/mi:1.356 Wed Jul 14 03:19:24 2021 +++ src/distrib/sets/lists/debug/mi Thu Aug 12 11:57:07 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.356 2021/07/14 03:19:24 ozaki-r Exp $ +# $NetBSD: mi,v 1.357 2021/08/12 11:57:07 martin Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib comp-sys-usr compatdir ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile @@ -2490,6 +2490,7 @@ ./usr/libdata/debug/usr/tests/usr.bin/tar/h_tar.debug tests-usr.bin-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/util/df/h_df.debug tests-obsolete obsolete,compattestfile ./usr/libdata/debug/usr/tests/util/id/h_id.debug tests-obsolete obsolete,compattestfile +./usr/tests/usr.bin/mkdep/h_findcc.debugtests-obsolete obsolete,compattestfile ./usr/libdata/debug/usr/tests/util/systrace/h_have_systrace.debug tests-obsolete obsolete,compattestfile ./usr/tests/lib/libc/tls/libh_tls_dynamic_g.a comp-c-debuglib atf,debuglib,compattestfile ./var/db/obsolete/debugbase-sys-root debug
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: martin Date: Fri Aug 6 08:44:31 UTC 2021 Modified Files: src/distrib/sets/lists/tests: mi Log Message: Fix copy+pasto (wrong dir for t_lint2) To generate a diff of this commit: cvs rdiff -u -r1.1104 -r1.1105 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.1104 src/distrib/sets/lists/tests/mi:1.1105 --- src/distrib/sets/lists/tests/mi:1.1104 Thu Aug 5 22:36:07 2021 +++ src/distrib/sets/lists/tests/mi Fri Aug 6 08:44:31 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1104 2021/08/05 22:36:07 rillig Exp $ +# $NetBSD: mi,v 1.1105 2021/08/06 08:44:31 martin Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -7064,7 +7064,7 @@ ./usr/tests/usr.bin/xlint/lint2/msg_017.ln tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/xlint/lint2/msg_018.exp tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/xlint/lint2/msg_018.ln tests-usr.bin-tests compattestfile,atf -./usr/tests/usr.bin/xlint/lint1/t_lint2tests-usr.bin-tests compattestfile,atf +./usr/tests/usr.bin/xlint/lint2/t_lint2tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/ztesttests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/ztest/Atffile tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/ztest/Kyuafile tests-usr.bin-tests compattestfile,atf,kyua
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: rillig Date: Fri Jul 30 21:29:01 UTC 2021 Modified Files: src/distrib/sets/lists/tests: mi Log Message: tests/make: register test varmod-order-numeric To generate a diff of this commit: cvs rdiff -u -r1.1096 -r1.1097 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.1096 src/distrib/sets/lists/tests/mi:1.1097 --- src/distrib/sets/lists/tests/mi:1.1096 Sun Jul 25 22:03:42 2021 +++ src/distrib/sets/lists/tests/mi Fri Jul 30 21:29:00 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1096 2021/07/25 22:03:42 rillig Exp $ +# $NetBSD: mi,v 1.1097 2021/07/30 21:29:00 rillig Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -5809,6 +5809,8 @@ ./usr/tests/usr.bin/make/unit-tests/varmod-match.mktests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/make/unit-tests/varmod-no-match.exptests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/make/unit-tests/varmod-no-match.mktests-usr.bin-tests compattestfile,atf +./usr/tests/usr.bin/make/unit-tests/varmod-order-numeric.exp tests-usr.bin-tests compattestfile,atf +./usr/tests/usr.bin/make/unit-tests/varmod-order-numeric.mk tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/make/unit-tests/varmod-order-reverse.exp tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/make/unit-tests/varmod-order-reverse.mk tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/make/unit-tests/varmod-order-shuffle.exp tests-usr.bin-tests compattestfile,atf
CVS commit: src/distrib/amd64/liveimage/emuimage
Module Name:src
Committed By: jmcneill
Date: Sat Jul 24 16:13:45 UTC 2021
Modified Files:
src/distrib/amd64/liveimage/emuimage: Makefile spec.emuimage
Added Files:
src/distrib/amd64/liveimage/emuimage: rc.conf.emuimage
Removed Files:
src/distrib/amd64/liveimage/emuimage: dhcpcd ec2_init resize_disklabel
resize_root sshd
Log Message:
amd64: liveimage: use RC_CONF_EXTRA instead of rc.conf.d
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/distrib/amd64/liveimage/emuimage/Makefile
cvs rdiff -u -r1.1 -r0 src/distrib/amd64/liveimage/emuimage/dhcpcd \
src/distrib/amd64/liveimage/emuimage/resize_disklabel \
src/distrib/amd64/liveimage/emuimage/resize_root \
src/distrib/amd64/liveimage/emuimage/sshd
cvs rdiff -u -r1.4 -r0 src/distrib/amd64/liveimage/emuimage/ec2_init
cvs rdiff -u -r0 -r1.1 src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage
cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/liveimage/emuimage/spec.emuimage
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/liveimage/emuimage/Makefile
diff -u src/distrib/amd64/liveimage/emuimage/Makefile:1.8 src/distrib/amd64/liveimage/emuimage/Makefile:1.9
--- src/distrib/amd64/liveimage/emuimage/Makefile:1.8 Wed Aug 5 01:35:18 2020
+++ src/distrib/amd64/liveimage/emuimage/Makefile Sat Jul 24 16:13:44 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2020/08/05 01:35:18 jmcneill Exp $
+# $NetBSD: Makefile,v 1.9 2021/07/24 16:13:44 jmcneill Exp $
LIVEIMGBASE= NetBSD-${DISTRIBVER}-amd64-live # gives ${IMGBASE}.img
@@ -10,13 +10,9 @@ IMAGEHOSTNAME= netbsd
FILESDIR!= cd ${.CURDIR}/../../../utils/embedded/files ; pwd
SPEC_EXTRA= ${.CURDIR}/spec.emuimage
+RC_CONF_EXTRA= ${.CURDIR}/rc.conf.emuimage
IMGFILE_EXTRA=\
${FILESDIR}/ec2_init etc/rc.d/ec2_init \
- ${FILESDIR}/resize_disklabel etc/rc.d/resize_disklabel \
- ${.CURDIR}/dhcpcd etc/rc.conf.d/dhcpcd \
- ${.CURDIR}/ec2_init etc/rc.conf.d/ec2_init \
- ${.CURDIR}/resize_disklabel etc/rc.conf.d/resize_disklabel \
- ${.CURDIR}/resize_root etc/rc.conf.d/resize_root \
- ${.CURDIR}/sshd etc/rc.conf.d/sshd
+ ${FILESDIR}/resize_disklabel etc/rc.d/resize_disklabel
.include "${.CURDIR}/../Makefile.liveimage"
Index: src/distrib/amd64/liveimage/emuimage/spec.emuimage
diff -u src/distrib/amd64/liveimage/emuimage/spec.emuimage:1.1 src/distrib/amd64/liveimage/emuimage/spec.emuimage:1.2
--- src/distrib/amd64/liveimage/emuimage/spec.emuimage:1.1 Wed Aug 5 01:35:18 2020
+++ src/distrib/amd64/liveimage/emuimage/spec.emuimage Sat Jul 24 16:13:44 2021
@@ -1,8 +1,3 @@
-# $NetBSD: spec.emuimage,v 1.1 2020/08/05 01:35:18 jmcneill Exp $
-./etc/rc.conf.d/dhcpcd type=file mode=0644 uname=root gname=wheel
-./etc/rc.conf.d/ec2_init type=file mode=0644 uname=root gname=wheel
-./etc/rc.conf.d/resize_disklabel type=file mode=0644 uname=root gname=wheel
-./etc/rc.conf.d/resize_root type=file mode=0644 uname=root gname=wheel
-./etc/rc.conf.d/sshd type=file mode=0644 uname=root gname=wheel
+# $NetBSD: spec.emuimage,v 1.2 2021/07/24 16:13:44 jmcneill Exp $
./etc/rc.d/ec2_init type=file mode=0555 uname=root gname=wheel
./etc/rc.d/resize_disklabel type=file mode=0555 uname=root gname=wheel
Added files:
Index: src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage
diff -u /dev/null src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage:1.1
--- /dev/null Sat Jul 24 16:13:45 2021
+++ src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage Sat Jul 24 16:13:44 2021
@@ -0,0 +1,36 @@
+# $NetBSD: rc.conf.emuimage,v 1.1 2021/07/24 16:13:44 jmcneill Exp $
+
+is_ec2() {
+ val=NO
+ # Look for the string "amazon" in one of these sysctl nodes
+ for node in machdep.dmi.system-vendor \
+ machdep.dmi.system-version \
+ machdep.dmi.bios-version \
+ machdep.xen.version ; do
+ if /sbin/sysctl -q $node; then
+ nodeval="$(/sbin/sysctl -n $node | tr '[A-Z]' '[a-z]')"
+ case "$nodeval" in
+ *amazon*)
+val=YES
+;;
+ # OpenStack is not EC2 but it does have a metadata service.
+ *openstack*)
+val=YES
+;;
+ esac
+ fi
+ done
+ printf $val
+}
+
+resize_disklabel=YES
+resize_root=YES
+resize_root_flags="-p"
+resize_root_postcmd="/sbin/reboot -n"
+dhcpcd=YES
+sshd=YES
+ec2_init=$(is_ec2)
+
+if checkyesno ec2_init; then
+ dhcpcd_flags="$dhcpcd_flags -w"
+fi
CVS commit: src/distrib/evbarm/liveimage/armimage
Module Name:src
Committed By: jmcneill
Date: Sat Jul 24 14:00:08 UTC 2021
Modified Files:
src/distrib/evbarm/liveimage/armimage: Makefile spec.armimage
Added Files:
src/distrib/evbarm/liveimage/armimage: rc.conf.armimage
Removed Files:
src/distrib/evbarm/liveimage/armimage: dhcpcd ec2_init resize_gpt
resize_root sshd
Log Message:
evbarm: liveimage: use RC_CONF_EXTRA instead of rc.conf.d
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/evbarm/liveimage/armimage/Makefile \
src/distrib/evbarm/liveimage/armimage/spec.armimage
cvs rdiff -u -r1.1 -r0 src/distrib/evbarm/liveimage/armimage/dhcpcd \
src/distrib/evbarm/liveimage/armimage/ec2_init \
src/distrib/evbarm/liveimage/armimage/resize_gpt \
src/distrib/evbarm/liveimage/armimage/resize_root \
src/distrib/evbarm/liveimage/armimage/sshd
cvs rdiff -u -r0 -r1.1 src/distrib/evbarm/liveimage/armimage/rc.conf.armimage
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/evbarm/liveimage/armimage/Makefile
diff -u src/distrib/evbarm/liveimage/armimage/Makefile:1.1 src/distrib/evbarm/liveimage/armimage/Makefile:1.2
--- src/distrib/evbarm/liveimage/armimage/Makefile:1.1 Fri Jul 23 21:53:34 2021
+++ src/distrib/evbarm/liveimage/armimage/Makefile Sat Jul 24 14:00:08 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/07/23 21:53:34 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2021/07/24 14:00:08 jmcneill Exp $
LIVEIMGBASE= NetBSD-${DISTRIBVER}-${MACHINE_ARCH}-live # gives ${IMGBASE}.img
@@ -10,13 +10,9 @@ IMAGEHOSTNAME= netbsd
FILESDIR!= cd ${.CURDIR}/../../../utils/embedded/files ; pwd
SPEC_EXTRA= ${.CURDIR}/spec.armimage
+RC_CONF_EXTRA= ${.CURDIR}/rc.conf.armimage
IMGFILE_EXTRA=\
${FILESDIR}/ec2_init etc/rc.d/ec2_init \
- ${FILESDIR}/resize_gpt etc/rc.d/resize_gpt \
- ${.CURDIR}/dhcpcd etc/rc.conf.d/dhcpcd \
- ${.CURDIR}/ec2_init etc/rc.conf.d/ec2_init \
- ${.CURDIR}/resize_gpt etc/rc.conf.d/resize_gpt \
- ${.CURDIR}/resize_root etc/rc.conf.d/resize_root \
- ${.CURDIR}/sshd etc/rc.conf.d/sshd
+ ${FILESDIR}/resize_gpt etc/rc.d/resize_gpt
.include "${.CURDIR}/../Makefile.liveimage"
Index: src/distrib/evbarm/liveimage/armimage/spec.armimage
diff -u src/distrib/evbarm/liveimage/armimage/spec.armimage:1.1 src/distrib/evbarm/liveimage/armimage/spec.armimage:1.2
--- src/distrib/evbarm/liveimage/armimage/spec.armimage:1.1 Fri Jul 23 21:53:34 2021
+++ src/distrib/evbarm/liveimage/armimage/spec.armimage Sat Jul 24 14:00:08 2021
@@ -1,8 +1,3 @@
-# $NetBSD: spec.armimage,v 1.1 2021/07/23 21:53:34 jmcneill Exp $
-./etc/rc.conf.d/dhcpcd type=file mode=0644 uname=root gname=wheel
-./etc/rc.conf.d/ec2_init type=file mode=0644 uname=root gname=wheel
-./etc/rc.conf.d/resize_gpt type=file mode=0644 uname=root gname=wheel
-./etc/rc.conf.d/resize_root type=file mode=0644 uname=root gname=wheel
-./etc/rc.conf.d/sshd type=file mode=0644 uname=root gname=wheel
+# $NetBSD: spec.armimage,v 1.2 2021/07/24 14:00:08 jmcneill Exp $
./etc/rc.d/ec2_init type=file mode=0555 uname=root gname=wheel
./etc/rc.d/resize_gpt type=file mode=0555 uname=root gname=wheel
Added files:
Index: src/distrib/evbarm/liveimage/armimage/rc.conf.armimage
diff -u /dev/null src/distrib/evbarm/liveimage/armimage/rc.conf.armimage:1.1
--- /dev/null Sat Jul 24 14:00:08 2021
+++ src/distrib/evbarm/liveimage/armimage/rc.conf.armimage Sat Jul 24 14:00:08 2021
@@ -0,0 +1,36 @@
+# $NetBSD: rc.conf.armimage,v 1.1 2021/07/24 14:00:08 jmcneill Exp $
+
+is_ec2() {
+ val=NO
+ # Look for the string "amazon" in one of these sysctl nodes
+ for node in machdep.dmi.system-vendor \
+ machdep.dmi.system-version \
+ machdep.dmi.bios-version \
+ machdep.xen.version ; do
+ if /sbin/sysctl -q $node; then
+ nodeval="$(/sbin/sysctl -n $node | tr '[A-Z]' '[a-z]')"
+ case "$nodeval" in
+ *amazon*)
+val=YES
+;;
+ # OpenStack is not EC2 but it does have a metadata service.
+ *openstack*)
+val=YES
+;;
+ esac
+ fi
+ done
+ printf $val
+}
+
+resize_gpt=YES
+resize_root=YES
+resize_root_flags="-p"
+resize_root_postcmd="/sbin/reboot -n"
+dhcpcd=YES
+sshd=YES
+ec2_init=$(is_ec2)
+
+if checkyesno ec2_init; then
+ dhcpcd_flags="$dhcpcd_flags -w"
+fi
CVS commit: src/distrib/common/bootimage
Module Name:src
Committed By: jmcneill
Date: Sat Jul 24 13:59:29 UTC 2021
Modified Files:
src/distrib/common/bootimage: Makefile.bootimage
Log Message:
bootimage: allow appending additional rc.conf options
If RC_CONF_EXTRA is defined, append the contents of this file to the
target file-system's rc.conf
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/distrib/common/bootimage/Makefile.bootimage
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/bootimage/Makefile.bootimage
diff -u src/distrib/common/bootimage/Makefile.bootimage:1.27 src/distrib/common/bootimage/Makefile.bootimage:1.28
--- src/distrib/common/bootimage/Makefile.bootimage:1.27 Fri Jun 4 17:09:36 2021
+++ src/distrib/common/bootimage/Makefile.bootimage Sat Jul 24 13:59:28 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.27 2021/06/04 17:09:36 tsutsui Exp $
+# $NetBSD: Makefile.bootimage,v 1.28 2021/07/24 13:59:28 jmcneill Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -366,6 +366,10 @@ ${TARGETFS}: prepare_md_post ${WORKFSTAB
@echo Setting savecore=NO in /etc/rc.conf ...
echo "savecore=NO" >> ${WORKRCCONF}
.endif
+.if defined(RC_CONF_EXTRA)
+ @echo Adding contents of ${RC_CONF_EXTRA} to /etc/rc.conf ...
+ cat ${RC_CONF_EXTRA} >> ${WORKRCCONF}
+.endif
${INSTALL} ${COPY} -m 0644 ${WORKRCCONF} ${WORKDIR}/etc/rc.conf
.if defined(IMGDIR_EXTRA)
@echo Copying extra dirs...
CVS commit: src/distrib/evbarm
Module Name:src
Committed By: jmcneill
Date: Fri Jul 23 21:53:34 UTC 2021
Modified Files:
src/distrib/evbarm: Makefile
Added Files:
src/distrib/evbarm/liveimage: Makefile Makefile.liveimage
src/distrib/evbarm/liveimage/armimage: Makefile dhcpcd ec2_init
resize_gpt resize_root spec.armimage sshd
Log Message:
evbarm: Add build.sh live-image support for armv7/aarch64
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/distrib/evbarm/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/evbarm/liveimage/Makefile \
src/distrib/evbarm/liveimage/Makefile.liveimage
cvs rdiff -u -r0 -r1.1 src/distrib/evbarm/liveimage/armimage/Makefile \
src/distrib/evbarm/liveimage/armimage/dhcpcd \
src/distrib/evbarm/liveimage/armimage/ec2_init \
src/distrib/evbarm/liveimage/armimage/resize_gpt \
src/distrib/evbarm/liveimage/armimage/resize_root \
src/distrib/evbarm/liveimage/armimage/spec.armimage \
src/distrib/evbarm/liveimage/armimage/sshd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/evbarm/Makefile
diff -u src/distrib/evbarm/Makefile:1.15 src/distrib/evbarm/Makefile:1.16
--- src/distrib/evbarm/Makefile:1.15 Mon Nov 16 11:38:29 2020
+++ src/distrib/evbarm/Makefile Fri Jul 23 21:53:33 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2020/11/16 11:38:29 rin Exp $
+# $NetBSD: Makefile,v 1.16 2021/07/23 21:53:33 jmcneill Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -8,6 +8,7 @@
SUBDIR= gzboot instkernel
.if !empty(MACHINE_ARCH:Maarch64*) || !empty(MACHINE_ARCH:Mearmv7hf*)
SUBDIR+= installimage
+SUBDIR+= liveimage
.endif
.if !empty(MACHINE_ARCH:Maarch64*)
SUBDIR+= isoimage
@@ -27,6 +28,9 @@ iso_image:
${MAKEDIRTARGET} isoimage iso_image
.endif
+live_image:
+ ${MAKEDIRTARGET} liveimage live_image
+
install_image:
${MAKEDIRTARGET} installimage install_image
Added files:
Index: src/distrib/evbarm/liveimage/Makefile
diff -u /dev/null src/distrib/evbarm/liveimage/Makefile:1.1
--- /dev/null Fri Jul 23 21:53:34 2021
+++ src/distrib/evbarm/liveimage/Makefile Fri Jul 23 21:53:33 2021
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile,v 1.1 2021/07/23 21:53:33 jmcneill Exp $
+
+SUBDIR= armimage
+
+TARGETS+= release live_image
+
+.include
Index: src/distrib/evbarm/liveimage/Makefile.liveimage
diff -u /dev/null src/distrib/evbarm/liveimage/Makefile.liveimage:1.1
--- /dev/null Fri Jul 23 21:53:34 2021
+++ src/distrib/evbarm/liveimage/Makefile.liveimage Fri Jul 23 21:53:33 2021
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile.liveimage,v 1.1 2021/07/23 21:53:33 jmcneill Exp $
+
+.include
+
+.if !empty(MACHINE_ARCH:Maarch64*)
+KERN_SET= kern-GENERIC64
+EFIBOOT= ${WORKDIR}/usr/mdec/bootaa64.efi
+.else
+KERN_SET= kern-GENERIC
+EFIBOOT= ${WORKDIR}/usr/mdec/bootarm.efi
+.endif
+
+USE_MBR= yes
+USE_GPT= yes
+
+.include "${.CURDIR}/../../../common/bootimage/Makefile.liveimage"
Index: src/distrib/evbarm/liveimage/armimage/Makefile
diff -u /dev/null src/distrib/evbarm/liveimage/armimage/Makefile:1.1
--- /dev/null Fri Jul 23 21:53:34 2021
+++ src/distrib/evbarm/liveimage/armimage/Makefile Fri Jul 23 21:53:34 2021
@@ -0,0 +1,22 @@
+# $NetBSD: Makefile,v 1.1 2021/07/23 21:53:34 jmcneill Exp $
+
+LIVEIMGBASE= NetBSD-${DISTRIBVER}-${MACHINE_ARCH}-live # gives ${IMGBASE}.img
+
+EMUIMAGEMB?= 1907 # 2GB USB flash memories aren't 2GiB
+LIVEIMAGEMB= ${EMUIMAGEMB}
+SWAPMB= 0 # No swap
+IMAGEHOSTNAME= netbsd
+
+FILESDIR!= cd ${.CURDIR}/../../../utils/embedded/files ; pwd
+
+SPEC_EXTRA= ${.CURDIR}/spec.armimage
+IMGFILE_EXTRA=\
+ ${FILESDIR}/ec2_init etc/rc.d/ec2_init \
+ ${FILESDIR}/resize_gpt etc/rc.d/resize_gpt \
+ ${.CURDIR}/dhcpcd etc/rc.conf.d/dhcpcd \
+ ${.CURDIR}/ec2_init etc/rc.conf.d/ec2_init \
+ ${.CURDIR}/resize_gpt etc/rc.conf.d/resize_gpt \
+ ${.CURDIR}/resize_root etc/rc.conf.d/resize_root \
+ ${.CURDIR}/sshd etc/rc.conf.d/sshd
+
+.include "${.CURDIR}/../Makefile.liveimage"
Index: src/distrib/evbarm/liveimage/armimage/dhcpcd
diff -u /dev/null src/distrib/evbarm/liveimage/armimage/dhcpcd:1.1
--- /dev/null Fri Jul 23 21:53:34 2021
+++ src/distrib/evbarm/liveimage/armimage/dhcpcd Fri Jul 23 21:53:34 2021
@@ -0,0 +1,3 @@
+# $NetBSD: dhcpcd,v 1.1 2021/07/23 21:53:34 jmcneill Exp $
+
+dhcpcd=YES
Index: src/distrib/evbarm/liveimage/armimage/ec2_init
diff -u /dev/null src/distrib/evbarm/liveimage/armimage/ec2_init:1.1
--- /dev/null Fri Jul 23 21:53:34 2021
+++ src/distrib/evbarm/liveimage/armimage/ec2_init Fri Jul 23 21:53:34 2021
@@ -0,0 +1,31 @@
+# $NetBSD: ec2_init,v 1.1 2021/07/23 21:53:34 jmcneill Exp $
+
+is_ec2() {
+ val=NO
+ # Look for the string "amazon" in one of these sysctl nodes
+ for node in machdep.dmi.system-vendor \
+ machdep.dmi.system-version \
+ machdep.dmi.bios-version \
+ machdep.xen.version ; do
+ if /sbin/sysctl -q $node; then
+ nodeval="$(/sbin/sysctl -n
CVS commit: src/distrib/sets/lists/xbase
Module Name:src Committed By: mrg Date: Thu Jul 22 21:49:44 UTC 2021 Modified Files: src/distrib/sets/lists/xbase: shl.mi Log Message: fix typo in unused obsolete set name. noted by tnn. To generate a diff of this commit: cvs rdiff -u -r1.96 -r1.97 src/distrib/sets/lists/xbase/shl.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/xbase/shl.mi diff -u src/distrib/sets/lists/xbase/shl.mi:1.96 src/distrib/sets/lists/xbase/shl.mi:1.97 --- src/distrib/sets/lists/xbase/shl.mi:1.96 Tue Jul 13 05:53:12 2021 +++ src/distrib/sets/lists/xbase/shl.mi Thu Jul 22 21:49:44 2021 @@ -1,8 +1,8 @@ -# $NetBSD: shl.mi,v 1.96 2021/07/13 05:53:12 mrg Exp $ +# $NetBSD: shl.mi,v 1.97 2021/07/22 21:49:44 mrg Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # -./usr/X11R7/lib/X11/locale/lib/common/ximcp.so obsolet obsolete +./usr/X11R7/lib/X11/locale/lib/common/ximcp.so obsolete obsolete ./usr/X11R7/lib/X11/locale/lib/common/ximcp.so.2 obsolete obsolete ./usr/X11R7/lib/X11/locale/lib/common/ximcp.so.2.0 obsolete obsolete ./usr/X11R7/lib/X11/locale/lib/common/xlcDef.so obsolete obsolete
CVS commit: src/distrib/utils/embedded/files
Module Name:src
Committed By: rhialto
Date: Tue Jul 20 19:31:23 UTC 2021
Modified Files:
src/distrib/utils/embedded/files: ec2_init
Log Message:
Extract just the random bits to feed to /dev/urandom.
This makes no difference in the randomness of the pool, but it improves
on the estimation (if any) of how many random bits were obtained.
Also make the ftp -q time out a bit longer since I got some time outs.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/utils/embedded/files/ec2_init
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/files/ec2_init
diff -u src/distrib/utils/embedded/files/ec2_init:1.3 src/distrib/utils/embedded/files/ec2_init:1.4
--- src/distrib/utils/embedded/files/ec2_init:1.3 Thu Jul 15 19:03:17 2021
+++ src/distrib/utils/embedded/files/ec2_init Tue Jul 20 19:31:23 2021
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: ec2_init,v 1.3 2021/07/15 19:03:17 rhialto Exp $
+# $NetBSD: ec2_init,v 1.4 2021/07/20 19:31:23 rhialto Exp $
#
# PROVIDE: ec2_init
# REQUIRE: NETWORKING
@@ -28,6 +28,11 @@ ec2_newuser()
useradd -g users -G wheel,operator -m "${EC2_USER}"
}
+extract_random_seed()
+{
+ sed -n -e '/random_seed/s/.*"random_seed": *"\([A-Za-z0-9+/=]*\)".*/\1/p'
+}
+
ec2_init()
{
(
@@ -38,7 +43,7 @@ ec2_init()
try=0
while [ $((try++)) -lt 20 ]
do
- HOSTNAME=$(ftp -o - -q 1 "${METADATA_URL}${HOSTNAME_URL}")
+ HOSTNAME=$(ftp -o - -q 2 "${METADATA_URL}${HOSTNAME_URL}")
if [ -n "$HOSTNAME" ]; then
echo "Setting EC2 hostname: ${HOSTNAME}"
echo "$HOSTNAME" > /etc/myname
@@ -53,7 +58,7 @@ ec2_init()
id "${EC2_USER}" >/dev/null 2>&1 || ec2_newuser
# fetch the public key from Amazon Web Services
- EC2_SSH_KEY=$(ftp -o - -q 1 "${METADATA_URL}${SSH_KEY_URL}")
+ EC2_SSH_KEY=$(ftp -o - -q 2 "${METADATA_URL}${SSH_KEY_URL}")
if [ -n "$EC2_SSH_KEY" ]; then
# A key pair is associated with this instance, add it
@@ -71,10 +76,11 @@ ec2_init()
fi
fi
- # May contain a "random_seed". Everything else doesn't matter.
- OS_METADATA="$(ftp -o - -q 1 ${OS_METADATA_URL})"
+ # May contain a "random_seed".
+ OS_METADATA="$(ftp -o - -q 2 ${OS_METADATA_URL})"
if echo "$OS_METADATA" | grep -q random_seed; then
- echo "$OS_METADATA" >> /dev/urandom
+ echo "$OS_METADATA" | extract_random_seed |
+ base64 -di >> /dev/urandom
fi
)
}
CVS commit: src/distrib/amd64/liveimage/emuimage
Module Name:src
Committed By: rhialto
Date: Tue Jul 20 19:27:51 UTC 2021
Modified Files:
src/distrib/amd64/liveimage/emuimage: ec2_init
Log Message:
Don't override /etc/rc.conf if it sets ec2_init.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/liveimage/emuimage/ec2_init
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/liveimage/emuimage/ec2_init
diff -u src/distrib/amd64/liveimage/emuimage/ec2_init:1.3 src/distrib/amd64/liveimage/emuimage/ec2_init:1.4
--- src/distrib/amd64/liveimage/emuimage/ec2_init:1.3 Thu Jul 15 17:20:25 2021
+++ src/distrib/amd64/liveimage/emuimage/ec2_init Tue Jul 20 19:27:51 2021
@@ -1,4 +1,4 @@
-# $NetBSD: ec2_init,v 1.3 2021/07/15 17:20:25 rhialto Exp $
+# $NetBSD: ec2_init,v 1.4 2021/07/20 19:27:51 rhialto Exp $
is_ec2() {
val=NO
@@ -23,4 +23,9 @@ is_ec2() {
printf $val
}
-ec2_init=$(is_ec2)
+# Don't override /etc/rc.conf
+if [ -z "$ec2_init" ]
+then
+ ec2_init=$(is_ec2)
+fi
+
CVS commit: src/distrib/utils/embedded/files
Module Name:src
Committed By: rhialto
Date: Thu Jul 15 19:03:17 UTC 2021
Modified Files:
src/distrib/utils/embedded/files: ec2_init
Log Message:
Add some OpenStack support.
I found that in the cloud I tried, by the time this script runs, there
is no default route in effect yet. That takes some 5 to 10 seconds
longer. So I added a retry loop, and to make that easier, changed the
order of queries. To make sure it doesn't wait ~forever for a
non-existent service I added the -q 1 option to ftp invocations.
I also added OpenStack-specific metadata which contains a different
random_seed of 512 bytes every time it is requested. See
https://github.com/openstack/nova/blob/master/nova/api/metadata/base.py#L355
It may not be trusted data but only in the strictest sense of the word.
The data can only be observed by people with access to the cloud's
overlay network for the particular VM.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/utils/embedded/files/ec2_init
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/files/ec2_init
diff -u src/distrib/utils/embedded/files/ec2_init:1.2 src/distrib/utils/embedded/files/ec2_init:1.3
--- src/distrib/utils/embedded/files/ec2_init:1.2 Thu Jul 1 18:05:45 2021
+++ src/distrib/utils/embedded/files/ec2_init Thu Jul 15 19:03:17 2021
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: ec2_init,v 1.2 2021/07/01 18:05:45 jmcneill Exp $
+# $NetBSD: ec2_init,v 1.3 2021/07/15 19:03:17 rhialto Exp $
#
# PROVIDE: ec2_init
# REQUIRE: NETWORKING
@@ -20,6 +20,8 @@ HOSTNAME_URL="hostname"
SSH_KEY_FILE="/home/${EC2_USER}/.ssh/authorized_keys"
+OS_METADATA_URL="http://169.254.169.254/openstack/latest/meta_data.json;
+
ec2_newuser()
{
echo "Creating EC2 user account ${EC2_USER}"
@@ -31,11 +33,27 @@ ec2_init()
(
umask 022
+ # set hostname; it may be 5-10 seconds for the metadata service
+ # to become reachable.
+ try=0
+ while [ $((try++)) -lt 20 ]
+ do
+ HOSTNAME=$(ftp -o - -q 1 "${METADATA_URL}${HOSTNAME_URL}")
+ if [ -n "$HOSTNAME" ]; then
+ echo "Setting EC2 hostname: ${HOSTNAME}"
+ echo "$HOSTNAME" > /etc/myname
+ hostname "$HOSTNAME"
+ break
+ fi
+ echo "EC2 hostname not available yet (try $try)"
+ sleep 1
+ done
+
# create EC2 user
id "${EC2_USER}" >/dev/null 2>&1 || ec2_newuser
- # fetch the key pair from Amazon Web Services
- EC2_SSH_KEY=$(ftp -o - "${METADATA_URL}${SSH_KEY_URL}")
+ # fetch the public key from Amazon Web Services
+ EC2_SSH_KEY=$(ftp -o - -q 1 "${METADATA_URL}${SSH_KEY_URL}")
if [ -n "$EC2_SSH_KEY" ]; then
# A key pair is associated with this instance, add it
@@ -48,16 +66,16 @@ ec2_init()
grep -q "$EC2_SSH_KEY" "$SSH_KEY_FILE"
if [ $? -ne 0 ]; then
- echo "Setting EC2 SSH key pair: ${EC2_SSH_KEY##* }"
+ echo "Setting EC2 SSH public key for user ${EC2_USER}: ${EC2_SSH_KEY##* }"
echo "$EC2_SSH_KEY" >> "$SSH_KEY_FILE"
fi
fi
- # set hostname
- HOSTNAME=$(ftp -o - "${METADATA_URL}${HOSTNAME_URL}")
- echo "Setting EC2 hostname: ${HOSTNAME}"
- echo "$HOSTNAME" > /etc/myname
- hostname "$HOSTNAME"
+ # May contain a "random_seed". Everything else doesn't matter.
+ OS_METADATA="$(ftp -o - -q 1 ${OS_METADATA_URL})"
+ if echo "$OS_METADATA" | grep -q random_seed; then
+ echo "$OS_METADATA" >> /dev/urandom
+ fi
)
}
CVS commit: src/distrib/amd64/liveimage/emuimage
Module Name:src
Committed By: rhialto
Date: Thu Jul 15 17:20:25 UTC 2021
Modified Files:
src/distrib/amd64/liveimage/emuimage: ec2_init
Log Message:
Recognize OpenStack too (it also has a metadata service).
Typical values for machdep.dmi are:
machdep.dmi.system-vendor = OpenStack Foundation
machdep.dmi.system-product = OpenStack Nova
machdep.dmi.system-version = 17.0.12
machdep.dmi.system-serial = c46130fb-a56e-43f2-9d98-492d24656b9c
machdep.dmi.system-uuid = 680b8119-0d74-4f78-a6fd-e79dfede905c
machdep.dmi.bios-vendor = SeaBIOS
machdep.dmi.bios-version = 1.10.2-1ubuntu1
machdep.dmi.bios-date = 20140401
machdep.dmi.chassis-vendor = QEMU
machdep.dmi.chassis-type = QEMU
machdep.dmi.chassis-version = pc-i440fx-2.8
machdep.dmi.processor-vendor = QEMU
machdep.dmi.processor-version = pc-i440fx-2.8
machdep.dmi.processor-frequency = 2000 MHz
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/liveimage/emuimage/ec2_init
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/liveimage/emuimage/ec2_init
diff -u src/distrib/amd64/liveimage/emuimage/ec2_init:1.2 src/distrib/amd64/liveimage/emuimage/ec2_init:1.3
--- src/distrib/amd64/liveimage/emuimage/ec2_init:1.2 Wed Sep 9 13:25:48 2020
+++ src/distrib/amd64/liveimage/emuimage/ec2_init Thu Jul 15 17:20:25 2021
@@ -1,4 +1,4 @@
-# $NetBSD: ec2_init,v 1.2 2020/09/09 13:25:48 jmcneill Exp $
+# $NetBSD: ec2_init,v 1.3 2021/07/15 17:20:25 rhialto Exp $
is_ec2() {
val=NO
@@ -13,6 +13,10 @@ is_ec2() {
*amazon*)
val=YES
;;
+ # OpenStack is not EC2 but it does have a metadata service.
+ *openstack*)
+val=YES
+;;
esac
fi
done
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: mrg Date: Sun Jul 11 20:48:48 UTC 2021 Modified Files: src/distrib/sets/lists/xcomp: mi src/distrib/sets/lists/xdebug: shl.mi src/distrib/sets/lists/xserver: mi Log Message: remove mesa < 18 support To generate a diff of this commit: cvs rdiff -u -r1.224 -r1.225 src/distrib/sets/lists/xcomp/mi cvs rdiff -u -r1.61 -r1.62 src/distrib/sets/lists/xdebug/shl.mi cvs rdiff -u -r1.47 -r1.48 src/distrib/sets/lists/xserver/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.224 src/distrib/sets/lists/xcomp/mi:1.225 --- src/distrib/sets/lists/xcomp/mi:1.224 Sat Jan 9 02:40:44 2021 +++ src/distrib/sets/lists/xcomp/mi Sun Jul 11 20:48:48 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.224 2021/01/09 02:40:44 uki Exp $ +# $NetBSD: mi,v 1.225 2021/07/11 20:48:48 mrg Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -34,12 +34,11 @@ ./usr/X11R7/include/GL/internal/sarea.h xcomp-obsolete obsolete ./usr/X11R7/include/GL/osmesa.hxcomp-xorgproto-include xorg ./usr/X11R7/include/GL/wglext.hxcomp-xorgproto-include xorg -./usr/X11R7/include/GL/wmesa.hxcomp-obsolete xorg,obsolete,mesa_ver=18 -./usr/X11R7/include/GL/wmesa.hxcomp-xorgproto-include xorg,mesa_ver=10 +./usr/X11R7/include/GL/wmesa.hxcomp-obsolete obsolete ./usr/X11R7/include/GL/xmesa.hxcomp-obsolete obsolete ./usr/X11R7/include/GL/xmesa_x.h xcomp-obsolete obsolete ./usr/X11R7/include/GL/xmesa_xf86.h xcomp-obsolete obsolete -./usr/X11R7/include/KHR/khrplatform.h xcomp-KHR-include xorg,mesa_ver=18 +./usr/X11R7/include/KHR/khrplatform.h xcomp-KHR-include xorg ./usr/X11R7/include/X11/CallbackI.h xcomp-libXt-include xorg ./usr/X11R7/include/X11/Composite.h xcomp-libXt-include xorg ./usr/X11R7/include/X11/CompositeP.h xcomp-libXt-include xorg Index: src/distrib/sets/lists/xdebug/shl.mi diff -u src/distrib/sets/lists/xdebug/shl.mi:1.61 src/distrib/sets/lists/xdebug/shl.mi:1.62 --- src/distrib/sets/lists/xdebug/shl.mi:1.61 Sun Jul 11 00:08:06 2021 +++ src/distrib/sets/lists/xdebug/shl.mi Sun Jul 11 20:48:48 2021 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.61 2021/07/11 00:08:06 mrg Exp $ +# $NetBSD: shl.mi,v 1.62 2021/07/11 20:48:48 mrg Exp $ ./usr/libdata/debug/usr/X11R7/lib base-sys-usr xorg,debug,compatx11dir ./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libximcp.so.2.0.debug xorg,obsolete xorg,obsolete ./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcDef.so.2.0.debug xorg,obsolete xorg,obsolete @@ -107,11 +107,7 @@ ./usr/libdata/debug/usr/X11R7/lib/libxshmfence.so.1.0.debug xdebug-libxshmfence-debug xorg,debug,compatx11file ./usr/libdata/debug/usr/X11R7/lib/modules/dri/gallium_dri.so.0.debug xdebug-gallium-debug xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/dri/kms_swrast_dri.so.0.debug xdebug-MesaLib-debug xorg,debug -./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug xdebug-MesaLib-debug xorg,debug,machine=amd64,mesa_ver=10 -./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug xdebug-MesaLib-debug xorg,debug,machine=i386,mesa_ver=10 -./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug xdebug-obsolete xorg,obsolete,machine=amd64,mesa_ver=18 -./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug xdebug-obsolete xorg,obsolete,machine=i386,mesa_ver=18 -./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug xorg,obsolete obsolete,!machine=i386,!machine=amd64 +./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug xorg,obsolete obsolete ./usr/libdata/debug/usr/X11R7/lib/modules/dri/libswrast_dri.so.0.debug xorg,obsolete obsolete ./usr/libdata/debug/usr/X11R7/lib/modules/dri/nouveau_dri.so.0.debug xdebug-xf86-video-nouveau-debug xorg,debug,machine=amd64 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/nouveau_dri.so.0.debug xdebug-xf86-video-nouveau-debug xorg,debug,machine=i386 Index: src/distrib/sets/lists/xserver/mi diff -u src/distrib/sets/lists/xserver/mi:1.47 src/distrib/sets/lists/xserver/mi:1.48 --- src/distrib/sets/lists/xserver/mi:1.47 Sat Jan 9 02:40:44 2021 +++ src/distrib/sets/lists/xserver/mi Sun Jul 11 20:48:48 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.47 2021/01/09 02:40:44 uki Exp $ +# $NetBSD: mi,v 1.48 2021/07/11 20:48:48 mrg Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -9,16 +9,8 @@ ./usr/X11R7/lib/modules/dri/gallium_dri.so.0 xserver-gallium-drivers xorg ./usr/X11R7/lib/modules/dri/kms_swrast_dri.so xserver-MesaLib-drivers xorg ./usr/X11R7/lib/modules/dri/kms_swrast_dri.so.0 xserver-MesaLib-drivers xorg -./usr/X11R7/lib/modules/dri/libmesa_dri.so xserver-MesaLib-drivers xorg,machine=amd64,mesa_ver=10 -./usr/X11R7/lib/modules/dri/libmesa_dri.so
CVS commit: src/distrib/notes/hp300
Module Name:src Committed By: tsutsui Date: Sun Jul 11 14:17:48 UTC 2021 Modified Files: src/distrib/notes/hp300: hardware Log Message: 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.25 -r1.26 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.25 src/distrib/notes/hp300/hardware:1.26 --- src/distrib/notes/hp300/hardware:1.25 Sun Jul 11 13:53:48 2021 +++ src/distrib/notes/hp300/hardware Sun Jul 11 14:17:48 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: hardware,v 1.25 2021/07/11 13:53:48 tsutsui Exp $ +.\" $NetBSD: hardware,v 1.26 2021/07/11 14:17:48 tsutsui Exp $ . .Nx*M \*V will run on most HP 9000/300- and 400-series machines. @@ -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: src/distrib/notes/hp300
Module Name:src Committed By: tsutsui Date: Sun Jul 11 13:53:49 UTC 2021 Modified Files: src/distrib/notes/hp300: hardware Log Message: HP9000/360 can have up to 16 MB RAM, not 48 MB. Per Service Information Manual HP 9000 Series 300 Computers Models 360/370. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 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.24 src/distrib/notes/hp300/hardware:1.25 --- src/distrib/notes/hp300/hardware:1.24 Wed Dec 23 17:57:17 2020 +++ src/distrib/notes/hp300/hardware Sun Jul 11 13:53:48 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: hardware,v 1.24 2020/12/23 17:57:17 tsutsui Exp $ +.\" $NetBSD: hardware,v 1.25 2021/07/11 13:53:48 tsutsui 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
CVS commit: src/distrib/luna68k/ramdisk
Module Name:src Committed By: tsutsui Date: Sat Jul 10 03:19:12 UTC 2021 Modified Files: src/distrib/luna68k/ramdisk: list Log Message: Use more shrinked binaries from distrib/utils/x_foo versions. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/luna68k/ramdisk/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/luna68k/ramdisk/list diff -u src/distrib/luna68k/ramdisk/list:1.3 src/distrib/luna68k/ramdisk/list:1.4 --- src/distrib/luna68k/ramdisk/list:1.3 Thu Feb 20 14:30:23 2014 +++ src/distrib/luna68k/ramdisk/list Sat Jul 10 03:19:12 2021 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.3 2014/02/20 14:30:23 tsutsui Exp $ +# $NetBSD: list,v 1.4 2021/07/10 03:19:12 tsutsui Exp $ SRCDIRS bin sbin usr.bin usr.sbin @@ -57,10 +57,13 @@ PROG usr/sbin/chroot # init invokes the shell as -sh ARGVLN sh -sh +SPECIAL disklabel srcdir distrib/utils/x_disklabel SPECIAL ed srcdir distrib/utils/x_ed SPECIAL gzip srcdir distrib/utils/x_gzip +SPECIAL fsck_ffs srcdir distrib/utils/x_fsck_ffs SPECIAL ifconfig srcdir distrib/utils/x_ifconfig SPECIAL more srcdir distrib/utils/more +SPECIAL newfs srcdir distrib/utils/x_newfs SPECIAL ping srcdir distrib/utils/x_ping SPECIAL route srcdir distrib/utils/x_route SPECIAL umount srcdir distrib/utils/x_umount
CVS commit: src/distrib/hp300/ramdisk
Module Name:src Committed By: tsutsui Date: Fri Jul 9 19:11:06 UTC 2021 Modified Files: src/distrib/hp300/ramdisk: list Log Message: Use more shrinked binaries from distrib/utils/x_foo versions. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/distrib/hp300/ramdisk/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/hp300/ramdisk/list diff -u src/distrib/hp300/ramdisk/list:1.24 src/distrib/hp300/ramdisk/list:1.25 --- src/distrib/hp300/ramdisk/list:1.24 Fri Jan 14 10:26:32 2011 +++ src/distrib/hp300/ramdisk/list Fri Jul 9 19:11:06 2021 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.24 2011/01/14 10:26:32 tsutsui Exp $ +# $NetBSD: list,v 1.25 2021/07/09 19:11:06 tsutsui Exp $ SRCDIRS bin sbin usr.bin usr.sbin @@ -46,8 +46,11 @@ PROG usr/sbin/installboot # init invokes the shell as -sh ARGVLN sh -sh +SPECIAL disklabel srcdir distrib/utils/x_disklabel +SPECIAL fsck_ffs srcdir distrib/utils/x_fsck_ffs SPECIAL gzip srcdir distrib/utils/x_gzip SPECIAL ifconfig srcdir distrib/utils/x_ifconfig +SPECIAL newfs srcdir distrib/utils/x_newfs SPECIAL ping srcdir distrib/utils/x_ping SPECIAL route srcdir distrib/utils/x_route SPECIAL umount srcdir distrib/utils/x_umount
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Thu Jul 8 09:16:25 UTC 2021 Modified Files: src/distrib/sets/lists/debug: mi src/distrib/sets/lists/tests: mi Log Message: Add new interrupted stdio tests To generate a diff of this commit: cvs rdiff -u -r1.353 -r1.354 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.1078 -r1.1079 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.353 src/distrib/sets/lists/debug/mi:1.354 --- src/distrib/sets/lists/debug/mi:1.353 Mon May 17 00:07:41 2021 +++ src/distrib/sets/lists/debug/mi Thu Jul 8 05:16:24 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.353 2021/05/17 04:07:41 yamaguchi Exp $ +# $NetBSD: mi,v 1.354 2021/07/08 09:16:24 christos Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib comp-sys-usr compatdir ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile @@ -2088,6 +2088,9 @@ ./usr/libdata/debug/usr/tests/lib/libc/ssp/h_strncpy.debug tests-lib-debug debug,atf,ssp,compattestfile ./usr/libdata/debug/usr/tests/lib/libc/ssp/h_vsnprintf.debug tests-lib-debug debug,atf,ssp,compattestfile ./usr/libdata/debug/usr/tests/lib/libc/ssp/h_vsprintf.debug tests-lib-debug debug,atf,ssp,compattestfile +./usr/libdata/debug/usr/tests/lib/libc/stdio/h_intr.debug tests-lib-debug debug,atf,compattestfile +./usr/libdata/debug/usr/tests/lib/libc/stdio/h_makenumbers.debug tests-lib-debug debug,atf,compattestfile +./usr/libdata/debug/usr/tests/lib/libc/stdio/h_testnumbers.debug tests-lib-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/lib/libc/stdio/t_clearerr.debug tests-lib-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/lib/libc/stdio/t_fflush.debug tests-lib-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/lib/libc/stdio/t_fmemopen.debug tests-lib-debug debug,atf,compattestfile Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.1078 src/distrib/sets/lists/tests/mi:1.1079 --- src/distrib/sets/lists/tests/mi:1.1078 Thu Jul 8 01:18:49 2021 +++ src/distrib/sets/lists/tests/mi Thu Jul 8 05:16:24 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1078 2021/07/08 05:18:49 rillig Exp $ +# $NetBSD: mi,v 1.1079 2021/07/08 09:16:24 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -3063,12 +3063,16 @@ ./usr/tests/lib/libc/stdiotests-lib-tests compattestfile,atf ./usr/tests/lib/libc/stdio/Atffile tests-lib-tests compattestfile,atf ./usr/tests/lib/libc/stdio/Kyuafile tests-lib-tests compattestfile,atf,kyua +./usr/tests/lib/libc/stdio/h_intr tests-lib-tests compattestfile,atf +./usr/tests/lib/libc/stdio/h_makenumbers tests-lib-tests compattestfile,atf +./usr/tests/lib/libc/stdio/h_testnumbers tests-lib-tests compattestfile,atf ./usr/tests/lib/libc/stdio/t_clearerr tests-lib-tests compattestfile,atf ./usr/tests/lib/libc/stdio/t_fflush tests-lib-tests compattestfile,atf ./usr/tests/lib/libc/stdio/t_fmemopen tests-lib-tests compattestfile,atf ./usr/tests/lib/libc/stdio/t_fopen tests-lib-tests compattestfile,atf ./usr/tests/lib/libc/stdio/t_format tests-obsolete obsolete ./usr/tests/lib/libc/stdio/t_fputc tests-lib-tests compattestfile,atf +./usr/tests/lib/libc/stdio/t_intr tests-lib-tests compattestfile,atf ./usr/tests/lib/libc/stdio/t_mktemp tests-obsolete obsolete ./usr/tests/lib/libc/stdio/t_open_memstream tests-lib-tests compattestfile,atf ./usr/tests/lib/libc/stdio/t_popen tests-lib-tests compattestfile,atf
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Tue Jul 6 11:49:36 UTC 2021
Modified Files:
src/distrib/utils/embedded/conf: evbarm.conf evbmips.conf rpi_inst.conf
usermode.conf x86.conf
Log Message:
Disable kernfs on live images -- it is not required.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/distrib/utils/embedded/conf/evbarm.conf
cvs rdiff -u -r1.2 -r1.3 src/distrib/utils/embedded/conf/evbmips.conf
cvs rdiff -u -r1.17 -r1.18 src/distrib/utils/embedded/conf/rpi_inst.conf
cvs rdiff -u -r1.5 -r1.6 src/distrib/utils/embedded/conf/usermode.conf
cvs rdiff -u -r1.9 -r1.10 src/distrib/utils/embedded/conf/x86.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.38 src/distrib/utils/embedded/conf/evbarm.conf:1.39
--- src/distrib/utils/embedded/conf/evbarm.conf:1.38 Wed Dec 23 10:35:18 2020
+++ src/distrib/utils/embedded/conf/evbarm.conf Tue Jul 6 11:49:36 2021
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.38 2020/12/23 10:35:18 rin Exp $
+# $NetBSD: evbarm.conf,v 1.39 2021/07/06 11:49:36 jmcneill Exp $
# evbarm shared config
#
image=$HOME/${board}.img
@@ -71,7 +71,6 @@ make_fstab_evbarm_gpt() {
# See /usr/share/examples/fstab/ for more examples.
NAME=${gpt_label_ffs:-netbsd-root} / ffs rw,noatime 1 1
NAME=${gpt_label_boot:-EFI} /boot msdos rw 1 1
-kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw
procfs /proc procfs rw
tmpfs /var/shm tmpfs rw,-m1777,-sram%25
@@ -84,7 +83,6 @@ make_fstab_evbarm_normal() {
# See /usr/share/examples/fstab/ for more examples.
ROOT.a / ffs rw,noatime 1 1
ROOT.e /boot msdos rw 1 1
-kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw
procfs /proc procfs rw
tmpfs /var/shm tmpfs rw,-m1777,-sram%25
@@ -100,7 +98,6 @@ make_fstab_evbarm_minwrites() {
# See /usr/share/examples/fstab/ for more examples.
ROOT.a / ffs rw,log,noatime,nodevmtime 1 1
ROOT.e /boot msdos rw 1 1
-kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw
procfs /proc procfs rw
tmpfs /tmp tmpfs rw,-s32M
@@ -128,8 +125,6 @@ make_fstab_evbarm() {
# Missing mount points from fstab
echo "./proc type=dir uname=root gname=wheel mode=0755" \
>> "$tmp/selected_sets"
- echo "./kern type=dir uname=root gname=wheel mode=0755" \
- >> "$tmp/selected_sets"
}
customize_evbarm() {
Index: src/distrib/utils/embedded/conf/evbmips.conf
diff -u src/distrib/utils/embedded/conf/evbmips.conf:1.2 src/distrib/utils/embedded/conf/evbmips.conf:1.3
--- src/distrib/utils/embedded/conf/evbmips.conf:1.2 Wed Dec 23 10:35:18 2020
+++ src/distrib/utils/embedded/conf/evbmips.conf Tue Jul 6 11:49:36 2021
@@ -1,4 +1,4 @@
-# $NetBSD: evbmips.conf,v 1.2 2020/12/23 10:35:18 rin Exp $
+# $NetBSD: evbmips.conf,v 1.3 2021/07/06 11:49:36 jmcneill Exp $
# evbmips shared config
#
image=$HOME/${board}.img
@@ -71,7 +71,6 @@ make_fstab_evbmips_gpt() {
# See /usr/share/examples/fstab/ for more examples.
NAME=${gpt_label_ffs:-netbsd-root} / ffs rw,noatime 1 1
NAME=${gpt_label_boot:-boot} /boot msdos rw 1 1
-kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw
procfs /proc procfs rw
tmpfs /var/shm tmpfs rw,-m1777,-sram%25
@@ -84,7 +83,6 @@ make_fstab_evbmips_normal() {
# See /usr/share/examples/fstab/ for more examples.
ROOT.a / ffs rw,noatime 1 1
ROOT.e /boot msdos rw 1 1
-kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw
procfs /proc procfs rw
tmpfs /var/shm tmpfs rw,-m1777,-sram%25
@@ -100,7 +98,6 @@ make_fstab_evbmips_minwrites() {
# See /usr/share/examples/fstab/ for more examples.
ROOT.a / ffs rw,log,noatime,nodevmtime 1 1
ROOT.e /boot msdos rw 1 1
-kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw
procfs /proc procfs rw
tmpfs /tmp tmpfs rw,-s32M
@@ -128,8 +125,6 @@ make_fstab_evbmips() {
# Missing mount points from fstab
echo "./proc type=dir uname=root gname=wheel mode=0755" \
>> "$tmp/selected_sets"
- echo "./kern type=dir uname=root gname=wheel mode=0755" \
- >> "$tmp/selected_sets"
}
customize_evbmips() {
Index: src/distrib/utils/embedded/conf/rpi_inst.conf
diff -u src/distrib/utils/embedded/conf/rpi_inst.conf:1.17 src/distrib/utils/embedded/conf/rpi_inst.conf:1.18
--- src/distrib/utils/embedded/conf/rpi_inst.conf:1.17 Tue Dec 1 04:21:10 2020
+++ src/distrib/utils/embedded/conf/rpi_inst.conf Tue Jul 6 11:49:36 2021
@@ -1,4 +1,4 @@
-# $NetBSD: rpi_inst.conf,v 1.17 2020/12/01 04:21:10 rin Exp $
+# $NetBSD: rpi_inst.conf,v 1.18 2021/07/06 11:49:36 jmcneill Exp $
# Raspberry Pi customization script used by mkimage
#
@@ -24,7 +24,7 @@ make_label() {
customize() {
echo "${bar} creating directories ${bar}"
- mkdir ${mnt}/proc ${mnt}/kern
+ mkdir ${mnt}/proc
}
make_fstab() {
Index: src/distrib/utils/embedded/conf/usermode.conf
diff -u
CVS commit: src/distrib/utils/embedded/files
Module Name:src
Committed By: jmcneill
Date: Thu Jul 1 18:05:45 UTC 2021
Modified Files:
src/distrib/utils/embedded/files: ec2_init
Log Message:
AWS marketplace does not allow root ssh logins. Create an ec2-user account
and install the ssh key in that user's home directory instead.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/embedded/files/ec2_init
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/files/ec2_init
diff -u src/distrib/utils/embedded/files/ec2_init:1.1 src/distrib/utils/embedded/files/ec2_init:1.2
--- src/distrib/utils/embedded/files/ec2_init:1.1 Fri Nov 30 20:53:02 2018
+++ src/distrib/utils/embedded/files/ec2_init Thu Jul 1 18:05:45 2021
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: ec2_init,v 1.1 2018/11/30 20:53:02 jmcneill Exp $
+# $NetBSD: ec2_init,v 1.2 2021/07/01 18:05:45 jmcneill Exp $
#
# PROVIDE: ec2_init
# REQUIRE: NETWORKING
@@ -13,24 +13,37 @@ rcvar=${name}
start_cmd="ec2_init"
stop_cmd=":"
+EC2_USER="ec2-user"
METADATA_URL="http://169.254.169.254/latest/meta-data/;
SSH_KEY_URL="public-keys/0/openssh-key"
HOSTNAME_URL="hostname"
-SSH_KEY_FILE="/root/.ssh/authorized_keys"
+SSH_KEY_FILE="/home/${EC2_USER}/.ssh/authorized_keys"
+
+ec2_newuser()
+{
+ echo "Creating EC2 user account ${EC2_USER}"
+ useradd -g users -G wheel,operator -m "${EC2_USER}"
+}
ec2_init()
{
(
umask 022
+
+ # create EC2 user
+ id "${EC2_USER}" >/dev/null 2>&1 || ec2_newuser
+
# fetch the key pair from Amazon Web Services
EC2_SSH_KEY=$(ftp -o - "${METADATA_URL}${SSH_KEY_URL}")
if [ -n "$EC2_SSH_KEY" ]; then
# A key pair is associated with this instance, add it
- # to root 'authorized_keys' file
+ # to EC2_USER's 'authorized_keys' file
mkdir -p $(dirname "$SSH_KEY_FILE")
+ chown "${EC2_USER}:users" $(dirname "$SSH_KEY_FILE")
touch "$SSH_KEY_FILE"
+ chown "${EC2_USER}:users" "$SSH_KEY_FILE"
cd $(dirname "$SSH_KEY_FILE")
grep -q "$EC2_SSH_KEY" "$SSH_KEY_FILE"
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Thu Jul 1 17:31:21 UTC 2021
Modified Files:
src/distrib/utils/embedded/conf: arm64mbr.conf
Log Message:
No need for ec2_init on arm64mbr
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/embedded/conf/arm64mbr.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/arm64mbr.conf
diff -u src/distrib/utils/embedded/conf/arm64mbr.conf:1.1 src/distrib/utils/embedded/conf/arm64mbr.conf:1.2
--- src/distrib/utils/embedded/conf/arm64mbr.conf:1.1 Thu May 28 10:22:49 2020
+++ src/distrib/utils/embedded/conf/arm64mbr.conf Thu Jul 1 17:31:21 2021
@@ -1,4 +1,4 @@
-# $NetBSD: arm64mbr.conf,v 1.1 2020/05/28 10:22:49 jmcneill Exp $
+# $NetBSD: arm64mbr.conf,v 1.2 2021/07/01 17:31:21 jmcneill Exp $
# ARM64 (MBR partitioning) customization script used by mkimage
#
board=arm64mbr
@@ -24,16 +24,10 @@ customize() {
mdnsd=YES
devpubd=YES
wscons=\$(dev_exists wsdisplay0)
-ec2_init=\$(dev_exists ena0)
EOF
}
populate_common() {
- # Add EC2 init script
- cp ${DIR}/files/ec2_init ${mnt}/etc/rc.d/ec2_init
- echo "./etc/rc.d/ec2_init type=file uname=root gname=wheel mode=0555" \
- >> "$tmp/selected_sets"
-
# Rename kernel to netbsd.img
mv "${mnt}/boot/netbsd-${kernel_GENERIC64}.img" "${mnt}/boot/netbsd.img"
CVS commit: src/distrib/utils/embedded/conf
Module Name:src Committed By: jmcneill Date: Thu Jul 1 17:32:07 UTC 2021 Modified Files: src/distrib/utils/embedded/conf: arm64.conf Log Message: port-evbarm/56274: no network on ec2 arm64 9.99.85 Add -w to dhcpcd_flags when running on EC2, since we need to wait for the network to come up before contacting the metadata service. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/distrib/utils/embedded/conf/arm64.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/arm64.conf diff -u src/distrib/utils/embedded/conf/arm64.conf:1.12 src/distrib/utils/embedded/conf/arm64.conf:1.13 --- src/distrib/utils/embedded/conf/arm64.conf:1.12 Fri Jul 17 15:16:34 2020 +++ src/distrib/utils/embedded/conf/arm64.conf Thu Jul 1 17:32:07 2021 @@ -1,4 +1,4 @@ -# $NetBSD: arm64.conf,v 1.12 2020/07/17 15:16:34 jmcneill Exp $ +# $NetBSD: arm64.conf,v 1.13 2021/07/01 17:32:07 jmcneill Exp $ # ARM64 customization script used by mkimage # board=arm64 @@ -29,6 +29,9 @@ mdnsd=YES devpubd=YES wscons=\$(dev_exists wsdisplay0) ec2_init=\$(dev_exists ena0) +if checkyesno ec2_init ; then + dhcpcd_flags="\$dhcpcd_flags -w" +fi EOF }
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: rillig Date: Sun Jun 27 12:11:10 UTC 2021 Modified Files: src/distrib/sets/lists/tests: mi Log Message: tests/lint: fix list of files to be installed To generate a diff of this commit: cvs rdiff -u -r1.1064 -r1.1065 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.1064 src/distrib/sets/lists/tests/mi:1.1065 --- src/distrib/sets/lists/tests/mi:1.1064 Sun Jun 27 09:22:31 2021 +++ src/distrib/sets/lists/tests/mi Sun Jun 27 12:11:10 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1064 2021/06/27 09:22:31 rillig Exp $ +# $NetBSD: mi,v 1.1065 2021/06/27 12:11:10 rillig Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -6201,9 +6201,9 @@ ./usr/tests/usr.bin/xlint/lint1/decl_struct_member.c tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/xlint/lint1/decl_struct_member.exp tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/xlint/lint1/emit.ctests-usr.bin-tests compattestfile,atf -./usr/tests/usr.bin/xlint/lint1/emit.exp tests-obsolete obsolete +./usr/tests/usr.bin/xlint/lint1/emit.exp tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/xlint/lint1/emit.exp-ln tests-usr.bin-tests compattestfile,atf -./usr/tests/usr.bin/xlint/lint1/emit.lntests-usr.bin-tests compattestfile,atf +./usr/tests/usr.bin/xlint/lint1/emit.lnobsolete obsolete ./usr/tests/usr.bin/xlint/lint1/expr_range.c tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/xlint/lint1/expr_range.exp tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/xlint/lint1/feat_stacktrace.c tests-usr.bin-tests compattestfile,atf
CVS commit: src/distrib
Module Name:src
Committed By: tsutsui
Date: Sun Jun 27 05:25:12 UTC 2021
Modified Files:
src/distrib/sun2/miniroot: list
src/distrib/sun3/miniroot: list
Log Message:
Use more SMALL binaries and reduce diffs between sun2 and sun3.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/distrib/sun2/miniroot/list
cvs rdiff -u -r1.31 -r1.32 src/distrib/sun3/miniroot/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/sun2/miniroot/list
diff -u src/distrib/sun2/miniroot/list:1.24 src/distrib/sun2/miniroot/list:1.25
--- src/distrib/sun2/miniroot/list:1.24 Mon Mar 1 16:49:07 2021
+++ src/distrib/sun2/miniroot/list Sun Jun 27 05:25:12 2021
@@ -1,5 +1,5 @@
#
-# $NetBSD: list,v 1.24 2021/03/01 16:49:07 martin Exp $
+# $NetBSD: list,v 1.25 2021/06/27 05:25:12 tsutsui Exp $
#
# The PROM provides a default kernel name of "vmunix"
@@ -103,7 +103,7 @@ PROG bin/ls
PROG bin/mkdir
PROG bin/mt
PROG bin/mv
-PROG bin/pax usr/bin/tar usr/bin/cpio
+PROG bin/pax usr/bin/tar usr/bin/cpio
PROG bin/ps
PROG bin/pwd
PROG bin/rm
@@ -148,6 +148,7 @@ SPECIAL ifconfig srcdir distrib/utils/x_
SPECIAL newfs srcdir distrib/utils/x_newfs
SPECIAL ping srcdir distrib/utils/x_ping
SPECIAL route srcdir distrib/utils/x_route
+SPECIAL umount srcdir distrib/utils/x_umount
SPECIAL more srcdir distrib/utils/more
SPECIAL edlabel srcdir distrib/utils/edlabel
Index: src/distrib/sun3/miniroot/list
diff -u src/distrib/sun3/miniroot/list:1.31 src/distrib/sun3/miniroot/list:1.32
--- src/distrib/sun3/miniroot/list:1.31 Sun Apr 5 11:19:01 2020
+++ src/distrib/sun3/miniroot/list Sun Jun 27 05:25:12 2021
@@ -1,5 +1,5 @@
#
-# $NetBSD: list,v 1.31 2020/04/05 11:19:01 martin Exp $
+# $NetBSD: list,v 1.32 2021/06/27 05:25:12 tsutsui Exp $
#
COPY ${KERNEL3} netbsd.sun3
@@ -55,7 +55,7 @@ SRCDIRS bin sbin usr.bin usr.sbin
PROG sbin/disklabel
PROG sbin/dmesg
-PROG sbin/edlabel
+PROG sbin/edlabel
PROG sbin/fsck
PROG sbin/fsck_ffs
@@ -74,9 +74,9 @@ PROG sbin/newfs sbin/mount_mfs
PROG sbin/ping
PROG sbin/reboot sbin/halt
-PROG sbin/route
PROG sbin/restore sbin/rrestore
+PROG sbin/route
PROG sbin/shutdown
PROG sbin/slattach
PROG sbin/swapctl
@@ -132,19 +132,25 @@ PROG usr/bin/rsh
PROG usr/bin/sed
PROG usr/bin/tip
PROG usr/bin/vi
+
PROG usr/bin/gzip usr/bin/gzcat usr/bin/gunzip
# install.md still uses sort
PROG usr/bin/sort
-SPECIAL less srcdir external/bsd/less/bin/less
-SPECIAL vi srcdir external/bsd/nvi/usr.bin/nvi
+SPECIAL less srcdir external/bsd/less/bin/less
+SPECIAL vi srcdir external/bsd/nvi/usr.bin/nvi
+SPECIAL disklabel srcdir distrib/utils/x_disklabel
SPECIAL ed srcdir distrib/utils/x_ed
+SPECIAL fsck_ffs srcdir distrib/utils/x_fsck_ffs
SPECIAL gzip srcdir distrib/utils/x_gzip
SPECIAL ifconfig srcdir distrib/utils/x_ifconfig
+SPECIAL newfs srcdir distrib/utils/x_newfs
SPECIAL ping srcdir distrib/utils/x_ping
SPECIAL route srcdir distrib/utils/x_route
+SPECIAL umount srcdir distrib/utils/x_umount
+
SPECIAL edlabel srcdir distrib/utils/edlabel
ARGVLN sh -sh
CVS commit: src/distrib
Module Name:src
Committed By: tsutsui
Date: Sat Jun 26 00:38:16 UTC 2021
Modified Files:
src/distrib/sun2/miniroot: install.md
src/distrib/sun3/miniroot: install.md
Log Message:
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.8 -r1.9 src/distrib/sun2/miniroot/install.md
cvs rdiff -u -r1.8 -r1.9 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.8 src/distrib/sun2/miniroot/install.md:1.9
--- src/distrib/sun2/miniroot/install.md:1.8 Sat Jun 26 00:25:41 2021
+++ src/distrib/sun2/miniroot/install.md Sat Jun 26 00:38:16 2021
@@ -1,4 +1,4 @@
-# $NetBSD: install.md,v 1.8 2021/06/26 00:25:41 tsutsui Exp $
+# $NetBSD: install.md,v 1.9 2021/06/26 00:38:16 tsutsui Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -49,11 +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 /
- cp /dev/null /tmp/root_writable
fi
}
Index: src/distrib/sun3/miniroot/install.md
diff -u src/distrib/sun3/miniroot/install.md:1.8 src/distrib/sun3/miniroot/install.md:1.9
--- src/distrib/sun3/miniroot/install.md:1.8 Sat Jun 26 00:25:41 2021
+++ src/distrib/sun3/miniroot/install.md Sat Jun 26 00:38:16 2021
@@ -1,4 +1,4 @@
-# $NetBSD: install.md,v 1.8 2021/06/26 00:25:41 tsutsui Exp $
+# $NetBSD: install.md,v 1.9 2021/06/26 00:38:16 tsutsui Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -49,11 +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 /
- cp /dev/null /tmp/root_writable
fi
}
CVS commit: src/distrib/amiga/miniroot
Module Name:src
Committed By: tsutsui
Date: Sat Jun 26 00:28:19 UTC 2021
Modified Files:
src/distrib/amiga/miniroot: install.md
Log Message:
Remove an obsolete comment.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/distrib/amiga/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.32 src/distrib/amiga/miniroot/install.md:1.33
--- src/distrib/amiga/miniroot/install.md:1.32 Thu Feb 25 21:46:55 2021
+++ src/distrib/amiga/miniroot/install.md Sat Jun 26 00:28:19 2021
@@ -1,4 +1,4 @@
-# $NetBSD: install.md,v 1.32 2021/02/25 21:46:55 rin Exp $
+# $NetBSD: install.md,v 1.33 2021/06/26 00:28:19 tsutsui Exp $
#
#
# Copyright (c) 1996,2006 The NetBSD Foundation, Inc.
@@ -50,7 +50,6 @@ md_makerootwritable() {
# Mount root rw for convenience of the tester ;-)
if ! cp /dev/null /tmp/.root_writable >/dev/null 2>&1; then
mi_mount_kernfs
- # XXX: Use /kern/rootdev instead?
mount -t ffs -u /kern/rootdev / > /dev/null 2>&1
fi
}
CVS commit: src/distrib
Module Name:src
Committed By: tsutsui
Date: Sat Jun 26 00:25:41 UTC 2021
Modified Files:
src/distrib/sun2/miniroot: install.md
src/distrib/sun3/miniroot: install.md
Log Message:
Don't try to add swap on miniroot.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/distrib/sun2/miniroot/install.md
cvs rdiff -u -r1.7 -r1.8 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.7 src/distrib/sun2/miniroot/install.md:1.8
--- src/distrib/sun2/miniroot/install.md:1.7 Sat Dec 5 18:52:06 2020
+++ src/distrib/sun2/miniroot/install.md Sat Jun 26 00:25:41 2021
@@ -1,4 +1,4 @@
-# $NetBSD: install.md,v 1.7 2020/12/05 18:52:06 tsutsui Exp $
+# $NetBSD: install.md,v 1.8 2021/06/26 00:25:41 tsutsui Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -53,7 +53,6 @@ md_makerootwritable() {
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.7 src/distrib/sun3/miniroot/install.md:1.8
--- src/distrib/sun3/miniroot/install.md:1.7 Sat Dec 5 18:52:06 2020
+++ src/distrib/sun3/miniroot/install.md Sat Jun 26 00:25:41 2021
@@ -1,4 +1,4 @@
-# $NetBSD: install.md,v 1.7 2020/12/05 18:52:06 tsutsui Exp $
+# $NetBSD: install.md,v 1.8 2021/06/26 00:25:41 tsutsui Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -53,7 +53,6 @@ md_makerootwritable() {
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: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Wed Jun 23 18:30:33 UTC 2021 Modified Files: src/distrib/sets/lists/base: md.amd64 src/distrib/sets/lists/debug: md.amd64 Log Message: build gdbserver only when we build gdb (from adam) To generate a diff of this commit: cvs rdiff -u -r1.284 -r1.285 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.114 -r1.115 src/distrib/sets/lists/debug/md.amd64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/md.amd64 diff -u src/distrib/sets/lists/base/md.amd64:1.284 src/distrib/sets/lists/base/md.amd64:1.285 --- src/distrib/sets/lists/base/md.amd64:1.284 Mon Jun 7 10:24:42 2021 +++ src/distrib/sets/lists/base/md.amd64 Wed Jun 23 14:30:32 2021 @@ -1,9 +1,9 @@ -# $NetBSD: md.amd64,v 1.284 2021/06/07 14:24:42 christos Exp $ +# $NetBSD: md.amd64,v 1.285 2021/06/23 18:30:32 christos Exp $ ./dev/lms0 base-obsolete obsolete ./dev/mms0 base-obsolete obsolete ./libexec/ld.elf_so-i386 base-sys-shlib compat,pic ./usr/bin/fdformatbase-util-bin -./usr/bin/gdbserverbase-util-bin +./usr/bin/gdbserverbase-util-bin gdb ./usr/bin/pmc base-obsolete obsolete ./usr/lib/i386/libi386.so.2 base-compat-shlib compat,pic ./usr/lib/i386/libi386.so.2.0 base-compat-shlib compat,pic Index: src/distrib/sets/lists/debug/md.amd64 diff -u src/distrib/sets/lists/debug/md.amd64:1.114 src/distrib/sets/lists/debug/md.amd64:1.115 --- src/distrib/sets/lists/debug/md.amd64:1.114 Mon Jun 7 10:24:42 2021 +++ src/distrib/sets/lists/debug/md.amd64 Wed Jun 23 14:30:33 2021 @@ -1,5 +1,5 @@ -# $NetBSD: md.amd64,v 1.114 2021/06/07 14:24:42 christos Exp $ -./usr/libdata/debug/usr/bin/gdbserver.debug base-util-debug debug +# $NetBSD: md.amd64,v 1.115 2021/06/23 18:30:33 christos Exp $ +./usr/libdata/debug/usr/bin/gdbserver.debug base-util-debug gdb,debug ./usr/lib/i386/12.202++_g.a comp-c-debuglib debuglib,compat,12.202xx ./usr/lib/i386/libi386_g.a comp-c-debuglib debuglib,compat ./usr/lib/i386/libiberty_g.a comp-obsolete obsolete
CVS commit: src/distrib/miniroot
Module Name:src Committed By: tsutsui Date: Sat Jun 19 00:54:27 UTC 2021 Modified Files: src/distrib/miniroot: install.sub Log Message: 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.61 -r1.62 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.61 src/distrib/miniroot/install.sub:1.62 --- src/distrib/miniroot/install.sub:1.61 Sat Jun 19 00:00:26 2021 +++ src/distrib/miniroot/install.sub Sat Jun 19 00:54:27 2021 @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: install.sub,v 1.61 2021/06/19 00:00:26 tsutsui Exp $ +# $NetBSD: install.sub,v 1.62 2021/06/19 00:54:27 tsutsui 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
CVS commit: src/distrib/miniroot
Module Name:src
Committed By: tsutsui
Date: Sat Jun 19 00:00:27 UTC 2021
Modified Files:
src/distrib/miniroot: install.sub
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 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.60 src/distrib/miniroot/install.sub:1.61
--- src/distrib/miniroot/install.sub:1.60 Sat May 29 23:46:14 2021
+++ src/distrib/miniroot/install.sub Sat Jun 19 00:00:26 2021
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: install.sub,v 1.60 2021/05/29 23:46:14 tsutsui Exp $
+# $NetBSD: install.sub,v 1.61 2021/06/19 00:00:26 tsutsui Exp $
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -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
CVS commit: src/distrib
Module Name:src
Committed By: tsutsui
Date: Fri Jun 18 23:55:20 UTC 2021
Modified Files:
src/distrib/sun2/miniroot: Makefile
src/distrib/sun3/miniroot: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/distrib/sun2/miniroot/Makefile
cvs rdiff -u -r1.49 -r1.50 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/sun2/miniroot/Makefile
diff -u src/distrib/sun2/miniroot/Makefile:1.39 src/distrib/sun2/miniroot/Makefile:1.40
--- src/distrib/sun2/miniroot/Makefile:1.39 Mon Mar 1 09:24:27 2021
+++ src/distrib/sun2/miniroot/Makefile Fri Jun 18 23:55:20 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2021/03/01 09:24:27 martin Exp $
+# $NetBSD: Makefile,v 1.40 2021/06/18 23:55:20 tsutsui Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -57,7 +57,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.49 src/distrib/sun3/miniroot/Makefile:1.50
--- src/distrib/sun3/miniroot/Makefile:1.49 Sun Dec 29 18:26:19 2019
+++ src/distrib/sun3/miniroot/Makefile Fri Jun 18 23:55:20 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2019/12/29 18:26:19 christos Exp $
+# $NetBSD: Makefile,v 1.50 2021/06/18 23:55:20 tsutsui Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -52,7 +52,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: src/distrib/sun2/ramdisk
Module Name:src
Committed By: mrg
Date: Fri Jun 18 20:30:58 UTC 2021
Modified Files:
src/distrib/sun2/ramdisk: Makefile
Log Message:
make this build with GCC 10.
change makefs flags from:
density=2048
to:
density=3072,bsize=4096,fsize=512,optimization=space
so that everything fits again. add some comment GCC flags
that may help reduce size a little more.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/distrib/sun2/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/sun2/ramdisk/Makefile
diff -u src/distrib/sun2/ramdisk/Makefile:1.26 src/distrib/sun2/ramdisk/Makefile:1.27
--- src/distrib/sun2/ramdisk/Makefile:1.26 Mon Mar 1 16:50:01 2021
+++ src/distrib/sun2/ramdisk/Makefile Fri Jun 18 20:30:58 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2021/03/01 16:50:01 martin Exp $
+# $NetBSD: Makefile,v 1.27 2021/06/18 20:30:58 mrg Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -6,10 +6,28 @@
IMAGE= ramdisk.fs
IMAGESIZE= 600k
-MAKEFS_FLAGS+= -f 15 -o density=2048
+MAKEFS_FLAGS+= -f 15 -o density=3072,bsize=4096,fsize=512,optimization=space
WARNS= 1
-DBG= -Os -fno-unwind-tables
+DBG= -Os -fno-unwind-tables -fno-ident
+
+# XXXMRG - see if these help/hinder reduced size?
+#-fno-jump-tables
+#-fzero-initialized-in-bss
+#-fgcse-after-reload
+#-fdelete-null-pointer-checks
+#-fno-sched-interblock
+#-fno-sched-spec
+#-fsched-pressure
+#-fcode-hoisting
+#-ftree-partial-pre
+#-fno-ipa-cp
+#-ftree-builtin-call-dce
+#-fno-align-functions
+#-fno-align-loops
+#-fno-align-jumps
+#-fno-align-labels
+#-fallow-store-data-races
CRUNCHBIN= rd_bin
LISTS= ${.CURDIR}/list
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Thu Jun 17 01:17:28 UTC 2021 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/comp: mi src/distrib/sets/lists/debug: shl.mi Log Message: new libfido2 To generate a diff of this commit: cvs rdiff -u -r1.920 -r1.921 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.2388 -r1.2389 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.277 -r1.278 src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.920 src/distrib/sets/lists/base/shl.mi:1.921 --- src/distrib/sets/lists/base/shl.mi:1.920 Mon May 17 00:07:41 2021 +++ src/distrib/sets/lists/base/shl.mi Wed Jun 16 21:17:27 2021 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.920 2021/05/17 04:07:41 yamaguchi Exp $ +# $NetBSD: shl.mi,v 1.921 2021/06/17 01:17:27 christos Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -328,8 +328,8 @@ ./usr/lib/libfetch.so.3base-sys-shlib compatfile ./usr/lib/libfetch.so.3.0 base-sys-shlib compatfile ./usr/lib/libfido2.sobase-sys-shlib compatfile -./usr/lib/libfido2.so.2base-sys-shlib compatfile -./usr/lib/libfido2.so.2.1 base-sys-shlib compatfile +./usr/lib/libfido2.so.3base-sys-shlib compatfile +./usr/lib/libfido2.so.3.0 base-sys-shlib compatfile ./usr/lib/libform.sobase-sys-shlib compatfile ./usr/lib/libform.so.8base-sys-shlib compatfile ./usr/lib/libform.so.8.0 base-sys-shlib compatfile Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2388 src/distrib/sets/lists/comp/mi:1.2389 --- src/distrib/sets/lists/comp/mi:1.2388 Sat May 29 21:56:45 2021 +++ src/distrib/sets/lists/comp/mi Wed Jun 16 21:17:28 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2388 2021/05/30 01:56:45 joerg Exp $ +# $NetBSD: mi,v 1.2389 2021/06/17 01:17:28 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -952,6 +952,7 @@ ./usr/include/fido.hcomp-c-include ./usr/include/fido/bio.h comp-c-include ./usr/include/fido/credman.h comp-c-include +./usr/include/fido/config.h comp-c-include ./usr/include/fido/eddsa.h comp-c-include ./usr/include/fido/err.h comp-c-include ./usr/include/fido/es256.h comp-c-include @@ -7356,9 +7357,11 @@ ./usr/share/man/cat3/fido_cred_set_authdata.0 comp-c-catman .cat ./usr/share/man/cat3/fido_cred_verify.0 comp-c-catman .cat ./usr/share/man/cat3/fido_credman_metadata_new.0 comp-c-catman .cat +./usr/share/man/cat3/fido_dev_enable_entattest.0 comp-c-catman .cat ./usr/share/man/cat3/fido_dev_get_assert.0 comp-c-catman .cat ./usr/share/man/cat3/fido_dev_get_touch_begin.0 comp-c-catman .cat ./usr/share/man/cat3/fido_dev_info_manifest.0 comp-c-catman .cat +./usr/share/man/cat3/fido_dev_largeblob_get.0 comp-c-catman .cat ./usr/share/man/cat3/fido_dev_make_cred.0 comp-c-catman .cat ./usr/share/man/cat3/fido_dev_open.0 comp-c-catman .cat ./usr/share/man/cat3/fido_dev_set_io_functions.0 comp-c-catman .cat @@ -15639,9 +15642,11 @@ ./usr/share/man/html3/fido_cred_set_authdata.html comp-c-htmlman html ./usr/share/man/html3/fido_cred_verify.html comp-c-htmlman html ./usr/share/man/html3/fido_credman_metadata_new.html comp-c-htmlman html +./usr/share/man/html3/fido_dev_enable_entattest.html comp-c-htmlman html ./usr/share/man/html3/fido_dev_get_assert.html comp-c-htmlman html ./usr/share/man/html3/fido_dev_get_touch_begin.html comp-c-htmlman html ./usr/share/man/html3/fido_dev_info_manifest.html comp-c-htmlman html +./usr/share/man/html3/fido_dev_largeblob_get.html comp-c-htmlman html ./usr/share/man/html3/fido_dev_make_cred.html comp-c-htmlman html ./usr/share/man/html3/fido_dev_open.html comp-c-htmlman html ./usr/share/man/html3/fido_dev_set_io_functions.html comp-c-htmlman html @@ -23860,9 +23865,11 @@ ./usr/share/man/man3/fido_cred_set_authdata.3 comp-c-man .man ./usr/share/man/man3/fido_cred_verify.3 comp-c-man .man ./usr/share/man/man3/fido_credman_metadata_new.3 comp-c-man .man +./usr/share/man/man3/fido_dev_enable_entattest.3 comp-c-man .man ./usr/share/man/man3/fido_dev_get_assert.3 comp-c-man .man ./usr/share/man/man3/fido_dev_get_touch_begin.3 comp-c-man .man ./usr/share/man/man3/fido_dev_info_manifest.3 comp-c-man .man +./usr/share/man/man3/fido_dev_largeblob_get.3 comp-c-man .man ./usr/share/man/man3/fido_dev_make_cred.3 comp-c-man .man ./usr/share/man/man3/fido_dev_open.3 comp-c-man .man ./usr/share/man/man3/fido_dev_set_io_functions.3 comp-c-man .man Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.277 src/distrib/sets/lists/debug/shl.mi:1.278 --- src/distrib/sets/lists/debug/shl.mi:1.277 Mon May 17
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: blymn Date: Sun Jun 6 04:59:36 UTC 2021 Modified Files: src/distrib/sets/lists/tests: mi Log Message: New check files added for the libcurses addstr test. To generate a diff of this commit: cvs rdiff -u -r1.1055 -r1.1056 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.1055 src/distrib/sets/lists/tests/mi:1.1056 --- src/distrib/sets/lists/tests/mi:1.1055 Sat Jun 5 22:17:15 2021 +++ src/distrib/sets/lists/tests/mi Sun Jun 6 04:59:36 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1055 2021/06/05 22:17:15 blymn Exp $ +# $NetBSD: mi,v 1.1056 2021/06/06 04:59:36 blymn Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -3270,6 +3270,8 @@ ./usr/tests/lib/libcurses/check_files/addnwstr1.chk tests-lib-tests compattestfile,atf ./usr/tests/lib/libcurses/check_files/addnwstr2.chk tests-lib-tests compattestfile,atf ./usr/tests/lib/libcurses/check_files/addstr.chk tests-lib-tests compattestfile,atf +./usr/tests/lib/libcurses/check_files/addstr2.chk tests-lib-tests compattestfile,atf +./usr/tests/lib/libcurses/check_files/addstr3.chk tests-lib-tests compattestfile,atf ./usr/tests/lib/libcurses/check_files/addwstr1.chk tests-lib-tests compattestfile,atf ./usr/tests/lib/libcurses/check_files/addwstr2.chk tests-lib-tests compattestfile,atf ./usr/tests/lib/libcurses/check_files/addwstr3.chk tests-lib-tests compattestfile,atf
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: blymn Date: Sat Jun 5 22:17:15 UTC 2021 Modified Files: src/distrib/sets/lists/tests: mi Log Message: New check file for libcurses clear test. To generate a diff of this commit: cvs rdiff -u -r1.1054 -r1.1055 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.1054 src/distrib/sets/lists/tests/mi:1.1055 --- src/distrib/sets/lists/tests/mi:1.1054 Tue May 25 19:22:18 2021 +++ src/distrib/sets/lists/tests/mi Sat Jun 5 22:17:15 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1054 2021/05/25 19:22:18 rillig Exp $ +# $NetBSD: mi,v 1.1055 2021/06/05 22:17:15 blymn Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -3290,6 +3290,7 @@ ./usr/tests/lib/libcurses/check_files/chgat1.chk tests-lib-tests compattestfile,atf ./usr/tests/lib/libcurses/check_files/chgat2.chk tests-lib-tests compattestfile,atf ./usr/tests/lib/libcurses/check_files/chgat3.chk tests-lib-tests compattestfile,atf +./usr/tests/lib/libcurses/check_files/clear0.chk tests-lib-tests compattestfile,atf ./usr/tests/lib/libcurses/check_files/clear1.chk tests-lib-tests compattestfile,atf ./usr/tests/lib/libcurses/check_files/clear10.chk tests-lib-tests compattestfile,atf ./usr/tests/lib/libcurses/check_files/clear2.chk tests-lib-tests compattestfile,atf
CVS commit: src/distrib/common/bootimage
Module Name:src
Committed By: tsutsui
Date: Fri Jun 4 17:09:36 UTC 2021
Modified Files:
src/distrib/common/bootimage: Makefile.bootimage
Log Message:
Check and remove a stale work file for UEFI images with incorrect size.
Fixes PR/56132 (build.sh target install-image fails in update-mode).
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/distrib/common/bootimage/Makefile.bootimage
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/bootimage/Makefile.bootimage
diff -u src/distrib/common/bootimage/Makefile.bootimage:1.26 src/distrib/common/bootimage/Makefile.bootimage:1.27
--- src/distrib/common/bootimage/Makefile.bootimage:1.26 Wed Aug 5 01:35:18 2020
+++ src/distrib/common/bootimage/Makefile.bootimage Fri Jun 4 17:09:36 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.26 2020/08/05 01:35:18 jmcneill Exp $
+# $NetBSD: Makefile.bootimage,v 1.27 2021/06/04 17:09:36 tsutsui Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -294,6 +294,15 @@ WORKFATDIR?= work.fatdir
.if ${USE_GPT} != "no"
${WORKFSTAB}: ${WORKMBR}
+
+.BEGIN:
+ @if [ -f ${WORKMBR} ]; then \
+ st_size=`${TOOL_STAT} -f %z ${WORKMBR}`; \
+ if [ "$$st_size" -ne "$$((${IMAGESECTORS} * 512))" ]; then \
+ echo Removing stale ${WORKMBR} ...; \
+ rm -f ${WORKMBR};\
+ fi \
+ fi
.endif
${WORKFSTAB}:
CVS commit: src/distrib/sets/lists/man
Module Name:src Committed By: wiz Date: Thu Jun 3 13:16:42 UTC 2021 Modified Files: src/distrib/sets/lists/man: mi Log Message: Fix typo, caught by riastradh To generate a diff of this commit: cvs rdiff -u -r1.1721 -r1.1722 src/distrib/sets/lists/man/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1721 src/distrib/sets/lists/man/mi:1.1722 --- src/distrib/sets/lists/man/mi:1.1721 Thu Jun 3 07:41:26 2021 +++ src/distrib/sets/lists/man/mi Thu Jun 3 13:16:41 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1721 2021/06/03 07:41:26 wiz Exp $ +# $NetBSD: mi,v 1.1722 2021/06/03 13:16:41 wiz Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -4489,7 +4489,7 @@ ./usr/share/man/html4/hythygtemp.html man-sys-htmlman html ./usr/share/man/html4/i386/PCIBIOS.html man-sys-htmlman html ./usr/share/man/html4/i386/apm.html man-sys-htmlman html -./usr/share/man/html4/386/autoconf.html man-obsolete obsolete +./usr/share/man/html4/i386/autoconf.html man-obsolete obsolete ./usr/share/man/html4/i386/cmos.html man-sys-htmlman html ./usr/share/man/html4/i386/cons.html man-obsolete obsolete ./usr/share/man/html4/i386/console.html man-obsolete obsolete
CVS commit: src/distrib/amd64/installimage
Module Name:src
Committed By: pgoyette
Date: Wed Jun 2 16:07:33 UTC 2021
Modified Files:
src/distrib/amd64/installimage: Makefile
Log Message:
The install image grew again - update size
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/amd64/installimage/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/amd64/installimage/Makefile
diff -u src/distrib/amd64/installimage/Makefile:1.16 src/distrib/amd64/installimage/Makefile:1.17
--- src/distrib/amd64/installimage/Makefile:1.16 Mon Apr 26 14:08:11 2021
+++ src/distrib/amd64/installimage/Makefile Wed Jun 2 16:07:33 2021
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2021/04/26 14:08:11 pgoyette Exp $
+# $NetBSD: Makefile,v 1.17 2021/06/02 16:07:33 pgoyette Exp $
.include
INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-install # gives ${IMGBASE}.img
-INSTIMAGEMB?= 1700 # for all installation binaries
+INSTIMAGEMB?= 1800 # for all installation binaries
PRIMARY_BOOT= bootxx_ffsv1
SECONDARY_BOOT= boot
CVS commit: src/distrib/i386/installimage
Module Name:src
Committed By: martin
Date: Mon May 31 07:59:02 UTC 2021
Modified Files:
src/distrib/i386/installimage: Makefile
Log Message:
bump slightly harder
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/distrib/i386/installimage/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/i386/installimage/Makefile
diff -u src/distrib/i386/installimage/Makefile:1.20 src/distrib/i386/installimage/Makefile:1.21
--- src/distrib/i386/installimage/Makefile:1.20 Sun May 30 09:54:56 2021
+++ src/distrib/i386/installimage/Makefile Mon May 31 07:59:02 2021
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.20 2021/05/30 09:54:56 martin Exp $
+# $NetBSD: Makefile,v 1.21 2021/05/31 07:59:02 martin Exp $
.include
INSTIMGBASE= NetBSD-${DISTRIBVER}-i386-install # gives ${IMGBASE}.img
-INSTIMAGEMB?= 2000 # for all installation binaries
+INSTIMAGEMB?= 2100 # for all installation binaries
PRIMARY_BOOT= bootxx_ffsv1
SECONDARY_BOOT= boot
CVS commit: src/distrib/i386/installimage
Module Name:src
Committed By: martin
Date: Sun May 30 09:54:56 UTC 2021
Modified Files:
src/distrib/i386/installimage: Makefile
Log Message:
Bump image size slightly (for gcc 10)
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/distrib/i386/installimage/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/i386/installimage/Makefile
diff -u src/distrib/i386/installimage/Makefile:1.19 src/distrib/i386/installimage/Makefile:1.20
--- src/distrib/i386/installimage/Makefile:1.19 Wed May 6 09:18:10 2020
+++ src/distrib/i386/installimage/Makefile Sun May 30 09:54:56 2021
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2020/05/06 09:18:10 bouyer Exp $
+# $NetBSD: Makefile,v 1.20 2021/05/30 09:54:56 martin Exp $
.include
INSTIMGBASE= NetBSD-${DISTRIBVER}-i386-install # gives ${IMGBASE}.img
-INSTIMAGEMB?= 1900 # for all installation binaries
+INSTIMAGEMB?= 2000 # for all installation binaries
PRIMARY_BOOT= bootxx_ffsv1
SECONDARY_BOOT= boot
CVS commit: src/distrib/miniroot
Module Name:src
Committed By: tsutsui
Date: Sat May 29 23:46:14 UTC 2021
Modified Files:
src/distrib/miniroot: install.sub
Log Message:
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.59 -r1.60 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.59 src/distrib/miniroot/install.sub:1.60
--- src/distrib/miniroot/install.sub:1.59 Sat Dec 12 05:23:21 2020
+++ src/distrib/miniroot/install.sub Sat May 29 23:46:14 2021
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: install.sub,v 1.59 2020/12/12 05:23:21 tsutsui Exp $
+# $NetBSD: install.sub,v 1.60 2021/05/29 23:46:14 tsutsui 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: src/distrib/notes/alpha
Module Name:src Committed By: thorpej Date: Sat May 29 19:03:08 UTC 2021 Modified Files: src/distrib/notes/alpha: contents Log Message: Document netbsd-GENERIC.QEMU.gz To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/distrib/notes/alpha/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/alpha/contents diff -u src/distrib/notes/alpha/contents:1.24 src/distrib/notes/alpha/contents:1.25 --- src/distrib/notes/alpha/contents:1.24 Tue Sep 22 02:53:52 2020 +++ src/distrib/notes/alpha/contents Sat May 29 19:03:08 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: contents,v 1.24 2020/09/22 02:53:52 snj Exp $ +.\" $NetBSD: contents,v 1.25 2021/05/29 19:03:08 thorpej Exp $ .\" .\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -62,6 +62,14 @@ A gzipped .Nx kernel containing code for everything supported in this release. . +. It Pa netbsd-GENERIC.QEMU.gz +. +A gzipped +.Nx +kernel, identical to netbsd-GENERIC, except that it contains a static +copy of the kernel symbol table for convenience when running under Qemu, +which loads the kernel directly but does not load the kernel symbols. +. . tag) \" binary/kernel/ . . It Pa sets/
CVS commit: src/distrib/notes
Module Name:src
Committed By: martin
Date: Fri May 28 13:55:25 UTC 2021
Modified Files:
src/distrib/notes/amd64: hardware
src/distrib/notes/common: sysinst
Log Message:
PR 55413: 64-bit and OK police; grammar improvements.
>From Michael Siegel.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/notes/amd64/hardware
cvs rdiff -u -r1.111 -r1.112 src/distrib/notes/common/sysinst
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/hardware
diff -u src/distrib/notes/amd64/hardware:1.1 src/distrib/notes/amd64/hardware:1.2
--- src/distrib/notes/amd64/hardware:1.1 Sun Aug 21 18:35:26 2005
+++ src/distrib/notes/amd64/hardware Fri May 28 13:55:24 2021
@@ -1,6 +1,6 @@
-.\"$NetBSD: hardware,v 1.1 2005/08/21 18:35:26 riz Exp $
+.\"$NetBSD: hardware,v 1.2 2021/05/28 13:55:24 martin Exp $
.
.Nx*M
-supports CPUs that implement the 64bit AMD64 architecture.
+supports CPUs that implement the 64-bit AMD64 architecture.
These currently include AMD Opteron, AMD Athlon64, and Intel CPUs that
implement the EM64T extension.
Index: src/distrib/notes/common/sysinst
diff -u src/distrib/notes/common/sysinst:1.111 src/distrib/notes/common/sysinst:1.112
--- src/distrib/notes/common/sysinst:1.111 Thu May 27 15:47:42 2021
+++ src/distrib/notes/common/sysinst Fri May 28 13:55:24 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: sysinst,v 1.111 2021/05/27 15:47:42 martin Exp $
+.\" $NetBSD: sysinst,v 1.112 2021/05/28 13:55:24 martin Exp $
.\"
.\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -509,7 +509,7 @@ See the section on
When prompted, choose
.Me CD-ROM
as the install medium if booted from CD-ROM.
-The default values for the path and device should be ok.
+The default values for the path and device should be OK.
.if \n[amd64]:\n[i386] \{\
If you booted using a USB image, choose
.Me Local directory .
@@ -745,7 +745,7 @@ It will also include instructions for us
.Pp
If you do not intend to use networking during the installation,
but you do want your machine to be configured for networking once
-it is installed, you should first go to the
+the system is installed, you should first go to the
.Me Utility menu
and select the
.Me Configure network
@@ -1287,7 +1287,7 @@ the option to install a bootselector, wh
to pick the operating system to start up when your computer
is (re-)started.
.Pp
-If everything is ok, you can go on to the next step,
+If everything is OK, you can go on to the next step,
editing the
.Nx
disklabel.
CVS commit: src/distrib/notes/common
Module Name:src
Committed By: martin
Date: Thu May 27 15:47:42 UTC 2021
Modified Files:
src/distrib/notes/common: main postinstall sysinst xfer
Log Message:
Consistency and typo/grammar fixes from Michael Siegel in PR 55413,
With minor adjustments.
To generate a diff of this commit:
cvs rdiff -u -r1.563 -r1.564 src/distrib/notes/common/main
cvs rdiff -u -r1.88 -r1.89 src/distrib/notes/common/postinstall
cvs rdiff -u -r1.110 -r1.111 src/distrib/notes/common/sysinst
cvs rdiff -u -r1.76 -r1.77 src/distrib/notes/common/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.563 src/distrib/notes/common/main:1.564
--- src/distrib/notes/common/main:1.563 Sun Jul 26 11:05:39 2020
+++ src/distrib/notes/common/main Thu May 27 15:47:42 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: main,v 1.563 2020/07/26 11:05:39 jmcneill Exp $
+.\" $NetBSD: main,v 1.564 2021/05/27 15:47:42 martin Exp $
.\"
.\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -469,7 +469,7 @@ For third-party programs which are not p
.Nx
distribution, you will want to explore the
.Ic pkgsrc
-package management system, which contains thousands of third party software
+package management system, which contains thousands of third-party software
applications.
.El
.\}
@@ -478,11 +478,9 @@ applications.
.
The
.Nx
-Operating System is a fully functional
-.Tn Open Source
-.Ul
-operating system derived from the University of California, Berkeley
-Networking Release 2 (Net/2), 4.4BSD-Lite, and 4.4BSD-Lite2 sources.
+Operating System is a fully functional open-source operating system derived
+from the University of California, Berkeley Networking Release 2 (Net/2),
+4.4BSD-Lite, and 4.4BSD-Lite2 sources.
.Nx
runs on many different different system architectures (ports)
across a variety of distinct CPU families, and is being ported to more.
@@ -589,7 +587,7 @@ can still be found in pkgsrc as
The
.Nx
Foundation is a tax exempt, not-for-profit 501(c)(3) corporation
-that devotes itself to the traditional goals and Spirit of the
+that devotes itself to the traditional goals and spirit of the
.Nx
Project and owns the trademark of the word
.Dq NetBSD .
Index: src/distrib/notes/common/postinstall
diff -u src/distrib/notes/common/postinstall:1.88 src/distrib/notes/common/postinstall:1.89
--- src/distrib/notes/common/postinstall:1.88 Wed Oct 21 07:46:22 2020
+++ src/distrib/notes/common/postinstall Thu May 27 15:47:42 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: postinstall,v 1.88 2020/10/21 07:46:22 nia Exp $
+.\" $NetBSD: postinstall,v 1.89 2021/05/27 15:47:42 martin Exp $
.\"
.\" Copyright (c) 1999-2020 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -308,7 +308,7 @@ modified to match the resolution depth.
.\}
.\}
.It
-Installing third party packages
+Installing third-party packages
.Pp
If you wish to install any of the software freely available for
.Ul
Index: src/distrib/notes/common/sysinst
diff -u src/distrib/notes/common/sysinst:1.110 src/distrib/notes/common/sysinst:1.111
--- src/distrib/notes/common/sysinst:1.110 Wed Nov 27 09:29:25 2019
+++ src/distrib/notes/common/sysinst Thu May 27 15:47:42 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: sysinst,v 1.110 2019/11/27 09:29:25 martin Exp $
+.\" $NetBSD: sysinst,v 1.111 2021/05/27 15:47:42 martin Exp $
.\"
.\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -149,7 +149,7 @@ installing
.Nx
on your hard disk.
.Ic sysinst
-is a menu driven program that guides you through the installation process.
+is a menu-driven program that guides you through the installation process.
Sometimes questions will be asked, and in many cases
the default answer will be displayed in brackets
.Pq Dq \&[\ ]
@@ -171,7 +171,7 @@ detail, but you may find that you do not
If you want detailed instructions, skip to the next section.
This section describes a basic installation, using a CD / DVD
.if \n[i386]:\n[amd64] (or USB stick)
-as the install media.
+as the install medium.
.Pp
.(bullet
What you need.
@@ -402,7 +402,7 @@ The main menu will be displayed.
.ie \n[alpha]:\n[amd64]:\n[i386] \{\
Insert the CD into the drive
.if \n[amd64]:\n[i386] \{\
-or the USB memstick into an available USB port
+or the USB stick into an available USB port
.\}
and boot the computer from it.
.if \n[alpha] \{\
@@ -1381,7 +1381,7 @@ but this is historical practice and not
.
.Pp
You will then be asked to name your disk's disklabel.
-The default response will be ok for most purposes.
+The default response will be OK for most purposes.
If you choose to name it something different, make sure the name
is a single word and contains no special characters.
You don't need to remember this name.
@@ -1473,7 +1473,7 @@ specified location and proceed to the ex
.To 2 "Installation using FTP"
.Em
CVS commit: src/distrib/sets/lists/xserver
Module Name:src Committed By: jdc Date: Thu May 27 04:55:34 UTC 2021 Modified Files: src/distrib/sets/lists/xserver: md.sparc Log Message: Restore the pnozz Xorg driver, now that it has EXA support. To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 src/distrib/sets/lists/xserver/md.sparc 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/xserver/md.sparc diff -u src/distrib/sets/lists/xserver/md.sparc:1.74 src/distrib/sets/lists/xserver/md.sparc:1.75 --- src/distrib/sets/lists/xserver/md.sparc:1.74 Tue Nov 10 21:47:41 2020 +++ src/distrib/sets/lists/xserver/md.sparc Thu May 27 04:55:34 2021 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc,v 1.74 2020/11/10 21:47:41 kamil Exp $ +# $NetBSD: md.sparc,v 1.75 2021/05/27 04:55:34 jdc Exp $ ./usr/X11R7/bin/X xserver-xorg-server-bin xorg ./usr/X11R7/bin/Xorg xserver-xorg-server-bin xorg ./usr/X11R7/bin/cvt xserver-xorg-server-bin xorg @@ -39,10 +39,8 @@ ./usr/X11R7/lib/modules/drivers/mga_drv.so.2 xserver-xf86-video-mga-drivers xorg ./usr/X11R7/lib/modules/drivers/mouse_drv.so xserver-xf86-input-mouse-drivers xorg ./usr/X11R7/lib/modules/drivers/mouse_drv.so.1 xserver-xf86-input-mouse-drivers xorg -./usr/X11R7/lib/modules/drivers/pnozz_drv.so -unknown- xorg,xorg_server_ver=110 -./usr/X11R7/lib/modules/drivers/pnozz_drv.so xserver-obsolete xorg,xorg_server_ver=120,obsolete -./usr/X11R7/lib/modules/drivers/pnozz_drv.so.0 -unknown- xorg,xorg_server_ver=110 -./usr/X11R7/lib/modules/drivers/pnozz_drv.so.0 xserver-obsolete xorg,xorg_server_ver=120,obsolete +./usr/X11R7/lib/modules/drivers/pnozz_drv.so xserver-xf86-video-pnozz-drivers xorg +./usr/X11R7/lib/modules/drivers/pnozz_drv.so.0 xserver-xf86-video-pnozz-drivers xorg ./usr/X11R7/lib/modules/drivers/r128_drv.so xserver-xf86-video-r128-drivers xorg ./usr/X11R7/lib/modules/drivers/r128_drv.so.6 xserver-xf86-video-r128-drivers xorg ./usr/X11R7/lib/modules/drivers/radeon_drv.so xserver-xf86-video-radeon-kms-drivers xorg @@ -192,8 +190,7 @@ ./usr/X11R7/man/cat4/kbd.0xserver-xf86-input-keyboard-catman .cat,xorg ./usr/X11R7/man/cat4/mga.0xserver-xf86-video-mga-catman .cat,xorg ./usr/X11R7/man/cat4/mousedrv.0xserver-xf86-input-mouse-catman .cat,xorg -./usr/X11R7/man/cat4/pnozz.0-unknown- .cat,xorg,xorg_server_ver=110 -./usr/X11R7/man/cat4/pnozz.0xserver-obsolete .cat,xorg,xorg_server_ver=120,obsolete +./usr/X11R7/man/cat4/pnozz.0xserver-xf86-video-pnozz-drivers .cat,xorg ./usr/X11R7/man/cat4/r128.0xserver-xf86-video-r128-catman .cat,xorg ./usr/X11R7/man/cat4/radeon.0xserver-xf86-video-radeon-kms-catman .cat,xorg ./usr/X11R7/man/cat4/suncg14.0xserver-xf86-video-suncg14-catman .cat,xorg @@ -218,8 +215,7 @@ ./usr/X11R7/man/html4/kbd.htmlxserver-xf86-input-keyboard-htmlman html,xorg ./usr/X11R7/man/html4/mga.htmlxserver-xf86-video-mga-htmlman html,xorg ./usr/X11R7/man/html4/mousedrv.html xserver-xf86-input-mouse-htmlman html,xorg -./usr/X11R7/man/html4/pnozz.html -unknown- html,xorg,xorg_server_ver=110 -./usr/X11R7/man/html4/pnozz.html xserver-obsolete html,xorg,xorg_server_ver=120,obsolete +./usr/X11R7/man/html4/pnozz.html xserver-xf86-video-pnozz-drivers html ./usr/X11R7/man/html4/r128.htmlxserver-xf86-video-r128-htmlman html,xorg ./usr/X11R7/man/html4/radeon.html xserver-xf86-video-radeon-kms-htmlman html,xorg ./usr/X11R7/man/html4/suncg14.html xserver-xf86-video-suncg14-htmlman html,xorg @@ -244,8 +240,7 @@ ./usr/X11R7/man/man4/kbd.4xserver-xf86-input-keyboard-man .man,xorg ./usr/X11R7/man/man4/mga.4xserver-xf86-video-mga-man .man,xorg ./usr/X11R7/man/man4/mousedrv.4xserver-xf86-input-mouse-man .man,xorg -./usr/X11R7/man/man4/pnozz.4-unknown- .man,xorg,xorg_server_ver=110 -./usr/X11R7/man/man4/pnozz.4xserver-obsolete .man,xorg,xorg_server_ver=120,obsolete +./usr/X11R7/man/man4/pnozz.4xserver-xf86-video-pnozz-drivers .man,xorg ./usr/X11R7/man/man4/r128.4xserver-xf86-video-r128-man .man,xorg ./usr/X11R7/man/man4/radeon.4xserver-xf86-video-radeon-kms-man .man,xorg ./usr/X11R7/man/man4/suncg14.4xserver-xf86-video-suncg14-man .man,xorg
CVS commit: src/distrib/macppc
Module Name:src
Committed By: martin
Date: Tue May 25 11:55:40 UTC 2021
Modified Files:
src/distrib/macppc: Makefile
Log Message:
While we do not yet have any 64bit kernels, do not build
floppy or CD images for installation.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/macppc/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/macppc/Makefile
diff -u src/distrib/macppc/Makefile:1.16 src/distrib/macppc/Makefile:1.17
--- src/distrib/macppc/Makefile:1.16 Mon Jun 23 02:16:53 2008
+++ src/distrib/macppc/Makefile Tue May 25 11:55:40 2021
@@ -1,17 +1,20 @@
-# $NetBSD: Makefile,v 1.16 2008/06/23 02:16:53 matt Exp $
+# $NetBSD: Makefile,v 1.17 2021/05/25 11:55:40 martin Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
.include
+.if ${MACHINE_ARCH} != "powerpc64"
SUBDIR= floppies cdroms
+.endif
TARGETS+= release
BOOTOBJ!= cd ${KERNSRCDIR}/arch/macppc/stand/ofwboot && ${PRINTOBJDIR}
OFWBOOTERS= ${BOOTOBJ}/ofwboot.elf ${BOOTOBJ}/ofwboot.xcf
release: check_RELEASEDIR .WAIT ${OWFBOOTERS}
+ mkdir -p ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation
${RELEASE_INSTALL} ${OFWBOOTERS} ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation
iso_image:
CVS commit: src/distrib
Module Name:src
Committed By: martin
Date: Tue May 25 10:58:41 UTC 2021
Modified Files:
src/distrib/macppc/floppies/ramdisk: Makefile
src/distrib/utils/libhack: Makefile.inc
Log Message:
Provide support to build 32bit crunched ramdisks and use that for
macppc64. With help from rin.
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/distrib/macppc/floppies/ramdisk/Makefile
cvs rdiff -u -r1.38 -r1.39 src/distrib/utils/libhack/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/macppc/floppies/ramdisk/Makefile
diff -u src/distrib/macppc/floppies/ramdisk/Makefile:1.52 src/distrib/macppc/floppies/ramdisk/Makefile:1.53
--- src/distrib/macppc/floppies/ramdisk/Makefile:1.52 Sun Apr 5 14:36:43 2020
+++ src/distrib/macppc/floppies/ramdisk/Makefile Tue May 25 10:58:41 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2020/04/05 14:36:43 sevan Exp $
+# $NetBSD: Makefile,v 1.53 2021/05/25 10:58:41 martin Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -12,9 +12,15 @@ IMAGESIZE= 2880k
MAKEFS_FLAGS+= -f 15
WARNS= 1
-DBG= -Os
+
+# No point in using 64bit binaries (if building for MACHINE_ARCH=powerpc64)
+# on the ramdisk, keep it small
+DBG= -Os -m32
+HACK_LD_FLAGS= -m elf32ppc_nbsd
+LDFLAGS+= -m32 -Wl,-melf32ppc_nbsd
CRUNCHBIN= ramdiskbin
+CRUNCHENV+= LDFLAGS=${LDFLAGS:Q}
LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst
MTREECONF= ${DISTRIBDIR}/common/mtree.common
IMAGEENDIAN= be
Index: src/distrib/utils/libhack/Makefile.inc
diff -u src/distrib/utils/libhack/Makefile.inc:1.38 src/distrib/utils/libhack/Makefile.inc:1.39
--- src/distrib/utils/libhack/Makefile.inc:1.38 Tue Mar 9 00:06:44 2021
+++ src/distrib/utils/libhack/Makefile.inc Tue May 25 10:58:41 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.38 2021/03/09 00:06:44 christos Exp $
+# $NetBSD: Makefile.inc,v 1.39 2021/05/25 10:58:41 martin Exp $
#
# Include this fragment to build libhack.o
# It is .o and not .a to make sure these are the
@@ -70,7 +70,7 @@ CPPFLAGS.gethost.c+= -I${HACKSRC}/../../
.if !defined(LIB)
libhack.o: ${HACKOBJS}
- ${LD} -r -o $@ ${.ALLSRC}
+ ${LD} -r ${HACK_LD_FLAGS} -o $@ ${.ALLSRC}
.endif
.if 1
CVS commit: src/distrib/acorn32/stand
Module Name:src
Committed By: christos
Date: Mon May 24 22:40:44 UTC 2021
Modified Files:
src/distrib/acorn32/stand: Makefile
Log Message:
PR/56207: Jan-Benedict Glaw: Handle error from find when removing CVS
directories on a git repo.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/distrib/acorn32/stand/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/acorn32/stand/Makefile
diff -u src/distrib/acorn32/stand/Makefile:1.28 src/distrib/acorn32/stand/Makefile:1.29
--- src/distrib/acorn32/stand/Makefile:1.28 Tue Jan 21 20:03:09 2014
+++ src/distrib/acorn32/stand/Makefile Mon May 24 18:40:44 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2014/01/22 01:03:09 christos Exp $
+# $NetBSD: Makefile,v 1.29 2021/05/24 22:40:44 christos Exp $
#
.include
@@ -91,9 +91,9 @@ setup_tmp:
-rm -rf tmp
mkdir tmp
cp -R ${.CURDIR}/BtNetBSD tmp/
- -find tmp -path '*/CVS/*' -type f -exec rm -rf {} \;
- find tmp -name CVS -type d | xargs rmdir
- find tmp -name '*.uue' -type f -exec rm -f {} \;
+ -find tmp -path '*/CVS/*' -type f -exec rm -rf {} +
+ -find tmp -name CVS -type d -exec rmdir {} +
+ -find tmp -name '*.uue' -type f -exec rm -f {} +
.PHONY: settypes
settypes: setup_tmp
CVS commit: src/distrib/utils/libhack
Module Name:src
Committed By: christos
Date: Mon May 24 21:34:07 UTC 2021
Modified Files:
src/distrib/utils/libhack: wrap.c
Log Message:
refuse should exit(3). Noted by joerg@
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/libhack/wrap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/libhack/wrap.c
diff -u src/distrib/utils/libhack/wrap.c:1.1 src/distrib/utils/libhack/wrap.c:1.2
--- src/distrib/utils/libhack/wrap.c:1.1 Mon Mar 8 19:06:44 2021
+++ src/distrib/utils/libhack/wrap.c Mon May 24 17:34:06 2021
@@ -28,9 +28,10 @@
*/
#include
-__RCSID("$NetBSD: wrap.c,v 1.1 2021/03/09 00:06:44 christos Exp $");
+__RCSID("$NetBSD: wrap.c,v 1.2 2021/05/24 21:34:06 christos Exp $");
#include
+#include
struct request_info *
request_init(struct request_info *ri, ...)
@@ -53,4 +54,6 @@ hosts_access(struct request_info *ri)
void
refuse(struct request_info *ri)
{
+ /* We don't need to wait for inetd, or eat the connection data here */
+ exit(EXIT_FAILURE);
}
CVS commit: src/distrib/sets/lists/modules
Module Name:src Committed By: simonb Date: Mon May 10 14:27:47 UTC 2021 Modified Files: src/distrib/sets/lists/modules: ad.mips Log Message: Column alignment. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/lists/modules/ad.mips 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/modules/ad.mips diff -u src/distrib/sets/lists/modules/ad.mips:1.17 src/distrib/sets/lists/modules/ad.mips:1.18 --- src/distrib/sets/lists/modules/ad.mips:1.17 Sun Nov 1 18:51:34 2020 +++ src/distrib/sets/lists/modules/ad.mips Mon May 10 14:27:47 2021 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips,v 1.17 2020/11/01 18:51:34 pgoyette Exp $ +# $NetBSD: ad.mips,v 1.18 2021/05/10 14:27:47 simonb Exp $ ./@MODULEDIR@/compat_netbsd32 modules-base-kernel kmod,arch64,nocompatmodules ./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod modules-base-kernel kmod,arch64,nocompatmodules ./@MODULEDIR@/compat_netbsd32_09 modules-base-kernel kmod,arch64,nocompatmodules @@ -29,27 +29,27 @@ ./@MODULEDIR@/compat_netbsd32_80/compat_netbsd32_80.kmod modules-base-kernel kmod,arch64,nocompatmodules ./@MODULEDIR@/compat_netbsd32_90 modules-base-kernel kmod,arch64,nocompatmodules ./@MODULEDIR@/compat_netbsd32_90/compat_netbsd32_90.kmod modules-base-kernel kmod,arch64,nocompatmodules -./@MODULEDIR@/compat_netbsd32_coredump modules-base-kernel kmod,arch64,nocompatmodules +./@MODULEDIR@/compat_netbsd32_coredump modules-base-kernel kmod,arch64,nocompatmodules ./@MODULEDIR@/compat_netbsd32_coredump/compat_netbsd32_coredump.kmod modules-base-kernel kmod,arch64,nocompatmodules -./@MODULEDIR@/compat_netbsd32_mqueue modules-base-kernel kmod,arch64,nocompatmodules +./@MODULEDIR@/compat_netbsd32_mqueue modules-base-kernel kmod,arch64,nocompatmodules ./@MODULEDIR@/compat_netbsd32_mqueue/compat_netbsd32_mqueue.kmod modules-base-kernel kmod,arch64,nocompatmodules -./@MODULEDIR@/compat_netbsd32_nfssrv modules-base-kernel kmod,arch64,nocompatmodules +./@MODULEDIR@/compat_netbsd32_nfssrv modules-base-kernel kmod,arch64,nocompatmodules ./@MODULEDIR@/compat_netbsd32_nfssrv/compat_netbsd32_nfssrv.kmod modules-base-kernel kmod,arch64,nocompatmodules -./@MODULEDIR@/compat_netbsd32_ptrace modules-base-kernel kmod,arch64,nocompatmodules +./@MODULEDIR@/compat_netbsd32_ptrace modules-base-kernel kmod,arch64,nocompatmodules ./@MODULEDIR@/compat_netbsd32_ptrace/compat_netbsd32_ptrace.kmod modules-base-kernel kmod,arch64,nocompatmodules -./@MODULEDIR@/compat_netbsd32_quota modules-base-kernel kmod,arch64,nocompatmodules +./@MODULEDIR@/compat_netbsd32_quota modules-base-kernel kmod,arch64,nocompatmodules ./@MODULEDIR@/compat_netbsd32_quota/compat_netbsd32_quota.kmod modules-base-kernel kmod,arch64,nocompatmodules -./@MODULEDIR@/compat_netbsd32_quota_50 modules-base-kernel kmod,arch64,nocompatmodules +./@MODULEDIR@/compat_netbsd32_quota_50 modules-base-kernel kmod,arch64,nocompatmodules ./@MODULEDIR@/compat_netbsd32_quota_50/compat_netbsd32_quota_50.kmod modules-base-kernel kmod,arch64,nocompatmodules -./@MODULEDIR@/compat_netbsd32_raid modules-base-kernel kmod,arch64,nocompatmodules +./@MODULEDIR@/compat_netbsd32_raid modules-base-kernel kmod,arch64,nocompatmodules ./@MODULEDIR@/compat_netbsd32_raid/compat_netbsd32_raid.kmod modules-base-kernel kmod,arch64,nocompatmodules -./@MODULEDIR@/compat_netbsd32_sysvipc modules-base-kernel kmod,arch64,nocompatmodules +./@MODULEDIR@/compat_netbsd32_sysvipc modules-base-kernel kmod,arch64,nocompatmodules ./@MODULEDIR@/compat_netbsd32_sysvipc/compat_netbsd32_sysvipc.kmod modules-base-kernel kmod,arch64,nocompatmodules -./@MODULEDIR@/compat_netbsd32_sysvipc_10 modules-base-kernel kmod,arch64,nocompatmodules +./@MODULEDIR@/compat_netbsd32_sysvipc_10 modules-base-kernel kmod,arch64,nocompatmodules ./@MODULEDIR@/compat_netbsd32_sysvipc_10/compat_netbsd32_sysvipc_10.kmod modules-base-kernel kmod,arch64,nocompatmodules -./@MODULEDIR@/compat_netbsd32_sysvipc_14 modules-base-kernel kmod,arch64,nocompatmodules +./@MODULEDIR@/compat_netbsd32_sysvipc_14 modules-base-kernel kmod,arch64,nocompatmodules ./@MODULEDIR@/compat_netbsd32_sysvipc_14/compat_netbsd32_sysvipc_14.kmod modules-base-kernel kmod,arch64,nocompatmodules -./@MODULEDIR@/compat_netbsd32_sysvipc_50 modules-base-kernel kmod,arch64,nocompatmodules +./@MODULEDIR@/compat_netbsd32_sysvipc_50 modules-base-kernel kmod,arch64,nocompatmodules ./@MODULEDIR@/compat_netbsd32_sysvipc_50/compat_netbsd32_sysvipc_50.kmod modules-base-kernel kmod,arch64,nocompatmodules ./@MODULEDIR@/exec_elf32 modules-base-kernel kmod ./@MODULEDIR@/exec_elf32/exec_elf32.kmod modules-base-kernel kmod
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: rin Date: Sat May 8 09:23:37 UTC 2021 Modified Files: src/distrib/sets/lists/debug: mi Log Message: Add missing aiomixer.debug to fix debug build. XXX I *really* hope someone(TM) invent better replacement of distrib/sets/lists... To generate a diff of this commit: cvs rdiff -u -r1.351 -r1.352 src/distrib/sets/lists/debug/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/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.351 src/distrib/sets/lists/debug/mi:1.352 --- src/distrib/sets/lists/debug/mi:1.351 Fri Apr 23 22:50:06 2021 +++ src/distrib/sets/lists/debug/mi Sat May 8 09:23:37 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.351 2021/04/23 22:50:06 mrg Exp $ +# $NetBSD: mi,v 1.352 2021/05/08 09:23:37 rin Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib comp-sys-usr compatdir ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile @@ -460,6 +460,7 @@ ./usr/libdata/debug/usr/bin/addftinfo.debug comp-groff-debug groff,debug ./usr/libdata/debug/usr/bin/addr2line.debug comp-debug-debug binutils,debug ./usr/libdata/debug/usr/bin/agrep.debug comp-util-debug debug +./usr/libdata/debug/usr/bin/aiomixer.debug comp-audio-debug debug ./usr/libdata/debug/usr/bin/apply.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/apropos.debug comp-man-debug debug ./usr/libdata/debug/usr/bin/ar.debug comp-util-debug binutils,debug
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: christos Date: Fri Apr 30 13:55:18 UTC 2021 Modified Files: src/distrib/sets/lists/comp: md.amd64 md.i386 Log Message: Add (we could gc now the files if we fix the sources that use them. To generate a diff of this commit: cvs rdiff -u -r1.285 -r1.286 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.201 -r1.202 src/distrib/sets/lists/comp/md.i386 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/md.amd64 diff -u src/distrib/sets/lists/comp/md.amd64:1.285 src/distrib/sets/lists/comp/md.amd64:1.286 --- src/distrib/sets/lists/comp/md.amd64:1.285 Sun Apr 11 22:08:59 2021 +++ src/distrib/sets/lists/comp/md.amd64 Fri Apr 30 09:55:18 2021 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.285 2021/04/12 02:08:59 mrg Exp $ +# $NetBSD: md.amd64,v 1.286 2021/04/30 13:55:18 christos Exp $ ./usr/include/amd64comp-c-include ./usr/include/amd64/ansi.h comp-c-include ./usr/include/amd64/aout_machdep.h comp-c-include @@ -1144,6 +1144,7 @@ ./usr/include/x86/dbregs.h comp-obsolete obsolete ./usr/include/x86/float.h comp-c-include ./usr/include/x86/fpu.hcomp-c-include +./usr/include/x86/gdt.hcomp-c-include ./usr/include/x86/ieee.h comp-c-include ./usr/include/x86/ieeefp.h comp-c-include ./usr/include/x86/intr.h comp-c-include Index: src/distrib/sets/lists/comp/md.i386 diff -u src/distrib/sets/lists/comp/md.i386:1.201 src/distrib/sets/lists/comp/md.i386:1.202 --- src/distrib/sets/lists/comp/md.i386:1.201 Sun Apr 11 22:09:00 2021 +++ src/distrib/sets/lists/comp/md.i386 Fri Apr 30 09:55:18 2021 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.201 2021/04/12 02:09:00 mrg Exp $ +# $NetBSD: md.i386,v 1.202 2021/04/30 13:55:18 christos Exp $ ./usr/include/clang-3.4/__wmmintrin_aes.h comp-obsolete obsolete ./usr/include/clang-3.4/__wmmintrin_pclmul.h comp-obsolete obsolete ./usr/include/clang-3.4/ammintrin.h comp-obsolete obsolete @@ -1017,6 +1017,7 @@ ./usr/include/x86/dbregs.h comp-obsolete obsolete ./usr/include/x86/float.h comp-c-include ./usr/include/x86/fpu.hcomp-c-include +./usr/include/x86/gdt.hcomp-c-include ./usr/include/x86/ieee.h comp-c-include ./usr/include/x86/ieeefp.h comp-c-include ./usr/include/x86/intr.h comp-c-include
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Thu Apr 29 17:27:54 UTC 2021 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/debug: shl.mi Log Message: bump shlibs for bind-9.16.15 To generate a diff of this commit: cvs rdiff -u -r1.918 -r1.919 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.275 -r1.276 src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.918 src/distrib/sets/lists/base/shl.mi:1.919 --- src/distrib/sets/lists/base/shl.mi:1.918 Mon Apr 19 10:41:18 2021 +++ src/distrib/sets/lists/base/shl.mi Thu Apr 29 13:27:54 2021 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.918 2021/04/19 14:41:18 christos Exp $ +# $NetBSD: shl.mi,v 1.919 2021/04/29 17:27:54 christos Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -226,8 +226,8 @@ ./usr/lib/libbfd.so.17base-sys-shlib compatfile,binutils=234 ./usr/lib/libbfd.so.17.0 base-sys-shlib compatfile,binutils=234 ./usr/lib/libbind9.sobase-bind-shlib compatfile -./usr/lib/libbind9.so.16 base-bind-shlib compatfile -./usr/lib/libbind9.so.16.0 base-bind-shlib compatfile +./usr/lib/libbind9.so.17 base-bind-shlib compatfile +./usr/lib/libbind9.so.17.0 base-bind-shlib compatfile ./usr/lib/libblacklist.so base-obsolete obsolete,compatfile ./usr/lib/libblacklist.so.0 base-obsolete obsolete,compatfile ./usr/lib/libblacklist.so.0.0 base-obsolete obsolete,compatfile @@ -292,8 +292,8 @@ ./usr/lib/libdm.so.0base-sys-shlib compatfile ./usr/lib/libdm.so.0.0base-sys-shlib compatfile ./usr/lib/libdns.sobase-bind-shlib compatfile -./usr/lib/libdns.so.16base-bind-shlib compatfile -./usr/lib/libdns.so.16.0 base-bind-shlib compatfile +./usr/lib/libdns.so.17base-bind-shlib compatfile +./usr/lib/libdns.so.17.0 base-bind-shlib compatfile ./usr/lib/libdns_sd.sobase-mdns-shlib compatfile,mdns ./usr/lib/libdns_sd.so.0 base-mdns-shlib compatfile,mdns ./usr/lib/libdns_sd.so.0.0 base-mdns-shlib compatfile,mdns @@ -374,17 +374,17 @@ ./usr/lib/libipsec.so.3base-net-shlib compatfile ./usr/lib/libipsec.so.3.0 base-net-shlib compatfile ./usr/lib/libirs.sobase-bind-shlib compatfile -./usr/lib/libirs.so.16base-bind-shlib compatfile -./usr/lib/libirs.so.16.0 base-bind-shlib compatfile +./usr/lib/libirs.so.17base-bind-shlib compatfile +./usr/lib/libirs.so.17.0 base-bind-shlib compatfile ./usr/lib/libisc.sobase-bind-shlib compatfile -./usr/lib/libisc.so.16base-bind-shlib compatfile -./usr/lib/libisc.so.16.0 base-bind-shlib compatfile +./usr/lib/libisc.so.17base-bind-shlib compatfile +./usr/lib/libisc.so.17.0 base-bind-shlib compatfile ./usr/lib/libisccc.sobase-bind-shlib compatfile -./usr/lib/libisccc.so.16 base-bind-shlib compatfile -./usr/lib/libisccc.so.16.0 base-bind-shlib compatfile +./usr/lib/libisccc.so.17 base-bind-shlib compatfile +./usr/lib/libisccc.so.17.0 base-bind-shlib compatfile ./usr/lib/libisccfg.sobase-bind-shlib compatfile -./usr/lib/libisccfg.so.16 base-bind-shlib compatfile -./usr/lib/libisccfg.so.16.0 base-bind-shlib compatfile +./usr/lib/libisccfg.so.17 base-bind-shlib compatfile +./usr/lib/libisccfg.so.17.0 base-bind-shlib compatfile ./usr/lib/libiscsi.sobase-iscsi-shlib iscsi,compatfile ./usr/lib/libiscsi.so.2base-iscsi-shlib iscsi,compatfile ./usr/lib/libiscsi.so.2.0 base-iscsi-shlib iscsi,compatfile @@ -469,8 +469,8 @@ ./usr/lib/libnpf.so.0base-npf-shlib npf,compatfile ./usr/lib/libnpf.so.0.1base-npf-shlib npf,compatfile ./usr/lib/libns.sobase-bind-shlib compatfile -./usr/lib/libns.so.16base-bind-shlib compatfile -./usr/lib/libns.so.16.0base-bind-shlib compatfile +./usr/lib/libns.so.17base-bind-shlib compatfile +./usr/lib/libns.so.17.0base-bind-shlib compatfile ./usr/lib/libnvmm.sobase-sys-shlib nvmm,pic ./usr/lib/libnvmm.so.0base-sys-shlib nvmm,pic ./usr/lib/libnvmm.so.0.1 base-sys-shlib nvmm,pic Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.275 src/distrib/sets/lists/debug/shl.mi:1.276 --- src/distrib/sets/lists/debug/shl.mi:1.275 Mon Apr 19 10:41:18 2021 +++ src/distrib/sets/lists/debug/shl.mi Thu Apr 29 13:27:54 2021 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.275 2021/04/19 14:41:18 christos Exp $ +# $NetBSD: shl.mi,v 1.276 2021/04/29 17:27:54 christos Exp $ ./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils ./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir ./usr/libdata/debug/lib/libavl.so.0.0.debug comp-zfs-debug debug,dynamicroot,zfs @@ -76,7 +76,7 @@ ./usr/libdata/debug/usr/lib/libavl.so.0.0.debug comp-zfs-debug
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: rin Date: Wed Apr 28 02:15:03 UTC 2021 Modified Files: src/distrib/sets/lists/comp: mi Log Message: config_found_ia.9 and config_found_sm_loc.9 have been obsoleted. Should fix build. To generate a diff of this commit: cvs rdiff -u -r1.2384 -r1.2385 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2384 src/distrib/sets/lists/comp/mi:1.2385 --- src/distrib/sets/lists/comp/mi:1.2384 Wed Apr 28 00:49:22 2021 +++ src/distrib/sets/lists/comp/mi Wed Apr 28 02:15:03 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2384 2021/04/28 00:49:22 thorpej Exp $ +# $NetBSD: mi,v 1.2385 2021/04/28 02:15:03 rin Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -27833,9 +27833,9 @@ ./usr/share/man/man9/config_detach_release.9 comp-sys-man .man ./usr/share/man/man9/config_finalize_register.9 comp-sys-man .man ./usr/share/man/man9/config_found.9 comp-sys-man .man -./usr/share/man/man9/config_found_ia.9 comp-sys-man .man +./usr/share/man/man9/config_found_ia.9 comp-obsolete obsolete ./usr/share/man/man9/config_found_sm.9 comp-obsolete obsolete -./usr/share/man/man9/config_found_sm_loc.9 comp-sys-man .man +./usr/share/man/man9/config_found_sm_loc.9 comp-sys-man obsolete ./usr/share/man/man9/config_interrupts.9 comp-sys-man .man ./usr/share/man/man9/config_match.9 comp-sys-man .man ./usr/share/man/man9/config_mountroot.9 comp-sys-man .man
CVS commit: src/distrib/notes/evbarm
Module Name:src Committed By: nia Date: Tue Apr 27 19:52:06 UTC 2021 Modified Files: src/distrib/notes/evbarm: install Log Message: ignore machine-dependent disklabel partitions To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/distrib/notes/evbarm/install Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/evbarm/install diff -u src/distrib/notes/evbarm/install:1.16 src/distrib/notes/evbarm/install:1.17 --- src/distrib/notes/evbarm/install:1.16 Fri Aug 7 00:27:11 2020 +++ src/distrib/notes/evbarm/install Tue Apr 27 19:52:06 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: install,v 1.16 2020/08/07 00:27:11 snj Exp $ +.\" $NetBSD: install,v 1.17 2021/04/27 19:52:06 nia Exp $ .\" .\" Copyright (c) 2001-2020 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -35,7 +35,7 @@ on Unix. .It Write the image to disk: .Bd -literal -# dd if=armv7.img of=/dev/rld0d bs=1m conv=sync +# dd if=armv7.img of=/dev/rld0 bs=1m conv=sync progress=1 .Ed .It If you are using Microsoft Windows, you can use @@ -61,12 +61,12 @@ existing Install the board-specific U-Boot to the SD card, e.g. for Allwinner devices (PINE H64 in this case): .Bd -literal -# dd if=/usr/pkg/share/u-boot/pine-h64/u-boot-sunxi-with-spl.bin of=/dev/rld0d bs=1k seek=8 conv=sync +# dd if=/usr/pkg/share/u-boot/pine-h64/u-boot-sunxi-with-spl.bin of=/dev/rld0 bs=1k seek=8 conv=sync progress=1 .Ed .Pp Or a Rockchip device (e.g. RockPro64): .Bd -literal -# dd if=/usr/pkg/share/u-boot/rockpro64/rksd_loader.img of=/dev/rld0d seek=64 conv=sync +# dd if=/usr/pkg/share/u-boot/rockpro64/rksd_loader.img of=/dev/rld0 seek=64 conv=sync progress=1 .Ed .El .Pp
CVS commit: src/distrib/amd64/installimage
Module Name:src
Committed By: pgoyette
Date: Mon Apr 26 14:08:11 UTC 2021
Modified Files:
src/distrib/amd64/installimage: Makefile
Log Message:
The image, with all sorts of MK*DEBUG* turned on, has once again grown.
This time probably as a result of the move to gcc-10.
Bump size to accomodate.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/distrib/amd64/installimage/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/amd64/installimage/Makefile
diff -u src/distrib/amd64/installimage/Makefile:1.15 src/distrib/amd64/installimage/Makefile:1.16
--- src/distrib/amd64/installimage/Makefile:1.15 Fri Mar 26 21:18:29 2021
+++ src/distrib/amd64/installimage/Makefile Mon Apr 26 14:08:11 2021
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2021/03/26 21:18:29 pgoyette Exp $
+# $NetBSD: Makefile,v 1.16 2021/04/26 14:08:11 pgoyette Exp $
.include
INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-install # gives ${IMGBASE}.img
-INSTIMAGEMB?= 1600 # for all installation binaries
+INSTIMAGEMB?= 1700 # for all installation binaries
PRIMARY_BOOT= bootxx_ffsv1
SECONDARY_BOOT= boot
CVS commit: src/distrib
Module Name:src
Committed By: christos
Date: Sun Apr 25 23:40:06 UTC 2021
Modified Files:
src/distrib/cobalt/instkernel: Makefile
src/distrib/evbmips/instkernel/instkernel: Makefile
src/distrib/evbmips/instkernel/ramdisk: Makefile
src/distrib/pmax/instkernel: Makefile
src/distrib/pmax/miniroot: Makefile.inc
src/distrib/pmax/ramdisk: Makefile
Log Message:
handle mipsn64
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/cobalt/instkernel/Makefile
cvs rdiff -u -r1.7 -r1.8 src/distrib/evbmips/instkernel/instkernel/Makefile
cvs rdiff -u -r1.14 -r1.15 src/distrib/evbmips/instkernel/ramdisk/Makefile
cvs rdiff -u -r1.44 -r1.45 src/distrib/pmax/instkernel/Makefile
cvs rdiff -u -r1.25 -r1.26 src/distrib/pmax/miniroot/Makefile.inc
cvs rdiff -u -r1.54 -r1.55 src/distrib/pmax/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/cobalt/instkernel/Makefile
diff -u src/distrib/cobalt/instkernel/Makefile:1.2 src/distrib/cobalt/instkernel/Makefile:1.3
--- src/distrib/cobalt/instkernel/Makefile:1.2 Sun Feb 20 03:26:08 2011
+++ src/distrib/cobalt/instkernel/Makefile Sun Apr 25 19:40:05 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/02/20 08:26:08 matt Exp $
+# $NetBSD: Makefile,v 1.3 2021/04/25 23:40:05 christos Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -6,7 +6,7 @@
RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR}
RAMDISK= ${RAMDISKDIR}/ramdisk.fs
-.if ${MACHINE_ARCH} == "mips64el"
+.if !empty(MACHINE_ARCH:Mmips*64el)
SFX= 64
.endif
Index: src/distrib/evbmips/instkernel/instkernel/Makefile
diff -u src/distrib/evbmips/instkernel/instkernel/Makefile:1.7 src/distrib/evbmips/instkernel/instkernel/Makefile:1.8
--- src/distrib/evbmips/instkernel/instkernel/Makefile:1.7 Wed Jul 15 08:15:30 2020
+++ src/distrib/evbmips/instkernel/instkernel/Makefile Sun Apr 25 19:40:05 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2020/07/15 12:15:30 simonb Exp $
+# $NetBSD: Makefile,v 1.8 2021/04/25 23:40:05 christos Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -12,12 +12,12 @@ MDSETTARGETS= INSTALL_CI20 ${RAMDISK}
MDSETTARGETS+= INSTALL_OMSAL400 ${RAMDISK} -
MDSETTARGETS+= INSTALL_MALTA ${RAMDISK} -
-.elif ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
+.elif ${MACHINE_MIPS64}
MDSETTARGETS= INSTALL_MALTA32 ${RAMDISK} -
MDSETTARGETS+= INSTALL_MALTA64 ${RAMDISK} -
MDSETTARGETS+= INSTALL_XLSATX32 ${RAMDISK} -
MDSETTARGETS+= INSTALL_XLSATX64 ${RAMDISK} -
-.if ${MACHINE_ARCH} == "mips64el"
+.if !empty(MACHINE_ARCH:Mmips*64el)
MDSETTARGETS+= INSTALL_LOONGSON ${RAMDISK} -
.else
MDSETTARGETS+= INSTALL_OCTEON ${RAMDISK} -
Index: src/distrib/evbmips/instkernel/ramdisk/Makefile
diff -u src/distrib/evbmips/instkernel/ramdisk/Makefile:1.14 src/distrib/evbmips/instkernel/ramdisk/Makefile:1.15
--- src/distrib/evbmips/instkernel/ramdisk/Makefile:1.14 Thu Jan 9 15:07:46 2020
+++ src/distrib/evbmips/instkernel/ramdisk/Makefile Sun Apr 25 19:40:05 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2020/01/09 20:07:46 martin Exp $
+# $NetBSD: Makefile,v 1.15 2021/04/25 23:40:05 christos Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -13,7 +13,7 @@ DBG= -Os
CRUNCHBIN= ramdiskbin
LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst
MTREECONF= ${DISTRIBDIR}/common/mtree.common
-.if ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mips64el"
+.if !empty(MACHINE_ARCH:M*el)
IMAGEENDIAN= le
.else
IMAGEENDIAN= be
Index: src/distrib/pmax/instkernel/Makefile
diff -u src/distrib/pmax/instkernel/Makefile:1.44 src/distrib/pmax/instkernel/Makefile:1.45
--- src/distrib/pmax/instkernel/Makefile:1.44 Sun Aug 16 07:43:36 2020
+++ src/distrib/pmax/instkernel/Makefile Sun Apr 25 19:40:05 2021
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.44 2020/08/16 11:43:36 mrg Exp $
+# $NetBSD: Makefile,v 1.45 2021/04/25 23:40:05 christos Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
.include
-.if ${MACHINE_ARCH} == "mips64el"
+.if !empty(MACHINE_ARCH:Mmips*64el)
SFX= 64
.endif
Index: src/distrib/pmax/miniroot/Makefile.inc
diff -u src/distrib/pmax/miniroot/Makefile.inc:1.25 src/distrib/pmax/miniroot/Makefile.inc:1.26
--- src/distrib/pmax/miniroot/Makefile.inc:1.25 Tue Jan 24 13:04:04 2017
+++ src/distrib/pmax/miniroot/Makefile.inc Sun Apr 25 19:40:05 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.25 2017/01/24 18:04:04 christos Exp $
+# $NetBSD: Makefile.inc,v 1.26 2021/04/25 23:40:05 christos Exp $
-.if ${MACHINE_ARCH} == "mips64el"
+.if !empty(MACHINE_ARCH:Mmips*64el)
SFX= 64
.endif
Index: src/distrib/pmax/ramdisk/Makefile
diff -u src/distrib/pmax/ramdisk/Makefile:1.54 src/distrib/pmax/ramdisk/Makefile:1.55
--- src/distrib/pmax/ramdisk/Makefile:1.54 Mon Sep
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Sun Apr 25 22:30:30 UTC 2021 Modified Files: src/distrib/sets/lists/base: ad.mips src/distrib/sets/lists/comp: ad.mips src/distrib/sets/lists/debug: ad.mips Log Message: Choose the right compat sets for the platform: mipsn64 -> o32 n32 mips64 -> o32 64 To generate a diff of this commit: cvs rdiff -u -r1.82 -r1.83 src/distrib/sets/lists/base/ad.mips cvs rdiff -u -r1.88 -r1.89 src/distrib/sets/lists/comp/ad.mips cvs rdiff -u -r1.79 -r1.80 src/distrib/sets/lists/debug/ad.mips Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/ad.mips diff -u src/distrib/sets/lists/base/ad.mips:1.82 src/distrib/sets/lists/base/ad.mips:1.83 --- src/distrib/sets/lists/base/ad.mips:1.82 Sun Apr 11 22:08:59 2021 +++ src/distrib/sets/lists/base/ad.mips Sun Apr 25 18:30:29 2021 @@ -1,12 +1,13 @@ -# $NetBSD: ad.mips,v 1.82 2021/04/12 02:08:59 mrg Exp $ +# $NetBSD: ad.mips,v 1.83 2021/04/25 22:30:29 christos Exp $ ./lib/libc_fp.sobase-sys-shlib dynamicroot,softfloat,arch64 ./lib/libc_fp.so.0base-sys-shlib dynamicroot,softfloat,arch64 ./lib/libc_fp.so.0.0base-sys-shlib dynamicroot,softfloat,arch64 -./libexec/ld.elf_so-64base-compat-shlib compat,pic,arch64 +./libexec/ld.elf_so-64base-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb +./libexec/ld.elf_so-n32base-compat-shlib compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb ./libexec/ld.elf_so-o32base-compat-shlib compat,pic,arch64 -./usr/lib/64/libc_fp.sobase-compat-shlib compat,pic,arch64 -./usr/lib/64/libc_fp.so.0 base-compat-shlib compat,pic,arch64 -./usr/lib/64/libc_fp.so.0.0 base-compat-shlib compat,pic,arch64 +./usr/lib/64/libc_fp.sobase-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb +./usr/lib/64/libc_fp.so.0 base-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb +./usr/lib/64/libc_fp.so.0.0 base-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb ./usr/lib/libc_fp.sobase-sys-shlib softfloat,arch64 ./usr/lib/libc_fp.so.0base-sys-shlib softfloat,arch64 ./usr/lib/libc_fp.so.0.0 base-sys-shlib softfloat,arch64 @@ -17,6 +18,10 @@ ./usr/lib/o32/libgomp.so.2.0 base-compat-shlib compat,pic,arch64,gcc=9 ./usr/lib/o32/libgomp.so.2.0 base-compat-shlib compat,pic,arch64,gcc=10,obsolete ./usr/lib/o32/libgomp.so.2.1 base-compat-shlib compat,pic,arch64,gcc=10 -./usr/libexec/ld.elf_so-64 base-compat-shlib compat,pic,arch64 +./usr/lib/n32/libc_fp.so base-compat-shlib compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb +./usr/lib/n32/libc_fp.so.0 base-compat-shlib compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb +./usr/lib/n32/libc_fp.so.0.0 base-compat-shlib compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb +./usr/libexec/ld.elf_so-64 base-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb +./usr/libexec/ld.elf_so-n32 base-compat-shlib compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb ./usr/libexec/ld.elf_so-o32 base-sysutil-bin compat,pic,arch64 ./usr/lkm/ldscriptbase-obsolete obsolete Index: src/distrib/sets/lists/comp/ad.mips diff -u src/distrib/sets/lists/comp/ad.mips:1.88 src/distrib/sets/lists/comp/ad.mips:1.89 --- src/distrib/sets/lists/comp/ad.mips:1.88 Sun Apr 11 22:08:59 2021 +++ src/distrib/sets/lists/comp/ad.mips Sun Apr 25 18:30:29 2021 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips,v 1.88 2021/04/12 02:08:59 mrg Exp $ +# $NetBSD: ad.mips,v 1.89 2021/04/25 22:30:29 christos Exp $ -./usr/lib/64/libgomp.a -./usr/lib/64/libgomp.so -./usr/lib/64/libgomp.so.1 @@ -104,15 +104,18 @@ ./usr/include/mips/varargs.h comp-obsolete obsolete ./usr/include/mips/vmparam.h comp-c-include ./usr/include/mips/wchar_limits.h comp-c-include -./usr/lib/64/libc_fp.acomp-c-lib softfloat,compat,arch64 -./usr/lib/64/libc_fp_p.a comp-c-lib profile,softfloat,compat,arch64 -./usr/lib/64/libc_fp_pic.a comp-c-piclib softfloat,picinstall,compat,arch64 +./usr/lib/64/libc_fp.acomp-c-lib softfloat,compat,arch64,!machine_arch=mipsn64eb,!machine_arch=mipsn64el +./usr/lib/64/libc_fp_p.a comp-c-lib profile,softfloat,compat,arch64,!machine_arch=mipsn64eb,!machine_arch=mipsn64el +./usr/lib/64/libc_fp_pic.a comp-c-piclib softfloat,picinstall,compat,arch64,!machine_arch=mipsn64eb,!machine_arch=mipsn64el ./usr/lib/libc_fp.acomp-c-lib softfloat,arch64 ./usr/lib/libc_fp_p.acomp-c-lib profile,softfloat,arch64 ./usr/lib/libc_fp_pic.acomp-c-piclib softfloat,picinstall,arch64 ./usr/lib/o32/libc_fp.acomp-c-lib softfloat,compat,arch64 ./usr/lib/o32/libc_fp_p.a comp-c-lib profile,softfloat,compat,arch64 ./usr/lib/o32/libc_fp_pic.a comp-c-piclib
CVS commit: src/distrib/notes/common
Module Name:src
Committed By: tsutsui
Date: Sat Apr 24 15:38:10 UTC 2021
Modified Files:
src/distrib/notes/common: netboot
Log Message:
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.38 -r1.39 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.38 src/distrib/notes/common/netboot:1.39
--- src/distrib/notes/common/netboot:1.38 Wed Nov 27 09:29:25 2019
+++ src/distrib/notes/common/netboot Sat Apr 24 15:38:10 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: netboot,v 1.38 2019/11/27 09:29:25 martin Exp $
+.\" $NetBSD: netboot,v 1.39 2021/04/24 15:38:10 tsutsui 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: src/distrib/utils/zcat
Module Name:src
Committed By: mrg
Date: Sat Apr 24 04:50:47 UTC 2021
Modified Files:
src/distrib/utils/zcat: Makefile
Log Message:
use GCC_NO_IMPLICIT_FALLTHRU
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/distrib/utils/zcat/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/zcat/Makefile
diff -u src/distrib/utils/zcat/Makefile:1.19 src/distrib/utils/zcat/Makefile:1.20
--- src/distrib/utils/zcat/Makefile:1.19 Sun Sep 29 23:44:58 2019
+++ src/distrib/utils/zcat/Makefile Sat Apr 24 04:50:47 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/09/29 23:44:58 mrg Exp $
+# $NetBSD: Makefile,v 1.20 2021/04/24 04:50:47 mrg Exp $
# Small zcat (i.e. for install media)
#
@@ -26,9 +26,7 @@ CPPFLAGS+= -I${LIBC}/include
CPPFLAGS+= -Dsnprintf=snprintf_ss -Dsprintf=sprintf_ss
CPPFLAGS+= -Dstrerror=strerror_ss
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
-COPTS.inflate.c+= -Wno-error=implicit-fallthrough
-.endif
+COPTS.inflate.c+= ${GCC_NO_IMPLICIT_FALLTHRU}
.include
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: rin Date: Fri Apr 23 15:21:49 UTC 2021 Modified Files: src/distrib/sets/lists/debug: mi Log Message: Add lto-dump.debug. To generate a diff of this commit: cvs rdiff -u -r1.349 -r1.350 src/distrib/sets/lists/debug/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/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.349 src/distrib/sets/lists/debug/mi:1.350 --- src/distrib/sets/lists/debug/mi:1.349 Mon Apr 12 02:09:00 2021 +++ src/distrib/sets/lists/debug/mi Fri Apr 23 15:21:49 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.349 2021/04/12 02:09:00 mrg Exp $ +# $NetBSD: mi,v 1.350 2021/04/23 15:21:49 rin Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib comp-sys-usr compatdir ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile @@ -659,6 +659,7 @@ ./usr/libdata/debug/usr/bin/lpq.debug comp-lpr-debug debug ./usr/libdata/debug/usr/bin/lpr.debug comp-lpr-debug debug ./usr/libdata/debug/usr/bin/lprm.debug comp-lpr-debug debug +./usr/libdata/debug/usr/bin/lto-dump.debug comp-c-debug gcccmds,gcc=10,debug ./usr/libdata/debug/usr/bin/lua.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/luac.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/lzf.debug comp-util-debug debug
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: mrg Date: Fri Apr 23 01:53:55 UTC 2021 Modified Files: src/distrib/sets/lists/comp: mi Log Message: sort. To generate a diff of this commit: cvs rdiff -u -r1.2380 -r1.2381 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2380 src/distrib/sets/lists/comp/mi:1.2381 --- src/distrib/sets/lists/comp/mi:1.2380 Fri Apr 16 07:45:41 2021 +++ src/distrib/sets/lists/comp/mi Fri Apr 23 01:53:55 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2380 2021/04/16 07:45:41 msaitoh Exp $ +# $NetBSD: mi,v 1.2381 2021/04/23 01:53:55 mrg Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -981,8 +981,8 @@ ./usr/include/g++/backward/tempbuf.h comp-obsolete obsolete ./usr/include/g++/backward/tree.h comp-obsolete obsolete ./usr/include/g++/backward/vector.h comp-obsolete obsolete -./usr/include/g++/bitcomp-cxx-include gcc=9,cxx,libstdcxx ./usr/include/g++/bitcomp-cxx-include gcc=10,cxx,libstdcxx +./usr/include/g++/bitcomp-cxx-include gcc=9,cxx,libstdcxx ./usr/include/g++/bitdo1.h comp-obsolete obsolete ./usr/include/g++/bitdo2.h comp-obsolete obsolete ./usr/include/g++/bitprims.h comp-obsolete obsolete @@ -2127,6 +2127,16 @@ ./usr/include/g++/vector comp-cxx-include gcc,cxx,libstdcxx ./usr/include/g++/vector.h comp-obsolete obsolete ./usr/include/g++/version comp-cxx-include gcc,cxx,libstdcxx +./usr/include/gcc-10/omp.hcomp-gcc-include gcc=10 +./usr/include/gcc-10/openacc.hcomp-gcc-include gcc=10 +./usr/include/gcc-10/sanitizer/allocator_interface.h comp-gcc-include gcc=10 +./usr/include/gcc-10/sanitizer/asan_interface.h comp-gcc-include gcc=10 +./usr/include/gcc-10/sanitizer/common_interface_defs.h comp-gcc-include gcc=10 +./usr/include/gcc-10/sanitizer/lsan_interface.h comp-gcc-include gcc=10 +./usr/include/gcc-10/sanitizer/netbsd_syscall_hooks.h comp-gcc-include gcc=10 +./usr/include/gcc-10/sanitizer/tsan_interface.h comp-gcc-include gcc=10 +./usr/include/gcc-10/sanitizer/tsan_interface_atomic.h comp-gcc-include gcc=10 +./usr/include/gcc-10/stdatomic.h comp-gcc-include gcc=10 ./usr/include/gcc-4.5/mf-runtime.h comp-obsolete obsolete ./usr/include/gcc-4.5/omp.h comp-obsolete obsolete ./usr/include/gcc-4.8/mf-runtime.h comp-obsolete obsolete @@ -2228,16 +2238,6 @@ ./usr/include/gcc-9/sanitizer/tsan_interface.h comp-gcc-include gcc=9 ./usr/include/gcc-9/sanitizer/tsan_interface_atomic.h comp-gcc-include gcc=9 ./usr/include/gcc-9/stdatomic.hcomp-gcc-include gcc=9 -./usr/include/gcc-10/omp.hcomp-gcc-include gcc=10 -./usr/include/gcc-10/openacc.hcomp-gcc-include gcc=10 -./usr/include/gcc-10/sanitizer/allocator_interface.h comp-gcc-include gcc=10 -./usr/include/gcc-10/sanitizer/asan_interface.h comp-gcc-include gcc=10 -./usr/include/gcc-10/sanitizer/common_interface_defs.h comp-gcc-include gcc=10 -./usr/include/gcc-10/sanitizer/lsan_interface.h comp-gcc-include gcc=10 -./usr/include/gcc-10/sanitizer/netbsd_syscall_hooks.h comp-gcc-include gcc=10 -./usr/include/gcc-10/sanitizer/tsan_interface.h comp-gcc-include gcc=10 -./usr/include/gcc-10/sanitizer/tsan_interface_atomic.h comp-gcc-include gcc=10 -./usr/include/gcc-10/stdatomic.h comp-gcc-include gcc=10 ./usr/include/gelf.hcomp-c-include ./usr/include/getopt.hcomp-c-include ./usr/include/glob.hcomp-c-include @@ -4014,10 +4014,10 @@ ./usr/lib/libtpm_unseal_p.a comp-c-proflib compatfile,tpm,profile ./usr/lib/libtre.acomp-c-lib compatfile ./usr/lib/libtre_p.acomp-c-proflib compatfile,profile -./usr/lib/libtsan.acomp-c-lib arch64,cxx,gcc=9,machine=amd64 -./usr/lib/libtsan_p.acomp-c-proflib arch64,profile,cxx,gcc=9,machine=amd64 ./usr/lib/libtsan.acomp-c-lib arch64,cxx,gcc=10,machine=amd64 +./usr/lib/libtsan.acomp-c-lib arch64,cxx,gcc=9,machine=amd64 ./usr/lib/libtsan_p.acomp-c-proflib arch64,profile,cxx,gcc=10,machine=amd64 +./usr/lib/libtsan_p.acomp-c-proflib arch64,profile,cxx,gcc=9,machine=amd64 ./usr/lib/libtspi.acomp-c-lib compatfile,tpm ./usr/lib/libtspi_p.acomp-c-proflib compatfile,tpm,profile ./usr/lib/libubsan.acomp-c-lib compatfile,cxx,gcc @@ -7574,10 +7574,10 @@ ./usr/share/man/cat3/getttyent.0 comp-c-catman .cat ./usr/share/man/cat3/getttynam.0 comp-c-catman .cat ./usr/share/man/cat3/getusershell.0 comp-c-catman .cat -./usr/share/man/cat3/getutmp.0 comp-c-catman .cat -./usr/share/man/cat3/getutmpx.0 comp-c-catman .cat ./usr/share/man/cat3/getutent.0 comp-c-catman .cat ./usr/share/man/cat3/getutline.0 comp-c-catman .cat +./usr/share/man/cat3/getutmp.0 comp-c-catman .cat +./usr/share/man/cat3/getutmpx.0 comp-c-catman .cat ./usr/share/man/cat3/getutxent.0 comp-c-catman .cat
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Mon Apr 19 14:41:18 UTC 2021 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/debug: shl.mi Log Message: bump libssh To generate a diff of this commit: cvs rdiff -u -r1.917 -r1.918 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.274 -r1.275 src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.917 src/distrib/sets/lists/base/shl.mi:1.918 --- src/distrib/sets/lists/base/shl.mi:1.917 Sun Apr 11 22:08:59 2021 +++ src/distrib/sets/lists/base/shl.mi Mon Apr 19 10:41:18 2021 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.917 2021/04/12 02:08:59 mrg Exp $ +# $NetBSD: shl.mi,v 1.918 2021/04/19 14:41:18 christos Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -876,8 +876,8 @@ ./usr/lib/libsqlite3.so.1.4 base-sys-shlib compatfile ./usr/lib/libss.sobase-obsolete obsolete ./usr/lib/libssh.sobase-secsh-shlib compatfile -./usr/lib/libssh.so.39base-secsh-shlib compatfile -./usr/lib/libssh.so.39.0 base-secsh-shlib compatfile +./usr/lib/libssh.so.40base-secsh-shlib compatfile +./usr/lib/libssh.so.40.0 base-secsh-shlib compatfile ./usr/lib/libssl.sobase-crypto-shlib compatfile ./usr/lib/libssl.so.12base-crypto-shlib compatfile,openssl=10 ./usr/lib/libssl.so.12.0 base-crypto-shlib compatfile,openssl=10 Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.274 src/distrib/sets/lists/debug/shl.mi:1.275 --- src/distrib/sets/lists/debug/shl.mi:1.274 Sun Apr 11 22:09:00 2021 +++ src/distrib/sets/lists/debug/shl.mi Mon Apr 19 10:41:18 2021 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.274 2021/04/12 02:09:00 mrg Exp $ +# $NetBSD: shl.mi,v 1.275 2021/04/19 14:41:18 christos Exp $ ./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils ./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir ./usr/libdata/debug/lib/libavl.so.0.0.debug comp-zfs-debug debug,dynamicroot,zfs @@ -305,7 +305,7 @@ ./usr/libdata/debug/usr/lib/libskey.so.2.0.debug comp-sys-debug debug,compatfile,skey ./usr/libdata/debug/usr/lib/libsl.so.6.0.debug comp-krb5-debug debug,compatfile,kerberos ./usr/libdata/debug/usr/lib/libsqlite3.so.1.4.debug comp-sys-debug debug,compatfile -./usr/libdata/debug/usr/lib/libssh.so.39.0.debug comp-secsh-debug debug,compatfile +./usr/libdata/debug/usr/lib/libssh.so.40.0.debug comp-secsh-debug debug,compatfile ./usr/libdata/debug/usr/lib/libssl.so.12.0.debug comp-crypto-debug debug,compatfile,openssl=10 ./usr/libdata/debug/usr/lib/libssl.so.14.0.debug comp-crypto-debug debug,compatfile,openssl=11 ./usr/libdata/debug/usr/lib/libstdc++.so.9.0.debug comp-sys-debug debug,compatfile,gcc=9,cxx,libstdcxx
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: mrg Date: Fri Apr 16 01:14:38 UTC 2021 Modified Files: src/distrib/sets/lists/base: mi Log Message: restore gcc-8 subdirs and mark as obsolete. oops. noted by pgoyette. To generate a diff of this commit: cvs rdiff -u -r1.1277 -r1.1278 src/distrib/sets/lists/base/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1277 src/distrib/sets/lists/base/mi:1.1278 --- src/distrib/sets/lists/base/mi:1.1277 Mon Apr 12 02:08:59 2021 +++ src/distrib/sets/lists/base/mi Fri Apr 16 01:14:38 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1277 2021/04/12 02:08:59 mrg Exp $ +# $NetBSD: mi,v 1.1278 2021/04/16 01:14:38 mrg Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -1240,6 +1240,8 @@ ./usr/include/gcc-6/sanitizer base-obsolete obsolete ./usr/include/gcc-7base-obsolete obsolete ./usr/include/gcc-7/sanitizer base-obsolete obsolete +./usr/include/gcc-8base-obsolete obsolete +./usr/include/gcc-8/sanitizer base-obsolete obsolete ./usr/include/gcc-9base-c-usr ./usr/include/gcc-9/sanitizer base-c-usr ./usr/include/gcc-10base-c-usr
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: mrg Date: Mon Apr 12 02:09:00 UTC 2021 Modified Files: src/distrib/sets/lists/base: ad.mips mi shl.mi src/distrib/sets/lists/comp: ad.aarch64 ad.arm ad.hppa ad.m68k ad.mips ad.powerpc ad.riscv ad.sh3 md.alpha md.amd64 md.hppa md.i386 md.ia64 md.or1k md.sparc md.sparc64 md.vax mi shl.mi src/distrib/sets/lists/debug: ad.mips mi shl.mi Log Message: various updates for GCC 10 support. remove dead gcc7/8 support and properly mark obsolete files in gcc9/gcc10. testing on amd64 and shark for GCC 9, and many platforms for GCC 10, (though not arm yet.) To generate a diff of this commit: cvs rdiff -u -r1.81 -r1.82 src/distrib/sets/lists/base/ad.mips cvs rdiff -u -r1.1276 -r1.1277 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.916 -r1.917 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.44 -r1.45 src/distrib/sets/lists/comp/ad.aarch64 cvs rdiff -u -r1.104 -r1.105 src/distrib/sets/lists/comp/ad.arm cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/lists/comp/ad.hppa cvs rdiff -u -r1.64 -r1.65 src/distrib/sets/lists/comp/ad.m68k cvs rdiff -u -r1.87 -r1.88 src/distrib/sets/lists/comp/ad.mips cvs rdiff -u -r1.100 -r1.101 src/distrib/sets/lists/comp/ad.powerpc \ src/distrib/sets/lists/comp/md.sparc cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/lists/comp/ad.riscv cvs rdiff -u -r1.45 -r1.46 src/distrib/sets/lists/comp/ad.sh3 cvs rdiff -u -r1.78 -r1.79 src/distrib/sets/lists/comp/md.alpha cvs rdiff -u -r1.284 -r1.285 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.14 -r1.15 src/distrib/sets/lists/comp/md.hppa cvs rdiff -u -r1.200 -r1.201 src/distrib/sets/lists/comp/md.i386 cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/comp/md.ia64 cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/comp/md.or1k cvs rdiff -u -r1.212 -r1.213 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.52 -r1.53 src/distrib/sets/lists/comp/md.vax cvs rdiff -u -r1.2378 -r1.2379 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.344 -r1.345 src/distrib/sets/lists/comp/shl.mi cvs rdiff -u -r1.78 -r1.79 src/distrib/sets/lists/debug/ad.mips cvs rdiff -u -r1.348 -r1.349 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.273 -r1.274 src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/ad.mips diff -u src/distrib/sets/lists/base/ad.mips:1.81 src/distrib/sets/lists/base/ad.mips:1.82 --- src/distrib/sets/lists/base/ad.mips:1.81 Mon Sep 7 00:19:04 2020 +++ src/distrib/sets/lists/base/ad.mips Mon Apr 12 02:08:59 2021 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips,v 1.81 2020/09/07 00:19:04 mrg Exp $ +# $NetBSD: ad.mips,v 1.82 2021/04/12 02:08:59 mrg Exp $ ./lib/libc_fp.sobase-sys-shlib dynamicroot,softfloat,arch64 ./lib/libc_fp.so.0base-sys-shlib dynamicroot,softfloat,arch64 ./lib/libc_fp.so.0.0base-sys-shlib dynamicroot,softfloat,arch64 @@ -14,9 +14,9 @@ ./usr/lib/o32/libc_fp.so.0 base-compat-shlib compat,pic,arch64 ./usr/lib/o32/libc_fp.so.0.0 base-compat-shlib compat,pic,arch64 ./usr/lib/o32/libgomp.so.1.3 base-compat-shlib obsolete -./usr/lib/o32/libgomp.so.2.0 base-compat-shlib compat,pic,arch64,gcc=7 -./usr/lib/o32/libgomp.so.2.0 base-compat-shlib compat,pic,arch64,gcc=8 ./usr/lib/o32/libgomp.so.2.0 base-compat-shlib compat,pic,arch64,gcc=9 +./usr/lib/o32/libgomp.so.2.0 base-compat-shlib compat,pic,arch64,gcc=10,obsolete +./usr/lib/o32/libgomp.so.2.1 base-compat-shlib compat,pic,arch64,gcc=10 ./usr/libexec/ld.elf_so-64 base-compat-shlib compat,pic,arch64 ./usr/libexec/ld.elf_so-o32 base-sysutil-bin compat,pic,arch64 ./usr/lkm/ldscriptbase-obsolete obsolete Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1276 src/distrib/sets/lists/base/mi:1.1277 --- src/distrib/sets/lists/base/mi:1.1276 Thu Apr 1 10:35:24 2021 +++ src/distrib/sets/lists/base/mi Mon Apr 12 02:08:59 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1276 2021/04/01 10:35:24 martin Exp $ +# $NetBSD: mi,v 1.1277 2021/04/12 02:08:59 mrg Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -1240,10 +1240,10 @@ ./usr/include/gcc-6/sanitizer base-obsolete obsolete ./usr/include/gcc-7base-obsolete obsolete ./usr/include/gcc-7/sanitizer base-obsolete obsolete -./usr/include/gcc-8base-c-usr -./usr/include/gcc-8/sanitizer base-c-usr ./usr/include/gcc-9base-c-usr ./usr/include/gcc-9/sanitizer base-c-usr +./usr/include/gcc-10base-c-usr +./usr/include/gcc-10/sanitizer base-c-usr ./usr/include/gssapibase-c-usr ./usr/include/gssapi/rpc base-obsolete obsolete ./usr/include/isofsbase-c-usr Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.916 src/distrib/sets/lists/base/shl.mi:1.917 --- src/distrib/sets/lists/base/shl.mi:1.916 Wed Apr 7 03:45:18
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: martin Date: Thu Apr 8 13:04:02 UTC 2021 Modified Files: src/distrib/sets/lists/comp: mi Log Message: Add usr/include/elfdefinitions.h and usr/include/sys/elfdefinitions.h To generate a diff of this commit: cvs rdiff -u -r1.2377 -r1.2378 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2377 src/distrib/sets/lists/comp/mi:1.2378 --- src/distrib/sets/lists/comp/mi:1.2377 Wed Mar 10 13:30:34 2021 +++ src/distrib/sets/lists/comp/mi Thu Apr 8 13:04:01 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2377 2021/03/10 13:30:34 simonb Exp $ +# $NetBSD: mi,v 1.2378 2021/04/08 13:04:01 martin Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -807,6 +807,7 @@ ./usr/include/dns_sd.hcomp-mdns-include mdns ./usr/include/dwarf.hcomp-c-include ./usr/include/elf.hcomp-c-include +./usr/include/elfdefinitions.h comp-c-include ./usr/include/endian.hcomp-c-include ./usr/include/err.hcomp-c-include ./usr/include/errno.hcomp-c-include @@ -3068,6 +3069,7 @@ ./usr/include/sys/domain.h comp-c-include ./usr/include/sys/drvctlio.h comp-c-include ./usr/include/sys/dvdio.h comp-c-include +./usr/include/sys/elfdefinitions.h comp-c-include ./usr/include/sys/endian.h comp-c-include ./usr/include/sys/envsys.h comp-c-include ./usr/include/sys/errno.h comp-c-include
CVS commit: src/distrib/notes
Module Name:src
Committed By: nia
Date: Wed Apr 7 07:51:13 UTC 2021
Modified Files:
src/distrib/notes/arc: prep
src/distrib/notes/cats: prep
src/distrib/notes/macppc: prep.OPENFIRMWARE
Log Message:
Update for pkgsrc README.html transition
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/notes/arc/prep
cvs rdiff -u -r1.14 -r1.15 src/distrib/notes/cats/prep
cvs rdiff -u -r1.21 -r1.22 src/distrib/notes/macppc/prep.OPENFIRMWARE
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/arc/prep
diff -u src/distrib/notes/arc/prep:1.5 src/distrib/notes/arc/prep:1.6
--- src/distrib/notes/arc/prep:1.5 Sun Nov 24 11:15:32 2019
+++ src/distrib/notes/arc/prep Wed Apr 7 07:51:12 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: prep,v 1.5 2019/11/24 11:15:32 martin Exp $
+.\" $NetBSD: prep,v 1.6 2021/04/07 07:51:12 nia Exp $
.
First and foremost, before beginning the installation process,
.Em make sure you have a reliable backup
@@ -49,7 +49,7 @@ This is available in the packages collec
Systems not supported by the packages
collection should get it from the official website:
.br
-.Lk https://cdn.NetBSD.org/pub/NetBSD/packages/pkgsrc/sysutils/cdrtools/README.html
+.Lk https://cdn.NetBSD.org/pub/NetBSD/packages/pkgsrc/sysutils/cdrtools/
.br
.Lk http://cdrecord.berlios.de/old/private/cdrecord.html
.Pp
Index: src/distrib/notes/cats/prep
diff -u src/distrib/notes/cats/prep:1.14 src/distrib/notes/cats/prep:1.15
--- src/distrib/notes/cats/prep:1.14 Sun Nov 24 11:15:32 2019
+++ src/distrib/notes/cats/prep Wed Apr 7 07:51:12 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: prep,v 1.14 2019/11/24 11:15:32 martin Exp $
+.\" $NetBSD: prep,v 1.15 2021/04/07 07:51:12 nia Exp $
.
A \*M machine usually needs little or no preparation before installing
.Nx ,
@@ -45,7 +45,7 @@ This is available in the packages collec
Systems not supported by the packages
collection should get it from the official website:
.br
-.Lk https://cdn.NetBSD.org/pub/NetBSD/packages/pkgsrc/sysutils/cdrtools/README.html
+.Lk https://cdn.NetBSD.org/pub/NetBSD/packages/pkgsrc/sysutils/cdrtools/
.br
.Lk http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html
.Pp
Index: src/distrib/notes/macppc/prep.OPENFIRMWARE
diff -u src/distrib/notes/macppc/prep.OPENFIRMWARE:1.21 src/distrib/notes/macppc/prep.OPENFIRMWARE:1.22
--- src/distrib/notes/macppc/prep.OPENFIRMWARE:1.21 Sun Nov 24 11:15:34 2019
+++ src/distrib/notes/macppc/prep.OPENFIRMWARE Wed Apr 7 07:51:12 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: prep.OPENFIRMWARE,v 1.21 2019/11/24 11:15:34 martin Exp $
+.\" $NetBSD: prep.OPENFIRMWARE,v 1.22 2021/04/07 07:51:12 nia Exp $
.if \*[OF_VERSION_3] \{\
.
.Ss2 Updating your BootROM
@@ -1056,7 +1056,7 @@ for
file systems, and
.Ic hfstools
to create and mount HFS file systems.
-.Lk https://cdn.NetBSD.org/pub/NetBSD/packages/pkgsrc/sysutils/hfsutils/README.html
+.Lk https://cdn.NetBSD.org/pub/NetBSD/packages/pkgsrc/sysutils/hfsutils/
.Pp
Make the following partitions:
.(tag "A/UXxUserxandxA/UXxFree1" -offset indent
@@ -1199,7 +1199,7 @@ Other
.Ul
systems should get it from the official website:
.br
-.Lk https://cdn.NetBSD.org/pub/NetBSD/packages/pkgsrc/sysutils/cdrtools/README.html
+.Lk https://cdn.NetBSD.org/pub/NetBSD/packages/pkgsrc/sysutils/cdrtools/
.br
.Lk http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html
.Pp
@@ -1391,7 +1391,7 @@ Other
.Ul
systems should get it from the official website:
.br
-.Lk https://cdn.NetBSD.org/pub/NetBSD/packages/pkgsrc/sysutils/cdrtools/README.html
+.Lk https://cdn.NetBSD.org/pub/NetBSD/packages/pkgsrc/sysutils/cdrtools/
.br
.Lk http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html
.Pp
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Wed Apr 7 03:45:18 UTC 2021 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/debug: shl.mi Log Message: bump libevent To generate a diff of this commit: cvs rdiff -u -r1.915 -r1.916 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.272 -r1.273 src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.915 src/distrib/sets/lists/base/shl.mi:1.916 --- src/distrib/sets/lists/base/shl.mi:1.915 Fri Apr 2 06:06:26 2021 +++ src/distrib/sets/lists/base/shl.mi Tue Apr 6 23:45:18 2021 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.915 2021/04/02 10:06:26 martin Exp $ +# $NetBSD: shl.mi,v 1.916 2021/04/07 03:45:18 christos Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -44,7 +44,7 @@ ./lib/libedit.so.3.1base-sys-shlib dynamicroot ./lib/libevent.sobase-sys-shlib dynamicroot ./lib/libevent.so.4base-sys-shlib dynamicroot -./lib/libevent.so.4.1base-sys-shlib dynamicroot +./lib/libevent.so.4.2base-sys-shlib dynamicroot ./lib/libgcc_s.sobase-sys-shlib dynamicroot,gcc ./lib/libgcc_s.so.1base-sys-shlib dynamicroot,gcc ./lib/libgcc_s.so.1.0base-sys-shlib dynamicroot,gcc @@ -317,13 +317,13 @@ ./usr/lib/libelf.so.2.0base-sys-shlib compatfile ./usr/lib/libevent.sobase-sys-shlib compatfile ./usr/lib/libevent.so.4base-sys-shlib compatfile -./usr/lib/libevent.so.4.1 base-sys-shlib compatfile +./usr/lib/libevent.so.4.2 base-sys-shlib compatfile ./usr/lib/libevent_openssl.so base-sys-shlib compatfile ./usr/lib/libevent_openssl.so.4 base-sys-shlib compatfile -./usr/lib/libevent_openssl.so.4.1 base-sys-shlib compatfile +./usr/lib/libevent_openssl.so.4.2 base-sys-shlib compatfile ./usr/lib/libevent_pthreads.so base-sys-shlib compatfile ./usr/lib/libevent_pthreads.so.4 base-sys-shlib compatfile -./usr/lib/libevent_pthreads.so.4.1 base-sys-shlib compatfile +./usr/lib/libevent_pthreads.so.4.2 base-sys-shlib compatfile ./usr/lib/libexecinfo.so base-sys-shlib compatfile ./usr/lib/libexecinfo.so.0 base-sys-shlib compatfile ./usr/lib/libexecinfo.so.0.0 base-sys-shlib compatfile Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.272 src/distrib/sets/lists/debug/shl.mi:1.273 --- src/distrib/sets/lists/debug/shl.mi:1.272 Mon Mar 15 16:17:04 2021 +++ src/distrib/sets/lists/debug/shl.mi Tue Apr 6 23:45:18 2021 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.272 2021/03/15 20:17:04 christos Exp $ +# $NetBSD: shl.mi,v 1.273 2021/04/07 03:45:18 christos Exp $ ./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils ./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir ./usr/libdata/debug/lib/libavl.so.0.0.debug comp-zfs-debug debug,dynamicroot,zfs @@ -11,7 +11,7 @@ ./usr/libdata/debug/lib/libdevmapper.so.1.0.debug comp-sys-debug debug,dynamicroot,lvm ./usr/libdata/debug/lib/libdm.so.0.0.debug comp-sys-debug debug,dynamicroot ./usr/libdata/debug/lib/libedit.so.3.1.debug comp-sys-debug debug,dynamicroot -./usr/libdata/debug/lib/libevent.so.4.1.debug comp-sys-debug debug,dynamicroot +./usr/libdata/debug/lib/libevent.so.4.2.debug comp-sys-debug debug,dynamicroot ./usr/libdata/debug/lib/libgcc_s.so.1.0.debug comp-sys-debug debug,dynamicroot,gcc ./usr/libdata/debug/lib/libipsec.so.3.0.debug comp-sys-debug debug,dynamicroot ./usr/libdata/debug/lib/libkvm.so.6.0.debug comp-sys-debug debug,dynamicroot @@ -110,9 +110,9 @@ ./usr/libdata/debug/usr/lib/libdwarf.so.2.0.debug comp-sys-debug debug,compatfile ./usr/libdata/debug/usr/lib/libedit.so.3.1.debug comp-sys-debug debug,compatfile ./usr/libdata/debug/usr/lib/libelf.so.2.0.debug comp-sys-debug debug,compatfile -./usr/libdata/debug/usr/lib/libevent.so.4.1.debug comp-sys-debug debug,compatfile -./usr/libdata/debug/usr/lib/libevent_openssl.so.4.1.debug comp-sys-debug debug,compatfile -./usr/libdata/debug/usr/lib/libevent_pthreads.so.4.1.debug comp-sys-debug debug,compatfile +./usr/libdata/debug/usr/lib/libevent.so.4.2.debug comp-sys-debug debug,compatfile +./usr/libdata/debug/usr/lib/libevent_openssl.so.4.2.debug comp-sys-debug debug,compatfile +./usr/libdata/debug/usr/lib/libevent_pthreads.so.4.2.debug comp-sys-debug debug,compatfile ./usr/libdata/debug/usr/lib/libexecinfo.so.0.0.debug comp-sys-debug debug,compatfile ./usr/libdata/debug/usr/lib/libexpat.so.2.3.debug comp-sys-debug debug,compatfile ./usr/libdata/debug/usr/lib/libfetch.so.3.0.debug comp-sys-debug debug,compatfile
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: martin Date: Fri Apr 2 10:06:27 UTC 2021 Modified Files: src/distrib/sets/lists/base: shl.mi Log Message: named/filter-.so is unrelated to DYNAMICROOT To generate a diff of this commit: cvs rdiff -u -r1.914 -r1.915 src/distrib/sets/lists/base/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.914 src/distrib/sets/lists/base/shl.mi:1.915 --- src/distrib/sets/lists/base/shl.mi:1.914 Thu Apr 1 10:35:24 2021 +++ src/distrib/sets/lists/base/shl.mi Fri Apr 2 10:06:26 2021 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.914 2021/04/01 10:35:24 martin Exp $ +# $NetBSD: shl.mi,v 1.915 2021/04/02 10:06:26 martin Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -1002,4 +1002,4 @@ ./usr/lib/security/pam_u2f.so.4 base-sys-shlib compatfile,pam ./usr/lib/security/pam_unix.so.4 base-sys-shlib compatfile,pam ./usr/libexec/ld.elf_sobase-sys-shlib dynamicroot -./usr/libexec/named/filter-.so base-bind-bin dynamicroot +./usr/libexec/named/filter-.so base-bind-bin
CVS commit: src/distrib/notes
Module Name:src
Committed By: rin
Date: Fri Apr 2 07:09:11 UTC 2021
Modified Files:
src/distrib/notes/common: contents
src/distrib/notes/evbppc: contents
Log Message:
Document DHT kernel for evbppc.
To generate a diff of this commit:
cvs rdiff -u -r1.184 -r1.185 src/distrib/notes/common/contents
cvs rdiff -u -r1.8 -r1.9 src/distrib/notes/evbppc/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/common/contents
diff -u src/distrib/notes/common/contents:1.184 src/distrib/notes/common/contents:1.185
--- src/distrib/notes/common/contents:1.184 Tue Sep 22 02:53:52 2020
+++ src/distrib/notes/common/contents Fri Apr 2 07:09:11 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: contents,v 1.184 2020/09/22 02:53:52 snj Exp $
+.\" $NetBSD: contents,v 1.185 2021/04/02 07:09:11 rin Exp $
.\"
.\" Copyright (c) 1999-2020 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -206,6 +206,10 @@ A kernel suitable for booting on O2.
.\}
.
.if \n[evbppc] \{\
+. It Pa netbsd-DHT.gz
+A gzipped kernel (in ELF format) for the DHT Walnut 405GP evaluation board.
+. It Pa netbsd.bin-DHT.gz
+Same as the above, but in the raw binary format expected by the firmware.
. It Pa netbsd-EV64260.gz
A gzipped kernel (in ELF format) for the Marvell EV-64260.
. It Pa netbsd.img-EV64260.gz
@@ -743,6 +747,15 @@ kernel, which will use multiple processo
.\}
.el \{\
.ie \n[evbppc] \{\
+.It Sy kern-DHT
+This set contains a
+.Nx*M
+\*V
+kernel in ELF format named
+.Pa /netbsd
+and the same kernel in the raw binary format needed by the bootloader as
+.Pa /netbsd.bin .
+These kernels are specific to the DHT Walnut 405GP evaluation board.
.It Sy kern-EV64260
This set contains a
.Nx*M
Index: src/distrib/notes/evbppc/contents
diff -u src/distrib/notes/evbppc/contents:1.8 src/distrib/notes/evbppc/contents:1.9
--- src/distrib/notes/evbppc/contents:1.8 Fri Aug 7 00:43:48 2020
+++ src/distrib/notes/evbppc/contents Fri Apr 2 07:09:11 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: contents,v 1.8 2020/08/07 00:43:48 snj Exp $
+.\" $NetBSD: contents,v 1.9 2021/04/02 07:09:11 rin Exp $
.\"
.\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -56,6 +56,14 @@ conventions for indicating italic and bo
.
. (tag netbsd.gz -compact \" binary/kernel
.
+. It Pa netbsd-DHT.gz
+.
+A gzipped kernel (in ELF format) for the DHT Walnut 405GP evaluation board.
+.
+. It Pa netbsd.bin-DHT.gz
+.
+Same as the above, but in the raw binary format expected by the firmware.
+.
. It Pa netbsd-EV64260.gz
.
A gzipped kernel (in ELF format) for the Marvell EV-64260.
@@ -222,6 +230,15 @@ This set includes the games and their ma
.
.\" MD kernel set(s) -
.
+.It Sy kern-DHT
+This set contains a
+.Nx*M
+\*V
+kernel in ELF format named
+.Pa /netbsd
+and the same kernel in the raw binary format needed by the bootloader as
+.Pa /netbsd.bin .
+These kernels are specific to the DHT Walnut 405GP evaluation board.
.It Sy kern-EV64260
This set contains a
.Nx*M
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: martin Date: Thu Apr 1 10:35:24 UTC 2021 Modified Files: src/distrib/sets/lists/base: mi shl.mi Log Message: Move the named filter- plugin to the shared list To generate a diff of this commit: cvs rdiff -u -r1.1275 -r1.1276 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.913 -r1.914 src/distrib/sets/lists/base/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1275 src/distrib/sets/lists/base/mi:1.1276 --- src/distrib/sets/lists/base/mi:1.1275 Wed Mar 31 04:38:30 2021 +++ src/distrib/sets/lists/base/mi Thu Apr 1 10:35:24 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1275 2021/03/31 04:38:30 christos Exp $ +# $NetBSD: mi,v 1.1276 2021/04/01 10:35:24 martin Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -1602,7 +1602,6 @@ ./usr/libexec/makekeybase-crypto-bin ./usr/libexec/makewhatis base-man-bin !makemandb ./usr/libexec/namedbase-bind-bin -./usr/libexec/named/filter-.so base-bind-bin ./usr/libexec/named-xfer base-obsolete obsolete ./usr/libexec/ntalkdbase-netutil-bin ./usr/libexec/pfspamdbase-obsolete obsolete Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.913 src/distrib/sets/lists/base/shl.mi:1.914 --- src/distrib/sets/lists/base/shl.mi:1.913 Mon Mar 15 20:17:04 2021 +++ src/distrib/sets/lists/base/shl.mi Thu Apr 1 10:35:24 2021 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.913 2021/03/15 20:17:04 christos Exp $ +# $NetBSD: shl.mi,v 1.914 2021/04/01 10:35:24 martin Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -1002,3 +1002,4 @@ ./usr/lib/security/pam_u2f.so.4 base-sys-shlib compatfile,pam ./usr/lib/security/pam_unix.so.4 base-sys-shlib compatfile,pam ./usr/libexec/ld.elf_sobase-sys-shlib dynamicroot +./usr/libexec/named/filter-.so base-bind-bin dynamicroot
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: christos Date: Wed Mar 31 04:38:30 UTC 2021 Modified Files: src/distrib/sets/lists/base: mi Log Message: new named plugin (simon@) To generate a diff of this commit: cvs rdiff -u -r1.1274 -r1.1275 src/distrib/sets/lists/base/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1274 src/distrib/sets/lists/base/mi:1.1275 --- src/distrib/sets/lists/base/mi:1.1274 Sun Jan 17 14:32:52 2021 +++ src/distrib/sets/lists/base/mi Wed Mar 31 00:38:30 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1274 2021/01/17 19:32:52 rillig Exp $ +# $NetBSD: mi,v 1.1275 2021/03/31 04:38:30 christos Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -1601,6 +1601,8 @@ ./usr/libexec/mail.local base-mail-bin ./usr/libexec/makekeybase-crypto-bin ./usr/libexec/makewhatis base-man-bin !makemandb +./usr/libexec/namedbase-bind-bin +./usr/libexec/named/filter-.so base-bind-bin ./usr/libexec/named-xfer base-obsolete obsolete ./usr/libexec/ntalkdbase-netutil-bin ./usr/libexec/pfspamdbase-obsolete obsolete
CVS commit: src/distrib/amd64/installimage
Module Name:src
Committed By: pgoyette
Date: Fri Mar 26 21:18:29 UTC 2021
Modified Files:
src/distrib/amd64/installimage: Makefile
Log Message:
The install-image has grown a bit recently, and at least amd64 has
outgrown the previous size specification when the system was built
with all of MKDEBUG, MKKDEBUG, and MKDEBUGLIB set to "yes" (and
also when in-tree X11 is included).
So, bump the size a bit.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/distrib/amd64/installimage/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/amd64/installimage/Makefile
diff -u src/distrib/amd64/installimage/Makefile:1.14 src/distrib/amd64/installimage/Makefile:1.15
--- src/distrib/amd64/installimage/Makefile:1.14 Mon Jan 18 03:35:11 2021
+++ src/distrib/amd64/installimage/Makefile Fri Mar 26 21:18:29 2021
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2021/01/18 03:35:11 pgoyette Exp $
+# $NetBSD: Makefile,v 1.15 2021/03/26 21:18:29 pgoyette Exp $
.include
INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-install # gives ${IMGBASE}.img
-INSTIMAGEMB?= 1590 # for all installation binaries
+INSTIMAGEMB?= 1600 # for all installation binaries
PRIMARY_BOOT= bootxx_ffsv1
SECONDARY_BOOT= boot
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: nia Date: Thu Mar 25 21:37:10 UTC 2021 Modified Files: src/distrib/sets/lists/debug: module.md.amd64 module.md.i386 module.mi Log Message: Move pad module to MI debug set lists To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/debug/module.md.amd64 cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/debug/module.md.i386 cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/debug/module.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/debug/module.md.amd64 diff -u src/distrib/sets/lists/debug/module.md.amd64:1.4 src/distrib/sets/lists/debug/module.md.amd64:1.5 --- src/distrib/sets/lists/debug/module.md.amd64:1.4 Sun Nov 1 18:51:34 2020 +++ src/distrib/sets/lists/debug/module.md.amd64 Thu Mar 25 21:37:10 2021 @@ -1,4 +1,4 @@ -# $NetBSD: module.md.amd64,v 1.4 2020/11/01 18:51:34 pgoyette Exp $ +# $NetBSD: module.md.amd64,v 1.5 2021/03/25 21:37:10 nia Exp $ ./usr/libdata/debug/@MODULEDIR@/acpiacadmodules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/acpiacad/acpiacad.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/acpibatmodules-base-kernel kmod,debug @@ -179,8 +179,6 @@ ./usr/libdata/debug/@MODULEDIR@/nxt2k/nxt2k.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/odcmmodules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/odcm/odcm.kmod.debug modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/padmodules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/pad/pad.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/powernowmodules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/powernow/powernow.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/pwdogmodules-base-kernel kmod,debug Index: src/distrib/sets/lists/debug/module.md.i386 diff -u src/distrib/sets/lists/debug/module.md.i386:1.2 src/distrib/sets/lists/debug/module.md.i386:1.3 --- src/distrib/sets/lists/debug/module.md.i386:1.2 Tue Sep 8 14:57:32 2020 +++ src/distrib/sets/lists/debug/module.md.i386 Thu Mar 25 21:37:10 2021 @@ -1,4 +1,4 @@ -# $NetBSD: module.md.i386,v 1.2 2020/09/08 14:57:32 martin Exp $ +# $NetBSD: module.md.i386,v 1.3 2021/03/25 21:37:10 nia Exp $ ./usr/libdata/debug/@MODULEDIR@/acpiacadmodules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/acpiacad/acpiacad.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/acpibatmodules-base-kernel kmod,debug @@ -135,8 +135,6 @@ ./usr/libdata/debug/@MODULEDIR@/nxt2k/nxt2k.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/odcmmodules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/odcm/odcm.kmod.debug modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/padmodules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/pad/pad.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/padlockmodules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/padlock/padlock.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/powernowmodules-base-kernel kmod,debug Index: src/distrib/sets/lists/debug/module.mi diff -u src/distrib/sets/lists/debug/module.mi:1.7 src/distrib/sets/lists/debug/module.mi:1.8 --- src/distrib/sets/lists/debug/module.mi:1.7 Sun Oct 18 10:10:18 2020 +++ src/distrib/sets/lists/debug/module.mi Thu Mar 25 21:37:10 2021 @@ -1,4 +1,4 @@ -# $NetBSD: module.mi,v 1.7 2020/10/18 10:10:18 rin Exp $ +# $NetBSD: module.mi,v 1.8 2021/03/25 21:37:10 nia Exp $ ./usr/libdata/debug/@MODULEDIR@ modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/accf_dataready modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/accf_dataready/accf_dataready.kmod.debug modules-base-kernel kmod,debug @@ -286,6 +286,8 @@ ./usr/libdata/debug/@MODULEDIR@/opencrypto/opencrypto.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/overlaymodules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/overlay/overlay.kmod.debug modules-base-kernel kmod,debug +./usr/libdata/debug/@MODULEDIR@/padmodules-base-kernel kmod,debug +./usr/libdata/debug/@MODULEDIR@/pad/pad.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/pciverbose modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/pciverbose/pciverbose.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/pfmodules-base-kernel kmod,debug
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Mon Mar 15 20:17:04 UTC 2021 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/debug: shl.mi Log Message: bump libunbound To generate a diff of this commit: cvs rdiff -u -r1.912 -r1.913 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.271 -r1.272 src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.912 src/distrib/sets/lists/base/shl.mi:1.913 --- src/distrib/sets/lists/base/shl.mi:1.912 Fri Mar 5 13:08:21 2021 +++ src/distrib/sets/lists/base/shl.mi Mon Mar 15 16:17:04 2021 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.912 2021/03/05 18:08:21 christos Exp $ +# $NetBSD: shl.mi,v 1.913 2021/03/15 20:17:04 christos Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -926,8 +926,8 @@ ./usr/lib/libumem.so.0base-zfs-shlib compatfile,zfs ./usr/lib/libumem.so.0.0 base-zfs-shlib compatfile,zfs ./usr/lib/libunbound.sobase-sys-shlib compatfile,unbound -./usr/lib/libunbound.so.6 base-sys-shlib compatfile,unbound -./usr/lib/libunbound.so.6.2 base-sys-shlib compatfile,unbound +./usr/lib/libunbound.so.7 base-sys-shlib compatfile,unbound +./usr/lib/libunbound.so.7.0 base-sys-shlib compatfile,unbound ./usr/lib/libusbhid.sobase-sys-shlib compatfile ./usr/lib/libusbhid.so.1 base-sys-shlib compatfile ./usr/lib/libusbhid.so.1.0 base-sys-shlib compatfile Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.271 src/distrib/sets/lists/debug/shl.mi:1.272 --- src/distrib/sets/lists/debug/shl.mi:1.271 Fri Mar 5 13:08:21 2021 +++ src/distrib/sets/lists/debug/shl.mi Mon Mar 15 16:17:04 2021 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.271 2021/03/05 18:08:21 christos Exp $ +# $NetBSD: shl.mi,v 1.272 2021/03/15 20:17:04 christos Exp $ ./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils ./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir ./usr/libdata/debug/lib/libavl.so.0.0.debug comp-zfs-debug debug,dynamicroot,zfs @@ -327,7 +327,7 @@ ./usr/libdata/debug/usr/lib/libubsan.so.4.0.debug comp-sys-debug debug,compatfile,cxx,gcc=9 ./usr/libdata/debug/usr/lib/libukfs.so.1.0.debug comp-sys-debug debug,compatfile,rump ./usr/libdata/debug/usr/lib/libumem.so.0.0.debug comp-zfs-debug debug,compatfile,zfs -./usr/libdata/debug/usr/lib/libunbound.so.6.2.debug comp-net-debug debug,compatfile,unbound +./usr/libdata/debug/usr/lib/libunbound.so.7.0.debug comp-net-debug debug,compatfile,unbound ./usr/libdata/debug/usr/lib/libusbhid.so.1.0.debug comp-sys-debug debug,compatfile ./usr/libdata/debug/usr/lib/libutil.so.7.23.debug comp-obsolete debug,compatfile,obsolete ./usr/libdata/debug/usr/lib/libutil.so.7.24.debug comp-sys-debug debug,compatfile
CVS commit: src/distrib/evbarm/instkernel/sshramdisk
Module Name:src Committed By: christos Date: Tue Mar 9 00:08:04 UTC 2021 Modified Files: src/distrib/evbarm/instkernel/sshramdisk: list Log Message: We don't need libwrap anymore; libhack replaces it. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/distrib/evbarm/instkernel/sshramdisk/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/evbarm/instkernel/sshramdisk/list diff -u src/distrib/evbarm/instkernel/sshramdisk/list:1.4 src/distrib/evbarm/instkernel/sshramdisk/list:1.5 --- src/distrib/evbarm/instkernel/sshramdisk/list:1.4 Sun Mar 1 15:59:54 2020 +++ src/distrib/evbarm/instkernel/sshramdisk/list Mon Mar 8 19:08:04 2021 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.4 2020/03/01 20:59:54 christos Exp $ +# $NetBSD: list,v 1.5 2021/03/09 00:08:04 christos Exp $ SRCDIRS bin sbin external/bsd/less/bin crypto/external/bsd/openssh/bin/sshd usr.bin usr.sbin @@ -69,7 +69,7 @@ SPECIAL umount srcdir distrib/utils/x_u SPECIAL sshd srcdir crypto/external/bsd/openssh/bin/sshd SPECIAL sshd keepsymbols allow_severity deny_severity -LIBS libhack.o -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop-lssh -lcrypto -lwrap +LIBS libhack.o -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop-lssh -lcrypto # init invokes the shell as -sh ARGVLN sh -sh
CVS commit: src/distrib/utils/libhack
Module Name:src
Committed By: christos
Date: Tue Mar 9 00:06:44 UTC 2021
Modified Files:
src/distrib/utils/libhack: Makefile.inc
Added Files:
src/distrib/utils/libhack: wrap.c
Log Message:
Add a stubbed version of libwrap (tcpwrappers)
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/distrib/utils/libhack/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/distrib/utils/libhack/wrap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/libhack/Makefile.inc
diff -u src/distrib/utils/libhack/Makefile.inc:1.37 src/distrib/utils/libhack/Makefile.inc:1.38
--- src/distrib/utils/libhack/Makefile.inc:1.37 Thu Feb 25 16:24:00 2021
+++ src/distrib/utils/libhack/Makefile.inc Mon Mar 8 19:06:44 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.37 2021/02/25 21:24:00 christos Exp $
+# $NetBSD: Makefile.inc,v 1.38 2021/03/09 00:06:44 christos Exp $
#
# Include this fragment to build libhack.o
# It is .o and not .a to make sure these are the
@@ -25,7 +25,7 @@ HACKOBJS+= getcap.o getgrent.o getnet.o
localeconv.o multibyte.o perror.o runetable.o setlocale.o \
nl_langinfo.o strcasecmp.o \
strerror.o strsignal.o syslog.o utmp.o fmtcheck.o \
- aligned_alloc.o regcomp.o regexec.o
+ aligned_alloc.o regcomp.o regexec.o wrap.o
.if (${USE_YP} != "no")
HACKOBJS+= yplib.o
Added files:
Index: src/distrib/utils/libhack/wrap.c
diff -u /dev/null src/distrib/utils/libhack/wrap.c:1.1
--- /dev/null Mon Mar 8 19:06:44 2021
+++ src/distrib/utils/libhack/wrap.c Mon Mar 8 19:06:44 2021
@@ -0,0 +1,56 @@
+/*-
+ * Copyright (c) 2021 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * 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.
+ */
+
+#include
+__RCSID("$NetBSD: wrap.c,v 1.1 2021/03/09 00:06:44 christos Exp $");
+
+#include
+
+struct request_info *
+request_init(struct request_info *ri, ...)
+{
+
+ return ri;
+}
+
+void
+sock_host(struct request_info *ri)
+{
+}
+
+int
+hosts_access(struct request_info *ri)
+{
+ return 1; /* always allow */
+}
+
+void
+refuse(struct request_info *ri)
+{
+}
CVS commit: src/distrib/notes/evbarm
Module Name:src Committed By: nia Date: Sun Mar 7 16:25:06 UTC 2021 Modified Files: src/distrib/notes/evbarm: hardware Log Message: G12 To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 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/hardware diff -u src/distrib/notes/evbarm/hardware:1.24 src/distrib/notes/evbarm/hardware:1.25 --- src/distrib/notes/evbarm/hardware:1.24 Tue Sep 15 07:15:21 2020 +++ src/distrib/notes/evbarm/hardware Sun Mar 7 16:25:06 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: hardware,v 1.24 2020/09/15 07:15:21 nia Exp $ +.\" $NetBSD: hardware,v 1.25 2021/03/07 16:25:06 nia Exp $ .\" .\" Copyright (c) 2001-2020 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -61,7 +61,7 @@ are also supported. .It Allwinner H5, H6, A64 (e.g. PINE64, Pinebook, NanoPi A64, OLinuXino...) .It -Amlogic S905, S805X, S905D, S905W, S905X (e.g. ODROID-C2, Le Potato, NanoPi K2...) +Amlogic G12, S905, S805X, S905D, S905W, S905X (e.g. ODROID-N2+, Le Potato, NanoPi K2...) .It Broadcom BCM2837, BCM2711 (e.g. Raspberry Pi 3 and 4) .It
CVS commit: src/distrib/amd64/cdroms
Module Name:src
Committed By: dbj
Date: Sun Mar 7 03:55:47 UTC 2021
Modified Files:
src/distrib/amd64/cdroms: Makefile.cdrom
src/distrib/amd64/cdroms/bootcd-com: Makefile
Log Message:
distrib/amd64/cdroms: honor CDBOOTOPTIONS when installing EFI bootloader
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r1.8 -r1.9 src/distrib/amd64/cdroms/bootcd-com/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/amd64/cdroms/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.25 src/distrib/amd64/cdroms/Makefile.cdrom:1.26
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.25 Wed Feb 17 08:49:54 2021
+++ src/distrib/amd64/cdroms/Makefile.cdrom Sun Mar 7 03:55:47 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.25 2021/02/17 08:49:54 dbj Exp $
+# $NetBSD: Makefile.cdrom,v 1.26 2021/03/07 03:55:47 dbj Exp $
.include
.include
@@ -27,6 +27,12 @@ ${EFIBOOTIMG}: ${DESTDIR}/usr/mdec/bootx
${RM} -rf efiboot/EFI/boot
${MKDIR} ${MKDIRPERM} efiboot/EFI/boot
${INSTALL} ${COPY} -m 0444 ${.ALLSRC} efiboot/EFI/boot/
+.if defined(CDBOOTOPTIONS)
+ ${CHMOD} +w efiboot/EFI/boot/bootx64.efi efiboot/EFI/boot/bootia32.efi
+ ${TOOL_INSTALLBOOT} -m${MACHINE} -e ${CDBOOTOPTIONS} efiboot/EFI/boot/bootx64.efi
+ ${TOOL_INSTALLBOOT} -m${MACHINE} -e ${CDBOOTOPTIONS} efiboot/EFI/boot/bootia32.efi
+ ${CHMOD} -w efiboot/EFI/boot/bootx64.efi efiboot/EFI/boot/bootia32.efi
+.endif
${TOOL_MAKEFS} -M 1m -m 1m -B ${TARGET_ENDIANNESS} ${MAKEFS_TIMESTAMP} \
-t msdos -o F=12,c=1 ${EFIBOOTIMG} efiboot
Index: src/distrib/amd64/cdroms/bootcd-com/Makefile
diff -u src/distrib/amd64/cdroms/bootcd-com/Makefile:1.8 src/distrib/amd64/cdroms/bootcd-com/Makefile:1.9
--- src/distrib/amd64/cdroms/bootcd-com/Makefile:1.8 Wed Feb 17 08:49:55 2021
+++ src/distrib/amd64/cdroms/bootcd-com/Makefile Sun Mar 7 03:55:47 2021
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.8 2021/02/17 08:49:55 dbj Exp $
+# $NetBSD: Makefile,v 1.9 2021/03/07 03:55:47 dbj Exp $
#
+# HP Proliant iLO serial console is on com1
+CDBOOTOPTIONS= -o console=com0
+
.include "${.CURDIR}/../Makefile.cdrom"
CDBASE= boot-com # gives ${CDBASE}.iso
-# HP Proliant iLO serial console is on com1
-CDBOOTOPTIONS= -o console=com0
CDBUILDEXTRA+= boot.cfg # Add boot.cfg file
CLEANFILES+= boot.cfg
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Fri Mar 5 18:08:21 UTC 2021 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/debug: shl.mi Log Message: bump libssh To generate a diff of this commit: cvs rdiff -u -r1.911 -r1.912 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.270 -r1.271 src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.911 src/distrib/sets/lists/base/shl.mi:1.912 --- src/distrib/sets/lists/base/shl.mi:1.911 Fri Feb 19 12:06:26 2021 +++ src/distrib/sets/lists/base/shl.mi Fri Mar 5 13:08:21 2021 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.911 2021/02/19 17:06:26 christos Exp $ +# $NetBSD: shl.mi,v 1.912 2021/03/05 18:08:21 christos Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -876,8 +876,8 @@ ./usr/lib/libsqlite3.so.1.4 base-sys-shlib compatfile ./usr/lib/libss.sobase-obsolete obsolete ./usr/lib/libssh.sobase-secsh-shlib compatfile -./usr/lib/libssh.so.38base-secsh-shlib compatfile -./usr/lib/libssh.so.38.0 base-secsh-shlib compatfile +./usr/lib/libssh.so.39base-secsh-shlib compatfile +./usr/lib/libssh.so.39.0 base-secsh-shlib compatfile ./usr/lib/libssl.sobase-crypto-shlib compatfile ./usr/lib/libssl.so.12base-crypto-shlib compatfile,openssl=10 ./usr/lib/libssl.so.12.0 base-crypto-shlib compatfile,openssl=10 Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.270 src/distrib/sets/lists/debug/shl.mi:1.271 --- src/distrib/sets/lists/debug/shl.mi:1.270 Fri Feb 19 12:06:26 2021 +++ src/distrib/sets/lists/debug/shl.mi Fri Mar 5 13:08:21 2021 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.270 2021/02/19 17:06:26 christos Exp $ +# $NetBSD: shl.mi,v 1.271 2021/03/05 18:08:21 christos Exp $ ./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils ./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir ./usr/libdata/debug/lib/libavl.so.0.0.debug comp-zfs-debug debug,dynamicroot,zfs @@ -308,7 +308,7 @@ ./usr/libdata/debug/usr/lib/libskey.so.2.0.debug comp-sys-debug debug,compatfile,skey ./usr/libdata/debug/usr/lib/libsl.so.6.0.debug comp-krb5-debug debug,compatfile,kerberos ./usr/libdata/debug/usr/lib/libsqlite3.so.1.4.debug comp-sys-debug debug,compatfile -./usr/libdata/debug/usr/lib/libssh.so.38.0.debug comp-secsh-debug debug,compatfile +./usr/libdata/debug/usr/lib/libssh.so.39.0.debug comp-secsh-debug debug,compatfile ./usr/libdata/debug/usr/lib/libssl.so.12.0.debug comp-crypto-debug debug,compatfile,openssl=10 ./usr/libdata/debug/usr/lib/libssl.so.14.0.debug comp-crypto-debug debug,compatfile,openssl=11 ./usr/libdata/debug/usr/lib/libstdc++.so.9.0.debug comp-sys-debug debug,compatfile,gcc=7,cxx,libstdcxx
CVS commit: src/distrib/sets/lists/man
Module Name:src Committed By: jakllsch Date: Mon Mar 1 21:01:39 UTC 2021 Modified Files: src/distrib/sets/lists/man: mi Log Message: and the html for rge(4)... To generate a diff of this commit: cvs rdiff -u -r1.1715 -r1.1716 src/distrib/sets/lists/man/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1715 src/distrib/sets/lists/man/mi:1.1716 --- src/distrib/sets/lists/man/mi:1.1715 Mon Mar 1 18:01:05 2021 +++ src/distrib/sets/lists/man/mi Mon Mar 1 21:01:39 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1715 2021/03/01 18:01:05 jakllsch Exp $ +# $NetBSD: mi,v 1.1716 2021/03/01 21:01:39 jakllsch Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -4814,6 +4814,7 @@ ./usr/share/man/html4/rcons.html man-sys-htmlman html ./usr/share/man/html4/rdcphy.html man-sys-htmlman html ./usr/share/man/html4/re.html man-sys-htmlman html +./usr/share/man/html4/rge.html man-sys-htmlman html ./usr/share/man/html4/rgephy.html man-sys-htmlman html ./usr/share/man/html4/rlphy.html man-sys-htmlman html ./usr/share/man/html4/rmidi.html man-sys-htmlman html
CVS commit: src/distrib/sun2/ramdisk
Module Name:src
Committed By: martin
Date: Mon Mar 1 16:50:01 UTC 2021
Modified Files:
src/distrib/sun2/ramdisk: Makefile
Log Message:
Drop IEEE802.11 support from the ramdisk's ifconfig(8)
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/distrib/sun2/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/sun2/ramdisk/Makefile
diff -u src/distrib/sun2/ramdisk/Makefile:1.25 src/distrib/sun2/ramdisk/Makefile:1.26
--- src/distrib/sun2/ramdisk/Makefile:1.25 Tue Jan 24 18:04:05 2017
+++ src/distrib/sun2/ramdisk/Makefile Mon Mar 1 16:50:01 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2017/01/24 18:04:05 christos Exp $
+# $NetBSD: Makefile,v 1.26 2021/03/01 16:50:01 martin Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -9,7 +9,7 @@ IMAGESIZE= 600k
MAKEFS_FLAGS+= -f 15 -o density=2048
WARNS= 1
-DBG= -Os
+DBG= -Os -fno-unwind-tables
CRUNCHBIN= rd_bin
LISTS= ${.CURDIR}/list
@@ -25,6 +25,7 @@ MDSET_RELEASEDIR= binary/kernel
# Use stubs to eliminate some large stuff from libc
HACKSRC= ${DISTRIBDIR}/utils/libhack
+.MAKEFLAGS+= NOIEEE80211=1
.include "${HACKSRC}/Makefile.inc"
${CRUNCHBIN}: libhack.o
CVS commit: src/distrib/sun2/miniroot
Module Name:src Committed By: martin Date: Mon Mar 1 16:49:08 UTC 2021 Modified Files: src/distrib/sun2/miniroot: list Log Message: Now that we use the "hacked" (non-widechar) curses, drop -lcurses To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/distrib/sun2/miniroot/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/sun2/miniroot/list diff -u src/distrib/sun2/miniroot/list:1.23 src/distrib/sun2/miniroot/list:1.24 --- src/distrib/sun2/miniroot/list:1.23 Tue Oct 6 13:32:41 2020 +++ src/distrib/sun2/miniroot/list Mon Mar 1 16:49:07 2021 @@ -1,5 +1,5 @@ # -# $NetBSD: list,v 1.23 2020/10/06 13:32:41 rin Exp $ +# $NetBSD: list,v 1.24 2021/03/01 16:49:07 martin Exp $ # # The PROM provides a default kernel name of "vmunix" @@ -155,4 +155,4 @@ SPECIAL edlabel srcdir distrib/utils/ed ARGVLN sh -sh LIBS libhack.o -LIBS -lrmt -ledit -lutil -lcurses -lterminfo -lcrypt -ll -lm -lkvm -lz -lprop +LIBS -lrmt -ledit -lutil -lterminfo -lcrypt -ll -lm -lkvm -lz -lprop
CVS commit: src/distrib/sun2/miniroot
Module Name:src
Committed By: martin
Date: Mon Mar 1 09:24:27 UTC 2021
Modified Files:
src/distrib/sun2/miniroot: Makefile
Log Message:
Drop wide char support to save space
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/distrib/sun2/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/sun2/miniroot/Makefile
diff -u src/distrib/sun2/miniroot/Makefile:1.38 src/distrib/sun2/miniroot/Makefile:1.39
--- src/distrib/sun2/miniroot/Makefile:1.38 Sun Dec 29 18:26:18 2019
+++ src/distrib/sun2/miniroot/Makefile Mon Mar 1 09:24:27 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2019/12/29 18:26:18 christos Exp $
+# $NetBSD: Makefile,v 1.39 2021/03/01 09:24:27 martin Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -13,6 +13,7 @@ KERNEL= ${KERNOBJDIR}/INSTALL/netbsd
WARNS= 1
DBG= -Os -fno-unwind-tables
+USE_WIDECHAR= no
CRUNCHBIN= instbin
@@ -45,6 +46,13 @@ IMAGE_RELEASEDIR= installation/miniroot
# Use stubs to eliminate some large stuff from libc
HACKSRC= ${DISTRIBDIR}/utils/libhack
+HACK_CURSES= yes
+.MAKEFLAGS+= USE_WIDECHAR=no
+.include "${HACKSRC}/Makefile.inc"
+${CRUNCHBIN}: libhack.o
+
+# Use stubs to eliminate some large stuff from libc
+HACKSRC= ${DISTRIBDIR}/utils/libhack
.include "${HACKSRC}/Makefile.inc"
${CRUNCHBIN}: libhack.o
CVS commit: src/distrib/sets/lists/man
Module Name:src Committed By: nia Date: Fri Feb 26 11:05:33 UTC 2021 Modified Files: src/distrib/sets/lists/man: mi Log Message: add new evbarm device driver man pages To generate a diff of this commit: cvs rdiff -u -r1.1713 -r1.1714 src/distrib/sets/lists/man/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1713 src/distrib/sets/lists/man/mi:1.1714 --- src/distrib/sets/lists/man/mi:1.1713 Sun Jan 10 23:24:25 2021 +++ src/distrib/sets/lists/man/mi Fri Feb 26 11:05:33 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1713 2021/01/10 23:24:25 riastradh Exp $ +# $NetBSD: mi,v 1.1714 2021/02/26 11:05:33 nia Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1107,6 +1107,8 @@ ./usr/share/man/cat4/evbarm/iopaau.0 man-sys-catman .cat ./usr/share/man/cat4/evbarm/iopwdog.0 man-sys-catman .cat ./usr/share/man/cat4/evbarm/rktsadc.0 man-sys-catman .cat +./usr/share/man/cat4/evbarm/vcaudio.0 man-sys-catman .cat +./usr/share/man/cat4/evbarm/vchiq.0 man-sys-catman .cat ./usr/share/man/cat4/evbmips/aupci.0 man-sys-catman .cat ./usr/share/man/cat4/evbmips/intro.0 man-sys-catman .cat ./usr/share/man/cat4/evbppc/cpc.0 man-sys-catman .cat @@ -4333,6 +4335,8 @@ ./usr/share/man/html4/evbarm/iopaau.html man-sys-htmlman html ./usr/share/man/html4/evbarm/iopwdog.html man-sys-htmlman html ./usr/share/man/html4/evbarm/rktsadc.html man-sys-htmlman html +./usr/share/man/html4/evbarm/vcaudio.html man-sys-htmlman html +./usr/share/man/html4/evbarm/vchiq.html man-sys-htmlman html ./usr/share/man/html4/evbmips/aupci.html man-sys-htmlman html ./usr/share/man/html4/evbmips/intro.html man-sys-htmlman html ./usr/share/man/html4/evbppc/cpc.html man-sys-htmlman html @@ -7331,6 +7335,8 @@ ./usr/share/man/man4/evbarm/iopaau.4 man-sys-man .man ./usr/share/man/man4/evbarm/iopwdog.4 man-sys-man .man ./usr/share/man/man4/evbarm/rktsadc.4 man-sys-man .man +./usr/share/man/man4/evbarm/vcaudio.4 man-sys-man .man +./usr/share/man/man4/evbarm/vchiq.4 man-sys-man .man ./usr/share/man/man4/evbmips/aupci.4 man-sys-man .man ./usr/share/man/man4/evbmips/intro.4 man-sys-man .man ./usr/share/man/man4/evbppc/cpc.4 man-sys-man .man
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: christos Date: Fri Feb 26 03:08:25 UTC 2021 Modified Files: src/distrib/sets/lists/comp: mi Log Message: Add utmp man pages To generate a diff of this commit: cvs rdiff -u -r1.2374 -r1.2375 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2374 src/distrib/sets/lists/comp/mi:1.2375 --- src/distrib/sets/lists/comp/mi:1.2374 Mon Feb 15 09:38:06 2021 +++ src/distrib/sets/lists/comp/mi Thu Feb 25 22:08:25 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2374 2021/02/15 14:38:06 christos Exp $ +# $NetBSD: mi,v 1.2375 2021/02/26 03:08:25 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -6992,6 +6992,7 @@ ./usr/share/man/cat3/endservent.0 comp-c-catman .cat ./usr/share/man/cat3/endttyent.0 comp-c-catman .cat ./usr/share/man/cat3/endusershell.0 comp-c-catman .cat +./usr/share/man/cat3/endutent.0 comp-c-catman .cat ./usr/share/man/cat3/endutxent.0 comp-c-catman .cat ./usr/share/man/cat3/endwin.0 comp-c-catman .cat ./usr/share/man/cat3/erand48.0 comp-c-catman .cat @@ -7512,6 +7513,8 @@ ./usr/share/man/cat3/getusershell.0 comp-c-catman .cat ./usr/share/man/cat3/getutmp.0 comp-c-catman .cat ./usr/share/man/cat3/getutmpx.0 comp-c-catman .cat +./usr/share/man/cat3/getutent.0 comp-c-catman .cat +./usr/share/man/cat3/getutline.0 comp-c-catman .cat ./usr/share/man/cat3/getutxent.0 comp-c-catman .cat ./usr/share/man/cat3/getutxid.0 comp-c-catman .cat ./usr/share/man/cat3/getutxline.0 comp-c-catman .cat @@ -9532,6 +9535,7 @@ ./usr/share/man/cat3/putenv.0 comp-c-catman .cat ./usr/share/man/cat3/putp.0 comp-c-catman .cat ./usr/share/man/cat3/puts.0 comp-c-catman .cat +./usr/share/man/cat3/pututline.0 comp-c-catman .cat ./usr/share/man/cat3/pututxline.0 comp-c-catman .cat ./usr/share/man/cat3/putw.0 comp-c-catman .cat ./usr/share/man/cat3/putwc.0 comp-c-catman .cat @@ -9941,6 +9945,7 @@ ./usr/share/man/cat3/setupterm.0 comp-c-catman .cat ./usr/share/man/cat3/setusercontext.0 comp-c-catman .cat ./usr/share/man/cat3/setusershell.0 comp-c-catman .cat +./usr/share/man/cat3/setutent.0 comp-c-catman .cat ./usr/share/man/cat3/setutxent.0 comp-c-catman .cat ./usr/share/man/cat3/setvbuf.0 comp-c-catman .cat ./usr/share/man/cat3/sha.0 comp-obsolete obsolete @@ -15261,6 +15266,7 @@ ./usr/share/man/html3/endservent.html comp-c-htmlman html ./usr/share/man/html3/endttyent.html comp-c-htmlman html ./usr/share/man/html3/endusershell.html comp-c-htmlman html +./usr/share/man/html3/endutent.html comp-c-htmlman html ./usr/share/man/html3/endutxent.html comp-c-htmlman html ./usr/share/man/html3/endwin.html comp-c-htmlman html ./usr/share/man/html3/erand48.html comp-c-htmlman html @@ -15778,6 +15784,8 @@ ./usr/share/man/html3/getusershell.html comp-c-htmlman html ./usr/share/man/html3/getutmp.html comp-c-htmlman html ./usr/share/man/html3/getutmpx.html comp-c-htmlman html +./usr/share/man/html3/getutent.html comp-c-htmlman html +./usr/share/man/html3/getutline.html comp-c-htmlman html ./usr/share/man/html3/getutxent.html comp-c-htmlman html ./usr/share/man/html3/getutxid.html comp-c-htmlman html ./usr/share/man/html3/getutxline.html comp-c-htmlman html @@ -17783,6 +17791,7 @@ ./usr/share/man/html3/putenv.html comp-c-htmlman html ./usr/share/man/html3/putp.html comp-c-htmlman html ./usr/share/man/html3/puts.html comp-c-htmlman html +./usr/share/man/html3/pututline.html comp-c-htmlman html ./usr/share/man/html3/pututxline.html comp-c-htmlman html ./usr/share/man/html3/putw.html comp-c-htmlman html ./usr/share/man/html3/putwc.html comp-c-htmlman html @@ -18183,6 +18192,7 @@ ./usr/share/man/html3/setupterm.html comp-c-htmlman html ./usr/share/man/html3/setusercontext.html comp-c-htmlman html ./usr/share/man/html3/setusershell.html comp-c-htmlman html +./usr/share/man/html3/setutent.html comp-c-htmlman html ./usr/share/man/html3/setutxent.html comp-c-htmlman html ./usr/share/man/html3/setvbuf.html comp-c-htmlman html ./usr/share/man/html3/sha1.html comp-c-htmlman html @@ -23465,6 +23475,7 @@ ./usr/share/man/man3/endservent.3 comp-c-man .man ./usr/share/man/man3/endttyent.3 comp-c-man .man ./usr/share/man/man3/endusershell.3 comp-c-man .man +./usr/share/man/man3/endutent.3 comp-c-man .man ./usr/share/man/man3/endutxent.3 comp-c-man .man ./usr/share/man/man3/endwin.3 comp-c-man .man ./usr/share/man/man3/erand48.3 comp-c-man .man @@ -23985,6 +23996,8 @@ ./usr/share/man/man3/getusershell.3 comp-c-man .man ./usr/share/man/man3/getutmp.3 comp-c-man .man ./usr/share/man/man3/getutmpx.3 comp-c-man .man
CVS commit: src/distrib/amiga/miniroot
Module Name:src
Committed By: rin
Date: Thu Feb 25 21:46:55 UTC 2021
Modified Files:
src/distrib/amiga/miniroot: Makefile.inc install.md
Log Message:
Oops, forgot to commit this. One more adjust for amiga/boot ver 3.1.
Shuold fix build.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/distrib/amiga/miniroot/Makefile.inc
cvs rdiff -u -r1.31 -r1.32 src/distrib/amiga/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/Makefile.inc
diff -u src/distrib/amiga/miniroot/Makefile.inc:1.20 src/distrib/amiga/miniroot/Makefile.inc:1.21
--- src/distrib/amiga/miniroot/Makefile.inc:1.20 Tue Jan 24 18:04:01 2017
+++ src/distrib/amiga/miniroot/Makefile.inc Thu Feb 25 21:46:55 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.20 2017/01/24 18:04:01 christos Exp $
+# $NetBSD: Makefile.inc,v 1.21 2021/02/25 21:46:55 rin Exp $
IMAGESIZE= 7m
MAKEFS_FLAGS+= -o density=4k
@@ -9,4 +9,4 @@ IMAGEDEPENDS+= ${ARCHDIR}/dot.profile \
${DESTDIR}/usr/mdec/boot.amiga \
${KERNOBJDIR}/INSTALL/netbsd
-IMAGEPOSTBUILD= dd if=${DESTDIR}/usr/mdec/bootxx_ffs of=${IMAGE} bs=8192 conv=notrunc
+IMAGEPOSTBUILD= dd if=${DESTDIR}/usr/mdec/bootxx_ffsv1 of=${IMAGE} bs=8192 conv=notrunc
Index: src/distrib/amiga/miniroot/install.md
diff -u src/distrib/amiga/miniroot/install.md:1.31 src/distrib/amiga/miniroot/install.md:1.32
--- src/distrib/amiga/miniroot/install.md:1.31 Sat Dec 5 18:52:06 2020
+++ src/distrib/amiga/miniroot/install.md Thu Feb 25 21:46:55 2021
@@ -1,4 +1,4 @@
-# $NetBSD: install.md,v 1.31 2020/12/05 18:52:06 tsutsui Exp $
+# $NetBSD: install.md,v 1.32 2021/02/25 21:46:55 rin Exp $
#
#
# Copyright (c) 1996,2006 The NetBSD Foundation, Inc.
@@ -81,7 +81,7 @@ md_installboot() {
echo -n "Boot command? [netbsd -ASn2] "
getresp "netbsd -ASn2"
echo "Installing boot block..."
-chroot /mnt /usr/sbin/installboot -o command="$resp" /dev/r${1}a /usr/mdec/bootxx_ffs
+chroot /mnt /usr/sbin/installboot -o command="$resp" /dev/r${1}a /usr/mdec/bootxx_ffsv1
cp -p /mnt/usr/mdec/boot.amiga /mnt/
;;
*)
CVS commit: src/distrib/utils/libhack
Module Name:src
Committed By: christos
Date: Thu Feb 25 21:24:00 UTC 2021
Modified Files:
src/distrib/utils/libhack: Makefile.inc
Log Message:
Add regcomp.c and regexec.c so that we get a version that does not use NLS
and brings in all the locale code.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/distrib/utils/libhack/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/utils/libhack/Makefile.inc
diff -u src/distrib/utils/libhack/Makefile.inc:1.36 src/distrib/utils/libhack/Makefile.inc:1.37
--- src/distrib/utils/libhack/Makefile.inc:1.36 Fri Apr 17 10:55:24 2020
+++ src/distrib/utils/libhack/Makefile.inc Thu Feb 25 16:24:00 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.36 2020/04/17 14:55:24 jdolecek Exp $
+# $NetBSD: Makefile.inc,v 1.37 2021/02/25 21:24:00 christos Exp $
#
# Include this fragment to build libhack.o
# It is .o and not .a to make sure these are the
@@ -25,7 +25,7 @@ HACKOBJS+= getcap.o getgrent.o getnet.o
localeconv.o multibyte.o perror.o runetable.o setlocale.o \
nl_langinfo.o strcasecmp.o \
strerror.o strsignal.o syslog.o utmp.o fmtcheck.o \
- aligned_alloc.o
+ aligned_alloc.o regcomp.o regexec.o
.if (${USE_YP} != "no")
HACKOBJS+= yplib.o
@@ -78,9 +78,12 @@ libhack.o: ${HACKOBJS}
${HACKSRC} \
${HACKSRC}/../../../lib/libc/gen \
${HACKSRC}/../../../lib/libc/locale \
+ ${HACKSRC}/../../../lib/libc/regex \
${HACKSRC}/../../../lib/libc/stdlib
.else
# XXX .PATH won't work here, because of crunchgen used by various builds
+regcomp.o: ${HACKSRC}/../../../lib/libc/regex/regcomp.c
+regexec.o: ${HACKSRC}/../../../lib/libc/regex/regexec.c
getcap.o: ${HACKSRC}/../../../lib/libc/gen/getcap.c
getgrent.o: ${HACKSRC}/getgrent.c
gethost.o: ${HACKSRC}/gethost.c
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: rin Date: Thu Feb 25 03:43:00 UTC 2021 Modified Files: src/distrib/sets/lists/base: md.amiga Log Message: Adjust for amiga/boot ver 3.1. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/distrib/sets/lists/base/md.amiga Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/md.amiga diff -u src/distrib/sets/lists/base/md.amiga:1.56 src/distrib/sets/lists/base/md.amiga:1.57 --- src/distrib/sets/lists/base/md.amiga:1.56 Wed Aug 6 12:15:01 2014 +++ src/distrib/sets/lists/base/md.amiga Thu Feb 25 03:42:59 2021 @@ -1,8 +1,10 @@ -# $NetBSD: md.amiga,v 1.56 2014/08/06 12:15:01 martin Exp $ +# $NetBSD: md.amiga,v 1.57 2021/02/25 03:42:59 rin Exp $ ./sbin/binpatch base-sysutil-root ./usr/mdec/boot.amigabase-sysutil-bin ./usr/mdec/bootxx_fdbase-sysutil-bin -./usr/mdec/bootxx_ffsbase-sysutil-bin +./usr/mdec/bootxx_ffsbase-sysutil-bin obsolete +./usr/mdec/bootxx_ffsv1base-sysutil-bin +./usr/mdec/bootxx_ffsv2base-sysutil-bin ./usr/mdec/fdbootbase-obsolete obsolete ./usr/mdec/installbootbase-obsolete obsolete ./usr/mdec/xxbootbase-obsolete obsolete
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Sun Feb 21 02:29:57 UTC 2021 Modified Files: src/distrib/sets/lists/xbase: md.evbarm src/distrib/sets/lists/xdebug: md.evbarm Log Message: Add missing compatx11file To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/xbase/md.evbarm cvs rdiff -u -r1.28 -r1.29 src/distrib/sets/lists/xdebug/md.evbarm 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/xbase/md.evbarm diff -u src/distrib/sets/lists/xbase/md.evbarm:1.6 src/distrib/sets/lists/xbase/md.evbarm:1.7 --- src/distrib/sets/lists/xbase/md.evbarm:1.6 Sat Jan 18 19:58:13 2020 +++ src/distrib/sets/lists/xbase/md.evbarm Sat Feb 20 21:29:56 2021 @@ -1,10 +1,10 @@ -# $NetBSD: md.evbarm,v 1.6 2020/01/19 00:58:13 jmcneill Exp $ +# $NetBSD: md.evbarm,v 1.7 2021/02/21 02:29:56 christos Exp $ ./usr/X11R7/lib/libdrm_amdgpu.so xbase-libdrm_amdgpu-lib xorg,compatx11file ./usr/X11R7/lib/libdrm_amdgpu.so.1 xbase-libdrm_amdgpu-lib xorg,compatx11file ./usr/X11R7/lib/libdrm_amdgpu.so.1.0 xbase-libdrm_amdgpu-lib xorg,compatx11file -./usr/X11R7/lib/libdrm_nouveau.so xbase-libdrm_nouveau-lib xorg -./usr/X11R7/lib/libdrm_nouveau.so.3 xbase-libdrm_nouveau-lib xorg -./usr/X11R7/lib/libdrm_nouveau.so.3.0 xbase-libdrm_nouveau-lib xorg +./usr/X11R7/lib/libdrm_nouveau.so xbase-libdrm_nouveau-lib xorg,compatx11file +./usr/X11R7/lib/libdrm_nouveau.so.3 xbase-libdrm_nouveau-lib xorg,compatx11file +./usr/X11R7/lib/libdrm_nouveau.so.3.0 xbase-libdrm_nouveau-lib xorg,compatx11file ./usr/X11R7/lib/libvdpau.so xbase-libvdpau-lib xorg,compatx11file ./usr/X11R7/lib/libvdpau.so.1 xbase-libvdpau-lib xorg,compatx11file ./usr/X11R7/lib/libvdpau.so.1.0 xbase-libvdpau-lib xorg,compatx11file Index: src/distrib/sets/lists/xdebug/md.evbarm diff -u src/distrib/sets/lists/xdebug/md.evbarm:1.28 src/distrib/sets/lists/xdebug/md.evbarm:1.29 --- src/distrib/sets/lists/xdebug/md.evbarm:1.28 Thu Aug 27 11:32:00 2020 +++ src/distrib/sets/lists/xdebug/md.evbarm Sat Feb 20 21:29:57 2021 @@ -1,7 +1,7 @@ -# $NetBSD: md.evbarm,v 1.28 2020/08/27 15:32:00 riastradh Exp $ +# $NetBSD: md.evbarm,v 1.29 2021/02/21 02:29:57 christos Exp $ ./usr/X11R7/lib/libdrm_amdgpu_g.a xdebug-libdrm_amdgpu-debuglib xorg,debuglib,compatx11file -./usr/X11R7/lib/libdrm_nouveau_g.a xdebug-libdrm_nouveau-debuglib xorg,debuglib -./usr/X11R7/lib/libvdpau_g.axdebug-libvdpau-debuglib xorg,debuglib +./usr/X11R7/lib/libdrm_nouveau_g.a xdebug-libdrm_nouveau-debuglib xorg,debuglib,compatx11file +./usr/X11R7/lib/libvdpau_g.axdebug-libvdpau-debuglib xorg,debuglib,compatx11file ./usr/X11R7/lib/modules/extensions/libdbe_g.a xdebug-obsolete xorg,obsolete ./usr/X11R7/lib/modules/extensions/libdri2_g.a xdebug-obsolete xorg,obsolete ./usr/X11R7/lib/modules/extensions/libdri_g.a xdebug-obsolete xorg,obsolete @@ -21,8 +21,8 @@ ./usr/libdata/debug/usr/X11R7/bin/cvt.debug xdebug-xorg-server-debug xorg,debug ./usr/libdata/debug/usr/X11R7/bin/gtf.debug xdebug-xorg-server-debug xorg,debug ./usr/libdata/debug/usr/X11R7/lib/libdrm_amdgpu.so.1.0.debug xdebug-libdrm_amdgpu-debug xorg,debug,compatx11file -./usr/libdata/debug/usr/X11R7/lib/libdrm_nouveau.so.3.0.debug xdebug-libdrm_nouveau-debug xorg,debug -./usr/libdata/debug/usr/X11R7/lib/libvdpau.so.1.0.debug xdebug-libvdpau-debug xorg,debug +./usr/libdata/debug/usr/X11R7/lib/libdrm_nouveau.so.3.0.debug xdebug-libdrm_nouveau-debug xorg,debug,compatx11file +./usr/libdata/debug/usr/X11R7/lib/libvdpau.so.1.0.debug xdebug-libvdpau-debug xorg,debug,compatx11file ./usr/libdata/debug/usr/X11R7/lib/modules/dri/mesa_dri_drivers.so.0.debug xdebug-dri-debug xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/dri/nouveau_dri.so.0.debug xdebug-xf86-video-nouveau-debug xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/dri/r200_dri.so.0.debug xdebug-dri-debug xorg,debug
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Fri Feb 19 17:06:26 UTC 2021 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/debug: shl.mi Log Message: bump bind libraries To generate a diff of this commit: cvs rdiff -u -r1.910 -r1.911 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.269 -r1.270 src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.910 src/distrib/sets/lists/base/shl.mi:1.911 --- src/distrib/sets/lists/base/shl.mi:1.910 Fri Dec 4 13:43:47 2020 +++ src/distrib/sets/lists/base/shl.mi Fri Feb 19 12:06:26 2021 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.910 2020/12/04 18:43:47 christos Exp $ +# $NetBSD: shl.mi,v 1.911 2021/02/19 17:06:26 christos Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -232,8 +232,8 @@ ./usr/lib/libbfd.so.17base-sys-shlib compatfile,binutils=234 ./usr/lib/libbfd.so.17.0 base-sys-shlib compatfile,binutils=234 ./usr/lib/libbind9.sobase-bind-shlib compatfile -./usr/lib/libbind9.so.15base-bind-shlib compatfile -./usr/lib/libbind9.so.15.0 base-bind-shlib compatfile +./usr/lib/libbind9.so.16 base-bind-shlib compatfile +./usr/lib/libbind9.so.16.0 base-bind-shlib compatfile ./usr/lib/libblacklist.so base-obsolete obsolete,compatfile ./usr/lib/libblacklist.so.0 base-obsolete obsolete,compatfile ./usr/lib/libblacklist.so.0.0 base-obsolete obsolete,compatfile @@ -298,8 +298,8 @@ ./usr/lib/libdm.so.0base-sys-shlib compatfile ./usr/lib/libdm.so.0.0base-sys-shlib compatfile ./usr/lib/libdns.sobase-bind-shlib compatfile -./usr/lib/libdns.so.15base-bind-shlib compatfile -./usr/lib/libdns.so.15.0 base-bind-shlib compatfile +./usr/lib/libdns.so.16base-bind-shlib compatfile +./usr/lib/libdns.so.16.0 base-bind-shlib compatfile ./usr/lib/libdns_sd.sobase-mdns-shlib compatfile,mdns ./usr/lib/libdns_sd.so.0 base-mdns-shlib compatfile,mdns ./usr/lib/libdns_sd.so.0.0 base-mdns-shlib compatfile,mdns @@ -374,17 +374,17 @@ ./usr/lib/libipsec.so.3base-net-shlib compatfile ./usr/lib/libipsec.so.3.0 base-net-shlib compatfile ./usr/lib/libirs.sobase-bind-shlib compatfile -./usr/lib/libirs.so.15base-bind-shlib compatfile -./usr/lib/libirs.so.15.0 base-bind-shlib compatfile +./usr/lib/libirs.so.16base-bind-shlib compatfile +./usr/lib/libirs.so.16.0 base-bind-shlib compatfile ./usr/lib/libisc.sobase-bind-shlib compatfile -./usr/lib/libisc.so.15base-bind-shlib compatfile -./usr/lib/libisc.so.15.0 base-bind-shlib compatfile +./usr/lib/libisc.so.16base-bind-shlib compatfile +./usr/lib/libisc.so.16.0 base-bind-shlib compatfile ./usr/lib/libisccc.sobase-bind-shlib compatfile -./usr/lib/libisccc.so.15 base-bind-shlib compatfile -./usr/lib/libisccc.so.15.0 base-bind-shlib compatfile +./usr/lib/libisccc.so.16 base-bind-shlib compatfile +./usr/lib/libisccc.so.16.0 base-bind-shlib compatfile ./usr/lib/libisccfg.sobase-bind-shlib compatfile -./usr/lib/libisccfg.so.15 base-bind-shlib compatfile -./usr/lib/libisccfg.so.15.0 base-bind-shlib compatfile +./usr/lib/libisccfg.so.16 base-bind-shlib compatfile +./usr/lib/libisccfg.so.16.0 base-bind-shlib compatfile ./usr/lib/libiscsi.sobase-iscsi-shlib iscsi,compatfile ./usr/lib/libiscsi.so.2base-iscsi-shlib iscsi,compatfile ./usr/lib/libiscsi.so.2.0 base-iscsi-shlib iscsi,compatfile @@ -469,8 +469,8 @@ ./usr/lib/libnpf.so.0base-npf-shlib npf,compatfile ./usr/lib/libnpf.so.0.1base-npf-shlib npf,compatfile ./usr/lib/libns.sobase-bind-shlib compatfile -./usr/lib/libns.so.15base-bind-shlib compatfile -./usr/lib/libns.so.15.0base-bind-shlib compatfile +./usr/lib/libns.so.16base-bind-shlib compatfile +./usr/lib/libns.so.16.0base-bind-shlib compatfile ./usr/lib/libnvmm.sobase-sys-shlib nvmm,pic ./usr/lib/libnvmm.so.0base-sys-shlib nvmm,pic ./usr/lib/libnvmm.so.0.1 base-sys-shlib nvmm,pic Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.269 src/distrib/sets/lists/debug/shl.mi:1.270 --- src/distrib/sets/lists/debug/shl.mi:1.269 Fri Dec 4 13:43:47 2020 +++ src/distrib/sets/lists/debug/shl.mi Fri Feb 19 12:06:26 2021 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.269 2020/12/04 18:43:47 christos Exp $ +# $NetBSD: shl.mi,v 1.270 2021/02/19 17:06:26 christos Exp $ ./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils ./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir ./usr/libdata/debug/lib/libavl.so.0.0.debug comp-zfs-debug debug,dynamicroot,zfs @@ -77,7 +77,7 @@ ./usr/libdata/debug/usr/lib/libavl.so.0.0.debug comp-zfs-debug
CVS commit: src/distrib/amd64/cdroms
Module Name:src
Committed By: dbj
Date: Wed Feb 17 08:49:55 UTC 2021
Modified Files:
src/distrib/amd64/cdroms: Makefile.cdrom
src/distrib/amd64/cdroms/bootcd-com: Makefile
Log Message:
Revert "distrib/amd64/cdroms: honor CDBOOTOPTIONS when installing EFI
bootloader"
https://mail-index.netbsd.org/current-users/2021/02/17/msg040358.html
I think this change had unexpected side effects and needs further review
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r1.7 -r1.8 src/distrib/amd64/cdroms/bootcd-com/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/amd64/cdroms/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.24 src/distrib/amd64/cdroms/Makefile.cdrom:1.25
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.24 Sat Feb 6 16:02:43 2021
+++ src/distrib/amd64/cdroms/Makefile.cdrom Wed Feb 17 08:49:54 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.24 2021/02/06 16:02:43 dbj Exp $
+# $NetBSD: Makefile.cdrom,v 1.25 2021/02/17 08:49:54 dbj Exp $
.include
.include
@@ -27,12 +27,6 @@ ${EFIBOOTIMG}: ${DESTDIR}/usr/mdec/bootx
${RM} -rf efiboot/EFI/boot
${MKDIR} ${MKDIRPERM} efiboot/EFI/boot
${INSTALL} ${COPY} -m 0444 ${.ALLSRC} efiboot/EFI/boot/
-.if defined(CDBOOTOPTIONS)
- ${CHMOD} +w efiboot/EFI/boot/bootx64.efi efiboot/EFI/boot/bootia32.efi
- ${TOOL_INSTALLBOOT} -m${MACHINE} -e ${CDBOOTOPTIONS} efiboot/EFI/boot/bootx64.efi
- ${TOOL_INSTALLBOOT} -m${MACHINE} -e ${CDBOOTOPTIONS} efiboot/EFI/boot/bootia32.efi
- ${CHMOD} -w efiboot/EFI/boot/bootx64.efi efiboot/EFI/boot/bootia32.efi
-.endif
${TOOL_MAKEFS} -M 1m -m 1m -B ${TARGET_ENDIANNESS} ${MAKEFS_TIMESTAMP} \
-t msdos -o F=12,c=1 ${EFIBOOTIMG} efiboot
Index: src/distrib/amd64/cdroms/bootcd-com/Makefile
diff -u src/distrib/amd64/cdroms/bootcd-com/Makefile:1.7 src/distrib/amd64/cdroms/bootcd-com/Makefile:1.8
--- src/distrib/amd64/cdroms/bootcd-com/Makefile:1.7 Sat Feb 6 16:02:43 2021
+++ src/distrib/amd64/cdroms/bootcd-com/Makefile Wed Feb 17 08:49:55 2021
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2021/02/06 16:02:43 dbj Exp $
+# $NetBSD: Makefile,v 1.8 2021/02/17 08:49:55 dbj Exp $
#
-# HP Proliant iLO serial console is on com1
-CDBOOTOPTIONS= -o console=com0
-
.include "${.CURDIR}/../Makefile.cdrom"
CDBASE= boot-com # gives ${CDBASE}.iso
+# HP Proliant iLO serial console is on com1
+CDBOOTOPTIONS= -o console=com0
CDBUILDEXTRA+= boot.cfg # Add boot.cfg file
CLEANFILES+= boot.cfg
CVS commit: src/distrib/sets
Module Name:src Committed By: rillig Date: Mon Feb 15 23:46:46 UTC 2021 Modified Files: src/distrib/sets: fmt-list Log Message: distrib/sets/fmt-list: document how to sort by directory first In lists/base/mi, the directory ./libdata/firmware contains several subdirectories for which the entries do not look aligned right now, even after normalizing the alignment. This is because the indentation for a directory is not determined globally for all directory entries from the complete file, but instead for each group of items, after sorting, that have the same directory. This results in several entries having only a single item per group, such as ./libdata/firmware/nouveau, and this single item is obviously consistently indented since all of its 1 lines are already indented to the same depth. One possible solution for this is to sort the entries in another order, keeping all entries from a directory together. This allows to quickly see all entries from a certain directory, but on the other hand, when adding a new directory plus some entries, the directory has to be listed far away from its entries. (This would be done automatically by fmt-list though, which weakens this argument a bit.) Another possible solution for this is to first determine the indentation for all entries from each directory, no matter how far these entries are apart, and then indent these entries to the common indentation. This may or may not help since there will still be single entries between groups of differently indented entries. Writing down the intuitive rules for how to align the entries properly is a nontrivial task. See pkglint/varalignblock, which is around 650 lines of code, plus around 4000 lines of test code. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/fmt-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/sets/fmt-list diff -u src/distrib/sets/fmt-list:1.4 src/distrib/sets/fmt-list:1.5 --- src/distrib/sets/fmt-list:1.4 Mon Feb 15 23:00:03 2021 +++ src/distrib/sets/fmt-list Mon Feb 15 23:46:46 2021 @@ -1,5 +1,5 @@ #! /usr/bin/lua --- $NetBSD: fmt-list,v 1.4 2021/02/15 23:00:03 rillig Exp $ +-- $NetBSD: fmt-list,v 1.5 2021/02/15 23:46:46 rillig Exp $ --[[ @@ -337,8 +337,15 @@ local function normalize(entries) local function less(a, b) if a.fullname ~= b.fullname then + -- To sort by directory first, comment out the following line. return a.fullname < b.fullname end +if a.dirname ~= b.dirname then + return a.dirname < b.dirname +end +if a.basename ~= b.basename then + return a.basename < b.basename +end if a.category ~= nil and b.category ~= nil and a.category ~= b.category then return a.category < b.category end
CVS commit: src/distrib/sets
Module Name:src
Committed By: rillig
Date: Mon Feb 15 23:00:03 UTC 2021
Modified Files:
src/distrib/sets: fmt-list
Log Message:
distrib/sets/list-fmt: sort commented entries like regular entries
Seen in lists/modules/ad.aarch64, among others. These lines are not
intended as comments but as regular entries that just happen to be
commented out.
This is the same as how pkglint treats commented variable assignments,
which take part in aligning blocks of variable assignments even though
they are syntactically comments.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/fmt-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/sets/fmt-list
diff -u src/distrib/sets/fmt-list:1.3 src/distrib/sets/fmt-list:1.4
--- src/distrib/sets/fmt-list:1.3 Mon Nov 2 20:14:01 2020
+++ src/distrib/sets/fmt-list Mon Feb 15 23:00:03 2021
@@ -1,5 +1,5 @@
#! /usr/bin/lua
--- $NetBSD: fmt-list,v 1.3 2020/11/02 20:14:01 rillig Exp $
+-- $NetBSD: fmt-list,v 1.4 2021/02/15 23:00:03 rillig Exp $
--[[
@@ -106,10 +106,10 @@ end)
local function parse_entry(line)
local category_align, prefix, fullname, flags_align, category, flags =
-line:match("^((%-?)(%.%S*)%s+)((%S+)%s+)(%S+)$")
+line:match("^(([#%-]?)(%.%S*)%s+)((%S+)%s+)(%S+)$")
if fullname == nil then
category_align, prefix, fullname, category =
- line:match("^((%-?)(%.%S*)%s+)(%S+)$")
+ line:match("^(([#%-]?)(%.%S*)%s+)(%S+)$")
end
if fullname == nil then
prefix, fullname = line:match("^(%-)(%.%S*)$")
@@ -153,6 +153,16 @@ test(function()
assert_equals(entry.category, "category")
assert_equals(entry.flags_col, 16)
assert_equals(entry.flags, "flags")
+
+ entry = parse_entry("#./dirname/filename\tcat\tflags")
+ assert_equals(entry.prefix, "#")
+ assert_equals(entry.fullname, "./dirname/filename")
+ assert_equals(entry.dirname, "./dirname")
+ assert_equals(entry.basename, "filename")
+ assert_equals(entry.category_col, 24)
+ assert_equals(entry.category, "cat")
+ assert_equals(entry.flags_col, 8)
+ assert_equals(entry.flags, "flags")
end)
@@ -397,6 +407,8 @@ local function write_list(fname, head, e
if line ~= prev_line then
prev_line = line
f:write(line, "\n")
+else
+ --print(string.format("%s: duplicate entry: %s", fname, line))
end
end
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: christos Date: Mon Feb 15 14:38:06 UTC 2021 Modified Files: src/distrib/sets/lists/comp: mi Log Message: new locale pages, sort To generate a diff of this commit: cvs rdiff -u -r1.2373 -r1.2374 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2373 src/distrib/sets/lists/comp/mi:1.2374 --- src/distrib/sets/lists/comp/mi:1.2373 Sun Jan 24 12:29:11 2021 +++ src/distrib/sets/lists/comp/mi Mon Feb 15 09:38:06 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2373 2021/01/24 17:29:11 thorpej Exp $ +# $NetBSD: mi,v 1.2374 2021/02/15 14:38:06 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -984,8 +984,6 @@ ./usr/include/g++/bitdo1.h comp-obsolete obsolete ./usr/include/g++/bitdo2.h comp-obsolete obsolete ./usr/include/g++/bitprims.h comp-obsolete obsolete -./usr/include/g++/bits/erase_if.h comp-cxx-include gcc=9,cxx,libstdcxx -./usr/include/g++/bits/unique_lock.h comp-cxx-include gcc=9,cxx,libstdcxx ./usr/include/g++/bits/algorithmfwd.h comp-cxx-include gcc,cxx,libstdcxx ./usr/include/g++/bits/alloc_traits.h comp-cxx-include gcc,cxx,libstdcxx ./usr/include/g++/bits/allocated_ptr.h comp-cxx-include gcc,cxx,libstdcxx @@ -1027,6 +1025,7 @@ ./usr/include/g++/bits/cxxabi_tweaks.h comp-cxx-include gcc,cxx,libstdcxx ./usr/include/g++/bits/deque.tcc comp-cxx-include gcc,cxx,libstdcxx ./usr/include/g++/bits/enable_special_members.h comp-cxx-include gcc,cxx,libstdcxx +./usr/include/g++/bits/erase_if.h comp-cxx-include gcc=9,cxx,libstdcxx ./usr/include/g++/bits/error_constants.h comp-cxx-include gcc,cxx,libstdcxx ./usr/include/g++/bits/exception.h comp-cxx-include gcc,cxx,libstdcxx ./usr/include/g++/bits/exception_defines.h comp-cxx-include gcc,cxx,libstdcxx @@ -1149,6 +1148,7 @@ ./usr/include/g++/bits/time_members.h comp-cxx-include gcc,cxx,libstdcxx ./usr/include/g++/bits/type_traits.h comp-obsolete obsolete ./usr/include/g++/bits/uniform_int_dist.h comp-cxx-include gcc,cxx,libstdcxx +./usr/include/g++/bits/unique_lock.h comp-cxx-include gcc=9,cxx,libstdcxx ./usr/include/g++/bits/unique_ptr.h comp-cxx-include gcc,cxx,libstdcxx ./usr/include/g++/bits/unordered_map.h comp-cxx-include gcc,cxx,libstdcxx ./usr/include/g++/bits/unordered_set.h comp-cxx-include gcc,cxx,libstdcxx @@ -1825,27 +1825,27 @@ ./usr/include/g++/profile/unordered_set comp-cxx-include gcc,cxx,libstdcxx ./usr/include/g++/profile/vector comp-cxx-include gcc,cxx,libstdcxx ./usr/include/g++/projectn.h comp-obsolete obsolete -./usr/include/g++/pstl/algorithm_impl.h comp-cxx-include gcc=9,cxx,libstdcxx ./usr/include/g++/pstl/algorithm_fwd.h comp-cxx-include gcc=9,cxx,libstdcxx -./usr/include/g++/pstl/glue_algorithm_defs.h comp-cxx-include gcc=9,cxx,libstdcxx +./usr/include/g++/pstl/algorithm_impl.h comp-cxx-include gcc=9,cxx,libstdcxx ./usr/include/g++/pstl/execution_defs.h comp-cxx-include gcc=9,cxx,libstdcxx ./usr/include/g++/pstl/execution_impl.h comp-cxx-include gcc=9,cxx,libstdcxx -./usr/include/g++/pstl/numeric_impl.h comp-cxx-include gcc=9,cxx,libstdcxx +./usr/include/g++/pstl/glue_algorithm_defs.h comp-cxx-include gcc=9,cxx,libstdcxx ./usr/include/g++/pstl/glue_algorithm_impl.h comp-cxx-include gcc=9,cxx,libstdcxx -./usr/include/g++/pstl/glue_memory_defs.h comp-cxx-include gcc=9,cxx,libstdcxx ./usr/include/g++/pstl/glue_execution_defs.h comp-cxx-include gcc=9,cxx,libstdcxx +./usr/include/g++/pstl/glue_memory_defs.h comp-cxx-include gcc=9,cxx,libstdcxx ./usr/include/g++/pstl/glue_memory_impl.h comp-cxx-include gcc=9,cxx,libstdcxx ./usr/include/g++/pstl/glue_numeric_defs.h comp-cxx-include gcc=9,cxx,libstdcxx ./usr/include/g++/pstl/glue_numeric_impl.h comp-cxx-include gcc=9,cxx,libstdcxx ./usr/include/g++/pstl/memory_impl.h comp-cxx-include gcc=9,cxx,libstdcxx ./usr/include/g++/pstl/numeric_fwd.h comp-cxx-include gcc=9,cxx,libstdcxx -./usr/include/g++/pstl/parallel_backend_utils.h comp-cxx-include gcc=9,cxx,libstdcxx -./usr/include/g++/pstl/parallel_impl.h comp-cxx-include gcc=9,cxx,libstdcxx +./usr/include/g++/pstl/numeric_impl.h comp-cxx-include gcc=9,cxx,libstdcxx ./usr/include/g++/pstl/parallel_backend.h comp-cxx-include gcc=9,cxx,libstdcxx ./usr/include/g++/pstl/parallel_backend_tbb.h comp-cxx-include gcc=9,cxx,libstdcxx +./usr/include/g++/pstl/parallel_backend_utils.h comp-cxx-include gcc=9,cxx,libstdcxx +./usr/include/g++/pstl/parallel_impl.h comp-cxx-include gcc=9,cxx,libstdcxx +./usr/include/g++/pstl/pstl_config.h comp-cxx-include gcc=9,cxx,libstdcxx ./usr/include/g++/pstl/unseq_backend_simd.h comp-cxx-include gcc=9,cxx,libstdcxx ./usr/include/g++/pstl/utils.h comp-cxx-include gcc=9,cxx,libstdcxx -./usr/include/g++/pstl/pstl_config.h
