git: 54d487c4d01d - main - makesyscalls: don't make syscall.mk by default

The branch main has been updated by brooks:

URL: https://cgit.FreeBSD.org/src/commit/?id=54d487c4d01d68ef0ac03eae1fc574f7533d46f6

commit 54d487c4d01d68ef0ac03eae1fc574f7533d46f6
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2023-11-18 00:48:14 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2023-11-18 00:48:14 +0000

    makesyscalls: don't make syscall.mk by default
    
    We only want to produce syscall.mk for the main syscall table so default
    to not producing it (send it to /dev/null) and add a syscalls.conf to
    sys/kern to trigger the creation of sys/sys/syscall.mk.  This eliminates
    the need for entries in other syscalls.conf files and is a cleaner
    pattern going forward.
    
    Reviewed by:    kevans, imp
    Differential Revision:  https://reviews.freebsd.org/D42663
---
 sys/amd64/linux/syscalls.conf      | 1 -
 sys/amd64/linux32/syscalls.conf    | 1 -
 sys/arm64/linux/syscalls.conf      | 1 -
 sys/compat/freebsd32/syscalls.conf | 1 -
 sys/i386/linux/syscalls.conf       | 1 -
 sys/kern/Makefile                  | 1 -
 sys/kern/syscalls.conf             | 1 +
 sys/tools/makesyscalls.lua         | 2 +-
 8 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/sys/amd64/linux/syscalls.conf b/sys/amd64/linux/syscalls.conf
index b46b9e500553..2c6c1e45f8d9 100644
--- a/sys/amd64/linux/syscalls.conf
+++ b/sys/amd64/linux/syscalls.conf
@@ -3,7 +3,6 @@ sysproto="linux_proto.h"
 sysproto_h=_LINUX_SYSPROTO_H_
 syshdr="linux_syscall.h"
 syssw="linux_sysent.c"
-sysmk="/dev/null"
 syscallprefix="LINUX_SYS_"
 switchname="linux_sysent"
 namesname="linux_syscallnames"
diff --git a/sys/amd64/linux32/syscalls.conf b/sys/amd64/linux32/syscalls.conf
index 82ffa49fdbb8..e1b92f011d21 100644
--- a/sys/amd64/linux32/syscalls.conf
+++ b/sys/amd64/linux32/syscalls.conf
@@ -3,7 +3,6 @@ sysproto="linux32_proto.h"
 sysproto_h=_LINUX32_SYSPROTO_H_
 syshdr="linux32_syscall.h"
 syssw="linux32_sysent.c"
-sysmk="/dev/null"
 syscallprefix="LINUX32_SYS_"
 switchname="linux32_sysent"
 namesname="linux32_syscallnames"
diff --git a/sys/arm64/linux/syscalls.conf b/sys/arm64/linux/syscalls.conf
index b46b9e500553..2c6c1e45f8d9 100644
--- a/sys/arm64/linux/syscalls.conf
+++ b/sys/arm64/linux/syscalls.conf
@@ -3,7 +3,6 @@ sysproto="linux_proto.h"
 sysproto_h=_LINUX_SYSPROTO_H_
 syshdr="linux_syscall.h"
 syssw="linux_sysent.c"
-sysmk="/dev/null"
 syscallprefix="LINUX_SYS_"
 switchname="linux_sysent"
 namesname="linux_syscallnames"
diff --git a/sys/compat/freebsd32/syscalls.conf b/sys/compat/freebsd32/syscalls.conf
index af0409d8b3f1..055a041cf72a 100644
--- a/sys/compat/freebsd32/syscalls.conf
+++ b/sys/compat/freebsd32/syscalls.conf
@@ -3,7 +3,6 @@ sysproto="freebsd32_proto.h"
 sysproto_h=_FREEBSD32_SYSPROTO_H_
 syshdr="freebsd32_syscall.h"
 syssw="freebsd32_sysent.c"
-sysmk="/dev/null"
 syscallprefix="FREEBSD32_SYS_"
 switchname="freebsd32_sysent"
 namesname="freebsd32_syscallnames"
diff --git a/sys/i386/linux/syscalls.conf b/sys/i386/linux/syscalls.conf
index b46b9e500553..2c6c1e45f8d9 100644
--- a/sys/i386/linux/syscalls.conf
+++ b/sys/i386/linux/syscalls.conf
@@ -3,7 +3,6 @@ sysproto="linux_proto.h"
 sysproto_h=_LINUX_SYSPROTO_H_
 syshdr="linux_syscall.h"
 syssw="linux_sysent.c"
-sysmk="/dev/null"
 syscallprefix="LINUX_SYS_"
 switchname="linux_sysent"
 namesname="linux_syscallnames"
diff --git a/sys/kern/Makefile b/sys/kern/Makefile
index 839ad83b02e4..505175412661 100644
--- a/sys/kern/Makefile
+++ b/sys/kern/Makefile
@@ -2,7 +2,6 @@
 #
 # Makefile for init_sysent
 
-SYSENT_CONF=
 GENERATED=	init_sysent.c			\
 		syscalls.c			\
 		systrace_args.c			\
diff --git a/sys/kern/syscalls.conf b/sys/kern/syscalls.conf
new file mode 100644
index 000000000000..d328b992a45d
--- /dev/null
+++ b/sys/kern/syscalls.conf
@@ -0,0 +1 @@
+sysmk="../sys/syscall.mk"
diff --git a/sys/tools/makesyscalls.lua b/sys/tools/makesyscalls.lua
index f2d8f1a609b6..bf631ac2ffdd 100644
--- a/sys/tools/makesyscalls.lua
+++ b/sys/tools/makesyscalls.lua
@@ -46,7 +46,7 @@ local config = {
 	sysproto = "../sys/sysproto.h",
 	sysproto_h = "_SYS_SYSPROTO_H_",
 	syshdr = "../sys/syscall.h",
-	sysmk = "../sys/syscall.mk",
+	sysmk = "/dev/null",
 	syssw = "init_sysent.c",
 	syscallprefix = "SYS_",
 	switchname = "sysent",