CVS commit: src/usr.bin/ftp
Module Name:src Committed By: gutteridge Date: Wed Apr 17 02:46:03 UTC 2024 Modified Files: src/usr.bin/ftp: ftp.1 Log Message: ftp.1: drop a sentence that's no longer accurate To generate a diff of this commit: cvs rdiff -u -r1.153 -r1.154 src/usr.bin/ftp/ftp.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/ftp
Module Name:src Committed By: gutteridge Date: Wed Apr 17 02:46:03 UTC 2024 Modified Files: src/usr.bin/ftp: ftp.1 Log Message: ftp.1: drop a sentence that's no longer accurate To generate a diff of this commit: cvs rdiff -u -r1.153 -r1.154 src/usr.bin/ftp/ftp.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/ftp/ftp.1 diff -u src/usr.bin/ftp/ftp.1:1.153 src/usr.bin/ftp/ftp.1:1.154 --- src/usr.bin/ftp/ftp.1:1.153 Mon Feb 19 00:15:20 2024 +++ src/usr.bin/ftp/ftp.1 Wed Apr 17 02:46:03 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: ftp.1,v 1.153 2024/02/19 00:15:20 christos Exp $ +.\" $NetBSD: ftp.1,v 1.154 2024/04/17 02:46:03 gutteridge Exp $ .\" .\" Copyright (c) 1996-2023 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -57,7 +57,7 @@ .\" .\" @(#)ftp.1 8.3 (Berkeley) 10/9/94 .\" -.Dd February 18, 2024 +.Dd April 17, 2024 .Dt FTP 1 .Os .Sh NAME @@ -1905,7 +1905,6 @@ and (and optionally .Ar password\^ ) is in the URL, use them for the first attempt to authenticate. -There is currently no certificate validation and verification. .\" file:///path .It Li file:/// Ns Ar path A local URL, copied from
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: maya
Date: Wed Apr 17 02:34:45 UTC 2024
Modified Files:
src/sys/dev/usb: uftdi.c
Log Message:
Add support for a range of USB serial adapters
>From Cameron Williams in PR kern/58127
To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/sys/dev/usb/uftdi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/uftdi.c
diff -u src/sys/dev/usb/uftdi.c:1.77 src/sys/dev/usb/uftdi.c:1.78
--- src/sys/dev/usb/uftdi.c:1.77 Tue Mar 26 03:38:02 2024
+++ src/sys/dev/usb/uftdi.c Wed Apr 17 02:34:45 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: uftdi.c,v 1.77 2024/03/26 03:38:02 thorpej Exp $ */
+/* $NetBSD: uftdi.c,v 1.78 2024/04/17 02:34:45 maya Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.77 2024/03/26 03:38:02 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.78 2024/04/17 02:34:45 maya Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -126,6 +126,25 @@ static const struct ucom_methods uftdi_m
*/
static const struct usb_devno uftdi_devs[] = {
{ USB_VENDOR_BBELECTRONICS, USB_PRODUCT_BBELECTRONICS_USOTL4 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US101 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US159 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US235 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US257 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_12 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_34 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_56 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_78 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US313 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US320 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US324 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US346_12 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US346_34 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US701_12 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US701_34 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_12 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_34 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_56 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_78 },
{ USB_VENDOR_FALCOM, USB_PRODUCT_FALCOM_TWIST },
{ USB_VENDOR_FALCOM, USB_PRODUCT_FALCOM_SAMBA },
{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_230X },
CVS commit: src/sys/dev/usb
Module Name:src Committed By: maya Date: Wed Apr 17 02:34:45 UTC 2024 Modified Files: src/sys/dev/usb: uftdi.c Log Message: Add support for a range of USB serial adapters >From Cameron Williams in PR kern/58127 To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 src/sys/dev/usb/uftdi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: maya Date: Wed Apr 17 02:33:04 UTC 2024 Modified Files: src/sys/dev/usb: usbdevs.h usbdevs_data.h Log Message: Regen after usbdevs change To generate a diff of this commit: cvs rdiff -u -r1.806 -r1.807 src/sys/dev/usb/usbdevs.h \ src/sys/dev/usb/usbdevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: maya Date: Wed Apr 17 02:32:09 UTC 2024 Modified Files: src/sys/dev/usb: usbdevs Log Message: Add some USB serial adapters >From Cameron Williams in PR kern/58127 To generate a diff of this commit: cvs rdiff -u -r1.814 -r1.815 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.814 src/sys/dev/usb/usbdevs:1.815 --- src/sys/dev/usb/usbdevs:1.814 Wed Feb 28 21:50:51 2024 +++ src/sys/dev/usb/usbdevs Wed Apr 17 02:32:08 2024 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.814 2024/02/28 21:50:51 dholland Exp $ +$NetBSD: usbdevs,v 1.815 2024/04/17 02:32:08 maya Exp $ /*- * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -1118,6 +1118,27 @@ product BILLIONTON USBEL100 0x0988 USB10 product BILLIONTON USBE100 0x8511 USBE100 product BILLIONTON USB2AR 0x90ff USB2AR Ethernet +/* Brainboxes Limited products */ +product BRAINBOXES US101 0x1011 US-101 USB2Serial 1xRS232 +product BRAINBOXES US159 0x1021 US-159 USB2Serial 1xRS232 +product BRAINBOXES US235 0x1017 US-235 USB2Serial 1xRS232 +product BRAINBOXES US257 0x5001 US-257 USB2Serial 2xRS232 +product BRAINBOXES US279_12 0x2021 US-279 USB2Serial 8xRS232 (Port 1 and 2) +product BRAINBOXES US279_34 0x2022 US-279 USB2Serial 8xRS232 (Port 3 and 4) +product BRAINBOXES US279_56 0x2023 US-279 USB2Serial 8xRS232 (Port 5 and 6) +product BRAINBOXES US279_78 0x2024 US-279 USB2Serial 8xRS232 (Port 7 and 8) +product BRAINBOXES US313 0x6001 US-313 USB2Serial 2xRS422/485 +product BRAINBOXES US320 0x1019 US-320 USB2Serial 1xRS422/485 +product BRAINBOXES US324 0x1013 US-324 USB2Serial 1xRS422/485 +product BRAINBOXES US346_12 0x3011 US-346 USB2Serial 4xRS422/485 (Port 1 and 2) +product BRAINBOXES US346_34 0x3012 US-346 USB2Serial 4xRS422/485 (Port 3 and 4) +product BRAINBOXES US701_12 0x2011 US-701 USB2Serial 4xRS232 (Port 1 and 2) +product BRAINBOXES US701_34 0x2012 US-701 USB2Serial 4xRS232 (Port 3 and 4) +product BRAINBOXES US842_12 0x8001 US-842 USB2Serial 8xRS422/485 (Port 1 and 2) +product BRAINBOXES US842_34 0x8002 US-842 USB2Serial 8xRS422/485 (Port 3 and 4) +product BRAINBOXES US842_56 0x8003 US-842 USB2Serial 8xRS422/485 (Port 5 and 6) +product BRAINBOXES US842_78 0x8004 US-842 USB2Serial 8xRS422/485 (Port 7 and 8) + /* Broadcom products */ product BROADCOM BCMFW 0x0bdc BCMFW product BROADCOM BCM2033 0x2000 BCM2033
CVS commit: src/sys/dev/usb
Module Name:src Committed By: maya Date: Wed Apr 17 02:32:09 UTC 2024 Modified Files: src/sys/dev/usb: usbdevs Log Message: Add some USB serial adapters >From Cameron Williams in PR kern/58127 To generate a diff of this commit: cvs rdiff -u -r1.814 -r1.815 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl2/texinfo/dist/makeinfo
Module Name:src
Committed By: christos
Date: Tue Apr 16 23:43:08 UTC 2024
Modified Files:
src/external/gpl2/texinfo/dist/makeinfo: index.c
Log Message:
Add comparison function so that it can be used to provide a stable sort
(Jan-Benedict Glaw)
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/texinfo/dist/makeinfo/index.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl2/texinfo/dist/makeinfo/index.c
diff -u src/external/gpl2/texinfo/dist/makeinfo/index.c:1.1.1.1 src/external/gpl2/texinfo/dist/makeinfo/index.c:1.2
--- src/external/gpl2/texinfo/dist/makeinfo/index.c:1.1.1.1 Wed Jan 13 19:11:29 2016
+++ src/external/gpl2/texinfo/dist/makeinfo/index.c Tue Apr 16 19:43:08 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: index.c,v 1.1.1.1 2016/01/14 00:11:29 christos Exp $ */
+/* $NetBSD: index.c,v 1.2 2024/04/16 23:43:08 christos Exp $ */
/* index.c -- indexing for Texinfo.
Id: index.c,v 1.17 2004/11/30 02:03:23 karl Exp
@@ -511,8 +511,30 @@ index_element_compare (const void *eleme
{
INDEX_ELT **elt1 = (INDEX_ELT **) element1;
INDEX_ELT **elt2 = (INDEX_ELT **) element2;
+ int ret = 0;
- return index_compare_fn ((*elt1)->entry, (*elt2)->entry);
+ /* Find a stable sort order. */
+ if (ret == 0)
+ret = index_compare_fn ((*elt1)->entry, (*elt2)->entry);
+ if (ret == 0)
+ret = strcmp ((*elt1)->defining_file, (*elt2)->defining_file);
+ if (ret == 0)
+ret = strcmp ((*elt1)->node, (*elt2)->node);
+ if (ret == 0)
+if ((*elt1)->defining_line < (*elt2)->defining_line)
+ ret = -1;
+else if ((*elt1)->defining_line > (*elt2)->defining_line)
+ ret = 1;
+ if (ret == 0)
+if ((*elt1)->entry_number < (*elt2)->entry_number)
+ ret = -1;
+else if ((*elt1)->entry_number > (*elt2)->entry_number)
+ ret = 1;
+ if (ret == 0) {
+abort ();
+ }
+
+ return ret;
}
/* Force all index entries to be unique. */
CVS commit: src/external/gpl2/texinfo/dist/makeinfo
Module Name:src Committed By: christos Date: Tue Apr 16 23:43:08 UTC 2024 Modified Files: src/external/gpl2/texinfo/dist/makeinfo: index.c Log Message: Add comparison function so that it can be used to provide a stable sort (Jan-Benedict Glaw) To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/texinfo/dist/makeinfo/index.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/common
Module Name:src Committed By: christos Date: Tue Apr 16 23:40:36 UTC 2024 Modified Files: src/distrib/common: parselist.awk Log Message: Set LC_ALL=C before calling sort so that it works consistently. Unfortunately ENVIRON["LC_ALL"] = "C"; does not work like in gawk (Jan-Benedict Glaw) To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/distrib/common/parselist.awk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/common
Module Name:src
Committed By: christos
Date: Tue Apr 16 23:40:36 UTC 2024
Modified Files:
src/distrib/common: parselist.awk
Log Message:
Set LC_ALL=C before calling sort so that it works consistently. Unfortunately
ENVIRON["LC_ALL"] = "C"; does not work like in gawk (Jan-Benedict Glaw)
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/common/parselist.awk
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/parselist.awk
diff -u src/distrib/common/parselist.awk:1.16 src/distrib/common/parselist.awk:1.17
--- src/distrib/common/parselist.awk:1.16 Fri Apr 10 12:16:12 2009
+++ src/distrib/common/parselist.awk Tue Apr 16 19:40:36 2024
@@ -1,4 +1,4 @@
-# $NetBSD: parselist.awk,v 1.16 2009/04/10 16:16:12 apb Exp $
+# $NetBSD: parselist.awk,v 1.17 2024/04/16 23:40:36 christos Exp $
#
# Copyright (c) 2002 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -177,7 +177,7 @@ $1 == "COPYDIR" \
destdir=$3;
if (mode == "mtree") {
printf("./%s type=dir mode=755\n", destdir);
- command="cd " srcdir " && find . -type d -print"
+ command="cd " srcdir " && find . -type d -print | LC_ALL=C sort"
while (command | getline dir) {
gsub(/^\.\//, "", dir);
if (dir == ".")
@@ -187,7 +187,7 @@ $1 == "COPYDIR" \
close(command);
}
if (mode == "install" || mode == "mtree" || mode == "populate") {
- command="cd " srcdir " && find . -type f -print"
+ command="cd " srcdir " && find . -type f -print | LC_ALL=C sort"
while (command | getline srcfile) {
gsub(/^\.\//, "", srcfile);
copy(srcdir "/" srcfile, destdir "/" srcfile, "");
CVS commit: src/bin/sh
Module Name:src
Committed By: christos
Date: Tue Apr 16 23:30:19 UTC 2024
Modified Files:
src/bin/sh: mkoptions.sh
Log Message:
Be more explicit with sort fields to produce consistent results with gnu
sort (Jan-Benedict Glaw)
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/bin/sh/mkoptions.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/mkoptions.sh
diff -u src/bin/sh/mkoptions.sh:1.7 src/bin/sh/mkoptions.sh:1.8
--- src/bin/sh/mkoptions.sh:1.7 Sat Apr 6 10:20:27 2024
+++ src/bin/sh/mkoptions.sh Tue Apr 16 19:30:19 2024
@@ -1,6 +1,6 @@
#! /bin/sh
-# $NetBSD: mkoptions.sh,v 1.7 2024/04/06 14:20:27 kre Exp $
+# $NetBSD: mkoptions.sh,v 1.8 2024/04/16 23:30:19 christos Exp $
#
# It would be more sensible to generate 2 .h files, one which
@@ -52,8 +52,8 @@ ${SED:-sed} <"${IF}" \
-e '/^#/d' \
-e '/^[ ]*\//d' \
-e '/^[ ]*\*/d' \
- -e '/^[ ]*;/d' |
-sort -b -k2,2f -k2,2|
+ -e '/^[ ]*;/d' |
+sort -k2b,2f -k2b,2 |
while read line
do
# Look for comments in various styles, and ignore them
CVS commit: src/bin/sh
Module Name:src Committed By: christos Date: Tue Apr 16 23:30:19 UTC 2024 Modified Files: src/bin/sh: mkoptions.sh Log Message: Be more explicit with sort fields to produce consistent results with gnu sort (Jan-Benedict Glaw) To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/bin/sh/mkoptions.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: christos Date: Tue Apr 16 19:15:37 UTC 2024 Modified Files: src/distrib/sets/lists/base32: ad.aarch64 ad.mips64eb ad.mips64el ad.powerpc64 ad.riscv64 md.amd64 md.sparc64 src/distrib/sets/lists/debug32: ad.aarch64 ad.mips64eb ad.mips64el ad.mipsn64eb ad.mipsn64el ad.powerpc64 ad.riscv64 md.amd64 md.sparc64 src/etc/mtree: NetBSD.dist.compat.in src/external/mpl/bind/lib/plugins: Makefile Log Message: fix compat build of filter-.so.0 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/base32/ad.aarch64 \ src/distrib/sets/lists/base32/ad.mips64eb \ src/distrib/sets/lists/base32/ad.mips64el \ src/distrib/sets/lists/base32/ad.powerpc64 \ src/distrib/sets/lists/base32/ad.riscv64 \ src/distrib/sets/lists/base32/md.sparc64 cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/base32/md.amd64 cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/debug32/ad.aarch64 \ src/distrib/sets/lists/debug32/ad.mips64eb \ src/distrib/sets/lists/debug32/ad.mips64el \ src/distrib/sets/lists/debug32/ad.powerpc64 \ src/distrib/sets/lists/debug32/ad.riscv64 \ src/distrib/sets/lists/debug32/md.sparc64 cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/debug32/ad.mipsn64eb \ src/distrib/sets/lists/debug32/ad.mipsn64el cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/debug32/md.amd64 cvs rdiff -u -r1.7 -r1.8 src/etc/mtree/NetBSD.dist.compat.in cvs rdiff -u -r1.7 -r1.8 src/external/mpl/bind/lib/plugins/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base32/ad.aarch64 diff -u src/distrib/sets/lists/base32/ad.aarch64:1.2 src/distrib/sets/lists/base32/ad.aarch64:1.3 --- src/distrib/sets/lists/base32/ad.aarch64:1.2 Sat Apr 13 04:50:18 2024 +++ src/distrib/sets/lists/base32/ad.aarch64 Tue Apr 16 15:15:36 2024 @@ -1,4 +1,4 @@ -# $NetBSD: ad.aarch64,v 1.2 2024/04/13 08:50:18 nakayama Exp $ +# $NetBSD: ad.aarch64,v 1.3 2024/04/16 19:15:36 christos Exp $ ./lib/eabi base-compat-shlib compat ./lib/eabi/npf base-compat-shlib compat,npf ./lib/eabi/npf/ext_log.so base-compat-shlib compat,npf @@ -490,6 +490,8 @@ ./usr/lib/eabi/lua/5.4/netpgp.so base-compat-shlib compat ./usr/lib/eabi/lua/5.4/sqlite.so base-compat-shlib compat ./usr/lib/eabi/lua/5.4/syslog.so base-compat-shlib compat +./usr/lib/eabi/namedbase-compat-shlib compat +./usr/lib/eabi/named/filter-.so.0 base-compat-shlib compat ./usr/lib/eabi/opensslbase-crypto-usr compat ./usr/lib/eabi/openssl/engines base-crypto-usr compat ./usr/lib/eabi/openssl/engines/dasync.so base-crypto-usr compat,pic,openssl=30 @@ -990,6 +992,8 @@ ./usr/lib/eabihf/lua/5.4/netpgp.so base-compat-shlib compat ./usr/lib/eabihf/lua/5.4/sqlite.so base-compat-shlib compat ./usr/lib/eabihf/lua/5.4/syslog.so base-compat-shlib compat +./usr/lib/eabihf/namedbase-compat-shlib compat +./usr/lib/eabihf/named/filter-.so.0 base-compat-shlib compat ./usr/lib/eabihf/opensslbase-crypto-usr compat ./usr/lib/eabihf/openssl/engines base-crypto-usr compat ./usr/lib/eabihf/openssl/engines/dasync.so base-crypto-usr compat,pic,openssl=30 @@ -1029,9 +1033,11 @@ ./usr/libdata/debug/lib/eabihf/npf base-compat-shlib compat ./usr/libdata/debug/usr/lib/eabi base-compat-shlib compat ./usr/libdata/debug/usr/lib/eabi/i18n base-compat-shlib compat +./usr/libdata/debug/usr/lib/eabi/named base-compat-shlib compat ./usr/libdata/debug/usr/lib/eabi/security base-compat-shlib compat ./usr/libdata/debug/usr/lib/eabihf base-compat-shlib compat ./usr/libdata/debug/usr/lib/eabihf/i18n base-compat-shlib compat +./usr/libdata/debug/usr/lib/eabihf/named base-compat-shlib compat ./usr/libdata/debug/usr/lib/eabihf/security base-compat-shlib compat ./usr/libexec/ld.elf_so-eabi base-sys-shlib compat,pic ./usr/libexec/ld.elf_so-eabihf base-sys-shlib compat,pic Index: src/distrib/sets/lists/base32/ad.mips64eb diff -u src/distrib/sets/lists/base32/ad.mips64eb:1.2 src/distrib/sets/lists/base32/ad.mips64eb:1.3 --- src/distrib/sets/lists/base32/ad.mips64eb:1.2 Sat Apr 13 04:50:19 2024 +++ src/distrib/sets/lists/base32/ad.mips64eb Tue Apr 16 15:15:36 2024 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.2 2024/04/13 08:50:19 nakayama Exp $ +# $NetBSD: ad.mips64eb,v 1.3 2024/04/16 19:15:36 christos Exp $ ./lib/64 base-compat-shlib compat ./lib/64/npf base-compat-shlib compat,npf ./lib/64/npf/ext_log.so base-compat-shlib compat,npf @@ -493,6 +493,8 @@ ./usr/lib/64/lua/5.4/netpgp.so base-compat-shlib compat ./usr/lib/64/lua/5.4/sqlite.so base-compat-shlib compat ./usr/lib/64/lua/5.4/syslog.so base-compat-shlib compat +./usr/lib/64/namedbase-compat-shlib compat +./usr/lib/64/named/filter-.so.0 base-compat-shlib compat ./usr/lib/64/opensslbase-crypto-usr compat
CVS commit: src
Module Name:src Committed By: christos Date: Tue Apr 16 19:15:37 UTC 2024 Modified Files: src/distrib/sets/lists/base32: ad.aarch64 ad.mips64eb ad.mips64el ad.powerpc64 ad.riscv64 md.amd64 md.sparc64 src/distrib/sets/lists/debug32: ad.aarch64 ad.mips64eb ad.mips64el ad.mipsn64eb ad.mipsn64el ad.powerpc64 ad.riscv64 md.amd64 md.sparc64 src/etc/mtree: NetBSD.dist.compat.in src/external/mpl/bind/lib/plugins: Makefile Log Message: fix compat build of filter-.so.0 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/base32/ad.aarch64 \ src/distrib/sets/lists/base32/ad.mips64eb \ src/distrib/sets/lists/base32/ad.mips64el \ src/distrib/sets/lists/base32/ad.powerpc64 \ src/distrib/sets/lists/base32/ad.riscv64 \ src/distrib/sets/lists/base32/md.sparc64 cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/base32/md.amd64 cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/debug32/ad.aarch64 \ src/distrib/sets/lists/debug32/ad.mips64eb \ src/distrib/sets/lists/debug32/ad.mips64el \ src/distrib/sets/lists/debug32/ad.powerpc64 \ src/distrib/sets/lists/debug32/ad.riscv64 \ src/distrib/sets/lists/debug32/md.sparc64 cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/debug32/ad.mipsn64eb \ src/distrib/sets/lists/debug32/ad.mipsn64el cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/debug32/md.amd64 cvs rdiff -u -r1.7 -r1.8 src/etc/mtree/NetBSD.dist.compat.in cvs rdiff -u -r1.7 -r1.8 src/external/mpl/bind/lib/plugins/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Tue Apr 16 19:11:45 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.1 Log Message: Tickets #648, #649, #651, #652 To generate a diff of this commit: cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/doc/CHANGES-10.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-10.1 diff -u src/doc/CHANGES-10.1:1.1.2.1 src/doc/CHANGES-10.1:1.1.2.2 --- src/doc/CHANGES-10.1:1.1.2.1 Tue Apr 16 18:17:45 2024 +++ src/doc/CHANGES-10.1 Tue Apr 16 19:11:45 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.1,v 1.1.2.1 2024/04/16 18:17:45 martin Exp $ +# $NetBSD: CHANGES-10.1,v 1.1.2.2 2024/04/16 19:11:45 martin Exp $ A complete list of changes from the NetBSD 10.0 release on 2024-03-28 until the 10.1 release: @@ -9,5 +9,28 @@ doc/README.files external/gpl2/groff/tmac/mdoc.local patched by hand sys/sys/param.h patched by hand - Welcome to 10.0_BETA! + Welcome to 10.0_STABLE! + +lib/libc/time/strptime.c 1.66 + + strptime(3): PR 58041: pacify -Wsign-compare. + [riastradh, ticket #648] + +share/man/man4/ugen.41.39 +sys/dev/usb/uftdi.c1.77 +sys/dev/usb/ugen.c1.176 +sys/dev/usb/usbdevices.config 1.43 + + uftdi(4): fix openocd with the Tigard debug board. + [thorpej, ticket #649] + +sys/dev/usb/ugen.c1.177 + + ugen(4): add a "ugen-unit" device property for devpubd(8) scripts. + [thorpej, ticket #651] + +sys/arch/alpha/pci/irongate_pci.c 1.13 + + alpha: add a missing barrier in irongate_conf_read0(). + [thorpej, ticket #652]
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Tue Apr 16 19:11:45 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.1 Log Message: Tickets #648, #649, #651, #652 To generate a diff of this commit: cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/doc/CHANGES-10.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/arch/alpha/pci
Module Name:src Committed By: martin Date: Tue Apr 16 19:10:07 UTC 2024 Modified Files: src/sys/arch/alpha/pci [netbsd-10]: irongate_pci.c Log Message: Pull up following revision(s) (requested by thorpej in ticket #652): sys/arch/alpha/pci/irongate_pci.c: revision 1.13 Add a missing barrier in irongate_conf_read0(). To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.12.10.1 src/sys/arch/alpha/pci/irongate_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/alpha/pci/irongate_pci.c diff -u src/sys/arch/alpha/pci/irongate_pci.c:1.12 src/sys/arch/alpha/pci/irongate_pci.c:1.12.10.1 --- src/sys/arch/alpha/pci/irongate_pci.c:1.12 Fri Jun 25 03:45:59 2021 +++ src/sys/arch/alpha/pci/irongate_pci.c Tue Apr 16 19:10:07 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: irongate_pci.c,v 1.12 2021/06/25 03:45:59 thorpej Exp $ */ +/* $NetBSD: irongate_pci.c,v 1.12.10.1 2024/04/16 19:10:07 martin Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: irongate_pci.c,v 1.12 2021/06/25 03:45:59 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: irongate_pci.c,v 1.12.10.1 2024/04/16 19:10:07 martin Exp $"); #include #include @@ -106,6 +106,7 @@ irongate_conf_read0(void *ipv, pcitag_t REGVAL(PCI_CONF_ADDR) = (CONFADDR_ENABLE | tag | (offset & 0xff)); alpha_mb(); data = REGVAL(PCI_CONF_DATA); + alpha_mb(); REGVAL(PCI_CONF_ADDR) = 0; alpha_mb(); PCI_CONF_UNLOCK(s);
CVS commit: [netbsd-10] src/sys/arch/alpha/pci
Module Name:src Committed By: martin Date: Tue Apr 16 19:10:07 UTC 2024 Modified Files: src/sys/arch/alpha/pci [netbsd-10]: irongate_pci.c Log Message: Pull up following revision(s) (requested by thorpej in ticket #652): sys/arch/alpha/pci/irongate_pci.c: revision 1.13 Add a missing barrier in irongate_conf_read0(). To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.12.10.1 src/sys/arch/alpha/pci/irongate_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Tue Apr 16 19:07:22 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ticket #1824 To generate a diff of this commit: cvs rdiff -u -r1.1.2.142 -r1.1.2.143 src/doc/CHANGES-9.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.4 diff -u src/doc/CHANGES-9.4:1.1.2.142 src/doc/CHANGES-9.4:1.1.2.143 --- src/doc/CHANGES-9.4:1.1.2.142 Mon Mar 25 15:54:20 2024 +++ src/doc/CHANGES-9.4 Tue Apr 16 19:07:22 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.142 2024/03/25 15:54:20 martin Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.143 2024/04/16 19:07:22 martin Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -13534,3 +13534,8 @@ external/gpl2/groff/dist/tmac/doc.tmac correctly. [uwe, ticket #1823] +etc/mtree/special1.172 + + Add /etc/sshd/ssh_host_ed25519_key* . + [kim, ticket #1824] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Tue Apr 16 19:07:22 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ticket #1824 To generate a diff of this commit: cvs rdiff -u -r1.1.2.142 -r1.1.2.143 src/doc/CHANGES-9.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/etc/mtree
Module Name:src Committed By: martin Date: Tue Apr 16 19:06:07 UTC 2024 Modified Files: src/etc/mtree [netbsd-9]: special Log Message: Pull up following revision(s) (requested by kim in ticket #1824): etc/mtree/special: revision 1.172 Add /etc/sshd/ssh_host_ed25519_key* . To generate a diff of this commit: cvs rdiff -u -r1.167.2.1 -r1.167.2.2 src/etc/mtree/special Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/special diff -u src/etc/mtree/special:1.167.2.1 src/etc/mtree/special:1.167.2.2 --- src/etc/mtree/special:1.167.2.1 Tue Jun 30 18:22:48 2020 +++ src/etc/mtree/special Tue Apr 16 19:06:07 2024 @@ -1,4 +1,4 @@ -# $NetBSD: special,v 1.167.2.1 2020/06/30 18:22:48 martin Exp $ +# $NetBSD: special,v 1.167.2.2 2024/04/16 19:06:07 martin Exp $ # @(#)special 8.2 (Berkeley) 1/23/94 # # This file may be overwritten on upgrades. @@ -337,6 +337,8 @@ ./etc/ssh/ssh_host_dsa_key.pub type=file mode=0644 optional ./etc/ssh/ssh_host_ecdsa_key type=file mode=0600 optional tags=nodiff ./etc/ssh/ssh_host_ecdsa_key.pub type=file mode=0644 optional +./etc/ssh/ssh_host_ed25519_key type=file mode=0600 optional tags=nodiff +./etc/ssh/ssh_host_ed25519_key.pub type=file mode=0644 optional ./etc/ssh/ssh_host_key type=file mode=0600 optional tags=nodiff tags=nodiff ./etc/ssh/ssh_host_key.pub type=file mode=0644 optional ./etc/ssh/ssh_host_rsa_key type=file mode=0600 optional tags=nodiff
CVS commit: [netbsd-9] src/etc/mtree
Module Name:src Committed By: martin Date: Tue Apr 16 19:06:07 UTC 2024 Modified Files: src/etc/mtree [netbsd-9]: special Log Message: Pull up following revision(s) (requested by kim in ticket #1824): etc/mtree/special: revision 1.172 Add /etc/sshd/ssh_host_ed25519_key* . To generate a diff of this commit: cvs rdiff -u -r1.167.2.1 -r1.167.2.2 src/etc/mtree/special Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/dev/usb
Module Name:src
Committed By: martin
Date: Tue Apr 16 18:59:49 UTC 2024
Modified Files:
src/sys/dev/usb [netbsd-10]: ugen.c
Log Message:
Pull up following revision(s) (requested by thorpej in ticket #651):
sys/dev/usb/ugen.c: revision 1.177
ugen and ugenif share the same /dev/ugenN.xx namespace in such a way
that the device unit number does not necessarily match the /dev/ugenN.xx
unit number (N). If you ONLY have ugen devices, it happens to work out
and devpubd scripts can be extremely naive. If you ONLY have ugenif
devices, it also happens to work out, but your devpubd scripts have to
slightly more informed. If you have a mix of ugen AND ugenif devices,
though, you're pretty much out of luck.
So, this change adds a "ugen-unit" device property which devpubd scripts
can query to determine which /dev/ugenN.xx nodes a given ugen or ugenif
device is using.
To generate a diff of this commit:
cvs rdiff -u -r1.171.2.1 -r1.171.2.2 src/sys/dev/usb/ugen.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/ugen.c
diff -u src/sys/dev/usb/ugen.c:1.171.2.1 src/sys/dev/usb/ugen.c:1.171.2.2
--- src/sys/dev/usb/ugen.c:1.171.2.1 Tue Apr 16 18:45:39 2024
+++ src/sys/dev/usb/ugen.c Tue Apr 16 18:59:49 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ugen.c,v 1.171.2.1 2024/04/16 18:45:39 martin Exp $ */
+/* $NetBSD: ugen.c,v 1.171.2.2 2024/04/16 18:59:49 martin Exp $ */
/*
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.171.2.1 2024/04/16 18:45:39 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.171.2.2 2024/04/16 18:59:49 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -229,12 +229,18 @@ ugenif_get_unit(struct ugen_softc *sc)
KASSERT(sc0 == sc);
KASSERT(rb_tree_find_node(, ) == sc);
mutex_exit();
+
+ prop_dictionary_set_uint(device_properties(sc->sc_dev),
+ "ugen-unit", sc->sc_unit);
}
static void
ugenif_put_unit(struct ugen_softc *sc)
{
+ prop_dictionary_remove(device_properties(sc->sc_dev),
+ "ugen-unit");
+
mutex_enter();
KASSERT(rb_tree_find_node(, >sc_unit) == sc);
rb_tree_remove_node(, sc);
CVS commit: [netbsd-10] src/sys/dev/usb
Module Name:src Committed By: martin Date: Tue Apr 16 18:59:49 UTC 2024 Modified Files: src/sys/dev/usb [netbsd-10]: ugen.c Log Message: Pull up following revision(s) (requested by thorpej in ticket #651): sys/dev/usb/ugen.c: revision 1.177 ugen and ugenif share the same /dev/ugenN.xx namespace in such a way that the device unit number does not necessarily match the /dev/ugenN.xx unit number (N). If you ONLY have ugen devices, it happens to work out and devpubd scripts can be extremely naive. If you ONLY have ugenif devices, it also happens to work out, but your devpubd scripts have to slightly more informed. If you have a mix of ugen AND ugenif devices, though, you're pretty much out of luck. So, this change adds a "ugen-unit" device property which devpubd scripts can query to determine which /dev/ugenN.xx nodes a given ugen or ugenif device is using. To generate a diff of this commit: cvs rdiff -u -r1.171.2.1 -r1.171.2.2 src/sys/dev/usb/ugen.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src
Module Name:src
Committed By: martin
Date: Tue Apr 16 18:45:39 UTC 2024
Modified Files:
src/share/man/man4 [netbsd-10]: ugen.4
src/sys/dev/usb [netbsd-10]: uftdi.c ugen.c usbdevices.config
Log Message:
Pull up following revision(s) (requested by thorpej in ticket #649):
sys/dev/usb/uftdi.c: revision 1.77
share/man/man4/ugen.4: revision 1.39
sys/dev/usb/ugen.c: revision 1.176
sys/dev/usb/usbdevices.config: revision 1.43
Define a "flags 1" config directive for ugenif, which is similar to ugen's,
but rather forces the ugenif to match at the *lowest* match priority rather
than the highest. This allows ugenif to claim only otherwise unclaimed
interfaces.
Add a "match quirk" mechanism to the uftdi driver that allows it to
selectively reject individual interfaces based on the combination of
- Vendor ID
- Product ID
- Interface number
- Vendor string
- Product string
This is necessary[*] to allow some devices that would otherwise match
uftdi (and thus instantiate a ucom) to be matched by ugenif instead,
which is required to make the device available to libusb1.
[*] ...due to a deficiency in the USB stack that does not provide a
mechanism for a user-space driver to claim a device from a kernel driver
and then return it back at a later time.
Use this new match quirk mechanism to reject "interface 1" of the
FTDI 2232C-based Tigard debug board; On this board, "interface 0"
is brought out to regular TTL-level UART pins, but "interface 1" is
brought out to SWD and JTAG headers, and is really only useful when
used with something like openocd. Because the FTDI 2232C on this board
just uses the standard FTDI vendor and product IDs, it can only be
distinguished by the strings, which cannot be specified usbdevices.config,
thus necessitating the match quirk entry (that works in combination
with the ugenif entry added in usbdevices.config).
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.38.6.1 src/share/man/man4/ugen.4
cvs rdiff -u -r1.76 -r1.76.6.1 src/sys/dev/usb/uftdi.c
cvs rdiff -u -r1.171 -r1.171.2.1 src/sys/dev/usb/ugen.c
cvs rdiff -u -r1.42 -r1.42.10.1 src/sys/dev/usb/usbdevices.config
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/ugen.4
diff -u src/share/man/man4/ugen.4:1.38 src/share/man/man4/ugen.4:1.38.6.1
--- src/share/man/man4/ugen.4:1.38 Fri Aug 28 16:07:49 2020
+++ src/share/man/man4/ugen.4 Tue Apr 16 18:45:39 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: ugen.4,v 1.38 2020/08/28 16:07:49 fcambus Exp $
+.\" $NetBSD: ugen.4,v 1.38.6.1 2024/04/16 18:45:39 martin Exp $
.\"
.\" Copyright (c) 1999 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd September 14, 2019
+.Dd March 25, 2024
.Dt UGEN 4
.Os
.Sh NAME
@@ -37,6 +37,7 @@
.Cd "ugen* at uhub? flags N"
.Cd "ugen* at uhub? vendor V product P flags 1"
.Cd "ugenif* at uhub? vendor V product P configuration C interface I"
+.Cd "ugenif* at uhub? vendor V product P configuration C interface I flags 1"
.Sh DESCRIPTION
The
.Nm
@@ -62,7 +63,9 @@ locators this can be used to force the
driver to be used for a certain
device.
.Pp
-The second form of attachment can be used to
+The
+.Sq ugenif
+form of attachment can be used to
.Dq steal
only one interface from some device for use by the
.Nm
@@ -74,6 +77,12 @@ as otherwise the
driver would capture all of your
.Nm usb
devices.
+If
+.Dq flags 1
+is specified, the
+.Sq ugenif
+form will match at the lowest priority, thus allowing it to match only
+otherwise unclaimed interfaces.
.Em NOTE :
You have to be extremely careful,
when using this form,
Index: src/sys/dev/usb/uftdi.c
diff -u src/sys/dev/usb/uftdi.c:1.76 src/sys/dev/usb/uftdi.c:1.76.6.1
--- src/sys/dev/usb/uftdi.c:1.76 Sat Aug 7 16:19:17 2021
+++ src/sys/dev/usb/uftdi.c Tue Apr 16 18:45:39 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: uftdi.c,v 1.76 2021/08/07 16:19:17 thorpej Exp $ */
+/* $NetBSD: uftdi.c,v 1.76.6.1 2024/04/16 18:45:39 martin Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.76 2021/08/07 16:19:17 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.76.6.1 2024/04/16 18:45:39 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -47,6 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.
#include
#include
+#include
#include
#include
@@ -184,10 +185,72 @@ static int uftdi_detach(device_t, int);
CFATTACH_DECL2_NEW(uftdi, sizeof(struct uftdi_softc), uftdi_match,
uftdi_attach, uftdi_detach, NULL, NULL, uftdi_childdet);
+struct uftdi_match_quirk_entry {
+ uint16_t vendor_id;
+ uint16_t product_id;
+ int iface_no;
+ const char * vendor_str;
+ const char * product_str;
+ int match_ret;
+};
+
+static
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Tue Apr 16 18:45:39 UTC 2024 Modified Files: src/share/man/man4 [netbsd-10]: ugen.4 src/sys/dev/usb [netbsd-10]: uftdi.c ugen.c usbdevices.config Log Message: Pull up following revision(s) (requested by thorpej in ticket #649): sys/dev/usb/uftdi.c: revision 1.77 share/man/man4/ugen.4: revision 1.39 sys/dev/usb/ugen.c: revision 1.176 sys/dev/usb/usbdevices.config: revision 1.43 Define a "flags 1" config directive for ugenif, which is similar to ugen's, but rather forces the ugenif to match at the *lowest* match priority rather than the highest. This allows ugenif to claim only otherwise unclaimed interfaces. Add a "match quirk" mechanism to the uftdi driver that allows it to selectively reject individual interfaces based on the combination of - Vendor ID - Product ID - Interface number - Vendor string - Product string This is necessary[*] to allow some devices that would otherwise match uftdi (and thus instantiate a ucom) to be matched by ugenif instead, which is required to make the device available to libusb1. [*] ...due to a deficiency in the USB stack that does not provide a mechanism for a user-space driver to claim a device from a kernel driver and then return it back at a later time. Use this new match quirk mechanism to reject "interface 1" of the FTDI 2232C-based Tigard debug board; On this board, "interface 0" is brought out to regular TTL-level UART pins, but "interface 1" is brought out to SWD and JTAG headers, and is really only useful when used with something like openocd. Because the FTDI 2232C on this board just uses the standard FTDI vendor and product IDs, it can only be distinguished by the strings, which cannot be specified usbdevices.config, thus necessitating the match quirk entry (that works in combination with the ugenif entry added in usbdevices.config). To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.38.6.1 src/share/man/man4/ugen.4 cvs rdiff -u -r1.76 -r1.76.6.1 src/sys/dev/usb/uftdi.c cvs rdiff -u -r1.171 -r1.171.2.1 src/sys/dev/usb/ugen.c cvs rdiff -u -r1.42 -r1.42.10.1 src/sys/dev/usb/usbdevices.config Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/lib/libc/time
Module Name:src
Committed By: martin
Date: Tue Apr 16 18:33:47 UTC 2024
Modified Files:
src/lib/libc/time [netbsd-10]: strptime.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #648):
lib/libc/time/strptime.c: revision 1.66
strptime(3): Declare digit d as time_t.
This doesn't make a semantic difference -- d can only take on the ten
values {0,1,2,3,4,5,6,7,8,9}, and the arithmetic with it later all
comes out the same whether the type is unsigned or time_t, even if
time_t were int32_t instead of int64_t.
But it pacifies overzealous compilers used by downstream users of
this code. And while it's silly to use a much wider type (64-bit
signed) than is needed here to store a single digit, it doesn't
really hurt either (32-bit unsigned is much larger than needed too).
PR lib/58041
To generate a diff of this commit:
cvs rdiff -u -r1.63.6.1 -r1.63.6.2 src/lib/libc/time/strptime.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/time/strptime.c
diff -u src/lib/libc/time/strptime.c:1.63.6.1 src/lib/libc/time/strptime.c:1.63.6.2
--- src/lib/libc/time/strptime.c:1.63.6.1 Mon Mar 25 14:43:30 2024
+++ src/lib/libc/time/strptime.c Tue Apr 16 18:33:47 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: strptime.c,v 1.63.6.1 2024/03/25 14:43:30 martin Exp $ */
+/* $NetBSD: strptime.c,v 1.63.6.2 2024/04/16 18:33:47 martin Exp $ */
/*-
* Copyright (c) 1997, 1998, 2005, 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: strptime.c,v 1.63.6.1 2024/03/25 14:43:30 martin Exp $");
+__RCSID("$NetBSD: strptime.c,v 1.63.6.2 2024/04/16 18:33:47 martin Exp $");
#endif
#include "namespace.h"
@@ -348,8 +348,7 @@ literal:
case 's': { /* seconds since the epoch */
const time_t TIME_MAX = __type_max(time_t);
- time_t sse;
- unsigned d;
+ time_t sse, d;
if (*bp < '0' || *bp > '9') {
bp = NULL;
CVS commit: [netbsd-10] src/lib/libc/time
Module Name:src
Committed By: martin
Date: Tue Apr 16 18:33:47 UTC 2024
Modified Files:
src/lib/libc/time [netbsd-10]: strptime.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #648):
lib/libc/time/strptime.c: revision 1.66
strptime(3): Declare digit d as time_t.
This doesn't make a semantic difference -- d can only take on the ten
values {0,1,2,3,4,5,6,7,8,9}, and the arithmetic with it later all
comes out the same whether the type is unsigned or time_t, even if
time_t were int32_t instead of int64_t.
But it pacifies overzealous compilers used by downstream users of
this code. And while it's silly to use a much wider type (64-bit
signed) than is needed here to store a single digit, it doesn't
really hurt either (32-bit unsigned is much larger than needed too).
PR lib/58041
To generate a diff of this commit:
cvs rdiff -u -r1.63.6.1 -r1.63.6.2 src/lib/libc/time/strptime.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Tue Apr 16 18:17:45 UTC 2024 Modified Files: src/doc [netbsd-10]: LAST_MINUTE README.files src/external/gpl2/groff/tmac [netbsd-10]: mdoc.local src/sys/sys [netbsd-10]: param.h Added Files: src/doc [netbsd-10]: CHANGES-10.1 Log Message: Welcome to 10.0_STABLE To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.1 src/doc/CHANGES-10.1 cvs rdiff -u -r1.2.74.1 -r1.2.74.2 src/doc/LAST_MINUTE cvs rdiff -u -r1.5.34.1 -r1.5.34.2 src/doc/README.files cvs rdiff -u -r1.7.6.8 -r1.7.6.9 src/external/gpl2/groff/tmac/mdoc.local cvs rdiff -u -r1.722.2.8 -r1.722.2.9 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Tue Apr 16 18:17:45 UTC 2024 Modified Files: src/doc [netbsd-10]: LAST_MINUTE README.files src/external/gpl2/groff/tmac [netbsd-10]: mdoc.local src/sys/sys [netbsd-10]: param.h Added Files: src/doc [netbsd-10]: CHANGES-10.1 Log Message: Welcome to 10.0_STABLE To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.1 src/doc/CHANGES-10.1 cvs rdiff -u -r1.2.74.1 -r1.2.74.2 src/doc/LAST_MINUTE cvs rdiff -u -r1.5.34.1 -r1.5.34.2 src/doc/README.files cvs rdiff -u -r1.7.6.8 -r1.7.6.9 src/external/gpl2/groff/tmac/mdoc.local cvs rdiff -u -r1.722.2.8 -r1.722.2.9 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/LAST_MINUTE diff -u src/doc/LAST_MINUTE:1.2.74.1 src/doc/LAST_MINUTE:1.2.74.2 --- src/doc/LAST_MINUTE:1.2.74.1 Fri Dec 16 19:12:49 2022 +++ src/doc/LAST_MINUTE Tue Apr 16 18:17:45 2024 @@ -1,6 +1,6 @@ -# $NetBSD: LAST_MINUTE,v 1.2.74.1 2022/12/16 19:12:49 martin Exp $ +# $NetBSD: LAST_MINUTE,v 1.2.74.2 2024/04/16 18:17:45 martin Exp $ -This file contains important information on the NetBSD 10.0 release that +This file contains important information on the NetBSD 10.1 release that did not make it into the main documentation. [all] Index: src/doc/README.files diff -u src/doc/README.files:1.5.34.1 src/doc/README.files:1.5.34.2 --- src/doc/README.files:1.5.34.1 Fri Dec 16 19:12:49 2022 +++ src/doc/README.files Tue Apr 16 18:17:45 2024 @@ -1,4 +1,4 @@ -# $NetBSD: README.files,v 1.5.34.1 2022/12/16 19:12:49 martin Exp $ +# $NetBSD: README.files,v 1.5.34.2 2024/04/16 18:17:45 martin Exp $ What's in this directory: @@ -8,6 +8,8 @@ CHANGES Changes between the 9.0 and 10. CHANGES-10.0 Changes between the creation of the netbsd-10 branch and the 10.0 release. +CHANGES-10.1 Changes between the 10.0 and the 10.1 release. + CHANGES.prev Changes in previous NetBSD releases. LAST_MINUTE Last minute changes and notes about the release. Index: src/external/gpl2/groff/tmac/mdoc.local diff -u src/external/gpl2/groff/tmac/mdoc.local:1.7.6.8 src/external/gpl2/groff/tmac/mdoc.local:1.7.6.9 --- src/external/gpl2/groff/tmac/mdoc.local:1.7.6.8 Thu Mar 28 08:33:33 2024 +++ src/external/gpl2/groff/tmac/mdoc.local Tue Apr 16 18:17:45 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: mdoc.local,v 1.7.6.8 2024/03/28 08:33:33 martin Exp $ +.\" $NetBSD: mdoc.local,v 1.7.6.9 2024/04/16 18:17:45 martin Exp $ .\" .\" Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -44,9 +44,9 @@ .as doc-str-St--ieee1275-94 " (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq]) . .\" Default .Os value -.ds doc-operating-system NetBSD\~10.0_BETA +.ds doc-operating-system NetBSD\~10.0_STABLE .\" Default footer operating system value -.ds doc-default-operating-system NetBSD\~10.0 +.ds doc-default-operating-system NetBSD\~10.0_STABLE .\" Other known versions, not yet in groff distribution .ds doc-operating-system-NetBSD-1.3.3 1.3.3 .ds doc-operating-system-NetBSD-1.6.3 1.6.3 Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.722.2.8 src/sys/sys/param.h:1.722.2.9 --- src/sys/sys/param.h:1.722.2.8 Thu Mar 28 08:33:32 2024 +++ src/sys/sys/param.h Tue Apr 16 18:17:45 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.722.2.8 2024/03/28 08:33:32 martin Exp $ */ +/* $NetBSD: param.h,v 1.722.2.9 2024/04/16 18:17:45 martin Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -67,7 +67,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 10 /* NetBSD 10.0 */ +#define __NetBSD_Version__ 10 /* NetBSD 10.0_STABLE */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) <= __NetBSD_Version__) Added files: Index: src/doc/CHANGES-10.1 diff -u /dev/null src/doc/CHANGES-10.1:1.1.2.1 --- /dev/null Tue Apr 16 18:17:45 2024 +++ src/doc/CHANGES-10.1 Tue Apr 16 18:17:45 2024 @@ -0,0 +1,13 @@ +# $NetBSD: CHANGES-10.1,v 1.1.2.1 2024/04/16 18:17:45 martin Exp $ + +A complete list of changes from the NetBSD 10.0 release on 2024-03-28 +until the 10.1 release: + +doc/CHANGES-10.1created +doc/LAST_MINUTE patched by hand +doc/README.filespatched by hand +external/gpl2/groff/tmac/mdoc.local patched by hand +sys/sys/param.h patched by hand + + Welcome to 10.0_BETA! +
Re: CVS commit: src/distrib/amd64/liveimage/emuimage
maya@ wrote:
> Module Name: src
> Committed By: maya
> Date: Tue Apr 16 16:13:45 UTC 2024
>
> Modified Files:
> src/distrib/amd64/liveimage/emuimage: Makefile rc.conf.emuimage
> spec.emuimage
>
> Log Message:
> restore amd64 live image support for resize root after combined mbr/gpt commit
>
> we need to resize_gpt now, as it takes precedence over mbr/disklabel
> this change brings us to behave like the evbarm images.
>
> XXX: we don't seem to touch disklabel and MBR, but they exist. Not sure
> whether
> that has any negative repercussions, maybe another system might regard MBR as
> the
> sole source of truth when GPT also exists.
Actually disklabel or MBR does NOT exist in USE_GPT=YES case.
In src/distrib/common/bootimage/Makefile.bootimage,
both ${TOOL_FDISK} and ${TOOL_DISKLABEL} are only invoked
inside .if ${USE_GPT} == "no".
"${TOOL_GPT} biosboot -c /usr/mdec/gptmbr.bin" by USE_GPTMBR=yes
does all the tricks, i.e. gptmbr.bin in the MBR sector just reads
the first sector of the specified GPT partition:
https://github.com/NetBSD/src/blob/124fe5e/sys/arch/i386/stand/mbr/gptmbr.S
and the loaded pbr.S in the primary bootxx checks a GPT partition table
and loads the whole (~8KB) the primary bootxx:
https://github.com/NetBSD/src/blob/124fe5e/sys/arch/i386/stand/bootxx/pbr.S#L134-L135
https://github.com/NetBSD/src/blob/124fe5e/sys/arch/i386/stand/bootxx/pbr.S#L372-L380
Maybe this is the reason why some odd machines cannot boot UEFI images
(such ugly implemantations might assume MBR partition really exists).
---
Izumi Tsutsui
CVS commit: src/distrib/amd64/liveimage/emuimage
Module Name:src Committed By: maya Date: Tue Apr 16 16:13:45 UTC 2024 Modified Files: src/distrib/amd64/liveimage/emuimage: Makefile rc.conf.emuimage spec.emuimage Log Message: restore amd64 live image support for resize root after combined mbr/gpt commit we need to resize_gpt now, as it takes precedence over mbr/disklabel this change brings us to behave like the evbarm images. XXX: we don't seem to touch disklabel and MBR, but they exist. Not sure whether that has any negative repercussions, maybe another system might regard MBR as the sole source of truth when GPT also exists. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/distrib/amd64/liveimage/emuimage/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage cvs rdiff -u -r1.2 -r1.3 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.
CVS commit: src/distrib/amd64/liveimage/emuimage
Module Name:src
Committed By: maya
Date: Tue Apr 16 16:13:45 UTC 2024
Modified Files:
src/distrib/amd64/liveimage/emuimage: Makefile rc.conf.emuimage
spec.emuimage
Log Message:
restore amd64 live image support for resize root after combined mbr/gpt commit
we need to resize_gpt now, as it takes precedence over mbr/disklabel
this change brings us to behave like the evbarm images.
XXX: we don't seem to touch disklabel and MBR, but they exist. Not sure whether
that has any negative repercussions, maybe another system might regard MBR as
the
sole source of truth when GPT also exists.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/distrib/amd64/liveimage/emuimage/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage
cvs rdiff -u -r1.2 -r1.3 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.9 src/distrib/amd64/liveimage/emuimage/Makefile:1.10
--- src/distrib/amd64/liveimage/emuimage/Makefile:1.9 Sat Jul 24 16:13:44 2021
+++ src/distrib/amd64/liveimage/emuimage/Makefile Tue Apr 16 16:13:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2021/07/24 16:13:44 jmcneill Exp $
+# $NetBSD: Makefile,v 1.10 2024/04/16 16:13:44 maya Exp $
LIVEIMGBASE= NetBSD-${DISTRIBVER}-amd64-live # gives ${IMGBASE}.img
@@ -13,6 +13,6 @@ 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
+ ${FILESDIR}/resize_gpt etc/rc.d/resize_gpt
.include "${.CURDIR}/../Makefile.liveimage"
Index: src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage
diff -u src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage:1.3 src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage:1.4
--- src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage:1.3 Wed Sep 27 00:24:12 2023
+++ src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage Tue Apr 16 16:13:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: rc.conf.emuimage,v 1.3 2023/09/27 00:24:12 riastradh Exp $
+# $NetBSD: rc.conf.emuimage,v 1.4 2024/04/16 16:13:44 maya Exp $
is_ec2() {
val=NO
@@ -25,7 +25,7 @@ is_ec2() {
}
certctl_init=YES
-resize_disklabel=YES
+resize_gpt=YES
resize_root=YES
resize_root_flags="-p"
resize_root_postcmd="/sbin/reboot -n"
Index: src/distrib/amd64/liveimage/emuimage/spec.emuimage
diff -u src/distrib/amd64/liveimage/emuimage/spec.emuimage:1.2 src/distrib/amd64/liveimage/emuimage/spec.emuimage:1.3
--- src/distrib/amd64/liveimage/emuimage/spec.emuimage:1.2 Sat Jul 24 16:13:44 2021
+++ src/distrib/amd64/liveimage/emuimage/spec.emuimage Tue Apr 16 16:13:44 2024
@@ -1,3 +1,3 @@
-# $NetBSD: spec.emuimage,v 1.2 2021/07/24 16:13:44 jmcneill Exp $
+# $NetBSD: spec.emuimage,v 1.3 2024/04/16 16:13:44 maya 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
+./etc/rc.d/resize_gpt type=file mode=0555 uname=root gname=wheel
CVS commit: src/sys
Module Name:src Committed By: riastradh Date: Tue Apr 16 14:34:03 UTC 2024 Modified Files: src/sys/external/bsd/drm2/amdgpu: files.amdgpu src/sys/external/bsd/drm2/dist/drm/amd/amdgpu: amdgpu.h amdgpu_acpi.c src/sys/external/bsd/drm2/dist/drm/amd/powerplay/hwmgr: amdgpu_hwmgr.c amdgpu_smu7_hwmgr.c src/sys/external/bsd/drm2/dist/drm/i915: i915_drv.h src/sys/external/bsd/drm2/dist/drm/i915/display: intel_acpi.h intel_opregion.h src/sys/external/bsd/drm2/dist/drm/nouveau: nouveau_acpi.c nouveau_acpi.h nouveau_display.c nouveau_drv.h src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core: device.h src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device: nouveau_nvkm_engine_device_acpi.c nouveau_nvkm_engine_device_base.c nouveau_nvkm_engine_device_pci.c nouveau_nvkm_engine_device_tegra.c priv.h src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/bios: nouveau_nvkm_subdev_bios_shadowacpi.c src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mxm: nouveau_nvkm_subdev_mxm_base.c src/sys/external/bsd/drm2/dist/drm/radeon: radeon.h radeon_acpi.c radeon_bios.c radeon_drv.h src/sys/external/bsd/drm2/include/acpi: video.h src/sys/external/bsd/drm2/include/linux: acpi.h nbsd-namespace-acpi.h src/sys/external/bsd/drm2/nouveau: files.nouveau src/sys/external/bsd/drm2/radeon: files.radeon src/sys/modules/amdgpu: Makefile Added Files: src/sys/external/bsd/drm2/include/acpi: acpi_bus.h src/sys/external/bsd/drm2/include/linux: mxm-wmi.h Log Message: drm: Set CONFIG_ACPI in linux/acpi.h and make it build. Leave a little ACPI-related functionality disabled for now, like getting EDID out of ACPI -- needs a bit more work to make this work, and I don't have hardware to work on that. Should help with failures of the forms: - unable to locate a BIOS ROM - bios: unable to locate usable image on various machines. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/external/bsd/drm2/amdgpu/files.amdgpu cvs rdiff -u -r1.8 -r1.9 \ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu.h cvs rdiff -u -r1.5 -r1.6 \ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_acpi.c cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/dist/drm/amd/powerplay/hwmgr/amdgpu_hwmgr.c cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/drm2/dist/drm/amd/powerplay/hwmgr/amdgpu_smu7_hwmgr.c cvs rdiff -u -r1.48 -r1.49 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/drm2/dist/drm/i915/display/intel_acpi.h cvs rdiff -u -r1.5 -r1.6 \ src/sys/external/bsd/drm2/dist/drm/i915/display/intel_opregion.h cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_acpi.c \ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drv.h cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_acpi.h cvs rdiff -u -r1.5 -r1.6 \ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_display.c cvs rdiff -u -r1.9 -r1.10 \ src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/device.h cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_acpi.c \ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_tegra.c \ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/priv.h cvs rdiff -u -r1.12 -r1.13 \ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_base.c cvs rdiff -u -r1.11 -r1.12 \ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_pci.c cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/bios/nouveau_nvkm_subdev_bios_shadowacpi.c cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mxm/nouveau_nvkm_subdev_mxm_base.c cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/drm2/dist/drm/radeon/radeon.h cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_acpi.c \ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.h cvs rdiff -u -r1.13 -r1.14 \ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/acpi/acpi_bus.h cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/include/acpi/video.h cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/include/linux/acpi.h cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/linux/mxm-wmi.h cvs rdiff -u -r1.1 -r1.2 \ src/sys/external/bsd/drm2/include/linux/nbsd-namespace-acpi.h cvs rdiff -u -r1.39 -r1.40 src/sys/external/bsd/drm2/nouveau/files.nouveau cvs rdiff -u -r1.39 -r1.40 src/sys/external/bsd/drm2/radeon/files.radeon cvs rdiff -u -r1.8 -r1.9
CVS commit: src/sys
Module Name:src Committed By: riastradh Date: Tue Apr 16 14:34:03 UTC 2024 Modified Files: src/sys/external/bsd/drm2/amdgpu: files.amdgpu src/sys/external/bsd/drm2/dist/drm/amd/amdgpu: amdgpu.h amdgpu_acpi.c src/sys/external/bsd/drm2/dist/drm/amd/powerplay/hwmgr: amdgpu_hwmgr.c amdgpu_smu7_hwmgr.c src/sys/external/bsd/drm2/dist/drm/i915: i915_drv.h src/sys/external/bsd/drm2/dist/drm/i915/display: intel_acpi.h intel_opregion.h src/sys/external/bsd/drm2/dist/drm/nouveau: nouveau_acpi.c nouveau_acpi.h nouveau_display.c nouveau_drv.h src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core: device.h src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device: nouveau_nvkm_engine_device_acpi.c nouveau_nvkm_engine_device_base.c nouveau_nvkm_engine_device_pci.c nouveau_nvkm_engine_device_tegra.c priv.h src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/bios: nouveau_nvkm_subdev_bios_shadowacpi.c src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mxm: nouveau_nvkm_subdev_mxm_base.c src/sys/external/bsd/drm2/dist/drm/radeon: radeon.h radeon_acpi.c radeon_bios.c radeon_drv.h src/sys/external/bsd/drm2/include/acpi: video.h src/sys/external/bsd/drm2/include/linux: acpi.h nbsd-namespace-acpi.h src/sys/external/bsd/drm2/nouveau: files.nouveau src/sys/external/bsd/drm2/radeon: files.radeon src/sys/modules/amdgpu: Makefile Added Files: src/sys/external/bsd/drm2/include/acpi: acpi_bus.h src/sys/external/bsd/drm2/include/linux: mxm-wmi.h Log Message: drm: Set CONFIG_ACPI in linux/acpi.h and make it build. Leave a little ACPI-related functionality disabled for now, like getting EDID out of ACPI -- needs a bit more work to make this work, and I don't have hardware to work on that. Should help with failures of the forms: - unable to locate a BIOS ROM - bios: unable to locate usable image on various machines. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/external/bsd/drm2/amdgpu/files.amdgpu cvs rdiff -u -r1.8 -r1.9 \ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu.h cvs rdiff -u -r1.5 -r1.6 \ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_acpi.c cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/dist/drm/amd/powerplay/hwmgr/amdgpu_hwmgr.c cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/drm2/dist/drm/amd/powerplay/hwmgr/amdgpu_smu7_hwmgr.c cvs rdiff -u -r1.48 -r1.49 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/drm2/dist/drm/i915/display/intel_acpi.h cvs rdiff -u -r1.5 -r1.6 \ src/sys/external/bsd/drm2/dist/drm/i915/display/intel_opregion.h cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_acpi.c \ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drv.h cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_acpi.h cvs rdiff -u -r1.5 -r1.6 \ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_display.c cvs rdiff -u -r1.9 -r1.10 \ src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/device.h cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_acpi.c \ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_tegra.c \ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/priv.h cvs rdiff -u -r1.12 -r1.13 \ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_base.c cvs rdiff -u -r1.11 -r1.12 \ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_pci.c cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/bios/nouveau_nvkm_subdev_bios_shadowacpi.c cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mxm/nouveau_nvkm_subdev_mxm_base.c cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/drm2/dist/drm/radeon/radeon.h cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_acpi.c \ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.h cvs rdiff -u -r1.13 -r1.14 \ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/acpi/acpi_bus.h cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/include/acpi/video.h cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/include/linux/acpi.h cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/linux/mxm-wmi.h cvs rdiff -u -r1.1 -r1.2 \ src/sys/external/bsd/drm2/include/linux/nbsd-namespace-acpi.h cvs rdiff -u -r1.39 -r1.40 src/sys/external/bsd/drm2/nouveau/files.nouveau cvs rdiff -u -r1.39 -r1.40 src/sys/external/bsd/drm2/radeon/files.radeon cvs rdiff -u -r1.8 -r1.9
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: riastradh Date: Tue Apr 16 14:29:33 UTC 2024 Modified Files: src/external/cddl/osnet/sys/sys: elf.h Log Message: opensolaris/sys/sys/elf.h: Omit needless __ELF_WORD_SIZE. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/sys/sys/elf.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/sys/sys/elf.h diff -u src/external/cddl/osnet/sys/sys/elf.h:1.7 src/external/cddl/osnet/sys/sys/elf.h:1.8 --- src/external/cddl/osnet/sys/sys/elf.h:1.7 Mon Apr 1 18:33:23 2024 +++ src/external/cddl/osnet/sys/sys/elf.h Tue Apr 16 14:29:33 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: elf.h,v 1.7 2024/04/01 18:33:23 riastradh Exp $ */ +/* $NetBSD: elf.h,v 1.8 2024/04/16 14:29:33 riastradh Exp $ */ /* * CDDL HEADER START @@ -51,6 +51,4 @@ #define EM_AMD64 EM_X86_64 -#define __ELF_WORD_SIZE ELFSIZE - #endif /* !_SYS__ELF_SOLARIS_H_ */
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: riastradh Date: Tue Apr 16 14:29:33 UTC 2024 Modified Files: src/external/cddl/osnet/sys/sys: elf.h Log Message: opensolaris/sys/sys/elf.h: Omit needless __ELF_WORD_SIZE. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/sys/sys/elf.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/nouveau
Module Name:src
Committed By: riastradh
Date: Tue Apr 16 14:26:53 UTC 2024
Modified Files:
src/sys/external/bsd/drm2/nouveau: nouveau2netbsd
Log Message:
nouveau: Rework nouveau2netbsd hack to get ACPI stuff.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/nouveau/nouveau2netbsd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/nouveau/nouveau2netbsd
diff -u src/sys/external/bsd/drm2/nouveau/nouveau2netbsd:1.5 src/sys/external/bsd/drm2/nouveau/nouveau2netbsd:1.6
--- src/sys/external/bsd/drm2/nouveau/nouveau2netbsd:1.5 Mon Aug 27 00:46:21 2018
+++ src/sys/external/bsd/drm2/nouveau/nouveau2netbsd Tue Apr 16 14:26:53 2024
@@ -1,6 +1,6 @@
#!/bin/sh
-# $NetBSD: nouveau2netbsd,v 1.5 2018/08/27 00:46:21 riastradh Exp $
+# $NetBSD: nouveau2netbsd,v 1.6 2024/04/16 14:26:53 riastradh Exp $
#
# $ /path/to/nouveau2netbsd > /path/to/files.nouveau.new
#
@@ -32,9 +32,13 @@ filemap="$(mktemp -t ${0##*/})"
cat Kbuild\
| sed -e 's,^include \(.*\)$,.include "\1",'\
-| sed -e 's,^ifdef \(.*\)$,.if !empty(\1:M[yY][eE][sS]),' \
+| sed -e 's,^ifdef \(.*\)$,.if !empty(\1:M[yY]),' \
| sed -e 's,^endif$,.endif,' \
-| make -f /dev/stdin -V '$(nouveau-y)' src=.\
+| env \
+ env CONFIG_ACPI=y \
+ env CONFIG_X86=y \
+ env src=. \
+ make -f /dev/stdin -V '$(nouveau-y)'\
| tr ' ' '\n'\
| sed -e 's,^$,,' \
| sort -u\
CVS commit: src/sys/external/bsd/drm2/nouveau
Module Name:src Committed By: riastradh Date: Tue Apr 16 14:26:53 UTC 2024 Modified Files: src/sys/external/bsd/drm2/nouveau: nouveau2netbsd Log Message: nouveau: Rework nouveau2netbsd hack to get ACPI stuff. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/nouveau/nouveau2netbsd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: martin Date: Tue Apr 16 14:15:53 UTC 2024 Modified Files: src/distrib/sets/lists/base32: ad.mipsn64eb ad.mipsn64el src/distrib/sets/lists/debug32: ad.mipsn64eb ad.mipsn64el Log Message: mipsn64 has ld.elf_so-n32 for compat (and -o32), not ld.elf_so-64 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/base32/ad.mipsn64eb \ src/distrib/sets/lists/base32/ad.mipsn64el cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/debug32/ad.mipsn64eb \ src/distrib/sets/lists/debug32/ad.mipsn64el 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/base32/ad.mipsn64eb diff -u src/distrib/sets/lists/base32/ad.mipsn64eb:1.3 src/distrib/sets/lists/base32/ad.mipsn64eb:1.4 --- src/distrib/sets/lists/base32/ad.mipsn64eb:1.3 Mon Apr 15 12:24:53 2024 +++ src/distrib/sets/lists/base32/ad.mipsn64eb Tue Apr 16 14:15:53 2024 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mipsn64eb,v 1.3 2024/04/15 12:24:53 martin Exp $ +# $NetBSD: ad.mipsn64eb,v 1.4 2024/04/16 14:15:53 martin Exp $ ./lib/n32 base-compat-shlib compat ./lib/n32/npf base-compat-shlib compat,npf ./lib/n32/npf/ext_log.so base-compat-shlib compat,npf @@ -21,7 +21,7 @@ ./lib/o32/npf/ext_rndblock.so base-compat-shlib compat,npf ./lib/o32/npf/ext_rndblock.so.0 base-compat-shlib compat,npf ./lib/o32/npf/ext_rndblock.so.0.0 base-compat-shlib compat,npf -./libexec/ld.elf_so-64 base-compat-shlib compat,pic +./libexec/ld.elf_so-n32 base-compat-shlib compat,pic ./libexec/ld.elf_so-o32 base-compat-shlib compat,pic ./usr/lib/n32 base-compat-shlib compat ./usr/lib/n32/i18nbase-compat-shlib compat @@ -1039,5 +1039,5 @@ ./usr/libdata/debug/usr/lib/o32 base-compat-shlib compat ./usr/libdata/debug/usr/lib/o32/i18n base-compat-shlib compat ./usr/libdata/debug/usr/lib/o32/security base-compat-shlib compat -./usr/libexec/ld.elf_so-64 base-sys-shlib compat,pic +./usr/libexec/ld.elf_so-n32 base-sys-shlib compat,pic ./usr/libexec/ld.elf_so-o32 base-sys-shlib compat,pic Index: src/distrib/sets/lists/base32/ad.mipsn64el diff -u src/distrib/sets/lists/base32/ad.mipsn64el:1.3 src/distrib/sets/lists/base32/ad.mipsn64el:1.4 --- src/distrib/sets/lists/base32/ad.mipsn64el:1.3 Mon Apr 15 12:24:53 2024 +++ src/distrib/sets/lists/base32/ad.mipsn64el Tue Apr 16 14:15:53 2024 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mipsn64el,v 1.3 2024/04/15 12:24:53 martin Exp $ +# $NetBSD: ad.mipsn64el,v 1.4 2024/04/16 14:15:53 martin Exp $ ./lib/n32 base-compat-shlib compat ./lib/n32/npf base-compat-shlib compat,npf ./lib/n32/npf/ext_log.so base-compat-shlib compat,npf @@ -21,7 +21,7 @@ ./lib/o32/npf/ext_rndblock.so base-compat-shlib compat,npf ./lib/o32/npf/ext_rndblock.so.0 base-compat-shlib compat,npf ./lib/o32/npf/ext_rndblock.so.0.0 base-compat-shlib compat,npf -./libexec/ld.elf_so-64 base-compat-shlib compat,pic +./libexec/ld.elf_so-n32 base-compat-shlib compat,pic ./libexec/ld.elf_so-o32 base-compat-shlib compat,pic ./usr/lib/n32 base-compat-shlib compat ./usr/lib/n32/i18nbase-compat-shlib compat @@ -1039,5 +1039,5 @@ ./usr/libdata/debug/usr/lib/o32 base-compat-shlib compat ./usr/libdata/debug/usr/lib/o32/i18n base-compat-shlib compat ./usr/libdata/debug/usr/lib/o32/security base-compat-shlib compat -./usr/libexec/ld.elf_so-64 base-sys-shlib compat,pic +./usr/libexec/ld.elf_so-n32 base-sys-shlib compat,pic ./usr/libexec/ld.elf_so-o32 base-sys-shlib compat,pic Index: src/distrib/sets/lists/debug32/ad.mipsn64eb diff -u src/distrib/sets/lists/debug32/ad.mipsn64eb:1.4 src/distrib/sets/lists/debug32/ad.mipsn64eb:1.5 --- src/distrib/sets/lists/debug32/ad.mipsn64eb:1.4 Sat Apr 13 08:50:19 2024 +++ src/distrib/sets/lists/debug32/ad.mipsn64eb Tue Apr 16 14:15:53 2024 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mipsn64eb,v 1.4 2024/04/13 08:50:19 nakayama Exp $ +# $NetBSD: ad.mipsn64eb,v 1.5 2024/04/16 14:15:53 martin Exp $ ./usr/lib/n32/i18n/libBIG5_g.a comp-c-debuglib debuglib,compat ./usr/lib/n32/i18n/libDECHanyu_g.a comp-c-debuglib debuglib,compat ./usr/lib/n32/i18n/libEUCTW_g.a comp-c-debuglib debuglib,compat @@ -331,7 +331,7 @@ ./usr/libdata/debug/lib/o32/npf/ext_log.so.0.0.debug comp-sys-debug debug,compat,npf ./usr/libdata/debug/lib/o32/npf/ext_normalize.so.0.0.debug comp-sys-debug debug,compat,npf ./usr/libdata/debug/lib/o32/npf/ext_rndblock.so.0.0.debug comp-sys-debug debug,compat,npf -./usr/libdata/debug/libexec/ld.elf_so-64.debug comp-sys-debug debug,compat +./usr/libdata/debug/libexec/ld.elf_so-n32.debug comp-sys-debug debug,compat ./usr/libdata/debug/libexec/ld.elf_so-o32.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/n32/i18n/libBIG5.so.5.0.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/n32/i18n/libDECHanyu.so.5.0.debug comp-sys-debug debug,compat @@ -681,7 +681,7 @@
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: martin Date: Tue Apr 16 14:15:53 UTC 2024 Modified Files: src/distrib/sets/lists/base32: ad.mipsn64eb ad.mipsn64el src/distrib/sets/lists/debug32: ad.mipsn64eb ad.mipsn64el Log Message: mipsn64 has ld.elf_so-n32 for compat (and -o32), not ld.elf_so-64 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/base32/ad.mipsn64eb \ src/distrib/sets/lists/base32/ad.mipsn64el cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/debug32/ad.mipsn64eb \ src/distrib/sets/lists/debug32/ad.mipsn64el Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
