CVS commit: src/share/man/man9
Module Name:src
Committed By: christos
Date: Mon May 20 17:12:41 UTC 2024
Modified Files:
src/share/man/man9: versioningsyscalls.9
Log Message:
explain what the current and new numbering practice are.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/share/man/man9/versioningsyscalls.9
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man9/versioningsyscalls.9
diff -u src/share/man/man9/versioningsyscalls.9:1.5 src/share/man/man9/versioningsyscalls.9:1.6
--- src/share/man/man9/versioningsyscalls.9:1.5 Fri Jul 14 05:03:37 2023
+++ src/share/man/man9/versioningsyscalls.9 Mon May 20 13:12:41 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: versioningsyscalls.9,v 1.5 2023/07/14 09:03:37 rillig Exp $
+.\" $NetBSD: versioningsyscalls.9,v 1.6 2024/05/20 17:12:41 christos Exp $
.\"
.\" Copyright (c) 2023 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 June 23, 2023
+.Dd May 20, 2024
.Dt VERSIONINGSYSCALLS 9
.Os
.
@@ -89,7 +89,7 @@ The version of the syscall that will bec
.El
.Pp
Additionally,
-.Ar XYZ
+.Ar CNUM
always represents the last
.Nx
release where the current
@@ -115,6 +115,42 @@ will be versioned.
If not versioning a struct, passages that mention
.Ft my_struct
can be ignored.
+.Pp
+The syscall version suffix
+.Dv VNUM
+indicates the first release of
+.Nx
+the system call will appear in.
+The compat version
+.Dv CNUM
+is the last version of
+.Nx the old system call was used.
+Typically VNUM = CNUM + 1 .
+.Pp
+For example if you are versioning
+.Xr getcontext 2
+just after
+.Nx 11
+was released, and the original system call was called
+.Fn getcontext ,
+the system call will become
+.Fn __getcontext12
+and the compat entry point will become
+.Fn compat_11_getcontext .
+.Pp
+Next time
+.Xr getcontext 2
+needs versioning, for example just after
+.Nx 15
+was released, it will become
+.Fn __getcontext16
+and the compat entry will become
+.Fn compat_15___getcontext12 .
+.Pp
+Please note that the historical practice up to
+.Nx 11
+has been that the syscall suffix matched the version when the syscall
+was last used.
.
.Ss Versioning structs
To version
@@ -122,7 +158,7 @@ To version
first make a copy of
.Ft my_struct
renamed to
-.Ft my_structXYZ
+.Ft my_structCNUM
in an equivalent header in
.Pa sys/compat/sys .
After that, you can freely modify
@@ -131,14 +167,14 @@ as desired.
.
.Ss Versioning the entry point
The stub for the next version of the syscall will be
-.Fn __my_syscallXYZ ,
+.Fn __my_syscallVNUM ,
and will have entry point
-.Fn sys___my_syscallXYZ .
+.Fn sys___my_syscallVNUM .
.
.Ss Modifying syscalls.conf
.Pa sys/kern/syscalls.conf
may need to be modified to contain
-.Li compat_XYZ
+.Li compat_CNUM
in the
.Va compatopts
variable.
@@ -149,20 +185,20 @@ First, add the next syscall to
keeping
.Fn my_syscall
as the name, and set the (optional) compat field of the declaration to
-.Ar XYZ .
+.Ar CNUM .
.Pp
Next, modify the current version of the syscall, and replace the type
field
.Pq usually just Li STD
with
-.Dv COMPAT_XYZ MODULAR compat_XYZ .
+.Dv COMPAT_CNUM MODULAR compat_CNUM .
.Pp
The keyword
.Dv MODULAR
indicates that the system call can be part of a kernel module.
Even if the system call was not part of a module before, now it will be part
of the
-.Dv COMPAT_XYZ
+.Dv COMPAT_CNUM
module.
.Pp
Finally, if applicable, replace the types of the current and old versions of the
@@ -171,16 +207,16 @@ syscall with the compat type.
Overall, the final diff should look like
.Bd -literal
- 123 STD { int|sys||my_syscall(struct my_struct *ms); }
-+ 123 COMPAT_XYZ MODULAR compat_XYZ { int|sys||my_syscall(struct my_structXYZ *ms); }
++ 123 COMPAT_CNUM MODULAR compat_CNUM { int|sys||my_syscall(struct my_structCNUM *ms); }
\&...
-+ 456 STD { int|sys|XYZ|my_syscall(struct my_struct *ms); }
++ 456 STD { int|sys|VNUM|my_syscall(struct my_struct *ms); }
.Ed
.
.Ss Modifying Makefile.rump
If the current syscall is rump,
.Pa sys/rump/Makefile.rump
must contain
-.Ar XYZ
+.Ar CNUM
in the
.Dv RUMP_NBCOMPAT
variable.
@@ -189,7 +225,7 @@ variable.
If versioning structs, then modify
.Pa sys/kern/makesyscalls.sh
by adding and entry for
-.Ft struct my_structXYZ
+.Ft struct my_structCNUM
type to
.Va uncompattypes .
.Pp
@@ -223,26 +259,26 @@ and lives inside
.
.Ss Creating the compat current syscall
The compat version of the current syscall has entry point
-.Fn compat_XYZ_sys_my_syscall ,
+.Fn compat_CNUM_sys_my_syscall ,
and should be implemented in
-.Pa sys/compat/common/my_file_XYZ.c
+.Pa sys/compat/common/my_file_CNUM.c
with the same semantics as the current syscall.
Often this involves translating the arguments to the
CVS commit: src/share/man/man9
Module Name:src Committed By: christos Date: Mon May 20 17:12:41 UTC 2024 Modified Files: src/share/man/man9: versioningsyscalls.9 Log Message: explain what the current and new numbering practice are. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/share/man/man9/versioningsyscalls.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/tic
Module Name:src
Committed By: christos
Date: Mon May 20 14:41:37 UTC 2024
Modified Files:
src/usr.bin/tic: tic.c
Log Message:
PR/58270: RVP: tic does not honor the user's umask, output files are 0666.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/usr.bin/tic/tic.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/tic/tic.c
diff -u src/usr.bin/tic/tic.c:1.41 src/usr.bin/tic/tic.c:1.42
--- src/usr.bin/tic/tic.c:1.41 Sat May 11 18:06:57 2024
+++ src/usr.bin/tic/tic.c Mon May 20 10:41:37 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: tic.c,v 1.41 2024/05/11 22:06:57 christos Exp $ */
+/* $NetBSD: tic.c,v 1.42 2024/05/20 14:41:37 christos Exp $ */
/*
* Copyright (c) 2009, 2010, 2020 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#endif
#include
-__RCSID("$NetBSD: tic.c,v 1.41 2024/05/11 22:06:57 christos Exp $");
+__RCSID("$NetBSD: tic.c,v 1.42 2024/05/20 14:41:37 christos Exp $");
#include
#include
@@ -573,6 +573,7 @@ write_database(const char *dbname)
char *tmp_dbname;
TERM *term;
int fd;
+ mode_t m;
db = cdbw_open();
if (db == NULL)
@@ -589,7 +590,9 @@ write_database(const char *dbname)
if (cdbw_output(db, fd, "NetBSD terminfo", cdbw_stable_seeder))
err(EXIT_FAILURE,
"writing temporary database %s failed", tmp_dbname);
- if (fchmod(fd, DEFFILEMODE))
+ m = umask(0);
+ (void)umask(m);
+ if (fchmod(fd, DEFFILEMODE & ~m))
err(EXIT_FAILURE, "fchmod failed");
if (close(fd))
err(EXIT_FAILURE,
CVS commit: src/usr.bin/tic
Module Name:src Committed By: christos Date: Mon May 20 14:41:37 UTC 2024 Modified Files: src/usr.bin/tic: tic.c Log Message: PR/58270: RVP: tic does not honor the user's umask, output files are 0666. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/usr.bin/tic/tic.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump
Module Name:src
Committed By: christos
Date: Mon May 20 04:16:48 UTC 2024
Modified Files:
src/sys/rump: Makefile.rump
Log Message:
Handle versions > 100
To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 src/sys/rump/Makefile.rump
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.137 src/sys/rump/Makefile.rump:1.138
--- src/sys/rump/Makefile.rump:1.137 Sun May 19 18:25:49 2024
+++ src/sys/rump/Makefile.rump Mon May 20 00:16:48 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rump,v 1.137 2024/05/19 22:25:49 christos Exp $
+# $NetBSD: Makefile.rump,v 1.138 2024/05/20 04:16:48 christos Exp $
#
.if !defined(_RUMP_MK)
@@ -54,7 +54,7 @@ RUMP_NBCOMPAT= 50 60 70 80 90 100 110
RUMP_NBCOMPAT=
.endif
RUMP_NBCOMPAT:= ${RUMP_NBCOMPAT:S/,/ /g}
-CPPFLAGS+= ${RUMP_NBCOMPAT:C/[1-9]0/-DCOMPAT_&/g}
+CPPFLAGS+= ${RUMP_NBCOMPAT:C/^[1-9][0-9]*/-DCOMPAT_&/g}
CPPFLAGS+= -nostdinc
CFLAGS+= -ffreestanding -fno-strict-aliasing
CVS commit: src/sys/rump
Module Name:src Committed By: christos Date: Mon May 20 04:16:48 UTC 2024 Modified Files: src/sys/rump: Makefile.rump Log Message: Handle versions > 100 To generate a diff of this commit: cvs rdiff -u -r1.137 -r1.138 src/sys/rump/Makefile.rump Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/common
Module Name:src Committed By: christos Date: Mon May 20 02:36:33 UTC 2024 Modified Files: src/sys/compat/common: files.common Log Message: remove dup line To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/compat/common/files.common Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/common/files.common diff -u src/sys/compat/common/files.common:1.13 src/sys/compat/common/files.common:1.14 --- src/sys/compat/common/files.common:1.13 Sun May 19 21:30:34 2024 +++ src/sys/compat/common/files.common Sun May 19 22:36:33 2024 @@ -1,4 +1,4 @@ -# $NetBSD: files.common,v 1.13 2024/05/20 01:30:34 christos Exp $ +# $NetBSD: files.common,v 1.14 2024/05/20 02:36:33 christos Exp $ # # Generic utility files, used by various compat options. @@ -114,7 +114,6 @@ file compat/common/net_inet6_nd_90.c co # Compatibility code for NetBSD 10.0 file compat/common/compat_100_mod.c compat_100 file compat/common/kern_event_100.c compat_100 -file compat/common/compat_100_mod.c compat_100 file compat/common/sys_descrip_100.c compat_100 # Compatibility code for NetBSD 11.0
CVS commit: src/sys/compat/common
Module Name:src Committed By: christos Date: Mon May 20 02:36:33 UTC 2024 Modified Files: src/sys/compat/common: files.common Log Message: remove dup line To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/compat/common/files.common Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: christos Date: Mon May 20 01:40:45 UTC 2024 Modified Files: src/sys/compat/netbsd32: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c netbsd32_systrace_args.c src/sys/kern: init_sysent.c syscalls.c syscalls_autoload.c systrace_args.c src/sys/rump: rump.sysmap src/sys/rump/include/rump: rump_syscalls.h src/sys/rump/librump/rumpkern: rump_syscalls.c rumpkern_syscalls.c src/sys/rump/librump/rumpnet: rumpnet_syscalls.c src/sys/rump/librump/rumpvfs: rumpvfs_syscalls.c src/sys/sys: syscall.h syscallargs.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.161 -r1.162 src/sys/compat/netbsd32/netbsd32_syscall.h \ src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.160 -r1.161 src/sys/compat/netbsd32/netbsd32_syscallargs.h \ src/sys/compat/netbsd32/netbsd32_syscalls.c cvs rdiff -u -r1.40 -r1.41 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.53 -r1.54 src/sys/compat/netbsd32/netbsd32_systrace_args.c cvs rdiff -u -r1.342 -r1.343 src/sys/kern/init_sysent.c cvs rdiff -u -r1.330 -r1.331 src/sys/kern/syscalls.c cvs rdiff -u -r1.46 -r1.47 src/sys/kern/syscalls_autoload.c cvs rdiff -u -r1.52 -r1.53 src/sys/kern/systrace_args.c cvs rdiff -u -r1.10 -r1.11 src/sys/rump/rump.sysmap cvs rdiff -u -r1.129 -r1.130 src/sys/rump/include/rump/rump_syscalls.h cvs rdiff -u -r1.160 -r1.161 src/sys/rump/librump/rumpkern/rump_syscalls.c cvs rdiff -u -r1.10 -r1.11 src/sys/rump/librump/rumpkern/rumpkern_syscalls.c cvs rdiff -u -r1.9 -r1.10 src/sys/rump/librump/rumpnet/rumpnet_syscalls.c cvs rdiff -u -r1.11 -r1.12 src/sys/rump/librump/rumpvfs/rumpvfs_syscalls.c cvs rdiff -u -r1.325 -r1.326 src/sys/sys/syscall.h cvs rdiff -u -r1.308 -r1.309 src/sys/sys/syscallargs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: christos
Date: Mon May 20 01:40:45 UTC 2024
Modified Files:
src/sys/compat/netbsd32: netbsd32_syscall.h netbsd32_syscallargs.h
netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c
netbsd32_systrace_args.c
src/sys/kern: init_sysent.c syscalls.c syscalls_autoload.c
systrace_args.c
src/sys/rump: rump.sysmap
src/sys/rump/include/rump: rump_syscalls.h
src/sys/rump/librump/rumpkern: rump_syscalls.c rumpkern_syscalls.c
src/sys/rump/librump/rumpnet: rumpnet_syscalls.c
src/sys/rump/librump/rumpvfs: rumpvfs_syscalls.c
src/sys/sys: syscall.h syscallargs.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.162 src/sys/compat/netbsd32/netbsd32_syscall.h \
src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.160 -r1.161 src/sys/compat/netbsd32/netbsd32_syscallargs.h \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.40 -r1.41 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.53 -r1.54 src/sys/compat/netbsd32/netbsd32_systrace_args.c
cvs rdiff -u -r1.342 -r1.343 src/sys/kern/init_sysent.c
cvs rdiff -u -r1.330 -r1.331 src/sys/kern/syscalls.c
cvs rdiff -u -r1.46 -r1.47 src/sys/kern/syscalls_autoload.c
cvs rdiff -u -r1.52 -r1.53 src/sys/kern/systrace_args.c
cvs rdiff -u -r1.10 -r1.11 src/sys/rump/rump.sysmap
cvs rdiff -u -r1.129 -r1.130 src/sys/rump/include/rump/rump_syscalls.h
cvs rdiff -u -r1.160 -r1.161 src/sys/rump/librump/rumpkern/rump_syscalls.c
cvs rdiff -u -r1.10 -r1.11 src/sys/rump/librump/rumpkern/rumpkern_syscalls.c
cvs rdiff -u -r1.9 -r1.10 src/sys/rump/librump/rumpnet/rumpnet_syscalls.c
cvs rdiff -u -r1.11 -r1.12 src/sys/rump/librump/rumpvfs/rumpvfs_syscalls.c
cvs rdiff -u -r1.325 -r1.326 src/sys/sys/syscall.h
cvs rdiff -u -r1.308 -r1.309 src/sys/sys/syscallargs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.161 src/sys/compat/netbsd32/netbsd32_syscall.h:1.162
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.161 Sun May 19 18:27:15 2024
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Sun May 19 21:40:45 2024
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.161 2024/05/19 22:27:15 christos Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.162 2024/05/20 01:40:45 christos Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.145 2024/05/19 22:25:48 christos Exp
+ * created from NetBSD: syscalls.master,v 1.146 2024/05/20 01:30:33 christos Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -1200,8 +1200,8 @@
/* syscall: "netbsd32_pipe2" ret: "int" args: "netbsd32_intp" "int" */
#define NETBSD32_SYS_netbsd32_pipe2 453
-/* syscall: "compat_110_netbsd32_dup3" ret: "int" args: "int" "int" "int" */
-#define NETBSD32_SYS_compat_110_netbsd32_dup3 454
+/* syscall: "compat_100_netbsd32_dup3" ret: "int" args: "int" "int" "int" */
+#define NETBSD32_SYS_compat_100_netbsd32_dup3 454
/* syscall: "netbsd32_kqueue1" ret: "int" args: "int" */
#define NETBSD32_SYS_netbsd32_kqueue1 455
@@ -1353,8 +1353,8 @@
/* syscall: "netbsd32_epoll_pwait2" ret: "int" args: "int" "netbsd32_epoll_eventp_t" "int" "netbsd32_timespecp_t" "netbsd32_sigsetp_t" */
#define NETBSD32_SYS_netbsd32_epoll_pwait2 504
-/* syscall: "netbsd32___dup3110" ret: "int" args: "int" "int" "int" */
-#define NETBSD32_SYS_netbsd32___dup3110 505
+/* syscall: "netbsd32___dup3100" ret: "int" args: "int" "int" "int" */
+#define NETBSD32_SYS_netbsd32___dup3100 505
#define NETBSD32_SYS_MAXSYSCALL 506
#define NETBSD32_SYS_NSYSENT 512
Index: src/sys/compat/netbsd32/netbsd32_sysent.c
diff -u src/sys/compat/netbsd32/netbsd32_sysent.c:1.161 src/sys/compat/netbsd32/netbsd32_sysent.c:1.162
--- src/sys/compat/netbsd32/netbsd32_sysent.c:1.161 Sun May 19 18:27:15 2024
+++ src/sys/compat/netbsd32/netbsd32_sysent.c Sun May 19 21:40:45 2024
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_sysent.c,v 1.161 2024/05/19 22:27:15 christos Exp $ */
+/* $NetBSD: netbsd32_sysent.c,v 1.162 2024/05/20 01:40:45 christos Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.145 2024/05/19 22:25:48 christos Exp
+ * created from NetBSD: syscalls.master,v 1.146 2024/05/20 01:30:33 christos Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.161 2024/05/19 22:27:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.162 2024/05/20 01:40:45 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -1891,9 +1891,9 @@ struct sysent netbsd32_sysent[] = {
.sy_call = (sy_call_t *)netbsd32_pipe2
}, /* 453 = netbsd32_pipe2 */
{
-
CVS commit: src/lib/libc/compat
Module Name:src
Committed By: christos
Date: Mon May 20 01:33:40 UTC 2024
Modified Files:
src/lib/libc/compat/include: unistd.h
src/lib/libc/compat/sys: compat_dup3.c
Log Message:
finish renaming __dup3110 to __dup3100
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/compat/include/unistd.h
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/compat/sys/compat_dup3.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/compat/include/unistd.h
diff -u src/lib/libc/compat/include/unistd.h:1.4 src/lib/libc/compat/include/unistd.h:1.5
--- src/lib/libc/compat/include/unistd.h:1.4 Sun May 19 18:25:47 2024
+++ src/lib/libc/compat/include/unistd.h Sun May 19 21:33:39 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: unistd.h,v 1.4 2024/05/19 22:25:47 christos Exp $ */
+/* $NetBSD: unistd.h,v 1.5 2024/05/20 01:33:39 christos Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@ __BEGIN_DECLS
pid_t vfork(void) __returns_twice;
pid_t __vfork14(void) __returns_twice;
int dup3(int, int, int);
-int __dup3110(int, int, int);
+int __dup3100(int, int, int);
__END_DECLS
Index: src/lib/libc/compat/sys/compat_dup3.c
diff -u src/lib/libc/compat/sys/compat_dup3.c:1.1 src/lib/libc/compat/sys/compat_dup3.c:1.2
--- src/lib/libc/compat/sys/compat_dup3.c:1.1 Sun May 19 18:25:48 2024
+++ src/lib/libc/compat/sys/compat_dup3.c Sun May 19 21:33:40 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_dup3.c,v 1.1 2024/05/19 22:25:48 christos Exp $ */
+/* $NetBSD: compat_dup3.c,v 1.2 2024/05/20 01:33:40 christos Exp $ */
/*-
* Copyright (c) 2024 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_dup3.c,v 1.1 2024/05/19 22:25:48 christos Exp $");
+__RCSID("$NetBSD: compat_dup3.c,v 1.2 2024/05/20 01:33:40 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -45,7 +45,7 @@ int
dup3(int oldfd, int newfd, int flags)
{
if (oldfd != newfd) {
- return __dup3110(oldfd, newfd, flags);
+ return __dup3100(oldfd, newfd, flags);
}
if (flags & (O_NONBLOCK|O_NOSIGPIPE)) {
int e = fcntl(newfd, F_GETFL, 0);
CVS commit: src/lib/libc/compat
Module Name:src Committed By: christos Date: Mon May 20 01:33:40 UTC 2024 Modified Files: src/lib/libc/compat/include: unistd.h src/lib/libc/compat/sys: compat_dup3.c Log Message: finish renaming __dup3110 to __dup3100 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/lib/libc/compat/include/unistd.h cvs rdiff -u -r1.1 -r1.2 src/lib/libc/compat/sys/compat_dup3.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: christos Date: Mon May 20 01:30:34 UTC 2024 Modified Files: src/include: unistd.h src/lib/libc/sys: Makefile.inc src/sys/compat/common: compat_100_mod.c compat_110_mod.c compat_mod.h files.common src/sys/compat/netbsd32: netbsd32_compat_100.c netbsd32_compat_110.c netbsd32_netbsd.c syscalls.master src/sys/kern: syscalls.master src/sys/modules/compat_110: Makefile Added Files: src/sys/compat/common: sys_descrip_100.c Removed Files: src/sys/compat/common: sys_decrip_110.c Log Message: Rename dup3110 to dup3100 to match historical practice for NetBSD-11, because we already have kevent100. Fix compat_dup3 to belong in compat_100 not compat_110. To generate a diff of this commit: cvs rdiff -u -r1.165 -r1.166 src/include/unistd.h cvs rdiff -u -r1.254 -r1.255 src/lib/libc/sys/Makefile.inc cvs rdiff -u -r1.2 -r1.3 src/sys/compat/common/compat_100_mod.c cvs rdiff -u -r1.1 -r1.2 src/sys/compat/common/compat_110_mod.c cvs rdiff -u -r1.11 -r1.12 src/sys/compat/common/compat_mod.h cvs rdiff -u -r1.12 -r1.13 src/sys/compat/common/files.common cvs rdiff -u -r1.1 -r0 src/sys/compat/common/sys_decrip_110.c cvs rdiff -u -r0 -r1.1 src/sys/compat/common/sys_descrip_100.c cvs rdiff -u -r1.3 -r1.4 src/sys/compat/netbsd32/netbsd32_compat_100.c cvs rdiff -u -r1.1 -r1.2 src/sys/compat/netbsd32/netbsd32_compat_110.c cvs rdiff -u -r1.236 -r1.237 src/sys/compat/netbsd32/netbsd32_netbsd.c cvs rdiff -u -r1.145 -r1.146 src/sys/compat/netbsd32/syscalls.master cvs rdiff -u -r1.312 -r1.313 src/sys/kern/syscalls.master cvs rdiff -u -r1.1 -r1.2 src/sys/modules/compat_110/Makefile 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: Mon May 20 01:30:34 UTC 2024
Modified Files:
src/include: unistd.h
src/lib/libc/sys: Makefile.inc
src/sys/compat/common: compat_100_mod.c compat_110_mod.c compat_mod.h
files.common
src/sys/compat/netbsd32: netbsd32_compat_100.c netbsd32_compat_110.c
netbsd32_netbsd.c syscalls.master
src/sys/kern: syscalls.master
src/sys/modules/compat_110: Makefile
Added Files:
src/sys/compat/common: sys_descrip_100.c
Removed Files:
src/sys/compat/common: sys_decrip_110.c
Log Message:
Rename dup3110 to dup3100 to match historical practice for NetBSD-11,
because we already have kevent100. Fix compat_dup3 to belong in compat_100
not compat_110.
To generate a diff of this commit:
cvs rdiff -u -r1.165 -r1.166 src/include/unistd.h
cvs rdiff -u -r1.254 -r1.255 src/lib/libc/sys/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/sys/compat/common/compat_100_mod.c
cvs rdiff -u -r1.1 -r1.2 src/sys/compat/common/compat_110_mod.c
cvs rdiff -u -r1.11 -r1.12 src/sys/compat/common/compat_mod.h
cvs rdiff -u -r1.12 -r1.13 src/sys/compat/common/files.common
cvs rdiff -u -r1.1 -r0 src/sys/compat/common/sys_decrip_110.c
cvs rdiff -u -r0 -r1.1 src/sys/compat/common/sys_descrip_100.c
cvs rdiff -u -r1.3 -r1.4 src/sys/compat/netbsd32/netbsd32_compat_100.c
cvs rdiff -u -r1.1 -r1.2 src/sys/compat/netbsd32/netbsd32_compat_110.c
cvs rdiff -u -r1.236 -r1.237 src/sys/compat/netbsd32/netbsd32_netbsd.c
cvs rdiff -u -r1.145 -r1.146 src/sys/compat/netbsd32/syscalls.master
cvs rdiff -u -r1.312 -r1.313 src/sys/kern/syscalls.master
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/compat_110/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/unistd.h
diff -u src/include/unistd.h:1.165 src/include/unistd.h:1.166
--- src/include/unistd.h:1.165 Sun May 19 18:25:47 2024
+++ src/include/unistd.h Sun May 19 21:30:33 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: unistd.h,v 1.165 2024/05/19 22:25:47 christos Exp $ */
+/* $NetBSD: unistd.h,v 1.166 2024/05/20 01:30:33 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2008 The NetBSD Foundation, Inc.
@@ -330,7 +330,7 @@ int closefrom(int);
int des_cipher(const char *, char *, long, int);
int des_setkey(const char *);
#ifndef __LIBC12_SOURCE__
-int dup3(int, int, int) __RENAME(__dup3110);
+int dup3(int, int, int) __RENAME(__dup3100);
#endif
void endusershell(void);
int exect(const char *, char * const *, char * const *);
Index: src/lib/libc/sys/Makefile.inc
diff -u src/lib/libc/sys/Makefile.inc:1.254 src/lib/libc/sys/Makefile.inc:1.255
--- src/lib/libc/sys/Makefile.inc:1.254 Sun May 19 18:25:48 2024
+++ src/lib/libc/sys/Makefile.inc Sun May 19 21:30:33 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.254 2024/05/19 22:25:48 christos Exp $
+# $NetBSD: Makefile.inc,v 1.255 2024/05/20 01:30:33 christos Exp $
# @(#)Makefile.inc 8.3 (Berkeley) 10/24/94
# sys sources
@@ -102,7 +102,7 @@ ASM=\
chdir.S chflags.S chmod.S chown.S chroot.S \
clock_getcpuclockid2.S \
__clock_getres50.S __clock_gettime50.S \
- dup.S dup2.S __dup3110.S \
+ dup.S dup2.S __dup3100.S \
eventfd.S \
extattrctl.S \
extattr_delete_fd.S extattr_delete_file.S \
Index: src/sys/compat/common/compat_100_mod.c
diff -u src/sys/compat/common/compat_100_mod.c:1.2 src/sys/compat/common/compat_100_mod.c:1.3
--- src/sys/compat/common/compat_100_mod.c:1.2 Fri Jul 28 14:19:00 2023
+++ src/sys/compat/common/compat_100_mod.c Sun May 19 21:30:34 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_100_mod.c,v 1.2 2023/07/28 18:19:00 christos Exp $ */
+/* $NetBSD: compat_100_mod.c,v 1.3 2024/05/20 01:30:34 christos Exp $ */
/*-
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#endif
#include
-__KERNEL_RCSID(0, "$NetBSD: compat_100_mod.c,v 1.2 2023/07/28 18:19:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_100_mod.c,v 1.3 2024/05/20 01:30:34 christos Exp $");
#include
#include
@@ -49,15 +49,23 @@ __KERNEL_RCSID(0, "$NetBSD: compat_100_m
int
compat_100_init(void)
{
+ int error;
- return kern_event_100_init();
+ error = kern_event_100_init();
+ if (error)
+ return error;
+ return sys_descrip_100_init();
}
int
compat_100_fini(void)
{
+ int error;
- return kern_event_100_fini();
+ error = kern_event_100_fini();
+ if (error)
+ return error;
+ return sys_descrip_100_fini();
}
MODULE(MODULE_CLASS_EXEC, compat_100, NULL);
Index: src/sys/compat/common/compat_110_mod.c
diff -u src/sys/compat/common/compat_110_mod.c:1.1 src/sys/compat/common/compat_110_mod.c:1.2
--- src/sys/compat/common/compat_110_mod.c:1.1 Sun May 19 18:25:48 2024
+++ src/sys/compat/common/compat_110_mod.c Sun May 19 21:30:34 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_110_mod.c,v 1.1 2024/05/19 22:25:48 christos Exp $ */
+/* $NetBSD: compat_110_mod.c,v 1.2 2024/05/20 01:30:34 christos Exp $ */
/*-
*
Re: CVS commit: src
> On May 19, 2024, at 9:19 PM, Jason Thorpe wrote: > > >> On May 19, 2024, at 5:35 PM, Christos Zoulas wrote: >> >> In article <9c72736d-707b-4267-bd05-45bffea52...@me.com>, >> Jason Thorpe wrote: >>> >>> >>>> On May 19, 2024, at 3:25 PM, Christos Zoulas wrote: >>>> >>>> src/sys/compat/common: compat_110_mod.c sys_decrip_110.c >>>> src/sys/compat/netbsd32: netbsd32_compat_110.c >>>> src/sys/conf: compat_netbsd110.config >>>> src/sys/modules/compat_110: Makefile >>>> src/sys/modules/compat_netbsd32_110: Makefile >>> >>> Wait, why is there now a compat_110 module? netbsd-11 isn’t out yet. >>> dup3() belongs in the compat_100 module. >> >> You asked for the syscall to be called dup3110 so I put it in compat_110... > > The new system call is dup3110 (“dup3 for 11.0”), the old one is “netbsd-10 > compatibility”, so belongs in compat_10. > We discussed it with Taylor and decided to call it dup3100 after all since we've already followed the old scheme for kevent100 and it is better to be consistent for the 11 release.We can start calling new syscalls 12 after 11 is released. christos
Re: CVS commit: src
In article <9c72736d-707b-4267-bd05-45bffea52...@me.com>, Jason Thorpe wrote: > > >> On May 19, 2024, at 3:25â¯PM, Christos Zoulas wrote: >> >> src/sys/compat/common: compat_110_mod.c sys_decrip_110.c >> src/sys/compat/netbsd32: netbsd32_compat_110.c >> src/sys/conf: compat_netbsd110.config >> src/sys/modules/compat_110: Makefile >> src/sys/modules/compat_netbsd32_110: Makefile > >Wait, why is there now a compat_110 module? netbsd-11 isnât out yet. >dup3() belongs in the compat_100 module. You asked for the syscall to be called dup3110 so I put it in compat_110... christos
CVS commit: src/tests/lib/libc/sys
Module Name:src
Committed By: christos
Date: Mon May 20 00:27:53 UTC 2024
Modified Files:
src/tests/lib/libc/sys: t_dup.c
Log Message:
Adjust to the new dup3 behavior for equal fds
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/tests/lib/libc/sys/t_dup.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/sys/t_dup.c
diff -u src/tests/lib/libc/sys/t_dup.c:1.9 src/tests/lib/libc/sys/t_dup.c:1.10
--- src/tests/lib/libc/sys/t_dup.c:1.9 Fri Jan 13 15:31:53 2017
+++ src/tests/lib/libc/sys/t_dup.c Sun May 19 20:27:53 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: t_dup.c,v 1.9 2017/01/13 20:31:53 christos Exp $ */
+/* $NetBSD: t_dup.c,v 1.10 2024/05/20 00:27:53 christos Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: t_dup.c,v 1.9 2017/01/13 20:31:53 christos Exp $");
+__RCSID("$NetBSD: t_dup.c,v 1.10 2024/05/20 00:27:53 christos Exp $");
#include
#include
@@ -208,10 +208,10 @@ ATF_TC_BODY(dup3_err, tc)
ATF_REQUIRE(fd >= 0);
errno = 0;
- ATF_REQUIRE(dup3(fd, fd, O_CLOEXEC) != -1);
+ ATF_REQUIRE_ERRNO(EINVAL, dup3(fd, fd, O_CLOEXEC) == -1);
errno = 0;
- ATF_REQUIRE_ERRNO(EBADF, dup3(-1, -1, O_CLOEXEC) == -1);
+ ATF_REQUIRE_ERRNO(EINVAL, dup3(-1, -1, O_CLOEXEC) == -1);
errno = 0;
ATF_REQUIRE_ERRNO(EBADF, dup3(fd, -1, O_CLOEXEC) == -1);
CVS commit: src/tests/lib/libc/sys
Module Name:src Committed By: christos Date: Mon May 20 00:27:53 UTC 2024 Modified Files: src/tests/lib/libc/sys: t_dup.c Log Message: Adjust to the new dup3 behavior for equal fds To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/tests/lib/libc/sys/t_dup.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: christos Date: Sun May 19 22:27:16 UTC 2024 Modified Files: src/sys/compat/netbsd32: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c netbsd32_systrace_args.c src/sys/kern: init_sysent.c syscalls.c syscalls_autoload.c systrace_args.c src/sys/rump/include/rump: rump_syscalls.h src/sys/rump/librump/rumpkern: rump_syscalls.c rumpkern_syscalls.c src/sys/rump/librump/rumpnet: rumpnet_syscalls.c src/sys/rump/librump/rumpvfs: rumpvfs_syscalls.c src/sys/sys: syscall.h syscallargs.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.160 -r1.161 src/sys/compat/netbsd32/netbsd32_syscall.h \ src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.159 -r1.160 src/sys/compat/netbsd32/netbsd32_syscallargs.h \ src/sys/compat/netbsd32/netbsd32_syscalls.c cvs rdiff -u -r1.39 -r1.40 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.52 -r1.53 src/sys/compat/netbsd32/netbsd32_systrace_args.c cvs rdiff -u -r1.341 -r1.342 src/sys/kern/init_sysent.c cvs rdiff -u -r1.329 -r1.330 src/sys/kern/syscalls.c cvs rdiff -u -r1.45 -r1.46 src/sys/kern/syscalls_autoload.c cvs rdiff -u -r1.51 -r1.52 src/sys/kern/systrace_args.c cvs rdiff -u -r1.128 -r1.129 src/sys/rump/include/rump/rump_syscalls.h cvs rdiff -u -r1.159 -r1.160 src/sys/rump/librump/rumpkern/rump_syscalls.c cvs rdiff -u -r1.9 -r1.10 src/sys/rump/librump/rumpkern/rumpkern_syscalls.c cvs rdiff -u -r1.8 -r1.9 src/sys/rump/librump/rumpnet/rumpnet_syscalls.c cvs rdiff -u -r1.10 -r1.11 src/sys/rump/librump/rumpvfs/rumpvfs_syscalls.c cvs rdiff -u -r1.324 -r1.325 src/sys/sys/syscall.h cvs rdiff -u -r1.307 -r1.308 src/sys/sys/syscallargs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/netbsd32/netbsd32_syscall.h diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.160 src/sys/compat/netbsd32/netbsd32_syscall.h:1.161 --- src/sys/compat/netbsd32/netbsd32_syscall.h:1.160 Sun Jul 30 02:53:13 2023 +++ src/sys/compat/netbsd32/netbsd32_syscall.h Sun May 19 18:27:15 2024 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscall.h,v 1.160 2023/07/30 06:53:13 rin Exp $ */ +/* $NetBSD: netbsd32_syscall.h,v 1.161 2024/05/19 22:27:15 christos Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.144 2023/07/30 06:52:20 rin Exp + * created from NetBSD: syscalls.master,v 1.145 2024/05/19 22:25:48 christos Exp */ #ifndef _NETBSD32_SYS_SYSCALL_H_ @@ -1200,8 +1200,8 @@ /* syscall: "netbsd32_pipe2" ret: "int" args: "netbsd32_intp" "int" */ #define NETBSD32_SYS_netbsd32_pipe2 453 -/* syscall: "netbsd32_dup3" ret: "int" args: "int" "int" "int" */ -#define NETBSD32_SYS_netbsd32_dup3 454 +/* syscall: "compat_110_netbsd32_dup3" ret: "int" args: "int" "int" "int" */ +#define NETBSD32_SYS_compat_110_netbsd32_dup3 454 /* syscall: "netbsd32_kqueue1" ret: "int" args: "int" */ #define NETBSD32_SYS_netbsd32_kqueue1 455 @@ -1353,6 +1353,9 @@ /* syscall: "netbsd32_epoll_pwait2" ret: "int" args: "int" "netbsd32_epoll_eventp_t" "int" "netbsd32_timespecp_t" "netbsd32_sigsetp_t" */ #define NETBSD32_SYS_netbsd32_epoll_pwait2 504 -#define NETBSD32_SYS_MAXSYSCALL 505 +/* syscall: "netbsd32___dup3110" ret: "int" args: "int" "int" "int" */ +#define NETBSD32_SYS_netbsd32___dup3110 505 + +#define NETBSD32_SYS_MAXSYSCALL 506 #define NETBSD32_SYS_NSYSENT 512 #endif /* _NETBSD32_SYS_SYSCALL_H_ */ Index: src/sys/compat/netbsd32/netbsd32_sysent.c diff -u src/sys/compat/netbsd32/netbsd32_sysent.c:1.160 src/sys/compat/netbsd32/netbsd32_sysent.c:1.161 --- src/sys/compat/netbsd32/netbsd32_sysent.c:1.160 Wed May 1 03:22:43 2024 +++ src/sys/compat/netbsd32/netbsd32_sysent.c Sun May 19 18:27:15 2024 @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_sysent.c,v 1.160 2024/05/01 07:22:43 mlelstv Exp $ */ +/* $NetBSD: netbsd32_sysent.c,v 1.161 2024/05/19 22:27:15 christos Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.144 2023/07/30 06:52:20 rin Exp + * created from NetBSD: syscalls.master,v 1.145 2024/05/19 22:25:48 christos Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.160 2024/05/01 07:22:43 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.161 2024/05/19 22:27:15 christos Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -133,6 +133,12 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_sys #define compat_100(func) sys_nosys #endif +#ifdef COMPAT_110 +#define compat_110(func) __CONCAT(compat_110_,func) +#else +#define compat_110(func) sys_nosys +#endif + #define s(type) sizeof(type) #define n(type) (sizeof(type)/sizeof
CVS commit: src/sys
Module Name:src Committed By: christos Date: Sun May 19 22:27:16 UTC 2024 Modified Files: src/sys/compat/netbsd32: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c netbsd32_systrace_args.c src/sys/kern: init_sysent.c syscalls.c syscalls_autoload.c systrace_args.c src/sys/rump/include/rump: rump_syscalls.h src/sys/rump/librump/rumpkern: rump_syscalls.c rumpkern_syscalls.c src/sys/rump/librump/rumpnet: rumpnet_syscalls.c src/sys/rump/librump/rumpvfs: rumpvfs_syscalls.c src/sys/sys: syscall.h syscallargs.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.160 -r1.161 src/sys/compat/netbsd32/netbsd32_syscall.h \ src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.159 -r1.160 src/sys/compat/netbsd32/netbsd32_syscallargs.h \ src/sys/compat/netbsd32/netbsd32_syscalls.c cvs rdiff -u -r1.39 -r1.40 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.52 -r1.53 src/sys/compat/netbsd32/netbsd32_systrace_args.c cvs rdiff -u -r1.341 -r1.342 src/sys/kern/init_sysent.c cvs rdiff -u -r1.329 -r1.330 src/sys/kern/syscalls.c cvs rdiff -u -r1.45 -r1.46 src/sys/kern/syscalls_autoload.c cvs rdiff -u -r1.51 -r1.52 src/sys/kern/systrace_args.c cvs rdiff -u -r1.128 -r1.129 src/sys/rump/include/rump/rump_syscalls.h cvs rdiff -u -r1.159 -r1.160 src/sys/rump/librump/rumpkern/rump_syscalls.c cvs rdiff -u -r1.9 -r1.10 src/sys/rump/librump/rumpkern/rumpkern_syscalls.c cvs rdiff -u -r1.8 -r1.9 src/sys/rump/librump/rumpnet/rumpnet_syscalls.c cvs rdiff -u -r1.10 -r1.11 src/sys/rump/librump/rumpvfs/rumpvfs_syscalls.c cvs rdiff -u -r1.324 -r1.325 src/sys/sys/syscall.h cvs rdiff -u -r1.307 -r1.308 src/sys/sys/syscallargs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
pat_20 compat_30 compat_40 compat_50 compat_60 compat_70 compat_80 compat_90 compat_100"
+compatopts="compat_43 compat_09 compat_10 compat_11 compat_12 compat_13 compat_14 compat_15 compat_16 compat_20 compat_30 compat_40 compat_50 compat_60 compat_70 compat_80 compat_90 compat_100 compat_110"
libcompatopts=""
switchname="sysent"
Index: src/sys/kern/syscalls.master
diff -u src/sys/kern/syscalls.master:1.311 src/sys/kern/syscalls.master:1.312
--- src/sys/kern/syscalls.master:1.311 Fri Jul 28 14:19:01 2023
+++ src/sys/kern/syscalls.master Sun May 19 18:25:48 2024
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.311 2023/07/28 18:19:01 christos Exp $
+ $NetBSD: syscalls.master,v 1.312 2024/05/19 22:25:48 christos Exp $
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -954,7 +954,8 @@
; 452 only ever appeared in 5.99.x and can be reused after netbsd-7
452 OBSOL 5.99 quotactl
453 STD RUMP { int|sys||pipe2(int *fildes, int flags); }
-454 STD RUMP { int|sys||dup3(int from, int to, int flags); }
+454 COMPAT_110 MODULAR compat_110 RUMP \
+ { int|sys||dup3(int from, int to, int flags); }
455 STD RUMP { int|sys||kqueue1(int flags); }
456 STD RUMP { int|sys||paccept(int s, struct sockaddr *name, \
socklen_t *anamelen, const sigset_t *mask, \
@@ -1063,3 +1064,4 @@
struct epoll_event *events, int maxevents, \
const struct timespec *timeout, \
const sigset_t *sigmask); }
+505 STD RUMP { int|sys|110|dup3(int from, int to, int flags); }
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.286 src/sys/modules/Makefile:1.287
--- src/sys/modules/Makefile:1.286 Thu May 9 08:09:59 2024
+++ src/sys/modules/Makefile Sun May 19 18:25:49 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.286 2024/05/09 12:09:59 pho Exp $
+# $NetBSD: Makefile,v 1.287 2024/05/19 22:25:49 christos Exp $
.include
@@ -12,6 +12,7 @@ SUBDIR+= compat_43 compat_sysctl_09_43
SUBDIR+= compat_09 compat_10 compat_12 compat_13 compat_14
SUBDIR+= compat_16 compat_20 compat_30 compat_40 compat_50
SUBDIR+= compat_60 compat_70 compat_80 compat_90 compat_100
+SUBDIR+= compat_110
SUBDIR+= compat_sysv_10 compat_sysv_14 compat_sysv_50
@@ -318,6 +319,7 @@ SUBDIR+= compat_netbsd32_20 compat_netbs
SUBDIR+= compat_netbsd32_40 compat_netbsd32_50
SUBDIR+= compat_netbsd32_60 compat_netbsd32_80
SUBDIR+= compat_netbsd32_90 compat_netbsd32_100
+SUBDIR+= compat_netbsd32_110
SUBDIR+= compat_netbsd32_43
SUBDIR+= compat_netbsd32_coredump
SUBDIR+= compat_netbsd32_mqueue
Index: src/sys/rump/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.136 src/sys/rump/Makefile.rump:1.137
--- src/sys/rump/Makefile.rump:1.136 Sun Feb 4 13:52:36 2024
+++ src/sys/rump/Makefile.rump Sun May 19 18:25:49 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rump,v 1.136 2024/02/04 18:52:36 andvar Exp $
+# $NetBSD: Makefile.rump,v 1.137 2024/05/19 22:25:49 christos Exp $
#
.if !defined(_RUMP_MK)
@@ -48,7 +48,7 @@ CPPFLAGS+= -DMIPS1=1
# which NetBSD compat to build
RUMP_NBCOMPAT?=default
.if ${RUMP_NBCOMPAT} == "all" || ${RUMP_NBCOMPAT} == "default"
-RUMP_NBCOMPAT= 50 60 70 80 90 100
+RUMP_NBCOMPAT= 50 60 70 80 90 100 110
.endif
.if ${RUMP_NBCOMPAT} == "none"
RUMP_NBCOMPAT=
Added files:
Index: src/lib/libc/compat/sys/compat_dup3.c
diff -u /dev/null src/lib/libc/compat/sys/compat_dup3.c:1.1
--- /dev/null Sun May 19 18:25:49 2024
+++ src/lib/libc/compat/sys/compat_dup3.c Sun May 19 18:25:48 2024
@@ -0,0 +1,62 @@
+/* $NetBSD: compat_dup3.c,v 1.1 2024/05/19 22:25:48 christos Exp $ */
+
+/*-
+ * Copyright (c) 2024 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 NE
CVS commit: src
Module Name:src Committed By: christos Date: Sun May 19 22:25:49 UTC 2024 Modified Files: src/include: unistd.h src/lib/libc/compat/include: unistd.h src/lib/libc/compat/sys: Makefile.inc src/lib/libc/sys: Makefile.inc src/sys/compat/common: compat_mod.h files.common src/sys/compat/netbsd32: files.netbsd32 netbsd32_netbsd.c syscalls.conf syscalls.master src/sys/conf: files src/sys/kern: sys_descrip.c syscalls.conf syscalls.master src/sys/modules: Makefile src/sys/rump: Makefile.rump Added Files: src/lib/libc/compat/sys: compat_dup3.c src/sys/compat/common: compat_110_mod.c sys_decrip_110.c src/sys/compat/netbsd32: netbsd32_compat_110.c src/sys/conf: compat_netbsd110.config src/sys/modules/compat_110: Makefile src/sys/modules/compat_netbsd32_110: Makefile Log Message: version dup3 To generate a diff of this commit: cvs rdiff -u -r1.164 -r1.165 src/include/unistd.h cvs rdiff -u -r1.3 -r1.4 src/lib/libc/compat/include/unistd.h cvs rdiff -u -r1.11 -r1.12 src/lib/libc/compat/sys/Makefile.inc cvs rdiff -u -r0 -r1.1 src/lib/libc/compat/sys/compat_dup3.c cvs rdiff -u -r1.253 -r1.254 src/lib/libc/sys/Makefile.inc cvs rdiff -u -r0 -r1.1 src/sys/compat/common/compat_110_mod.c \ src/sys/compat/common/sys_decrip_110.c cvs rdiff -u -r1.10 -r1.11 src/sys/compat/common/compat_mod.h cvs rdiff -u -r1.11 -r1.12 src/sys/compat/common/files.common cvs rdiff -u -r1.55 -r1.56 src/sys/compat/netbsd32/files.netbsd32 cvs rdiff -u -r0 -r1.1 src/sys/compat/netbsd32/netbsd32_compat_110.c cvs rdiff -u -r1.235 -r1.236 src/sys/compat/netbsd32/netbsd32_netbsd.c cvs rdiff -u -r1.18 -r1.19 src/sys/compat/netbsd32/syscalls.conf cvs rdiff -u -r1.144 -r1.145 src/sys/compat/netbsd32/syscalls.master cvs rdiff -u -r0 -r1.1 src/sys/conf/compat_netbsd110.config cvs rdiff -u -r1.1312 -r1.1313 src/sys/conf/files cvs rdiff -u -r1.49 -r1.50 src/sys/kern/sys_descrip.c cvs rdiff -u -r1.32 -r1.33 src/sys/kern/syscalls.conf cvs rdiff -u -r1.311 -r1.312 src/sys/kern/syscalls.master cvs rdiff -u -r1.286 -r1.287 src/sys/modules/Makefile cvs rdiff -u -r0 -r1.1 src/sys/modules/compat_110/Makefile cvs rdiff -u -r0 -r1.1 src/sys/modules/compat_netbsd32_110/Makefile cvs rdiff -u -r1.136 -r1.137 src/sys/rump/Makefile.rump Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/sys
Module Name:src Committed By: christos Date: Sun May 19 16:04:46 UTC 2024 Modified Files: src/lib/libc/sys: dup.2 Log Message: Amend for oldfd == newfd returning EINVAL in dup3 To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/lib/libc/sys/dup.2 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/sys/dup.2 diff -u src/lib/libc/sys/dup.2:1.33 src/lib/libc/sys/dup.2:1.34 --- src/lib/libc/sys/dup.2:1.33 Mon Jul 3 17:32:50 2017 +++ src/lib/libc/sys/dup.2 Sun May 19 12:04:46 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: dup.2,v 1.33 2017/07/03 21:32:50 wiz Exp $ +.\" $NetBSD: dup.2,v 1.34 2024/05/19 16:04:46 christos Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)dup.2 8.1 (Berkeley) 6/4/93 .\" -.Dd December 24, 2013 +.Dd May 19, 2024 .Dt DUP 2 .Os .Sh NAME @@ -117,7 +117,14 @@ and can to some extent be adjusted with .Pp The .Fn dup3 -call includes an additional +call fails and returns +.Er EINVAL +if the numeric value in the +.Ar oldfd +argument is equal to the one in the +.Ar newfd +argument. +It also includes an additional .Fa flags argument supporting a subset of the .Xr open 2 @@ -207,11 +214,15 @@ and .Fa newfd is not in the range of valid file descriptors. .It Bq Er EINVAL -.Fa flags -contained an invalid value. -Only +In the .Fn dup3 -can generate this error. +call either the +.Fa flags +argument contained an invalid value or the +.Ar oldfd +argument is equal to the +.Ar newfd +argument. .It Bq Er EMFILE Too many descriptors are active. Only
CVS commit: src/lib/libc/sys
Module Name:src Committed By: christos Date: Sun May 19 16:04:46 UTC 2024 Modified Files: src/lib/libc/sys: dup.2 Log Message: Amend for oldfd == newfd returning EINVAL in dup3 To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/lib/libc/sys/dup.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: christos Date: Sun May 19 15:56:55 UTC 2024 Modified Files: src/sys/kern: sys_descrip.c Log Message: PR/58266: Collin Funk: Fail if from == to, like FreeBSD and Linux. The test is done in dup3 before any other tests so even if a bad descriptor it is passed we will return EINVAL not EBADFD like Linux does. To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/sys/kern/sys_descrip.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/sys_descrip.c diff -u src/sys/kern/sys_descrip.c:1.48 src/sys/kern/sys_descrip.c:1.49 --- src/sys/kern/sys_descrip.c:1.48 Sun Jul 9 22:31:55 2023 +++ src/sys/kern/sys_descrip.c Sun May 19 11:56:55 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: sys_descrip.c,v 1.48 2023/07/10 02:31:55 christos Exp $ */ +/* $NetBSD: sys_descrip.c,v 1.49 2024/05/19 15:56:55 christos Exp $ */ /*- * Copyright (c) 2008, 2020 The NetBSD Foundation, Inc. @@ -67,7 +67,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sys_descrip.c,v 1.48 2023/07/10 02:31:55 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sys_descrip.c,v 1.49 2024/05/19 15:56:55 christos Exp $"); #include #include @@ -156,6 +156,8 @@ sys_dup3(struct lwp *l, const struct sys syscallarg(int) to; syscallarg(int) flags; } */ + if (SCARG(uap, from) == SCARG(uap, to)) + return EINVAL; return dodup(l, SCARG(uap, from), SCARG(uap, to), SCARG(uap, flags), retval); }
CVS commit: src/sys/kern
Module Name:src Committed By: christos Date: Sun May 19 15:56:55 UTC 2024 Modified Files: src/sys/kern: sys_descrip.c Log Message: PR/58266: Collin Funk: Fail if from == to, like FreeBSD and Linux. The test is done in dup3 before any other tests so even if a bad descriptor it is passed we will return EINVAL not EBADFD like Linux does. To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/sys/kern/sys_descrip.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/ia64/include
Module Name:src
Committed By: christos
Date: Sat May 18 19:57:03 UTC 2024
Modified Files:
src/sys/arch/ia64/include: mcontext.h
Log Message:
allow things to compile again
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/ia64/include/mcontext.h
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/ia64/include/mcontext.h
diff -u src/sys/arch/ia64/include/mcontext.h:1.12 src/sys/arch/ia64/include/mcontext.h:1.13
--- src/sys/arch/ia64/include/mcontext.h:1.12 Mon Jun 29 13:09:33 2020
+++ src/sys/arch/ia64/include/mcontext.h Sat May 18 15:57:03 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mcontext.h,v 1.12 2020/06/29 17:09:33 scole Exp $ */
+/* $NetBSD: mcontext.h,v 1.13 2024/05/18 19:57:03 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -117,6 +117,11 @@ typedef struct __mcontext {
#define _UC_MACHINE_INTRV(uc) ((uc)->uc_mcontext.mc_scratch.gr8) /* gregs[8] */
#define _UC_MACHINE_SET_PC(uc, pc) (uc)->uc_mcontext.mc_special.iip = (pc)
+#define _UC_TLSBASE _UC_MD_BIT16
+#define _UC_SETSTACK _UC_MD_BIT17
+#define _UC_CLRSTACK _UC_MD_BIT18
+
+
#if defined(_RTLD_SOURCE) || defined(_LIBC_SOURCE) || \
defined(__LIBPTHREAD_SOURCE__)
#include
CVS commit: src/sys/arch/ia64/include
Module Name:src Committed By: christos Date: Sat May 18 19:57:03 UTC 2024 Modified Files: src/sys/arch/ia64/include: mcontext.h Log Message: allow things to compile again To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/ia64/include/mcontext.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/common/bootimage
Module Name:src Committed By: christos Date: Sat May 18 02:03:17 UTC 2024 Modified Files: src/distrib/common/bootimage: Makefile.bootimage Log Message: include all extra flavors of the kernel and use the proper variable for the machine dependent installation directory. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 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.
CVS commit: src/distrib/common/bootimage
Module Name:src
Committed By: christos
Date: Sat May 18 02:03:17 UTC 2024
Modified Files:
src/distrib/common/bootimage: Makefile.bootimage
Log Message:
include all extra flavors of the kernel and use the proper variable for
the machine dependent installation directory.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 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.36 src/distrib/common/bootimage/Makefile.bootimage:1.37
--- src/distrib/common/bootimage/Makefile.bootimage:1.36 Thu May 16 11:46:42 2024
+++ src/distrib/common/bootimage/Makefile.bootimage Fri May 17 22:03:17 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.36 2024/05/16 15:46:42 christos Exp $
+# $NetBSD: Makefile.bootimage,v 1.37 2024/05/18 02:03:17 christos Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -433,12 +433,13 @@ ${TARGETFS}: prepare_md_post ${WORKFSTAB
.if defined(SPEC_EXTRA)
cat ${SPEC_EXTRA} >> ${WORKSPEC}
.endif
- if [ -f ${WORKDIR}/netbsd.gdb ]; then \
- echo "./netbsd.gdb type=file uname=root gname=wheel mode=0444" \
- >> ${WORKSPEC}; \
- fi
- if [ -d ${WORKDIR}/${MACHINE} ]; then \
- ${MAKESPEC} -d ${WORKDIR} ${MACHINE} >> ${WORKSPEC}; \
+ for i in ${WORKDIR}/netbsd.*; do \
+ if [ -e $$i ]; then \
+ echo "./$$(basename $$i) type=file uname=root gname=wheel mode=0444" >> ${WORKSPEC}; \
+ fi; \
+ done
+ if [ -d ${WORKDIR}/${RELEASEMACHINEDIR} ]; then \
+ ${MAKESPEC} -d ${WORKDIR} ${RELEASEMACHINEDIR} >> ${WORKSPEC}; \
fi
@echo Creating rootfs...
# XXX /var/spool/ftp/hidden is unreadable
CVS commit: src/distrib
Module Name:src Committed By: christos Date: Fri May 17 21:31:10 UTC 2024 Modified Files: src/distrib/common: Makefile.image src/distrib/evbarm/instkernel/sshramdisk: Makefile Log Message: use IMAGESPECEXTRA to include libdata and don't include IMAGERUNTIME To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/distrib/common/Makefile.image cvs rdiff -u -r1.27 -r1.28 src/distrib/evbarm/instkernel/sshramdisk/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib
Module Name:src
Committed By: christos
Date: Fri May 17 21:31:10 UTC 2024
Modified Files:
src/distrib/common: Makefile.image
src/distrib/evbarm/instkernel/sshramdisk: Makefile
Log Message:
use IMAGESPECEXTRA to include libdata and don't include IMAGERUNTIME
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/distrib/common/Makefile.image
cvs rdiff -u -r1.27 -r1.28 src/distrib/evbarm/instkernel/sshramdisk/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/Makefile.image
diff -u src/distrib/common/Makefile.image:1.43 src/distrib/common/Makefile.image:1.44
--- src/distrib/common/Makefile.image:1.43 Fri May 17 15:54:28 2024
+++ src/distrib/common/Makefile.image Fri May 17 17:31:10 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.image,v 1.43 2024/05/17 19:54:28 christos Exp $
+# $NetBSD: Makefile.image,v 1.44 2024/05/17 21:31:10 christos Exp $
#
# Makefile snippet to build a tree from the provided lists,
# and make an ffs file system image from that tree
@@ -107,8 +107,7 @@ ${IMAGE}: ${WORKBUILT}
${IMAGEPREBUILD}
.endif
if [ "X${IMAGERUNTIME}" != "X" ]; then\
- release_destdir=${WORKDIR};\
- cd $$release_destdir; \
+ release_destdir=${CUROBJDIR}/${WORKDIR}; \
cd ${DESTDIR}; \
for imge in ${IMAGERUNTIME};\
do \
@@ -117,7 +116,7 @@ ${IMAGE}: ${WORKBUILT}
done; \
cd "${CUROBJDIR}"; \
fi
- for i in ${IMAGERUNTIME} ${IMAGESPECEXTRA}; do \
+ for i in ${IMAGESPECEXTRA}; do \
if [ -n "$$i" ] && [ -e ${WORKDIR}/$$i ]; then \
${MAKESPEC} -d ${WORKDIR} $$i >> ${WORKSPEC}; \
fi; \
Index: src/distrib/evbarm/instkernel/sshramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.27 src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.28
--- src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.27 Fri May 17 16:26:48 2024
+++ src/distrib/evbarm/instkernel/sshramdisk/Makefile Fri May 17 17:31:10 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2024/05/17 20:26:48 christos Exp $
+# $NetBSD: Makefile,v 1.28 2024/05/17 21:31:10 christos Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -30,6 +30,7 @@ IMAGEDEPENDS= ${CRUNCHBIN} \
${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
${DISTRIBDIR}/common/services
IMAGERUNTIME= libdata/firmware
+IMAGESPECEXTRA= libdata
# Use stubs to eliminate some large stuff from libc
HACKSRC= ${DISTRIBDIR}/utils/libhack
CVS commit: src/distrib
Module Name:src
Committed By: christos
Date: Fri May 17 20:27:09 UTC 2024
Modified Files:
src/distrib/sun2/ramdisk: Makefile
src/distrib/sun3/ramdisk: Makefile
Log Message:
Add /dev/pipe to the spec list using IMAGESPECEXTRA
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/distrib/sun2/ramdisk/Makefile
cvs rdiff -u -r1.41 -r1.42 src/distrib/sun3/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.27 src/distrib/sun2/ramdisk/Makefile:1.28
--- src/distrib/sun2/ramdisk/Makefile:1.27 Fri Jun 18 16:30:58 2021
+++ src/distrib/sun2/ramdisk/Makefile Fri May 17 16:27:09 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2021/06/18 20:30:58 mrg Exp $
+# $NetBSD: Makefile,v 1.28 2024/05/17 20:27:09 christos Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -33,6 +33,7 @@ CRUNCHBIN= rd_bin
LISTS= ${.CURDIR}/list
MTREECONF= ${.CURDIR}/mtree.conf
IMAGEENDIAN= be
+IMAGESPECEXTRA= dev/pipe
MAKEDEVTARGETS= std md0 cd0 st0 st1 sd0 sd1 sd2 xd0 xy0
IMAGEDEPENDS= ${CRUNCHBIN} \
fstab passwd protocols ${DISTRIBDIR}/common/services \
Index: src/distrib/sun3/ramdisk/Makefile
diff -u src/distrib/sun3/ramdisk/Makefile:1.41 src/distrib/sun3/ramdisk/Makefile:1.42
--- src/distrib/sun3/ramdisk/Makefile:1.41 Wed Feb 6 23:33:58 2019
+++ src/distrib/sun3/ramdisk/Makefile Fri May 17 16:27:09 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2019/02/07 04:33:58 mrg Exp $
+# $NetBSD: Makefile,v 1.42 2024/05/17 20:27:09 christos Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -6,6 +6,7 @@
IMAGE= ramdisk.fs
IMAGESIZE= 660k
+IMAGESPECEXTRA= dev/pipe
MAKEFS_FLAGS+= -f 6 -o density=3500
WARNS= 1
CVS commit: src/distrib
Module Name:src Committed By: christos Date: Fri May 17 20:27:09 UTC 2024 Modified Files: src/distrib/sun2/ramdisk: Makefile src/distrib/sun3/ramdisk: Makefile Log Message: Add /dev/pipe to the spec list using IMAGESPECEXTRA To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/distrib/sun2/ramdisk/Makefile cvs rdiff -u -r1.41 -r1.42 src/distrib/sun3/ramdisk/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/evbarm/instkernel/sshramdisk
Module Name:src
Committed By: christos
Date: Fri May 17 20:26:48 UTC 2024
Modified Files:
src/distrib/evbarm/instkernel/sshramdisk: Makefile
Log Message:
use IMAGERUNTIME to copy extra data instead of random pax commands
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/distrib/evbarm/instkernel/sshramdisk/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/evbarm/instkernel/sshramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.26 src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.27
--- src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.26 Thu Mar 14 22:20:58 2024
+++ src/distrib/evbarm/instkernel/sshramdisk/Makefile Fri May 17 16:26:48 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2024/03/15 02:20:58 riastradh Exp $
+# $NetBSD: Makefile,v 1.27 2024/05/17 20:26:48 christos Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -29,9 +29,7 @@ IMAGEDEPENDS= ${CRUNCHBIN} \
${NETBSDSRCDIR}/etc/group \
${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
${DISTRIBDIR}/common/services
-IMAGEPREBUILD= \
- (cd ${DESTDIR} && ${TOOL_PAX} ${PAX_TIMESTAMP} -w libdata/firmware) \
- | (cd ${WORKDIR} && ${TOOL_PAX} -r -pp)
+IMAGERUNTIME= libdata/firmware
# Use stubs to eliminate some large stuff from libc
HACKSRC= ${DISTRIBDIR}/utils/libhack
CVS commit: src/distrib/evbarm/instkernel/sshramdisk
Module Name:src Committed By: christos Date: Fri May 17 20:26:48 UTC 2024 Modified Files: src/distrib/evbarm/instkernel/sshramdisk: Makefile Log Message: use IMAGERUNTIME to copy extra data instead of random pax commands To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/distrib/evbarm/instkernel/sshramdisk/Makefile 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: Fri May 17 19:54:28 UTC 2024
Modified Files:
src/distrib/common: Makefile.image
Log Message:
Add IMAGERUNTIME and IMAGESPECEXTRA variables
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/distrib/common/Makefile.image
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/Makefile.image
diff -u src/distrib/common/Makefile.image:1.42 src/distrib/common/Makefile.image:1.43
--- src/distrib/common/Makefile.image:1.42 Thu May 16 11:46:42 2024
+++ src/distrib/common/Makefile.image Fri May 17 15:54:28 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.image,v 1.42 2024/05/16 15:46:42 christos Exp $
+# $NetBSD: Makefile.image,v 1.43 2024/05/17 19:54:28 christos Exp $
#
# Makefile snippet to build a tree from the provided lists,
# and make an ffs file system image from that tree
@@ -16,6 +16,8 @@
# IMAGEPREBUILD additional operations to run pre image creation
# IMAGEPOSTBUILD operation to run on ${IMAGE} ${.TARGET} after its built
# (if this returns non zero, ${.TARGET} is removed)
+# IMAGERUNTIME files/directories to copy from $DESTDIR onto the image
+# IMAGESPECEXTRA files/directories to add to the spec
# CRUNCHBIN name of crunchgen(1)ed binary
# DESTDIR destination directory
# MAKEFS_FLAGS extra options to ${TOOL_MAKEFS}
@@ -34,6 +36,7 @@ _MAKEFILE_IMAGE_=1
WORKDIR?= work
WORKSPEC?= work.spec
WORKBUILT?= work.built
+CUROBJDIR!= cd ${.CURDIR} && ${PRINTOBJDIR}
.include "${DISTRIBDIR}/common/Makefile.parselist"
@@ -44,6 +47,14 @@ MAKEFS_TIMESTAMP=-T "${MKREPRO_TIMESTAMP
PAX_TIMESTAMP=--timestamp "${MKREPRO_TIMESTAMP}"
GZIP_N_FLAG=-n
.endif
+MAKESPEC= ${HOST_SH} ${NETBSDSRCDIR}/etc/makespec
+
+.if ${MAKEVERBOSE} >= 2
+PAX_v?= -v
+.else
+PAX_v?=
+.endif
+
GZIP_FLAGS= -9 ${GZIP_N_FLAG}
@@ -95,6 +106,22 @@ ${IMAGE}: ${WORKBUILT}
.if defined(IMAGEPREBUILD)
${IMAGEPREBUILD}
.endif
+ if [ "X${IMAGERUNTIME}" != "X" ]; then\
+ release_destdir=${WORKDIR};\
+ cd $$release_destdir; \
+ cd ${DESTDIR}; \
+ for imge in ${IMAGERUNTIME};\
+ do \
+ ${TOOL_PAX} ${PAX_TIMESTAMP} -rw -pp ${PAX_v} \
+$${imge} $$release_destdir; \
+ done; \
+ cd "${CUROBJDIR}"; \
+ fi
+ for i in ${IMAGERUNTIME} ${IMAGESPECEXTRA}; do \
+ if [ -n "$$i" ] && [ -e ${WORKDIR}/$$i ]; then \
+ ${MAKESPEC} -d ${WORKDIR} $$i >> ${WORKSPEC}; \
+ fi; \
+ done
[ "${.OODATE}" = ${WORKBUILT} -a -f ${IMAGE} -a ! ${IMAGE} -ot ${WORKBUILT} ] || { \
${_MKSHMSG_CREATE} ${.CURDIR:T}/${.TARGET}; \
rm -f ${.TARGET} ${.TARGET}.tmp; \
CVS commit: src/distrib/common
Module Name:src Committed By: christos Date: Fri May 17 19:54:28 UTC 2024 Modified Files: src/distrib/common: Makefile.image Log Message: Add IMAGERUNTIME and IMAGESPECEXTRA variables To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/distrib/common/Makefile.image Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libedit
Module Name:src
Committed By: christos
Date: Fri May 17 02:59:09 UTC 2024
Modified Files:
src/lib/libedit: el.h eln.c
Log Message:
When calling el_line make sure that we call the resizing function
callback because el_line updates the legacy LineInfo structure and
we need to notify that the cached copy of the the buffer has changed.
Of course the resizing function can call el_line itself to update
the buffer, so prevent recursion. Bug found by Peter Rufer at Arista.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/lib/libedit/el.h
cvs rdiff -u -r1.37 -r1.38 src/lib/libedit/eln.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/libedit/el.h
diff -u src/lib/libedit/el.h:1.46 src/lib/libedit/el.h:1.47
--- src/lib/libedit/el.h:1.46 Sun Aug 15 06:08:41 2021
+++ src/lib/libedit/el.h Thu May 16 22:59:08 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: el.h,v 1.46 2021/08/15 10:08:41 christos Exp $ */
+/* $NetBSD: el.h,v 1.47 2024/05/17 02:59:08 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -58,6 +58,7 @@
#define NARROW_HISTORY 0x040
#define NO_RESET 0x080
#define FIXIO 0x100
+#define FROM_ELLINE 0x200
typedef unsigned char el_action_t; /* Index to command array */
Index: src/lib/libedit/eln.c
diff -u src/lib/libedit/eln.c:1.37 src/lib/libedit/eln.c:1.38
--- src/lib/libedit/eln.c:1.37 Tue Jan 11 13:30:15 2022
+++ src/lib/libedit/eln.c Thu May 16 22:59:08 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: eln.c,v 1.37 2022/01/11 18:30:15 christos Exp $ */
+/* $NetBSD: eln.c,v 1.38 2024/05/17 02:59:08 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include "config.h"
#if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: eln.c,v 1.37 2022/01/11 18:30:15 christos Exp $");
+__RCSID("$NetBSD: eln.c,v 1.38 2024/05/17 02:59:08 christos Exp $");
#endif /* not lint && not SCCSID */
#include
@@ -365,6 +365,10 @@ el_line(EditLine *el)
size_t offset;
const wchar_t *p;
+ if (el->el_flags & FROM_ELLINE)
+ return info;
+
+ el->el_flags |= FROM_ELLINE;
info->buffer = ct_encode_string(winfo->buffer, >el_lgcyconv);
offset = 0;
@@ -377,6 +381,10 @@ el_line(EditLine *el)
offset += ct_enc_width(*p);
info->lastchar = info->buffer + offset;
+ if (el->el_chared.c_resizefun)
+ (*el->el_chared.c_resizefun)(el, el->el_chared.c_resizearg);
+ el->el_flags &= ~FROM_ELLINE;
+
return info;
}
CVS commit: src/lib/libedit
Module Name:src Committed By: christos Date: Fri May 17 02:59:09 UTC 2024 Modified Files: src/lib/libedit: el.h eln.c Log Message: When calling el_line make sure that we call the resizing function callback because el_line updates the legacy LineInfo structure and we need to notify that the cached copy of the the buffer has changed. Of course the resizing function can call el_line itself to update the buffer, so prevent recursion. Bug found by Peter Rufer at Arista. To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/lib/libedit/el.h cvs rdiff -u -r1.37 -r1.38 src/lib/libedit/eln.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: Thu May 16 17:55:48 UTC 2024
Modified Files:
src/distrib/common: Makefile.bootcd
Log Message:
Add more extra stuff on the cds
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/distrib/common/Makefile.bootcd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.54 src/distrib/common/Makefile.bootcd:1.55
--- src/distrib/common/Makefile.bootcd:1.54 Tue May 14 13:17:13 2024
+++ src/distrib/common/Makefile.bootcd Thu May 16 13:55:48 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.54 2024/05/14 17:17:13 christos Exp $
+# $NetBSD: Makefile.bootcd,v 1.55 2024/05/16 17:55:48 christos Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -324,8 +324,12 @@ image:
.endif
if [ ! -s ${WORKSPEC} ]; then \
${MAKESPEC} -d cdrom . > ${WORKSPEC}; \
- elif [ -d cdrom/${MACHINE} ]; then \
- ${MAKESPEC} -d cdrom ${MACHINE} >> ${WORKSPEC}; \
+ else \
+ for i in ${RELEASEMACHINEDIR} source ${CDEXTRA} ${CDBUILDEXTRA}; do\
+ if [ -n "$$i" ] && [ -e cdrom/$$i ]; then \
+ ${MAKESPEC} -d cdrom $$i >> ${WORKSPEC}; \
+ fi; \
+ done; \
fi
${TOOL_MAKEFS} -N ${NETBSDSRCDIR}/etc -t cd9660 -F ${WORKSPEC} -xx \
${MAKEFS_TIMESTAMP} ${CDMAKEFSEXTRAOPTS} -o ${_CDMAKEFSOPTIONS:Q} \
CVS commit: src/distrib/common
Module Name:src Committed By: christos Date: Thu May 16 17:55:48 UTC 2024 Modified Files: src/distrib/common: Makefile.bootcd Log Message: Add more extra stuff on the cds To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/distrib/common/Makefile.bootcd 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: Thu May 16 15:46:42 UTC 2024
Modified Files:
src/distrib/common: Makefile.image
src/distrib/common/bootimage: Makefile.bootimage
Log Message:
Apply the -xx treatment to the rest of the ffs makefs invocations.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/distrib/common/Makefile.image
cvs rdiff -u -r1.35 -r1.36 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/Makefile.image
diff -u src/distrib/common/Makefile.image:1.41 src/distrib/common/Makefile.image:1.42
--- src/distrib/common/Makefile.image:1.41 Tue Mar 19 20:31:54 2024
+++ src/distrib/common/Makefile.image Thu May 16 11:46:42 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.image,v 1.41 2024/03/20 00:31:54 christos Exp $
+# $NetBSD: Makefile.image,v 1.42 2024/05/16 15:46:42 christos Exp $
#
# Makefile snippet to build a tree from the provided lists,
# and make an ffs file system image from that tree
@@ -99,7 +99,7 @@ ${IMAGE}: ${WORKBUILT}
${_MKSHMSG_CREATE} ${.CURDIR:T}/${.TARGET}; \
rm -f ${.TARGET} ${.TARGET}.tmp; \
${TOOL_MAKEFS} -t ffs -B ${IMAGEENDIAN} -s ${IMAGESIZE} -F ${WORKSPEC} \
- ${MAKEFS_TIMESTAMP} -N ${NETBSDSRCDIR}/etc ${IMGMAKEFSOPTIONS} \
+ -xx ${MAKEFS_TIMESTAMP} -N ${NETBSDSRCDIR}/etc ${IMGMAKEFSOPTIONS} \
-o optimization=space,minfree=0 \
${MAKEFS_FLAGS} ${.TARGET}.tmp ${WORKDIR} \
&& mv -f ${.TARGET}.tmp ${.TARGET}; \
Index: src/distrib/common/bootimage/Makefile.bootimage
diff -u src/distrib/common/bootimage/Makefile.bootimage:1.35 src/distrib/common/bootimage/Makefile.bootimage:1.36
--- src/distrib/common/bootimage/Makefile.bootimage:1.35 Mon Apr 22 10:41:24 2024
+++ src/distrib/common/bootimage/Makefile.bootimage Thu May 16 11:46:42 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.35 2024/04/22 14:41:24 nia Exp $
+# $NetBSD: Makefile.bootimage,v 1.36 2024/05/16 15:46:42 christos Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -171,6 +171,8 @@ DD?= dd
MKDIR?= mkdir -p
RM?= rm
+MAKESPEC= ${HOST_SH} ${NETBSDSRCDIR}/etc/makespec
+
#
# common definitions for image
#
@@ -351,6 +353,7 @@ ${WORKFSTAB}:
# create root file system for the image
#
${TARGETFS}: prepare_md_post ${WORKFSTAB}
+ @${RM} -f ${WORKSPEC}
@if [ ! -d ${RELEASEDIR}/${RELEASEMACHINEDIR} ]; then \
echo "Missing ${RELEASEDIR}/${RELEASEMACHINEDIR}, aborting"; \
false; \
@@ -413,11 +416,11 @@ ${TARGETFS}: prepare_md_post ${WORKFSTAB
@if [ -f ${_SRC} ]; then \
echo ${INSTALL} ${COPY} -m 0644 ${_SRC} ${WORKDIR}/${_TARGET}; \
${INSTALL} ${COPY} -m 0644 ${_SRC} ${WORKDIR}/${_TARGET}; \
+ echo "./${_TARGET} type=file uname=root gname=wheel mode=0555" >> ${WORKSPEC}; \
fi
.endfor
.endif
@echo Preparing spec files for makefs...
- ${RM} -f ${WORKSPEC}
cat ${WORKDIR}/etc/mtree/* | \
${TOOL_SED} -e 's/ size=[0-9]*//' > ${WORKSPEC}
${HOST_SH} ${WORKDIR}/dev/MAKEDEV -s all ipty | \
@@ -430,12 +433,19 @@ ${TARGETFS}: prepare_md_post ${WORKFSTAB
.if defined(SPEC_EXTRA)
cat ${SPEC_EXTRA} >> ${WORKSPEC}
.endif
+ if [ -f ${WORKDIR}/netbsd.gdb ]; then \
+ echo "./netbsd.gdb type=file uname=root gname=wheel mode=0444" \
+ >> ${WORKSPEC}; \
+ fi
+ if [ -d ${WORKDIR}/${MACHINE} ]; then \
+ ${MAKESPEC} -d ${WORKDIR} ${MACHINE} >> ${WORKSPEC}; \
+ fi
@echo Creating rootfs...
# XXX /var/spool/ftp/hidden is unreadable
${CHMOD} +r ${WORKDIR}/var/spool/ftp/hidden
${TOOL_MAKEFS} -M ${FSSIZE} -m ${FSSIZE} \
-B ${TARGET_ENDIANNESS} \
- -F ${WORKSPEC} -N ${WORKDIR}/etc\
+ -xx -F ${WORKSPEC} -N ${WORKDIR}/etc \
${MAKEFS_TIMESTAMP} \
${IMGMAKEFSOPTIONS} \
${WORKFS} ${WORKDIR}
CVS commit: src/distrib/common
Module Name:src Committed By: christos Date: Thu May 16 15:46:42 UTC 2024 Modified Files: src/distrib/common: Makefile.image src/distrib/common/bootimage: Makefile.bootimage Log Message: Apply the -xx treatment to the rest of the ffs makefs invocations. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/distrib/common/Makefile.image cvs rdiff -u -r1.35 -r1.36 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.
CVS commit: src/distrib/vax/cdroms/installcd
Module Name:src
Committed By: christos
Date: Wed May 15 16:31:36 UTC 2024
Modified Files:
src/distrib/vax/cdroms/installcd: Makefile
Added Files:
src/distrib/vax/cdroms/installcd: spec.in
Log Message:
Add missing stuff for vax
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/distrib/vax/cdroms/installcd/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/vax/cdroms/installcd/spec.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/vax/cdroms/installcd/Makefile
diff -u src/distrib/vax/cdroms/installcd/Makefile:1.19 src/distrib/vax/cdroms/installcd/Makefile:1.20
--- src/distrib/vax/cdroms/installcd/Makefile:1.19 Fri Dec 20 14:46:51 2019
+++ src/distrib/vax/cdroms/installcd/Makefile Wed May 15 12:31:35 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/12/20 19:46:51 martin Exp $
+# $NetBSD: Makefile,v 1.20 2024/05/15 16:31:35 christos Exp $
CDBASE= vaxcd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDDEV_POPULATE= true # populate /dev on the CD
@@ -11,6 +11,8 @@ CD_SETS= base etc # no modules for VAX
.include
SYSINSTDIR!= cd ${.CURDIR}/../../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR}
+SPEC_EXTRA:=${.PARSEDIR}/spec.in
+
# prepare mutliuser install environment
image_md_pre:
${RM} -f cdrom/boot
Added files:
Index: src/distrib/vax/cdroms/installcd/spec.in
diff -u /dev/null src/distrib/vax/cdroms/installcd/spec.in:1.1
--- /dev/null Wed May 15 12:31:36 2024
+++ src/distrib/vax/cdroms/installcd/spec.in Wed May 15 12:31:35 2024
@@ -0,0 +1,5 @@
+./install.sh type=file uname=root gname=wheel mode=755
+./mnt2 type=dir uname=root gname=wheel mode=755
+./netbsd type=file uname=root gname=wheel mode=644
+./targetroot type=dir uname=root gname=wheel mode=755
+./etc/gettytab type=link uname=root gname=wheel mode=755
CVS commit: src/distrib/vax/cdroms/installcd
Module Name:src Committed By: christos Date: Wed May 15 16:31:36 UTC 2024 Modified Files: src/distrib/vax/cdroms/installcd: Makefile Added Files: src/distrib/vax/cdroms/installcd: spec.in Log Message: Add missing stuff for vax To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/distrib/vax/cdroms/installcd/Makefile cvs rdiff -u -r0 -r1.1 src/distrib/vax/cdroms/installcd/spec.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sparc64/cdroms
Module Name:src Committed By: christos Date: Wed May 15 16:29:54 UTC 2024 Modified Files: src/distrib/sparc64/cdroms/installcd: Makefile src/distrib/sparc64/cdroms/installdvd: Makefile Added Files: src/distrib/sparc64/cdroms: Makefile.cdrom spec.in Log Message: Factor out common stuff. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/distrib/sparc64/cdroms/Makefile.cdrom \ src/distrib/sparc64/cdroms/spec.in cvs rdiff -u -r1.33 -r1.34 src/distrib/sparc64/cdroms/installcd/Makefile cvs rdiff -u -r1.2 -r1.3 src/distrib/sparc64/cdroms/installdvd/Makefile 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 May 14 17:17:13 UTC 2024
Modified Files:
src/distrib/common: Makefile.bootcd
Log Message:
check if the ${MACHINE} directory exists
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/distrib/common/Makefile.bootcd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.53 src/distrib/common/Makefile.bootcd:1.54
--- src/distrib/common/Makefile.bootcd:1.53 Tue May 14 10:58:05 2024
+++ src/distrib/common/Makefile.bootcd Tue May 14 13:17:13 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.53 2024/05/14 14:58:05 christos Exp $
+# $NetBSD: Makefile.bootcd,v 1.54 2024/05/14 17:17:13 christos Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -324,7 +324,7 @@ image:
.endif
if [ ! -s ${WORKSPEC} ]; then \
${MAKESPEC} -d cdrom . > ${WORKSPEC}; \
- else \
+ elif [ -d cdrom/${MACHINE} ]; then \
${MAKESPEC} -d cdrom ${MACHINE} >> ${WORKSPEC}; \
fi
${TOOL_MAKEFS} -N ${NETBSDSRCDIR}/etc -t cd9660 -F ${WORKSPEC} -xx \
CVS commit: src/distrib/common
Module Name:src
Committed By: christos
Date: Tue May 14 17:17:13 UTC 2024
Modified Files:
src/distrib/common: Makefile.bootcd
Log Message:
check if the ${MACHINE} directory exists
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/distrib/common/Makefile.bootcd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/distrib/i386/cdroms
Module Name:src
Committed By: christos
Date: Tue May 14 17:15:13 UTC 2024
Modified Files:
src/distrib/i386/cdroms: Makefile.cdrom
Added Files:
src/distrib/i386/cdroms: spec.in
Log Message:
Add the same extra stuff from amd64
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/distrib/i386/cdroms/Makefile.cdrom
cvs rdiff -u -r0 -r1.1 src/distrib/i386/cdroms/spec.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/i386/cdroms/Makefile.cdrom
diff -u src/distrib/i386/cdroms/Makefile.cdrom:1.43 src/distrib/i386/cdroms/Makefile.cdrom:1.44
--- src/distrib/i386/cdroms/Makefile.cdrom:1.43 Fri Apr 26 13:36:32 2024
+++ src/distrib/i386/cdroms/Makefile.cdrom Tue May 14 13:15:13 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.43 2024/04/26 17:36:32 nia Exp $
+# $NetBSD: Makefile.cdrom,v 1.44 2024/05/14 17:15:13 christos Exp $
.include
@@ -12,6 +12,8 @@ CDKERNELS= netbsd-GENERIC.gz netbs
CDRELEASE_NOISOS= true
CD_SETS+= base etc gpufw
+SPEC_EXTRA:=${.PARSEDIR}/spec.in
+
image_md_pre:
${RM} -f cdrom/etc/gettytab cdrom/etc/ttys cdrom/etc/rc cdrom/install.sh
${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
Added files:
Index: src/distrib/i386/cdroms/spec.in
diff -u /dev/null src/distrib/i386/cdroms/spec.in:1.1
--- /dev/null Tue May 14 13:15:13 2024
+++ src/distrib/i386/cdroms/spec.in Tue May 14 13:15:13 2024
@@ -0,0 +1,6 @@
+./boot type=file uname=root gname=wheel mode=644
+./install.sh type=file uname=root gname=wheel mode=755
+./mnt2 type=dir uname=root gname=wheel mode=755
+./netbsd type=file uname=root gname=wheel mode=644
+./targetroot type=dir uname=root gname=wheel mode=755
+./etc/gettytab type=link uname=root gname=wheel mode=755
CVS commit: src/distrib/i386/cdroms
Module Name:src Committed By: christos Date: Tue May 14 17:15:13 UTC 2024 Modified Files: src/distrib/i386/cdroms: Makefile.cdrom Added Files: src/distrib/i386/cdroms: spec.in Log Message: Add the same extra stuff from amd64 To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/distrib/i386/cdroms/Makefile.cdrom cvs rdiff -u -r0 -r1.1 src/distrib/i386/cdroms/spec.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/amd64/cdroms
Module Name:src
Committed By: christos
Date: Tue May 14 14:58:41 UTC 2024
Modified Files:
src/distrib/amd64/cdroms: Makefile.cdrom
Added Files:
src/distrib/amd64/cdroms: spec.in
Log Message:
Add the extra spec for the amd64 cdroms
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r0 -r1.1 src/distrib/amd64/cdroms/spec.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/cdroms/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.28 src/distrib/amd64/cdroms/Makefile.cdrom:1.29
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.28 Fri Apr 26 13:36:32 2024
+++ src/distrib/amd64/cdroms/Makefile.cdrom Tue May 14 10:58:41 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.28 2024/04/26 17:36:32 nia Exp $
+# $NetBSD: Makefile.cdrom,v 1.29 2024/05/14 14:58:41 christos Exp $
.include
.include
@@ -22,6 +22,8 @@ CD_SETS+= base etc gpufw
CD_SETS+= modules
.endif
+SPEC_EXTRA:=${.PARSEDIR}/spec.in
+
${EFIBOOTIMG}: ${DESTDIR}/usr/mdec/bootx64.efi ${DESTDIR}/usr/mdec/bootia32.efi
${RM} -f ${EFIBOOTIMG}
${RM} -rf efiboot/EFI/boot
Added files:
Index: src/distrib/amd64/cdroms/spec.in
diff -u /dev/null src/distrib/amd64/cdroms/spec.in:1.1
--- /dev/null Tue May 14 10:58:41 2024
+++ src/distrib/amd64/cdroms/spec.in Tue May 14 10:58:41 2024
@@ -0,0 +1,6 @@
+./boot type=file uname=root gname=wheel mode=644
+./install.sh type=file uname=root gname=wheel mode=755
+./mnt2 type=dir uname=root gname=wheel mode=755
+./netbsd type=file uname=root gname=wheel mode=644
+./targetroot type=dir uname=root gname=wheel mode=755
+./etc/gettytab type=link uname=root gname=wheel mode=755
CVS commit: src/distrib/amd64/cdroms
Module Name:src Committed By: christos Date: Tue May 14 14:58:41 UTC 2024 Modified Files: src/distrib/amd64/cdroms: Makefile.cdrom Added Files: src/distrib/amd64/cdroms: spec.in Log Message: Add the extra spec for the amd64 cdroms To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/distrib/amd64/cdroms/Makefile.cdrom cvs rdiff -u -r0 -r1.1 src/distrib/amd64/cdroms/spec.in 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 May 14 14:58:05 UTC 2024 Modified Files: src/distrib/common: Makefile.bootcd Log Message: Put back -xx (this will break some archs but we'll fix them) and automatically generate the spec for the machine-specific portions of the cdrom. To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/distrib/common/Makefile.bootcd 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 May 14 14:58:05 UTC 2024
Modified Files:
src/distrib/common: Makefile.bootcd
Log Message:
Put back -xx (this will break some archs but we'll fix them) and automatically
generate the spec for the machine-specific portions of the cdrom.
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/distrib/common/Makefile.bootcd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.52 src/distrib/common/Makefile.bootcd:1.53
--- src/distrib/common/Makefile.bootcd:1.52 Thu May 9 12:09:03 2024
+++ src/distrib/common/Makefile.bootcd Tue May 14 10:58:05 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.52 2024/05/09 16:09:03 christos Exp $
+# $NetBSD: Makefile.bootcd,v 1.53 2024/05/14 14:58:05 christos Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -285,7 +285,7 @@ copy-releasedir:
fi;\
${CDSETSCMD} ./maketars -i "${CUROBJDIR}/cdrom" \
${CD_METALOG.unpriv} ${mtunpriv} -N ${NETBSDSRCDIR}/etc \
- -F "${CUROBJDIR}/cdrom/etc/mtree" \
+ -xx -F "${CUROBJDIR}/cdrom/etc/mtree" \
-d "${DESTDIR:S,^$,/,}" ${set}
.endfor
if [ -d "${CUROBJDIR}/cdrom/var/spool/ftp/hidden" ]; then \
@@ -322,8 +322,12 @@ image:
.if defined(SPEC_EXTRA)
cat ${SPEC_EXTRA} >> ${WORKSPEC}
.endif
- if [ ! -s ${WORKSPEC} ]; then ${MAKESPEC} cdrom > ${WORKSPEC}; fi
- ${TOOL_MAKEFS} -N ${NETBSDSRCDIR}/etc -t cd9660 -F ${WORKSPEC} \
+ if [ ! -s ${WORKSPEC} ]; then \
+ ${MAKESPEC} -d cdrom . > ${WORKSPEC}; \
+ else \
+ ${MAKESPEC} -d cdrom ${MACHINE} >> ${WORKSPEC}; \
+ fi
+ ${TOOL_MAKEFS} -N ${NETBSDSRCDIR}/etc -t cd9660 -F ${WORKSPEC} -xx \
${MAKEFS_TIMESTAMP} ${CDMAKEFSEXTRAOPTS} -o ${_CDMAKEFSOPTIONS:Q} \
${CDIMAGE} cdrom
CVS commit: src/etc
Module Name:src
Committed By: christos
Date: Tue May 14 14:57:09 UTC 2024
Modified Files:
src/etc: makespec
Log Message:
Allow specific subdirectories to be added to the list
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/etc/makespec
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/makespec
diff -u src/etc/makespec:1.1 src/etc/makespec:1.2
--- src/etc/makespec:1.1 Tue May 7 16:30:33 2024
+++ src/etc/makespec Tue May 14 10:57:08 2024
@@ -55,17 +55,40 @@ gettype() {
esac
}
-if [ -z "$1" ]; then
- echo "Usage: $0 " 1>&2
+usage() {
+ echo "Usage: $0 -d ..." 1>&2
exit 1
+}
+
+
+while getopts "d:" i; do
+ case $i in
+ d)
+ DIR="$OPTARG";;
+ *)
+ usage;;
+ esac
+done
+
+shift $((OPTIND - 1))
+
+if [ -z "$DIR" ] || [ -z "$1" ]; then
+ usage
fi
-cd "$1"
-for i in $TYPES; do
+cd "$DIR"
+
+for d; do
+ case $d in
+ .);;
+ *) d="./$d";;
+ esac
+ for i in $TYPES; do
- t=$(gettype $i)
- m=$(getmode $i)
- find . -type $i -exec \
- printf "%s type=$t uname=root gname=wheel mode=$m\n" {} \;
+ t=$(gettype $i)
+ m=$(getmode $i)
+ find $d -type $i -exec \
+ printf "%s type=$t uname=root gname=wheel mode=$m\n" {} \;
+ done
done | sort
CVS commit: src/etc
Module Name:src Committed By: christos Date: Tue May 14 14:57:09 UTC 2024 Modified Files: src/etc: makespec Log Message: Allow specific subdirectories to be added to the list To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/etc/makespec 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/xcomp
Module Name:src Committed By: christos Date: Mon May 13 14:59:31 UTC 2024 Modified Files: src/distrib/sets/lists/xcomp: shl.mi Log Message: more Xf86misc obsolete To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/distrib/sets/lists/xcomp/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/xcomp/shl.mi diff -u src/distrib/sets/lists/xcomp/shl.mi:1.57 src/distrib/sets/lists/xcomp/shl.mi:1.58 --- src/distrib/sets/lists/xcomp/shl.mi:1.57 Thu Jul 14 03:41:49 2022 +++ src/distrib/sets/lists/xcomp/shl.mi Mon May 13 10:59:31 2024 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.57 2022/07/14 07:41:49 mrg Exp $ +# $NetBSD: shl.mi,v 1.58 2024/05/13 14:59:31 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -50,7 +50,7 @@ ./usr/X11R7/lib/libXvMC_pic.axcomp-libXvMC-lib xorg,picinstall,compatx11file ./usr/X11R7/lib/libXv_pic.axcomp-libXv-lib xorg,picinstall,compatx11file ./usr/X11R7/lib/libXxf86dga_pic.a xcomp-libXxf86dga-lib xorg,picinstall,compatx11file -./usr/X11R7/lib/libXxf86misc_pic.a xcomp-libXxf86misc-lib xorg,picinstall,compatx11file +./usr/X11R7/lib/libXxf86misc_pic.a xcomp-obsolete obsolete ./usr/X11R7/lib/libXxf86vm_pic.a xcomp-libXxf86vm-lib xorg,picinstall,compatx11file ./usr/X11R7/lib/libdrm_pic.axcomp-libdrm-lib xorg,picinstall,compatx11file ./usr/X11R7/lib/libdrm_radeon_pic.a xcomp-libdrm_radeon-lib xorg,picinstall,compatx11file
CVS commit: src/distrib/sets/lists/xcomp
Module Name:src Committed By: christos Date: Mon May 13 14:59:31 UTC 2024 Modified Files: src/distrib/sets/lists/xcomp: shl.mi Log Message: more Xf86misc obsolete To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/distrib/sets/lists/xcomp/shl.mi 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: christos Date: Mon May 13 14:56:44 UTC 2024 Modified Files: src/distrib/sets/lists/xcomp: mi src/distrib/sets/lists/xdebug: mi Log Message: mark more of libXxf86misc obsolete To generate a diff of this commit: cvs rdiff -u -r1.242 -r1.243 src/distrib/sets/lists/xcomp/mi cvs rdiff -u -r1.46 -r1.47 src/distrib/sets/lists/xdebug/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.242 src/distrib/sets/lists/xcomp/mi:1.243 --- src/distrib/sets/lists/xcomp/mi:1.242 Thu May 9 02:38:27 2024 +++ src/distrib/sets/lists/xcomp/mi Mon May 13 10:56:44 2024 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.242 2024/05/09 06:38:27 nia Exp $ +# $NetBSD: mi,v 1.243 2024/05/13 14:56:44 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -5962,7 +5962,7 @@ ./usr/libdata/lint/llib-lXvMC.ln xcomp-libXvMC-lintlib lint,xorg ./usr/libdata/lint/llib-lXvMCW.ln xcomp-libXvMCW-lintlib lint,xorg ./usr/libdata/lint/llib-lXxf86dga.ln xcomp-libXxf86dga-lintlib lint,xorg -./usr/libdata/lint/llib-lXxf86misc.ln xcomp-libXxf86misc-lintlib lint,xorg +./usr/libdata/lint/llib-lXxf86misc.ln xcomp-obsolete obsolete ./usr/libdata/lint/llib-lXxf86vm.ln xcomp-libXxf86vm-lintlib lint,xorg ./usr/libdata/lint/llib-ldrm.lnxcomp-libdrm-lintlib lint,xorg ./usr/libdata/lint/llib-ldrm_radeon.ln xcomp-libdrm_radeon-lintlib lint,xorg Index: src/distrib/sets/lists/xdebug/mi diff -u src/distrib/sets/lists/xdebug/mi:1.46 src/distrib/sets/lists/xdebug/mi:1.47 --- src/distrib/sets/lists/xdebug/mi:1.46 Sat Feb 4 11:34:36 2023 +++ src/distrib/sets/lists/xdebug/mi Mon May 13 10:56:44 2024 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.46 2023/02/04 16:34:36 wiz Exp $ +# $NetBSD: mi,v 1.47 2024/05/13 14:56:44 christos Exp $ ./etc/mtree/set.xdebug comp-sys-root ./usr/X11R7/lib base-x11-root xorg,debuglib,compatx11dir ./usr/X11R7/lib/libEGL_g.axdebug-libEGL-debuglib xorg,debuglib,compatx11file,xorg_glamor @@ -48,7 +48,7 @@ ./usr/X11R7/lib/libXvMC_g.axdebug-libXvMC-debuglib xorg,debuglib,compatx11file ./usr/X11R7/lib/libXv_g.axdebug-libXv-debuglib xorg,debuglib,compatx11file ./usr/X11R7/lib/libXxf86dga_g.axdebug-libXxf86dga-debuglib xorg,debuglib,compatx11file -./usr/X11R7/lib/libXxf86misc_g.a xdebug-libXxf86misc-debuglib xorg,debuglib,compatx11file +./usr/X11R7/lib/libXxf86misc_g.a xdebug-obsolete obsolete ./usr/X11R7/lib/libXxf86vm_g.axdebug-libXxf86vm-debuglib xorg,debuglib,compatx11file ./usr/X11R7/lib/libdrm_g.axdebug-libdrm-debuglib xorg,debuglib,compatx11file ./usr/X11R7/lib/libdrm_radeon_g.a xdebug-libdrm_radeon-debuglib xorg,debuglib,compatx11file
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Mon May 13 14:56:44 UTC 2024 Modified Files: src/distrib/sets/lists/xcomp: mi src/distrib/sets/lists/xdebug: mi Log Message: mark more of libXxf86misc obsolete To generate a diff of this commit: cvs rdiff -u -r1.242 -r1.243 src/distrib/sets/lists/xcomp/mi cvs rdiff -u -r1.46 -r1.47 src/distrib/sets/lists/xdebug/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/linux/common
Module Name:src Committed By: christos Date: Sun May 12 19:54:48 UTC 2024 Modified Files: src/sys/compat/linux/common: linux_misc.h Log Message: Add forward decl for procfs include. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/compat/linux/common/linux_misc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/linux/common/linux_misc.h diff -u src/sys/compat/linux/common/linux_misc.h:1.31 src/sys/compat/linux/common/linux_misc.h:1.32 --- src/sys/compat/linux/common/linux_misc.h:1.31 Sun May 12 15:50:42 2024 +++ src/sys/compat/linux/common/linux_misc.h Sun May 12 15:54:48 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_misc.h,v 1.31 2024/05/12 19:50:42 christos Exp $ */ +/* $NetBSD: linux_misc.h,v 1.32 2024/05/12 19:54:48 christos Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -174,6 +174,7 @@ __packed #ifdef _KERNEL __BEGIN_DECLS +struct linux_timeval; int bsd_to_linux_wstat(int); int linux_select1(struct lwp *, register_t *, int, fd_set *, fd_set *, fd_set *, struct linux_timeval *);
CVS commit: src/sys/compat/linux/common
Module Name:src Committed By: christos Date: Sun May 12 19:54:48 UTC 2024 Modified Files: src/sys/compat/linux/common: linux_misc.h Log Message: Add forward decl for procfs include. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/compat/linux/common/linux_misc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/linux/common
Module Name:src
Committed By: christos
Date: Sun May 12 19:50:42 UTC 2024
Modified Files:
src/sys/compat/linux/common: linux_misc.h
Log Message:
fix whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/compat/linux/common/linux_misc.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux/common/linux_misc.h
diff -u src/sys/compat/linux/common/linux_misc.h:1.30 src/sys/compat/linux/common/linux_misc.h:1.31
--- src/sys/compat/linux/common/linux_misc.h:1.30 Sun May 12 13:23:10 2024
+++ src/sys/compat/linux/common/linux_misc.h Sun May 12 15:50:42 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_misc.h,v 1.30 2024/05/12 17:23:10 christos Exp $ */
+/* $NetBSD: linux_misc.h,v 1.31 2024/05/12 19:50:42 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -94,11 +94,11 @@ struct linux_sysinfo {
#define LINUX_RLIMIT_MEMLOCK 8
#define LINUX_RLIMIT_AS 9
#define LINUX_RLIMIT_LOCKS 10
-#define LINUX_RLIMIT_SIGPENDING 11
-#define LINUX_RLIMIT_MSGQUEUE 12
-#define LINUX_RLIMIT_NICE 13
-#define LINUX_RLIMIT_RTPRIO 14
-#define LINUX_RLIMIT_RTTIME 15
+#define LINUX_RLIMIT_SIGPENDING 11
+#define LINUX_RLIMIT_MSGQUEUE 12
+#define LINUX_RLIMIT_NICE 13
+#define LINUX_RLIMIT_RTPRIO 14
+#define LINUX_RLIMIT_RTTIME 15
#ifdef __mips__ /* XXX only mips32. On mips64, it's ~0ul */
#define LINUX_RLIM_INFINITY 0x7fffUL
#define LINUX32_RLIM_INFINITY 0x7fffU
CVS commit: src/sys/compat/linux/common
Module Name:src Committed By: christos Date: Sun May 12 19:50:42 UTC 2024 Modified Files: src/sys/compat/linux/common: linux_misc.h Log Message: fix whitespace To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/compat/linux/common/linux_misc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/cgdconfig
Module Name:src
Committed By: christos
Date: Sun May 12 18:02:16 UTC 2024
Modified Files:
src/sbin/cgdconfig: Makefile cgdconfig.8 cgdconfig.c params.c params.h
Log Message:
PR/58212: Malte Dehling: Add zfs verification method
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sbin/cgdconfig/Makefile
cvs rdiff -u -r1.57 -r1.58 src/sbin/cgdconfig/cgdconfig.8
cvs rdiff -u -r1.62 -r1.63 src/sbin/cgdconfig/cgdconfig.c
cvs rdiff -u -r1.34 -r1.35 src/sbin/cgdconfig/params.c
cvs rdiff -u -r1.14 -r1.15 src/sbin/cgdconfig/params.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/cgdconfig/Makefile
diff -u src/sbin/cgdconfig/Makefile:1.22 src/sbin/cgdconfig/Makefile:1.23
--- src/sbin/cgdconfig/Makefile:1.22 Fri Aug 12 06:49:17 2022
+++ src/sbin/cgdconfig/Makefile Sun May 12 14:02:16 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2022/08/12 10:49:17 riastradh Exp $
+# $NetBSD: Makefile,v 1.23 2024/05/12 18:02:16 christos Exp $
RUMPPRG=cgdconfig
MAN= cgdconfig.8
@@ -29,4 +29,19 @@ ARGON2_NO_THREADS=1
.include "${NETBSDSRCDIR}/external/apache2/argon2/lib/libargon2/Makefile.inc"
.endif
+.if ${MKZFS} != "no"
+CPPFLAGS+= -DHAVE_ZFS
+
+OSNET=${NETBSDSRCDIR}/external/cddl/osnet
+CPPFLAGS.cgdconfig.c+= -I${OSNET}/include
+CPPFLAGS.cgdconfig.c+= -I${OSNET}/sys
+CPPFLAGS.cgdconfig.c+= -I${OSNET}/dist/head
+CPPFLAGS.cgdconfig.c+= -I${OSNET}/dist/lib/libzpool/common
+CPPFLAGS.cgdconfig.c+= -I${OSNET}/dist/uts/common
+CPPFLAGS.cgdconfig.c+= -I${OSNET}/dist/uts/common/fs/zfs
+
+COPTS.cgdconfig.c+= -Wno-unknown-pragmas
+COPTS.cgdconfig.c+= -Wno-strict-prototypes
+.endif
+
.include
Index: src/sbin/cgdconfig/cgdconfig.8
diff -u src/sbin/cgdconfig/cgdconfig.8:1.57 src/sbin/cgdconfig/cgdconfig.8:1.58
--- src/sbin/cgdconfig/cgdconfig.8:1.57 Fri Aug 12 06:49:47 2022
+++ src/sbin/cgdconfig/cgdconfig.8 Sun May 12 14:02:16 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: cgdconfig.8,v 1.57 2022/08/12 10:49:47 riastradh Exp $
+.\" $NetBSD: cgdconfig.8,v 1.58 2024/05/12 18:02:16 christos Exp $
.\"
.\" Copyright (c) 2002, 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 November 4, 2021
+.Dd May 12, 2024
.Dt CGDCONFIG 8
.Os
.Sh NAME
@@ -270,6 +270,8 @@ scan for a valid Master Boot Record.
scan for a valid GUID partition table.
.It ffs
scan for a valid FFS file system.
+.It zfs
+scan for a valid ZFS vdev label (if compiled with MKZFS).
.It re-enter
prompt for passphrase twice, and ensure entered passphrases are
identical.
Index: src/sbin/cgdconfig/cgdconfig.c
diff -u src/sbin/cgdconfig/cgdconfig.c:1.62 src/sbin/cgdconfig/cgdconfig.c:1.63
--- src/sbin/cgdconfig/cgdconfig.c:1.62 Sun Apr 28 20:28:18 2024
+++ src/sbin/cgdconfig/cgdconfig.c Sun May 12 14:02:16 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cgdconfig.c,v 1.62 2024/04/29 00:28:18 riastradh Exp $ */
+/* $NetBSD: cgdconfig.c,v 1.63 2024/05/12 18:02:16 christos Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 2002, 2003\
The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: cgdconfig.c,v 1.62 2024/04/29 00:28:18 riastradh Exp $");
+__RCSID("$NetBSD: cgdconfig.c,v 1.63 2024/05/12 18:02:16 christos Exp $");
#endif
#ifdef HAVE_ARGON2
@@ -73,6 +73,11 @@ __RCSID("$NetBSD: cgdconfig.c,v 1.62 202
#include
+#ifdef HAVE_ZFS
+#include
+#include
+#endif
+
#include "params.h"
#include "pkcs5_pbkdf2.h"
#include "utils.h"
@@ -98,11 +103,11 @@ enum action {
/* if nflag is set, do not configure/unconfigure the cgd's */
-int nflag = 0;
+static int nflag = 0;
/* if Sflag is set, generate shared keys */
-int Sflag = 0;
+static int Sflag = 0;
/* if pflag is set to PFLAG_STDIN read from stdin rather than getpass(3) */
@@ -110,7 +115,7 @@ int Sflag = 0;
#define PFLAG_GETPASS_ECHO 0x02
#define PFLAG_GETPASS_MASK 0x03
#define PFLAG_STDIN 0x04
-int pflag = PFLAG_GETPASS;
+static int pflag = PFLAG_GETPASS;
/*
* When configuring all cgds, save a cache of shared keys for key
@@ -127,7 +132,7 @@ struct sharedkey {
SLIST_ENTRY(sharedkey) used;
int verified;
};
-LIST_HEAD(, sharedkey) sharedkeys;
+static LIST_HEAD(, sharedkey) sharedkeys;
SLIST_HEAD(sharedkeyhits, sharedkey);
static int configure(int, char **, struct params *, int);
@@ -170,11 +175,14 @@ static int verify_ffs(int);
static int verify_reenter(struct params *);
static int verify_mbr(int);
static int verify_gpt(int);
+#ifdef HAVE_ZFS
+static int verify_zfs(int);
+#endif
__dead static void usage(void);
/* Verbose Framework */
-unsigned verbose = 0;
+static unsigned verbose = 0;
#define VERBOSE(x,y) if (verbose >= x) y
#define VPRINTF(x,y) if (verbose >= x) (void)printf y
@@ -636,12 +644,12 @@
CVS commit: src/sbin/cgdconfig
Module Name:src Committed By: christos Date: Sun May 12 18:02:16 UTC 2024 Modified Files: src/sbin/cgdconfig: Makefile cgdconfig.8 cgdconfig.c params.c params.h Log Message: PR/58212: Malte Dehling: Add zfs verification method To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sbin/cgdconfig/Makefile cvs rdiff -u -r1.57 -r1.58 src/sbin/cgdconfig/cgdconfig.8 cvs rdiff -u -r1.62 -r1.63 src/sbin/cgdconfig/cgdconfig.c cvs rdiff -u -r1.34 -r1.35 src/sbin/cgdconfig/params.c cvs rdiff -u -r1.14 -r1.15 src/sbin/cgdconfig/params.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/miscfs/procfs
Module Name:src
Committed By: christos
Date: Sun May 12 17:26:51 UTC 2024
Modified Files:
src/sys/miscfs/procfs: procfs.h procfs_linux.c procfs_subr.c
procfs_vfsops.c procfs_vnops.c
Log Message:
PR/58227: Ricardo Branco: Add support for proc/sysvipc in Linux emulator
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/miscfs/procfs/procfs.h
cvs rdiff -u -r1.87 -r1.88 src/sys/miscfs/procfs/procfs_linux.c
cvs rdiff -u -r1.118 -r1.119 src/sys/miscfs/procfs/procfs_subr.c
cvs rdiff -u -r1.115 -r1.116 src/sys/miscfs/procfs/procfs_vfsops.c
cvs rdiff -u -r1.231 -r1.232 src/sys/miscfs/procfs/procfs_vnops.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/miscfs/procfs/procfs.h
diff -u src/sys/miscfs/procfs/procfs.h:1.85 src/sys/miscfs/procfs/procfs.h:1.86
--- src/sys/miscfs/procfs/procfs.h:1.85 Sun May 12 13:22:29 2024
+++ src/sys/miscfs/procfs/procfs.h Sun May 12 13:26:50 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs.h,v 1.85 2024/05/12 17:22:29 christos Exp $ */
+/* $NetBSD: procfs.h,v 1.86 2024/05/12 17:26:50 christos Exp $ */
/*
* Copyright (c) 1993
@@ -112,7 +112,11 @@ typedef enum {
PFSstat, /* process status (if -o linux) */
PFSstatm, /* process memory info (if -o linux) */
PFSstatus, /* process status */
- PFStask, /* task subdirector (if -o linux) */
+ PFSsysvipc, /* sysvipc subdirectory (if -o linux) */
+ PFSsysvipc_msg, /* sysvipc msg info (if -o linux) */
+ PFSsysvipc_sem, /* sysvipc sem info (if -o linux) */
+ PFSsysvipc_shm, /* sysvipc shm info (if -o linux) */
+ PFStask, /* task subdirectory (if -o linux) */
PFSuptime, /* elapsed time since (if -o linux) */
PFSversion, /* kernel version (if -o linux) */
#ifdef __HAVE_PROCFS_MACHDEP
@@ -272,6 +276,12 @@ int procfs_dolimit(struct lwp *, struct
struct uio *);
int procfs_dolimits(struct lwp *, struct proc *, struct pfsnode *,
struct uio *);
+int procfs_dosysvipc_msg(struct lwp *, struct proc *, struct pfsnode *,
+struct uio *);
+int procfs_dosysvipc_sem(struct lwp *, struct proc *, struct pfsnode *,
+struct uio *);
+int procfs_dosysvipc_shm(struct lwp *, struct proc *, struct pfsnode *,
+struct uio *);
void procfs_hashrem(struct pfsnode *);
int procfs_getfp(struct pfsnode *, struct proc *, struct file **);
Index: src/sys/miscfs/procfs/procfs_linux.c
diff -u src/sys/miscfs/procfs/procfs_linux.c:1.87 src/sys/miscfs/procfs/procfs_linux.c:1.88
--- src/sys/miscfs/procfs/procfs_linux.c:1.87 Sat Sep 5 12:30:12 2020
+++ src/sys/miscfs/procfs/procfs_linux.c Sun May 12 13:26:50 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_linux.c,v 1.87 2020/09/05 16:30:12 riastradh Exp $ */
+/* $NetBSD: procfs_linux.c,v 1.88 2024/05/12 17:26:50 christos Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,11 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: procfs_linux.c,v 1.87 2020/09/05 16:30:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_linux.c,v 1.88 2024/05/12 17:26:50 christos Exp $");
+
+#if defined(_KERNEL_OPT)
+#include "opt_sysv.h"
+#endif
#include
#include
@@ -58,6 +62,15 @@ __KERNEL_RCSID(0, "$NetBSD: procfs_linux
#include
#include
#include
+#ifdef SYSVMSG
+#include
+#endif
+#ifdef SYSVSEM
+#include
+#endif
+#ifdef SYSVSHM
+#include
+#endif
#include
@@ -746,3 +759,141 @@ out:
sysctl_unlock();
return error;
}
+
+int
+procfs_dosysvipc_msg(struct lwp *curl, struct proc *p,
+struct pfsnode *pfs, struct uio *uio)
+{
+ char *bf;
+ int offset = 0;
+ int error = EFBIG;
+
+ bf = malloc(LBFSZ, M_TEMP, M_WAITOK);
+
+ offset += snprintf(bf, LBFSZ,
+ "%10s %10s %4s %10s %10s %5s %5s %5s %5s %5s %5s %10s %10s %10s\n",
+ "key", "msqid", "perms", "cbytes", "qnum", "lspid", "lrpid",
+ "uid", "gid", "cuid", "cgid", "stime", "rtime", "ctime");
+ if (offset >= LBFSZ)
+ goto out;
+
+#ifdef SYSVMSG
+ for (int id = 0; id < msginfo.msgmni; id++)
+ if (msqs[id].msq_u.msg_qbytes > 0) {
+ offset += snprintf([offset], LBFSZ - offset,
+ "%10d %10d %4o %10zu %10lu %5u %5u %5u %5u %5u %5u %10lld %10lld %10lld\n",
+ (int) msqs[id].msq_u.msg_perm._key,
+ IXSEQ_TO_IPCID(id, msqs[id].msq_u.msg_perm),
+ msqs[id].msq_u.msg_perm.mode,
+ msqs[id].msq_u._msg_cbytes,
+ msqs[id].msq_u.msg_qnum,
+ msqs[id].msq_u.msg_lspid,
+ msqs[id].msq_u.msg_lrpid,
+ msqs[id].msq_u.msg_perm.uid,
+ msqs[id].msq_u.msg_perm.gid,
+ msqs[id].msq_u.msg_perm.cuid,
+ msqs[id].msq_u.msg_perm.cgid,
+ (long long)msqs[id].msq_u.msg_stime,
+ (long long)msqs[id].msq_u.msg_rtime,
+ (long long)msqs[id].msq_u.msg_ctime);
+ if (offset >= LBFSZ)
+goto out;
+ }
+#endif
+
+ error = uiomove_frombuf(bf, offset, uio);
+out:
+ free(bf, M_TEMP);
+ return error;
+}
+
+int
+procfs_dosysvipc_sem(struct lwp *curl, struct proc *p,
+struct pfsnode *pfs, struct uio *uio)
CVS commit: src/sys/miscfs/procfs
Module Name:src Committed By: christos Date: Sun May 12 17:26:51 UTC 2024 Modified Files: src/sys/miscfs/procfs: procfs.h procfs_linux.c procfs_subr.c procfs_vfsops.c procfs_vnops.c Log Message: PR/58227: Ricardo Branco: Add support for proc/sysvipc in Linux emulator To generate a diff of this commit: cvs rdiff -u -r1.85 -r1.86 src/sys/miscfs/procfs/procfs.h cvs rdiff -u -r1.87 -r1.88 src/sys/miscfs/procfs/procfs_linux.c cvs rdiff -u -r1.118 -r1.119 src/sys/miscfs/procfs/procfs_subr.c cvs rdiff -u -r1.115 -r1.116 src/sys/miscfs/procfs/procfs_vfsops.c cvs rdiff -u -r1.231 -r1.232 src/sys/miscfs/procfs/procfs_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/linux/common
Module Name:src
Committed By: christos
Date: Sun May 12 17:23:10 UTC 2024
Modified Files:
src/sys/compat/linux/common: linux_limit.h linux_misc.h
Log Message:
PR/58240: Ricardo Branco: Add missing limits
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/compat/linux/common/linux_limit.h
cvs rdiff -u -r1.29 -r1.30 src/sys/compat/linux/common/linux_misc.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux/common/linux_limit.h
diff -u src/sys/compat/linux/common/linux_limit.h:1.8 src/sys/compat/linux/common/linux_limit.h:1.9
--- src/sys/compat/linux/common/linux_limit.h:1.8 Wed Dec 1 23:29:48 2021
+++ src/sys/compat/linux/common/linux_limit.h Sun May 12 13:23:10 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_limit.h,v 1.8 2021/12/02 04:29:48 ryo Exp $ */
+/* $NetBSD: linux_limit.h,v 1.9 2024/05/12 17:23:10 christos Exp $ */
/*-
* Copyright (c) 1995, 1998, 1999 The NetBSD Foundation, Inc.
@@ -94,6 +94,11 @@ linux_to_bsd_limit(int lim)
case LINUX_RLIMIT_AS:
return RLIMIT_AS;
case LINUX_RLIMIT_LOCKS:
+ case LINUX_RLIMIT_SIGPENDING:
+ case LINUX_RLIMIT_MSGQUEUE:
+ case LINUX_RLIMIT_NICE:
+ case LINUX_RLIMIT_RTPRIO:
+ case LINUX_RLIMIT_RTTIME:
return -EOPNOTSUPP;
default:
return -EINVAL;
Index: src/sys/compat/linux/common/linux_misc.h
diff -u src/sys/compat/linux/common/linux_misc.h:1.29 src/sys/compat/linux/common/linux_misc.h:1.30
--- src/sys/compat/linux/common/linux_misc.h:1.29 Fri Aug 18 15:41:19 2023
+++ src/sys/compat/linux/common/linux_misc.h Sun May 12 13:23:10 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_misc.h,v 1.29 2023/08/18 19:41:19 christos Exp $ */
+/* $NetBSD: linux_misc.h,v 1.30 2024/05/12 17:23:10 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -94,6 +94,11 @@ struct linux_sysinfo {
#define LINUX_RLIMIT_MEMLOCK 8
#define LINUX_RLIMIT_AS 9
#define LINUX_RLIMIT_LOCKS 10
+#define LINUX_RLIMIT_SIGPENDING 11
+#define LINUX_RLIMIT_MSGQUEUE 12
+#define LINUX_RLIMIT_NICE 13
+#define LINUX_RLIMIT_RTPRIO 14
+#define LINUX_RLIMIT_RTTIME 15
#ifdef __mips__ /* XXX only mips32. On mips64, it's ~0ul */
#define LINUX_RLIM_INFINITY 0x7fffUL
#define LINUX32_RLIM_INFINITY 0x7fffU
CVS commit: src/sys/compat/linux/common
Module Name:src Committed By: christos Date: Sun May 12 17:23:10 UTC 2024 Modified Files: src/sys/compat/linux/common: linux_limit.h linux_misc.h Log Message: PR/58240: Ricardo Branco: Add missing limits To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/compat/linux/common/linux_limit.h cvs rdiff -u -r1.29 -r1.30 src/sys/compat/linux/common/linux_misc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/miscfs/procfs
Module Name:src Committed By: christos Date: Sun May 12 17:22:29 UTC 2024 Modified Files: src/sys/miscfs/procfs: procfs.h procfs_limit.c procfs_subr.c procfs_vfsops.c procfs_vnops.c Log Message: PR/58240: Ricardo Branco: Add support for proc/self/limits as used by Linux To generate a diff of this commit: cvs rdiff -u -r1.84 -r1.85 src/sys/miscfs/procfs/procfs.h cvs rdiff -u -r1.4 -r1.5 src/sys/miscfs/procfs/procfs_limit.c cvs rdiff -u -r1.117 -r1.118 src/sys/miscfs/procfs/procfs_subr.c cvs rdiff -u -r1.114 -r1.115 src/sys/miscfs/procfs/procfs_vfsops.c cvs rdiff -u -r1.230 -r1.231 src/sys/miscfs/procfs/procfs_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/miscfs/procfs
Module Name:src
Committed By: christos
Date: Sun May 12 17:22:29 UTC 2024
Modified Files:
src/sys/miscfs/procfs: procfs.h procfs_limit.c procfs_subr.c
procfs_vfsops.c procfs_vnops.c
Log Message:
PR/58240: Ricardo Branco: Add support for proc/self/limits as used by Linux
To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/miscfs/procfs/procfs.h
cvs rdiff -u -r1.4 -r1.5 src/sys/miscfs/procfs/procfs_limit.c
cvs rdiff -u -r1.117 -r1.118 src/sys/miscfs/procfs/procfs_subr.c
cvs rdiff -u -r1.114 -r1.115 src/sys/miscfs/procfs/procfs_vfsops.c
cvs rdiff -u -r1.230 -r1.231 src/sys/miscfs/procfs/procfs_vnops.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/miscfs/procfs/procfs.h
diff -u src/sys/miscfs/procfs/procfs.h:1.84 src/sys/miscfs/procfs/procfs.h:1.85
--- src/sys/miscfs/procfs/procfs.h:1.84 Wed Jan 17 05:20:12 2024
+++ src/sys/miscfs/procfs/procfs.h Sun May 12 13:22:29 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs.h,v 1.84 2024/01/17 10:20:12 hannken Exp $ */
+/* $NetBSD: procfs.h,v 1.85 2024/05/12 17:22:29 christos Exp $ */
/*
* Copyright (c) 1993
@@ -97,6 +97,7 @@ typedef enum {
PFSfpregs, /* the process's FP register set */
PFSloadavg, /* load average (if -o linux) */
PFSlimit, /* resource limits */
+ PFSlimits, /* resource limits, Linux style (if -o linux) */
PFSmap, /* memory map */
PFSmaps, /* memory map, Linux style (if -o linux) */
PFSmem, /* the process's memory image */
@@ -269,6 +270,8 @@ int procfs_doauxv(struct lwp *, struct p
struct uio *);
int procfs_dolimit(struct lwp *, struct proc *, struct pfsnode *,
struct uio *);
+int procfs_dolimits(struct lwp *, struct proc *, struct pfsnode *,
+struct uio *);
void procfs_hashrem(struct pfsnode *);
int procfs_getfp(struct pfsnode *, struct proc *, struct file **);
Index: src/sys/miscfs/procfs/procfs_limit.c
diff -u src/sys/miscfs/procfs/procfs_limit.c:1.4 src/sys/miscfs/procfs/procfs_limit.c:1.5
--- src/sys/miscfs/procfs/procfs_limit.c:1.4 Sat May 23 19:42:43 2020
+++ src/sys/miscfs/procfs/procfs_limit.c Sun May 12 13:22:29 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_limit.c,v 1.4 2020/05/23 23:42:43 ad Exp $ */
+/* $NetBSD: procfs_limit.c,v 1.5 2024/05/12 17:22:29 christos Exp $ */
/*-
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -30,7 +30,11 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: procfs_limit.c,v 1.4 2020/05/23 23:42:43 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_limit.c,v 1.5 2024/05/12 17:22:29 christos Exp $");
+
+#if defined(_KERNEL_OPT)
+#include "opt_sysv.h"
+#endif
#include
#include
@@ -38,8 +42,35 @@ __KERNEL_RCSID(0, "$NetBSD: procfs_limit
#include
#include
#include
-
-#define MAXBUFFERSIZE (256 * 1024)
+#include
+#ifdef SYSVMSG
+#include
+#endif
+
+/* Taken from FreeBSD sys/compat/linprocfs/linprocfs.c */
+static const struct linux_rlimit_ident {
+ const char *desc;
+ const char *unit;
+ unsigned intrlim_id;
+} linux_rlimits_ident[] = {
+ { "Max cpu time", "seconds", RLIMIT_CPU },
+ { "Max file size", "bytes", RLIMIT_FSIZE },
+ { "Max data size", "bytes", RLIMIT_DATA },
+ { "Max stack size", "bytes", RLIMIT_STACK },
+ { "Max core file size", "bytes", RLIMIT_CORE },
+ { "Max resident set", "bytes", RLIMIT_RSS },
+ { "Max processes", "processes", RLIMIT_NPROC },
+ { "Max open files", "files", RLIMIT_NOFILE },
+ { "Max locked memory", "bytes", RLIMIT_MEMLOCK },
+ { "Max address space", "bytes", RLIMIT_AS },
+ { "Max file locks", "locks", LINUX_RLIMIT_LOCKS },
+ { "Max pending signals", "signals", LINUX_RLIMIT_SIGPENDING },
+ { "Max msgqueue size", "bytes", LINUX_RLIMIT_MSGQUEUE },
+ { "Max nice priority", "", LINUX_RLIMIT_NICE },
+ { "Max realtime priority", "", LINUX_RLIMIT_RTPRIO },
+ { "Max realtime timeout", "us", LINUX_RLIMIT_RTTIME },
+ { 0, 0, 0 }
+};
static size_t
prl(char *buf, size_t len, intmax_t lim, char sep)
@@ -92,3 +123,72 @@ procfs_dolimit(struct lwp *curl, struct
return error;
}
+
+int
+procfs_dolimits(struct lwp *curl, struct proc *p, struct pfsnode *pfs,
+ struct uio *uio)
+{
+ const struct linux_rlimit_ident *li;
+ int error;
+ char *buffer;
+ size_t bufsize, pos;
+ struct rlimit rl, rlimits[RLIM_NLIMITS];
+
+ if (uio->uio_rw != UIO_READ)
+ return EOPNOTSUPP;
+
+ mutex_enter(_lock);
+ mutex_enter(p->p_lock);
+ memcpy(rlimits, p->p_rlimit, sizeof(rlimits));
+ mutex_exit(p->p_lock);
+ mutex_exit(_lock);
+
+ error = 0;
+
+ bufsize = (64 * 3) * __arraycount(linux_rlimits_ident);
+ buffer = malloc(bufsize, M_TEMP, M_WAITOK);
+ pos = snprintf(buffer, bufsize, "%-26s%-21s%-21s%-21s\n",
+ "Limit", "Soft Limit", "Hard Limit", "Units");
+ for (li = linux_rlimits_ident; li->desc != NULL; ++li) {
+ switch (li->rlim_id)
+ {
+ case LINUX_RLIMIT_LOCKS:
+ case LINUX_RLIMIT_RTTIME:
+ case LINUX_RLIMIT_SIGPENDING:
+ rl.rlim_cur = RLIM_INFINITY;
+ break;
+ case
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: christos
Date: Sun May 12 17:18:34 UTC 2024
Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h
Log Message:
Regen
To generate a diff of this commit:
cvs rdiff -u -r1.807 -r1.808 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.
Modified files:
Index: src/sys/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.807 src/sys/dev/usb/usbdevs.h:1.808
--- src/sys/dev/usb/usbdevs.h:1.807 Tue Apr 16 22:33:04 2024
+++ src/sys/dev/usb/usbdevs.h Sun May 12 13:18:34 2024
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.807 2024/04/17 02:33:04 maya Exp $ */
+/* $NetBSD: usbdevs.h,v 1.808 2024/05/12 17:18:34 christos Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.814 2024/02/28 21:50:51 dholland Exp
+ * NetBSD: usbdevs,v 1.816 2024/05/12 17:17:56 christos Exp
*/
/*-
@@ -3474,6 +3474,7 @@
#define USB_PRODUCT_TPLINK_T4UV2 0x010d /* Archer T4U ver 2 */
#define USB_PRODUCT_TPLINK_T4UHV2 0x010e /* Archer T4UH ver 2 */
#define USB_PRODUCT_TPLINK_T2UNANO 0x011e /* Archer T2U Nano */
+#define USB_PRODUCT_TPLINK_UE300 0x0601 /* UE300 10/100/1000 LAN */
/* Trek Technology products */
#define USB_PRODUCT_TREK_THUMBDRIVE 0x /* ThumbDrive */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.807 src/sys/dev/usb/usbdevs_data.h:1.808
--- src/sys/dev/usb/usbdevs_data.h:1.807 Tue Apr 16 22:33:04 2024
+++ src/sys/dev/usb/usbdevs_data.h Sun May 12 13:18:34 2024
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.807 2024/04/17 02:33:04 maya Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.808 2024/05/12 17:18:34 christos Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.814 2024/02/28 21:50:51 dholland Exp
+ * NetBSD: usbdevs,v 1.816 2024/05/12 17:17:56 christos Exp
*/
/*-
@@ -4767,168 +4767,170 @@ static const uint32_t usb_products[] = {
20027, 20038, 7643, 6624, 0,
USB_VENDOR_TPLINK, USB_PRODUCT_TPLINK_T2UNANO,
20027, 20043, 6975, 0,
+ USB_VENDOR_TPLINK, USB_PRODUCT_TPLINK_UE300,
+ 20047, 20053, 7459, 0,
USB_VENDOR_TREK, USB_PRODUCT_TREK_THUMBDRIVE,
- 20047, 0,
+ 20065, 0,
USB_VENDOR_TREK, USB_PRODUCT_TREK_THUMBDRIVE_8MB,
- 20047, 20058, 0,
+ 20065, 20076, 0,
USB_VENDOR_TRENDNET, USB_PRODUCT_TRENDNET_RTL8192CU,
5282, 0,
USB_VENDOR_TRENDNET, USB_PRODUCT_TRENDNET_RTL8188CU,
5302, 0,
USB_VENDOR_TRENDNET, USB_PRODUCT_TRENDNET_TEW648UBM,
- 20062, 0,
+ 20080, 0,
USB_VENDOR_TRIPPLITE, USB_PRODUCT_TRIPPLITE_U209,
- 20073, 7044, 5007, 0,
+ 20091, 7044, 5007, 0,
USB_VENDOR_TRIPPLITE2, USB_PRODUCT_TRIPPLITE2_UPS,
3207, 3213, 480, 0,
USB_VENDOR_TRIPPLITE2, USB_PRODUCT_TRIPPLITE2_SMARTLCD,
- 20078, 480, 0,
+ 20096, 480, 0,
USB_VENDOR_TRIPPLITE2, USB_PRODUCT_TRIPPLITE2_AVR550U,
- 3207, 3213, 20087, 0,
+ 3207, 3213, 20105, 0,
USB_VENDOR_TRUMPION, USB_PRODUCT_TRUMPION_T33521,
- 20095, 20103, 0,
+ 20113, 20121, 0,
USB_VENDOR_TRUMPION, USB_PRODUCT_TRUMPION_XXX1100,
- 16365, 20111, 0,
+ 16365, 20129, 0,
USB_VENDOR_TSUNAMI, USB_PRODUCT_TSUNAMI_SM2000,
- 20116, 0,
+ 20134, 0,
USB_VENDOR_TWINMOS, USB_PRODUCT_TWINMOS_G240,
- 20124, 0,
+ 20142, 0,
USB_VENDOR_ULTIMA, USB_PRODUCT_ULTIMA_1200UBPLUS,
11625, 15247, 11515, 7345, 0,
USB_VENDOR_ULTIMA, USB_PRODUCT_ULTIMA_T14BR,
- 20129, 20135, 6945, 0,
+ 20147, 20153, 6945, 0,
USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA1236U,
- 20141, 5778, 20147, 0,
+ 20159, 5778, 20165, 0,
USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA1220U,
- 20141, 20155, 20147, 0,
+ 20159, 20173, 20165, 0,
USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA2000U,
- 20141, 20161, 20147, 0,
+ 20159, 20179, 20165, 0,
USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA3400,
- 20141, 20167, 20147, 0,
+ 20159, 20185, 20165, 0,
USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA2100U,
- 20141, 20172, 20147, 0,
+ 20159, 20190, 20165, 0,
USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA2200U,
- 20141, 20178, 20147, 0,
+ 20159, 20196, 20165, 0,
USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_TEW429UB_A,
- 20184, 0,
+ 20202, 0,
USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_TEW429UB,
- 20196, 0,
+ 20214, 0,
USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_TEW429UBC1,
- 20196, 9551, 0,
+ 20214, 9551, 0,
USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_RT2870_1,
5161, 0,
USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_TEW645UB,
- 20206, 0,
+ 20224, 0,
USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_ALL0298V2,
- 20216, 7632, 0,
+ 20234, 7632, 0,
USB_VENDOR_UNIACCESS,
CVS commit: src/sys/dev/usb
Module Name:src Committed By: christos Date: Sun May 12 17:18:34 UTC 2024 Modified Files: src/sys/dev/usb: usbdevs.h usbdevs_data.h Log Message: Regen To generate a diff of this commit: cvs rdiff -u -r1.807 -r1.808 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: christos
Date: Sun May 12 17:17:56 UTC 2024
Modified Files:
src/sys/dev/usb: if_ure.c usbdevs
Log Message:
PR/58250: RVP: Add TP-Link UE300 USB LAN adapter
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/usb/if_ure.c
cvs rdiff -u -r1.815 -r1.816 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/if_ure.c
diff -u src/sys/dev/usb/if_ure.c:1.59 src/sys/dev/usb/if_ure.c:1.60
--- src/sys/dev/usb/if_ure.c:1.59 Mon Oct 9 07:28:05 2023
+++ src/sys/dev/usb/if_ure.c Sun May 12 13:17:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ure.c,v 1.59 2023/10/09 11:28:05 riastradh Exp $ */
+/* $NetBSD: if_ure.c,v 1.60 2024/05/12 17:17:56 christos Exp $ */
/* $OpenBSD: if_ure.c,v 1.10 2018/11/02 21:32:30 jcs Exp $ */
/*-
@@ -30,7 +30,7 @@
/* RealTek RTL8152/RTL8153 10/100/Gigabit USB Ethernet device */
#include
-__KERNEL_RCSID(0, "$NetBSD: if_ure.c,v 1.59 2023/10/09 11:28:05 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ure.c,v 1.60 2024/05/12 17:17:56 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -72,7 +72,8 @@ int uredebug = 0;
static const struct usb_devno ure_devs[] = {
{ USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8152 },
- { USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8153 }
+ { USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8153 },
+ { USB_VENDOR_TPLINK, USB_PRODUCT_TPLINK_UE300 },
};
#define URE_BUFSZ (16 * 1024)
Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.815 src/sys/dev/usb/usbdevs:1.816
--- src/sys/dev/usb/usbdevs:1.815 Tue Apr 16 22:32:08 2024
+++ src/sys/dev/usb/usbdevs Sun May 12 13:17:56 2024
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.815 2024/04/17 02:32:08 maya Exp $
+$NetBSD: usbdevs,v 1.816 2024/05/12 17:17:56 christos Exp $
/*-
* Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -3467,6 +3467,7 @@ product TPLINK RTL8188EU 0x010c RTL8188E
product TPLINK T4UV2 0x010d Archer T4U ver 2
product TPLINK T4UHV2 0x010e Archer T4UH ver 2
product TPLINK T2UNANO 0x011e Archer T2U Nano
+product TPLINK UE300 0x0601 UE300 10/100/1000 LAN
/* Trek Technology products */
product TREK THUMBDRIVE 0x ThumbDrive
CVS commit: src/sys/dev/usb
Module Name:src Committed By: christos Date: Sun May 12 17:17:56 UTC 2024 Modified Files: src/sys/dev/usb: if_ure.c usbdevs Log Message: PR/58250: RVP: Add TP-Link UE300 USB LAN adapter To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/sys/dev/usb/if_ure.c cvs rdiff -u -r1.815 -r1.816 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/usr.bin/tic
Module Name:src
Committed By: christos
Date: Sat May 11 22:06:57 UTC 2024
Modified Files:
src/usr.bin/tic: tic.c
Log Message:
Only mark the terminfo entry promoted if actually was.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/usr.bin/tic/tic.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/tic/tic.c
diff -u src/usr.bin/tic/tic.c:1.40 src/usr.bin/tic/tic.c:1.41
--- src/usr.bin/tic/tic.c:1.40 Sun Mar 29 20:09:06 2020
+++ src/usr.bin/tic/tic.c Sat May 11 18:06:57 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: tic.c,v 1.40 2020/03/30 00:09:06 roy Exp $ */
+/* $NetBSD: tic.c,v 1.41 2024/05/11 22:06:57 christos Exp $ */
/*
* Copyright (c) 2009, 2010, 2020 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#endif
#include
-__RCSID("$NetBSD: tic.c,v 1.40 2020/03/30 00:09:06 roy Exp $");
+__RCSID("$NetBSD: tic.c,v 1.41 2024/05/11 22:06:57 christos Exp $");
#include
#include
@@ -468,7 +468,7 @@ merge_use(int flags)
if (!promoted && rtic->rtype != TERMINFO_RTYPE) {
if (promote(rtic, utic) == -1)
err(EXIT_FAILURE, "promote");
-promoted = true;
+promoted = rtic->rtype == TERMINFO_RTYPE;
}
merge(rtic, utic, flags);
CVS commit: src/usr.bin/tic
Module Name:src Committed By: christos Date: Sat May 11 22:06:57 UTC 2024 Modified Files: src/usr.bin/tic: tic.c Log Message: Only mark the terminfo entry promoted if actually was. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/usr.bin/tic/tic.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/distrib/common
> On May 9, 2024, at 5:37 PM, Robert Elz wrote: > > Date:Thu, 9 May 2024 12:09:03 -0400 >From: "Christos Zoulas" >Message-ID: <20240509160903.6e41bf...@cvs.netbsd.org> > > | Instead of augmenting the platform spec with an autogenerated one, > | we should understand why we have missing entries in the first place. > > Is it really important? Everything was fine without it previously, > except that reproducible builds, weren't (as local info was being > used in the CD images). > > As long as the "augmenting" is just providing info for files that > weren't otherwise specified (an issue I admit to not checking in the > change I made) - that is, as long as makefs takes the first entry in > the spec file it is given, should there be more than one for a file > (if it prefers to use the last, then that would just change the order > in which the augmentation file is included, no need to change makefs) > then I'm not really sure what the problem is. I am not sure either but the resulting cd does not boot anymore. I am trying to understand why. If augmenting works as you describe, there is more problem... christos > > That is, I don't see we need to add yet another manual maintenance step > that we need to make in order to add or remove a file from a CD image > (or whatever the image is destined for) when the information being added > isn't really important - but just needs to be consistent. > > kre
CVS commit: src/distrib/common
Module Name:src Committed By: christos Date: Thu May 9 16:09:03 UTC 2024 Modified Files: src/distrib/common: Makefile.bootcd Log Message: Remove the -xx, now we have the list of 20 platforms that have incomplete fspecs. Instead of augmenting the platform spec with an autogenerated one, we should understand why we have missing entries in the first place. To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/distrib/common/Makefile.bootcd 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: Thu May 9 16:09:03 UTC 2024
Modified Files:
src/distrib/common: Makefile.bootcd
Log Message:
Remove the -xx, now we have the list of 20 platforms that have incomplete
fspecs. Instead of augmenting the platform spec with an autogenerated one,
we should understand why we have missing entries in the first place.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/distrib/common/Makefile.bootcd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.51 src/distrib/common/Makefile.bootcd:1.52
--- src/distrib/common/Makefile.bootcd:1.51 Wed May 8 23:41:05 2024
+++ src/distrib/common/Makefile.bootcd Thu May 9 12:09:03 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.51 2024/05/09 03:41:05 kre Exp $
+# $NetBSD: Makefile.bootcd,v 1.52 2024/05/09 16:09:03 christos Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -285,7 +285,7 @@ copy-releasedir:
fi;\
${CDSETSCMD} ./maketars -i "${CUROBJDIR}/cdrom" \
${CD_METALOG.unpriv} ${mtunpriv} -N ${NETBSDSRCDIR}/etc \
- -F "${CUROBJDIR}/cdrom/etc/mtree" -xx \
+ -F "${CUROBJDIR}/cdrom/etc/mtree" \
-d "${DESTDIR:S,^$,/,}" ${set}
.endfor
if [ -d "${CUROBJDIR}/cdrom/var/spool/ftp/hidden" ]; then \
@@ -322,8 +322,8 @@ image:
.if defined(SPEC_EXTRA)
cat ${SPEC_EXTRA} >> ${WORKSPEC}
.endif
- ${MAKESPEC} cdrom >> ${WORKSPEC}
- ${TOOL_MAKEFS} -N ${NETBSDSRCDIR}/etc -t cd9660 -F ${WORKSPEC} -xx \
+ if [ ! -s ${WORKSPEC} ]; then ${MAKESPEC} cdrom > ${WORKSPEC}; fi
+ ${TOOL_MAKEFS} -N ${NETBSDSRCDIR}/etc -t cd9660 -F ${WORKSPEC} \
${MAKEFS_TIMESTAMP} ${CDMAKEFSEXTRAOPTS} -o ${_CDMAKEFSOPTIONS:Q} \
${CDIMAGE} cdrom
CVS commit: xsrc/external/mit/MesaLib/dist/src/compiler
Module Name:xsrc
Committed By: christos
Date: Wed May 8 16:54:51 UTC 2024
Modified Files:
xsrc/external/mit/MesaLib/dist/src/compiler/nir: nir_lower_blend.c
nir_lower_subgroups.c nir_opt_copy_prop_vars.c
xsrc/external/mit/MesaLib/dist/src/compiler/spirv: spirv_to_nir.c
Log Message:
Add casts to appease clang
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_lower_blend.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_lower_subgroups.c
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_opt_copy_prop_vars.c
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/compiler/spirv/spirv_to_nir.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_lower_blend.c
diff -u xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_lower_blend.c:1.1.1.1 xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_lower_blend.c:1.2
--- xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_lower_blend.c:1.1.1.1 Sun May 8 21:23:27 2022
+++ xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_lower_blend.c Wed May 8 12:54:50 2024
@@ -375,7 +375,7 @@ nir_lower_blend_instr(nir_builder *b, ni
blended = nir_color_mask(b, options->rt[rt].colormask, blended, dst);
if (src_num_comps != 4)
- blended = nir_channels(b, blended, BITFIELD_MASK(src_num_comps));
+ blended = nir_channels(b, blended, (nir_component_mask_t)BITFIELD_MASK(src_num_comps));
/* Write out the final color instead of the input */
nir_instr_rewrite_src_ssa(instr, >src[1], blended);
Index: xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_lower_subgroups.c
diff -u xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_lower_subgroups.c:1.1.1.2 xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_lower_subgroups.c:1.2
--- xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_lower_subgroups.c:1.1.1.2 Sun May 8 21:23:27 2022
+++ xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_lower_subgroups.c Wed May 8 12:54:50 2024
@@ -98,7 +98,7 @@ uint_to_ballot_type(nir_builder *b, nir_
* have enough ballot bits.
*/
if (value->num_components > num_components)
- value = nir_channels(b, value, BITFIELD_MASK(num_components));
+ value = nir_channels(b, value, (nir_component_mask_t)BITFIELD_MASK(num_components));
return value;
}
Index: xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_opt_copy_prop_vars.c
diff -u xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_opt_copy_prop_vars.c:1.1.1.4 xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_opt_copy_prop_vars.c:1.2
--- xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_opt_copy_prop_vars.c:1.1.1.4 Sun May 8 21:23:28 2022
+++ xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_opt_copy_prop_vars.c Wed May 8 12:54:50 2024
@@ -191,7 +191,7 @@ gather_vars_written(struct copy_prop_var
nir_deref_instr *payload =
nir_src_as_deref(*nir_get_shader_call_payload_src(intrin));
-nir_component_mask_t mask =
+nir_component_mask_t mask = (nir_component_mask_t)
BITFIELD_MASK(glsl_get_vector_elements(payload->type));
struct hash_entry *ht_entry =
@@ -1150,7 +1150,7 @@ copy_prop_vars_block(struct copy_prop_va
nir_deref_and_path payload = {
nir_src_as_deref(*nir_get_shader_call_payload_src(intrin)), NULL};
- nir_component_mask_t full_mask =
+ nir_component_mask_t full_mask = (nir_component_mask_t)
BITFIELD_MASK(glsl_get_vector_elements(payload.instr->type));
kill_aliases(state, copies, , full_mask);
break;
Index: xsrc/external/mit/MesaLib/dist/src/compiler/spirv/spirv_to_nir.c
diff -u xsrc/external/mit/MesaLib/dist/src/compiler/spirv/spirv_to_nir.c:1.1.1.4 xsrc/external/mit/MesaLib/dist/src/compiler/spirv/spirv_to_nir.c:1.2
--- xsrc/external/mit/MesaLib/dist/src/compiler/spirv/spirv_to_nir.c:1.1.1.4 Sun May 8 21:23:28 2022
+++ xsrc/external/mit/MesaLib/dist/src/compiler/spirv/spirv_to_nir.c Wed May 8 12:54:51 2024
@@ -3095,7 +3095,8 @@ vtn_handle_texture(struct vtn_builder *b
unsigned result_size = glsl_get_vector_elements(ret_type->type);
dest->elems[0]->def = nir_channel(>nb, >dest.ssa, result_size);
dest->elems[1]->def = nir_channels(>nb, >dest.ssa,
- BITFIELD_MASK(result_size));
+ (nir_component_mask_t)
+ BITFIELD_MASK(result_size));
vtn_push_ssa_value(b, w[2], dest);
} else {
vtn_push_nir_ssa(b, w[2], >dest.ssa);
@@ -3514,7 +3515,8 @@ vtn_handle_image(struct vtn_builder *b,
if (intrin->dest.ssa.bit_size != 32)
dest->elems[0]->def = nir_u2u32(>nb,
CVS commit: xsrc/external/mit/MesaLib/dist/src/compiler
Module Name:xsrc Committed By: christos Date: Wed May 8 16:54:51 UTC 2024 Modified Files: xsrc/external/mit/MesaLib/dist/src/compiler/nir: nir_lower_blend.c nir_lower_subgroups.c nir_opt_copy_prop_vars.c xsrc/external/mit/MesaLib/dist/src/compiler/spirv: spirv_to_nir.c Log Message: Add casts to appease clang To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_lower_blend.c cvs rdiff -u -r1.1.1.2 -r1.2 \ xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_lower_subgroups.c cvs rdiff -u -r1.1.1.4 -r1.2 \ xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_opt_copy_prop_vars.c cvs rdiff -u -r1.1.1.4 -r1.2 \ xsrc/external/mit/MesaLib/dist/src/compiler/spirv/spirv_to_nir.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external
Module Name:src Committed By: christos Date: Wed May 8 16:53:35 UTC 2024 Modified Files: src/external/mit/xorg/lib/dri: Makefile src/external/mpl/dhcp/bind/lib/libdns: Makefile src/external/mpl/dhcp/bind/lib/libisc: Makefile src/external/mpl/dhcp/bind/lib/libisccfg: Makefile Log Message: fix clang lint build (except for the programs that enables -T) To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/external/mit/xorg/lib/dri/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/mpl/dhcp/bind/lib/libdns/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/mpl/dhcp/bind/lib/libisc/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/mpl/dhcp/bind/lib/libisccfg/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/dri/Makefile diff -u src/external/mit/xorg/lib/dri/Makefile:1.42 src/external/mit/xorg/lib/dri/Makefile:1.43 --- src/external/mit/xorg/lib/dri/Makefile:1.42 Sun May 5 11:25:31 2024 +++ src/external/mit/xorg/lib/dri/Makefile Wed May 8 12:53:34 2024 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2024/05/05 15:25:31 riastradh Exp $ +# $NetBSD: Makefile,v 1.43 2024/05/08 16:53:34 christos Exp $ # Link the mesa_dri_drivers mega driver. @@ -528,7 +528,8 @@ CWARNFLAGS.clang+= -Wno-error=initialize -Wno-error=enum-conversion \ -Wno-error=implicit-int-float-conversion \ -Wno-error=tautological-constant-compare \ - -Wno-c99-designator -Wno-xor-used-as-pow + -Wno-c99-designator -Wno-xor-used-as-pow \ + -Wno-typedef-redefinition COPTS+= -Wno-error=stack-protector Index: src/external/mpl/dhcp/bind/lib/libdns/Makefile diff -u src/external/mpl/dhcp/bind/lib/libdns/Makefile:1.1 src/external/mpl/dhcp/bind/lib/libdns/Makefile:1.2 --- src/external/mpl/dhcp/bind/lib/libdns/Makefile:1.1 Sun Feb 18 15:58:00 2024 +++ src/external/mpl/dhcp/bind/lib/libdns/Makefile Wed May 8 12:53:34 2024 @@ -1,5 +1,6 @@ -# $NetBSD: Makefile,v 1.1 2024/02/18 20:58:00 christos Exp $ +# $NetBSD: Makefile,v 1.2 2024/05/08 16:53:34 christos Exp $ +NOLINT=yes LIBISPRIVATE=yes LIB=dns Index: src/external/mpl/dhcp/bind/lib/libisc/Makefile diff -u src/external/mpl/dhcp/bind/lib/libisc/Makefile:1.1 src/external/mpl/dhcp/bind/lib/libisc/Makefile:1.2 --- src/external/mpl/dhcp/bind/lib/libisc/Makefile:1.1 Sun Feb 18 15:58:00 2024 +++ src/external/mpl/dhcp/bind/lib/libisc/Makefile Wed May 8 12:53:35 2024 @@ -1,5 +1,6 @@ -# $NetBSD: Makefile,v 1.1 2024/02/18 20:58:00 christos Exp $ +# $NetBSD: Makefile,v 1.2 2024/05/08 16:53:35 christos Exp $ +NOLINT=yes LIBISPRIVATE=yes LIB=isc Index: src/external/mpl/dhcp/bind/lib/libisccfg/Makefile diff -u src/external/mpl/dhcp/bind/lib/libisccfg/Makefile:1.1 src/external/mpl/dhcp/bind/lib/libisccfg/Makefile:1.2 --- src/external/mpl/dhcp/bind/lib/libisccfg/Makefile:1.1 Sun Feb 18 15:58:01 2024 +++ src/external/mpl/dhcp/bind/lib/libisccfg/Makefile Wed May 8 12:53:35 2024 @@ -1,5 +1,6 @@ -# $NetBSD: Makefile,v 1.1 2024/02/18 20:58:01 christos Exp $ +# $NetBSD: Makefile,v 1.2 2024/05/08 16:53:35 christos Exp $ +NOLINT=yes LIBISPRIVATE=yes LIB=isccfg
CVS commit: src/external
Module Name:src Committed By: christos Date: Wed May 8 16:53:35 UTC 2024 Modified Files: src/external/mit/xorg/lib/dri: Makefile src/external/mpl/dhcp/bind/lib/libdns: Makefile src/external/mpl/dhcp/bind/lib/libisc: Makefile src/external/mpl/dhcp/bind/lib/libisccfg: Makefile Log Message: fix clang lint build (except for the programs that enables -T) To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/external/mit/xorg/lib/dri/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/mpl/dhcp/bind/lib/libdns/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/mpl/dhcp/bind/lib/libisc/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/mpl/dhcp/bind/lib/libisccfg/Makefile 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: Wed May 8 16:08:08 UTC 2024
Modified Files:
src/distrib/common: Makefile.bootcd
Log Message:
Fail on incomplete mtree specs
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/distrib/common/Makefile.bootcd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.49 src/distrib/common/Makefile.bootcd:1.50
--- src/distrib/common/Makefile.bootcd:1.49 Tue May 7 16:33:20 2024
+++ src/distrib/common/Makefile.bootcd Wed May 8 12:08:08 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.49 2024/05/07 20:33:20 christos Exp $
+# $NetBSD: Makefile.bootcd,v 1.50 2024/05/08 16:08:08 christos Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -285,7 +285,7 @@ copy-releasedir:
fi;\
${CDSETSCMD} ./maketars -i "${CUROBJDIR}/cdrom" \
${CD_METALOG.unpriv} ${mtunpriv} -N ${NETBSDSRCDIR}/etc \
- -F "${CUROBJDIR}/cdrom/etc/mtree"\
+ -F "${CUROBJDIR}/cdrom/etc/mtree" -xx \
-d "${DESTDIR:S,^$,/,}" ${set}
.endfor
if [ -d "${CUROBJDIR}/cdrom/var/spool/ftp/hidden" ]; then \
@@ -323,8 +323,9 @@ image:
cat ${SPEC_EXTRA} >> ${WORKSPEC}
.endif
if [ ! -s ${WORKSPEC} ]; then ${MAKESPEC} cdrom > ${WORKSPEC}; fi
- ${TOOL_MAKEFS} -N ${NETBSDSRCDIR}/etc -t cd9660 -F ${WORKSPEC} \
- ${MAKEFS_TIMESTAMP} ${CDMAKEFSEXTRAOPTS} -o ${_CDMAKEFSOPTIONS:Q} ${CDIMAGE} cdrom
+ ${TOOL_MAKEFS} -N ${NETBSDSRCDIR}/etc -t cd9660 -F ${WORKSPEC} -xx \
+ ${MAKEFS_TIMESTAMP} ${CDMAKEFSEXTRAOPTS} -o ${_CDMAKEFSOPTIONS:Q} \
+ ${CDIMAGE} cdrom
.if ${CDRELEASE} == false
release: prepare .WAIT prepare_md_post .WAIT copy-releasedir .WAIT image_md_pre .WAIT image .WAIT image_md_post
CVS commit: src/distrib/common
Module Name:src Committed By: christos Date: Wed May 8 16:08:08 UTC 2024 Modified Files: src/distrib/common: Makefile.bootcd Log Message: Fail on incomplete mtree specs To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/distrib/common/Makefile.bootcd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/makefs
Module Name:src
Committed By: christos
Date: Wed May 8 15:57:56 UTC 2024
Modified Files:
src/usr.sbin/makefs: makefs.8 makefs.c walk.c
Log Message:
Add an option to warn and error out for mtree missing entries.
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/usr.sbin/makefs/makefs.8
cvs rdiff -u -r1.57 -r1.58 src/usr.sbin/makefs/makefs.c
cvs rdiff -u -r1.39 -r1.40 src/usr.sbin/makefs/walk.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/makefs/makefs.8
diff -u src/usr.sbin/makefs/makefs.8:1.71 src/usr.sbin/makefs/makefs.8:1.72
--- src/usr.sbin/makefs/makefs.8:1.71 Thu Nov 17 01:40:41 2022
+++ src/usr.sbin/makefs/makefs.8 Wed May 8 11:57:56 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: makefs.8,v 1.71 2022/11/17 06:40:41 chs Exp $
+.\" $NetBSD: makefs.8,v 1.72 2024/05/08 15:57:56 christos Exp $
.\"
.\" Copyright (c) 2001-2003 Wasabi Systems, Inc.
.\" All rights reserved.
@@ -33,7 +33,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd April 4, 2021
+.Dd May 8, 2024
.Dt MAKEFS 8
.Os
.Sh NAME
@@ -260,6 +260,10 @@ ISO/Ecma UDF file system.
.El
.It Fl x
Exclude file system nodes not explicitly listed in the specfile.
+Repeating this flag causes
+.Nm
+to print a warning for each missing system nodes and exit with an error code
+if there are any missing.
.It Fl Z
Create a sparse file for
.Sy ffs .
Index: src/usr.sbin/makefs/makefs.c
diff -u src/usr.sbin/makefs/makefs.c:1.57 src/usr.sbin/makefs/makefs.c:1.58
--- src/usr.sbin/makefs/makefs.c:1.57 Sun Feb 18 11:59:16 2024
+++ src/usr.sbin/makefs/makefs.c Wed May 8 11:57:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: makefs.c,v 1.57 2024/02/18 16:59:16 christos Exp $ */
+/* $NetBSD: makefs.c,v 1.58 2024/05/08 15:57:56 christos Exp $ */
/*
* Copyright (c) 2001-2003 Wasabi Systems, Inc.
@@ -41,7 +41,7 @@
#include
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: makefs.c,v 1.57 2024/02/18 16:59:16 christos Exp $");
+__RCSID("$NetBSD: makefs.c,v 1.58 2024/05/08 15:57:56 christos Exp $");
#endif /* !__lint */
#include
@@ -261,7 +261,7 @@ main(int argc, char *argv[])
break;
case 'x':
- fsoptions.onlyspec = 1;
+ fsoptions.onlyspec++;
break;
case 'Z':
Index: src/usr.sbin/makefs/walk.c
diff -u src/usr.sbin/makefs/walk.c:1.39 src/usr.sbin/makefs/walk.c:1.40
--- src/usr.sbin/makefs/walk.c:1.39 Wed Apr 24 17:59:39 2024
+++ src/usr.sbin/makefs/walk.c Wed May 8 11:57:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: walk.c,v 1.39 2024/04/24 21:59:39 rillig Exp $ */
+/* $NetBSD: walk.c,v 1.40 2024/05/08 15:57:56 christos Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -41,7 +41,7 @@
#include
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: walk.c,v 1.39 2024/04/24 21:59:39 rillig Exp $");
+__RCSID("$NetBSD: walk.c,v 1.40 2024/05/08 15:57:56 christos Exp $");
#endif /* !__lint */
#include
@@ -65,6 +65,7 @@ static void apply_specentry(const char
static fsnode *create_fsnode(const char *, const char *, const char *,
struct stat *);
static fsinode *link_check(fsinode *);
+static size_t missing = 0;
/*
* fsnode_cmp --
@@ -429,6 +430,9 @@ apply_specfile(const char *specfile, con
apply_specdir(dir, root, parent, speconly);
free_nodes(root);
+ if (missing)
+ errx(EXIT_FAILURE, "Add %zu missing entries in `%s'",
+ missing, specfile);
}
static void
@@ -469,6 +473,11 @@ apply_specdir(const char *dir, NODE *spe
break;
}
if (curnode == NULL) {
+if (speconly > 1) {
+ warnx("missing specfile entry for %s/%s",
+ dir, curfsnode->name);
+ missing++;
+}
if (debug & DEBUG_APPLY_SPECONLY) {
printf("%s: trimming %s/%s %p\n",
__func__, dir, curfsnode->name,
CVS commit: src/usr.sbin/makefs
Module Name:src Committed By: christos Date: Wed May 8 15:57:56 UTC 2024 Modified Files: src/usr.sbin/makefs: makefs.8 makefs.c walk.c Log Message: Add an option to warn and error out for mtree missing entries. To generate a diff of this commit: cvs rdiff -u -r1.71 -r1.72 src/usr.sbin/makefs/makefs.8 cvs rdiff -u -r1.57 -r1.58 src/usr.sbin/makefs/makefs.c cvs rdiff -u -r1.39 -r1.40 src/usr.sbin/makefs/walk.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 May 7 20:33:20 UTC 2024 Modified Files: src/distrib/common: Makefile.bootcd Log Message: PR/58196: Jan-Benedict Glaw: If there was no spec file specified, generate one on the fly. Should fix reproducible builds where the mode and the ownership/group is not fixed and picked up from the filesystem. To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/distrib/common/Makefile.bootcd 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 May 7 20:33:20 UTC 2024
Modified Files:
src/distrib/common: Makefile.bootcd
Log Message:
PR/58196: Jan-Benedict Glaw: If there was no spec file specified, generate
one on the fly. Should fix reproducible builds where the mode and the
ownership/group is not fixed and picked up from the filesystem.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/distrib/common/Makefile.bootcd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.48 src/distrib/common/Makefile.bootcd:1.49
--- src/distrib/common/Makefile.bootcd:1.48 Thu Apr 25 07:56:51 2024
+++ src/distrib/common/Makefile.bootcd Tue May 7 16:33:20 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.48 2024/04/25 11:56:51 nia Exp $
+# $NetBSD: Makefile.bootcd,v 1.49 2024/05/07 20:33:20 christos Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -106,6 +106,7 @@ _CDMAKEFSOPTIONS= rockridge,label=${ISO_
MAKEFS_TIMESTAMP=-T "${MKREPRO_TIMESTAMP}"
PAX_TIMESTAMP=--timestamp "${MKREPRO_TIMESTAMP}"
.endif
+MAKESPEC= ${HOST_SH} ${NETBSDSRCDIR}/etc/makespec
.if ${MKUNPRIVED} == "no"
CD_METALOG.unpriv=
@@ -321,8 +322,8 @@ image:
.if defined(SPEC_EXTRA)
cat ${SPEC_EXTRA} >> ${WORKSPEC}
.endif
- if [ -s ${WORKSPEC} ]; then specarg="-F ${WORKSPEC}"; fi; \
- ${TOOL_MAKEFS} -N ${NETBSDSRCDIR}/etc -t cd9660 $${specarg} \
+ if [ ! -s ${WORKSPEC} ]; then ${MAKESPEC} cdrom > ${WORKSPEC}; fi
+ ${TOOL_MAKEFS} -N ${NETBSDSRCDIR}/etc -t cd9660 -F ${WORKSPEC} \
${MAKEFS_TIMESTAMP} ${CDMAKEFSEXTRAOPTS} -o ${_CDMAKEFSOPTIONS:Q} ${CDIMAGE} cdrom
.if ${CDRELEASE} == false
CVS commit: src/etc
Module Name:src Committed By: christos Date: Tue May 7 20:30:33 UTC 2024 Added Files: src/etc: makespec Log Message: Simple script to create an mtree spec file from a directory tree with fixed default owner/group/perms. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/etc/makespec Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc
Module Name:src
Committed By: christos
Date: Tue May 7 20:30:33 UTC 2024
Added Files:
src/etc: makespec
Log Message:
Simple script to create an mtree spec file from a directory tree with
fixed default owner/group/perms.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/etc/makespec
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/etc/makespec
diff -u /dev/null src/etc/makespec:1.1
--- /dev/null Tue May 7 16:30:33 2024
+++ src/etc/makespec Tue May 7 16:30:33 2024
@@ -0,0 +1,71 @@
+#!/bin/sh
+#
+# Copyright (c) 2024 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.
+#
+# Create an mtree spec file with per file type defaults
+
+TYPES="b c d f l p s"
+
+getmode() {
+ case $1 in
+ b|c) echo 0600;;
+ d) echo 0755;;
+ f) echo 0644;;
+ l) echo 0777;;
+ p|s) echo 0666;;
+ *) echo "*error $1*";;
+ esac
+}
+
+gettype() {
+ case $1 in
+ b) echo block;;
+ c) echo char;;
+ d) echo dir;;
+ f) echo file;;
+ l) echo link;;
+ p) echo fifo;;
+ s) echo socket;;
+ *) echo "*error $1*";;
+ esac
+}
+
+if [ -z "$1" ]; then
+ echo "Usage: $0 " 1>&2
+ exit 1
+fi
+
+cd "$1"
+for i in $TYPES; do
+
+ t=$(gettype $i)
+ m=$(getmode $i)
+ find . -type $i -exec \
+ printf "%s type=$t uname=root gname=wheel mode=$m\n" {} \;
+
+done | sort
CVS commit: src/share/man/man9
Module Name:src Committed By: christos Date: Tue May 7 15:40:15 UTC 2024 Modified Files: src/share/man/man9: ltsleep.9 Log Message: also mention kpause(9) here. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/share/man/man9/ltsleep.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man9
Module Name:src Committed By: christos Date: Tue May 7 15:40:15 UTC 2024 Modified Files: src/share/man/man9: ltsleep.9 Log Message: also mention kpause(9) here. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/share/man/man9/ltsleep.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/ltsleep.9 diff -u src/share/man/man9/ltsleep.9:1.19 src/share/man/man9/ltsleep.9:1.20 --- src/share/man/man9/ltsleep.9:1.19 Thu Aug 27 10:14:00 2020 +++ src/share/man/man9/ltsleep.9 Tue May 7 11:40:15 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: ltsleep.9,v 1.19 2020/08/27 14:14:00 fcambus Exp $ +.\" $NetBSD: ltsleep.9,v 1.20 2024/05/07 15:40:15 christos Exp $ .\" .\" Copyright (c) 1996, 2002, 2007 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 March 22, 2014 +.Dd May 7, 2024 .Dt LTSLEEP 9 .Os .Sh NAME @@ -270,6 +270,7 @@ require amending to remove .Xr sigaction 2 , .Xr condvar 9 , .Xr hz 9 , +.Xr kpause 9 , .Xr mutex 9 , .Xr rwlock 9 .Sh HISTORY
CVS commit: src/usr.bin/gzip
Module Name:src
Committed By: christos
Date: Sat May 4 13:18:06 UTC 2024
Modified Files:
src/usr.bin/gzip: unlz.c
Log Message:
PR/58233: RVP: Fix lzip dictionary size calculation
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/gzip/unlz.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/gzip/unlz.c
diff -u src/usr.bin/gzip/unlz.c:1.9 src/usr.bin/gzip/unlz.c:1.10
--- src/usr.bin/gzip/unlz.c:1.9 Sat May 4 09:17:03 2024
+++ src/usr.bin/gzip/unlz.c Sat May 4 09:18:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: unlz.c,v 1.9 2024/05/04 13:17:03 christos Exp $ */
+/* $NetBSD: unlz.c,v 1.10 2024/05/04 13:18:06 christos Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -602,7 +602,7 @@ static unsigned
lz_get_dict_size(unsigned char c)
{
unsigned dict_size = 1 << (c & 0x1f);
- dict_size -= (dict_size >> 2) * ( (c >> 5) & 0x7);
+ dict_size -= (dict_size >> 4) * ( (c >> 5) & 0x7);
if (dict_size < MIN_DICTIONARY_SIZE || dict_size > MAX_DICTIONARY_SIZE)
return 0;
return dict_size;
CVS commit: src/usr.bin/gzip
Module Name:src Committed By: christos Date: Sat May 4 13:18:06 UTC 2024 Modified Files: src/usr.bin/gzip: unlz.c Log Message: PR/58233: RVP: Fix lzip dictionary size calculation To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/usr.bin/gzip/unlz.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/gzip
Module Name:src
Committed By: christos
Date: Sat May 4 13:17:03 UTC 2024
Modified Files:
src/usr.bin/gzip: unlz.c unxz.c
Log Message:
PR/58223: RVP: Don't write to stdout when testing.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/gzip/unlz.c src/usr.bin/gzip/unxz.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/gzip/unlz.c
diff -u src/usr.bin/gzip/unlz.c:1.8 src/usr.bin/gzip/unlz.c:1.9
--- src/usr.bin/gzip/unlz.c:1.8 Sat Jun 10 00:45:25 2023
+++ src/usr.bin/gzip/unlz.c Sat May 4 09:17:03 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: unlz.c,v 1.8 2023/06/10 04:45:25 simonb Exp $ */
+/* $NetBSD: unlz.c,v 1.9 2024/05/04 13:17:03 christos Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -295,7 +295,7 @@ lz_flush(struct lz_decoder *lz)
size_t size = (size_t)offs;
lz_crc_update(>crc, lz->obuf + lz->spos, size);
- if (fwrite(lz->obuf + lz->spos, 1, size, lz->fout) != size)
+ if (!tflag && fwrite(lz->obuf + lz->spos, 1, size, lz->fout) != size)
return -1;
lz->wrapped = lz->pos >= lz->dict_size;
Index: src/usr.bin/gzip/unxz.c
diff -u src/usr.bin/gzip/unxz.c:1.8 src/usr.bin/gzip/unxz.c:1.9
--- src/usr.bin/gzip/unxz.c:1.8 Sat Oct 6 12:36:45 2018
+++ src/usr.bin/gzip/unxz.c Sat May 4 09:17:03 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: unxz.c,v 1.8 2018/10/06 16:36:45 martin Exp $ */
+/* $NetBSD: unxz.c,v 1.9 2024/05/04 13:17:03 christos Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: unxz.c,v 1.8 2018/10/06 16:36:45 martin Exp $");
+__RCSID("$NetBSD: unxz.c,v 1.9 2024/05/04 13:17:03 christos Exp $");
#include
#include
@@ -99,7 +99,8 @@ unxz(int i, int o, char *pre, size_t pre
if (strm.avail_out == 0 || ret != LZMA_OK) {
const size_t write_size = sizeof(obuf) - strm.avail_out;
- if (write(o, obuf, write_size) != (ssize_t)write_size)
+ if (!tflag &&
+ write(o, obuf, write_size) != (ssize_t)write_size)
maybe_err("write failed");
strm.next_out = obuf;
CVS commit: src/usr.bin/gzip
Module Name:src Committed By: christos Date: Sat May 4 13:17:03 UTC 2024 Modified Files: src/usr.bin/gzip: unlz.c unxz.c Log Message: PR/58223: RVP: Don't write to stdout when testing. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/usr.bin/gzip/unlz.c src/usr.bin/gzip/unxz.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
