From nobody Wed Dec 13 23:22:46 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SrBNR0dHYz54TWZ; Wed, 13 Dec 2023 23:22:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SrBNQ6vmjz3bqv; Wed, 13 Dec 2023 23:22:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702509767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+FLyqdq2b4yfMtUk0brXcDo4hLys1Q98VH3xjJM4a54=; b=eZFz0OPEZmEbsCr/l0uBdb41hj9GJvRYi1a8xr6MN2r7r+2I3o/Ur2f8keq6G9gkPNKu4H cN3rxLCNrJzWR/LBCPCafY/lurAd4jOX0du/FY8X0K5lISNDCTlKOBe1GYvAe76Kh0dOKK nF2nC1+JXfL8EZdC0SrHgQIcKQeWmj8C3zeoWy2eW9ljLvbqhPcttFVGe2u372eMa6VQ/B pEAeCOm+RVr1lg1ur6Yd0ZUgyaSqiEn8lH1D74rNrHENSl/i1OjgdamwG0hB6fLbTFQE/D s6aGbhYyUNYd9JeWmEQOTgartedTOnbh5CR5m1RwzCtjlL0K9g3UKJNdfuNxQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702509767; a=rsa-sha256; cv=none; b=UGMmh0a5FsuuzfDol96d+vCK1RT1+vr5FYM6YuB0tkv6CwEsKQY7kQluzLUeaJeVbip3G+ sE2J0zQWc1tMu0j2uF+gS8f9cpLiXCa4J0PSrFMH7bqL4cAYf88xd+tWuwABGrwvdYq4XU w8UuRfSGc2gu+tbtlRwR9mbLHa+TnBeW67UgHfpZdhZ+6Est3+kbTGYG7xKm453Ti8tVJv kji8VqY0FVNSGMbJ6o05b4AfQiEr9Y+rQ3t04RxSWRJQGdFj9UH8kTLzjTL1huSJBFGlqf EovF3QAjPGW1xN65PQYfxYP4zo7ND5kB5xpQYMh/w3ocQ7udi6KUFsMzDLYXXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702509767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+FLyqdq2b4yfMtUk0brXcDo4hLys1Q98VH3xjJM4a54=; b=Mu7Drq3BSBskiyfJHazxmkmsgWwfBbkL/KQEPMeD74k9P42HPthLRgx+vBitk7Om1GyFh9 sKuZgBra36CPOxCtgfwumGV531YLqGLNv5k4npxC+QEQ4gMbwfUs6y4V/klacNn2nYbp/9 /1GH8a+w3aViXBCW90ggdRtHfzalrjXQziJncRgOHIJHjl2oD2NFU/UV3WcU9t0NFOwQNH O1iTy+IQ5GgonWEuEtk8CcMa8iCYPnI97p5BZZjiySsGOKL+qvQoqa1AkgyGLw/o6cd+0O qfGERMybmC621UPcXcelsj0eiYePh5FM+c3bcJZHMJ7L8UfdUV8TWlv2hXgufg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SrBNQ5y3jz1Hhc; Wed, 13 Dec 2023 23:22:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BDNMkj0024440; Wed, 13 Dec 2023 23:22:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BDNMkv6024437; Wed, 13 Dec 2023 23:22:46 GMT (envelope-from git) Date: Wed, 13 Dec 2023 23:22:46 GMT Message-Id: <202312132322.3BDNMkv6024437@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 3ad2fd6fb11d - stable/14 - makesyscalls: don't make syscall.mk by default List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3ad2fd6fb11d36566aa9322bbc360eaf5232634f Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=3ad2fd6fb11d36566aa9322bbc360eaf5232634f commit 3ad2fd6fb11d36566aa9322bbc360eaf5232634f Author: Brooks Davis AuthorDate: 2023-11-18 00:48:14 +0000 Commit: Brooks Davis CommitDate: 2023-12-13 23:07:06 +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 (cherry picked from commit 54d487c4d01d68ef0ac03eae1fc574f7533d46f6) --- 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 a800de26a282..8a56310f0068 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",