From nobody Thu Oct 07 23:03:44 2021 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 67FCC12DBE93; Thu, 7 Oct 2021 23:03:44 +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 4HQRhJ2Y6Fz3Hmb; Thu, 7 Oct 2021 23:03:44 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 37E621C788; Thu, 7 Oct 2021 23:03:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 197N3i0B036891; Thu, 7 Oct 2021 23:03:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 197N3ijw036890; Thu, 7 Oct 2021 23:03:44 GMT (envelope-from git) Date: Thu, 7 Oct 2021 23:03:44 GMT Message-Id: <202110072303.197N3ijw036890@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 55c0af86ce74 - stable/13 - Bring the tags and links entries for amd64 up to date. 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: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 55c0af86ce740747e8f5d79131d2ef02d31f97c4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=55c0af86ce740747e8f5d79131d2ef02d31f97c4 commit 55c0af86ce740747e8f5d79131d2ef02d31f97c4 Author: Kirk McKusick AuthorDate: 2021-09-23 23:38:37 +0000 Commit: Kirk McKusick CommitDate: 2021-10-07 23:01:46 +0000 Bring the tags and links entries for amd64 up to date. Sponsored by: Netflix (cherry picked from commit 1c8d670cb633d39cea68cdeecab507d2ee264705) --- sys/amd64/Makefile | 8 +++++--- sys/kern/Make.tags.inc | 6 ------ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/sys/amd64/Makefile b/sys/amd64/Makefile index 2e87b95895e7..0f1367f859f2 100644 --- a/sys/amd64/Makefile +++ b/sys/amd64/Makefile @@ -14,7 +14,7 @@ all: @echo "make links or tags only" # Directories in which to place amd64 tags links -DAMD64= acpica amd64 ia32 include linux linux32 pci vmm +DAMD64= acpica amd64 ia32 include linux linux32 pci sgx vmm links:: -for i in ${COMMDIR1}; do \ @@ -22,13 +22,13 @@ links:: -for i in ${COMMDIR2}; do \ (cd $$i && { rm -f tags; ln -s ../../${TAGDIR}/tags tags; }) done -for i in ${DAMD64}; do \ - (cd $$i && { rm -f tags; ln -s ../tags tags; }) done + (cd ${SYS}/amd64/$$i && { rm -f tags; ln -s ../tags tags; }) done SAMD64= ${SYS}/amd64/acpica/*.[ch] \ ${SYS}/amd64/amd64/*.[ch] ${SYS}/amd64/ia32/*.[ch] \ ${SYS}/amd64/include/*.[ch] ${SYS}/amd64/linux/*.[ch] \ ${SYS}/amd64/linux32/*.[ch] ${SYS}/amd64/pci/*.[ch] \ - ${SYS}/amd64/vmm/*.[ch] + ${SYS}/amd64/sgx/*.[ch] ${SYS}/amd64/vmm/*.[ch] AAMD64= ${SYS}/amd64/amd64/*.S tags:: @@ -38,3 +38,5 @@ tags:: >> tags sort -o tags tags chmod 444 tags + rm -f ${SYS}/amd64/tags + mv tags ${SYS}/amd64/tags diff --git a/sys/kern/Make.tags.inc b/sys/kern/Make.tags.inc index cdefa98a32f6..23a85150c19a 100644 --- a/sys/kern/Make.tags.inc +++ b/sys/kern/Make.tags.inc @@ -12,12 +12,10 @@ SYS?= ${.CURDIR}/.. COMM= ${SYS}/sys/vnode.h \ ${SYS}/dev/alc/*.[ch] \ - ${SYS}/dev/en/*.[ch] \ ${SYS}/dev/iicbus/*.[ch] \ ${SYS}/dev/isp/*.[ch] \ ${SYS}/dev/ppbus/*.[ch] \ ${SYS}/dev/smbus/*.[ch] \ - ${SYS}/dev/vx/*.[ch] \ ${SYS}/fs/autofs/*.[ch] \ ${SYS}/fs/cd9660/*.[ch] \ ${SYS}/fs/cuse/*.[ch] \ @@ -44,7 +42,6 @@ COMM= ${SYS}/sys/vnode.h \ ${SYS}/netinet/*.[ch] \ ${SYS}/netinet6/*.[ch] \ ${SYS}/netipsec/*.[ch] \ - ${SYS}/netnatm/*.[ch] \ ${SYS}/ddb/*.[ch] \ ${SYS}/ufs/ffs/*.[ch] \ ${SYS}/ufs/ufs/*.[ch] \ @@ -58,19 +55,16 @@ COMMDIR1= ${SYS}/conf \ ${SYS}/netinet \ ${SYS}/netinet6 \ ${SYS}/netipsec \ - ${SYS}/netnatm \ ${SYS}/ddb \ ${SYS}/vm \ ${SYS}/sys COMMDIR2= ${SYS}/dev/alc \ - ${SYS}/dev/en \ ${SYS}/dev/iicbus \ ${SYS}/dev/isp \ ${SYS}/dev/md \ ${SYS}/dev/ppbus \ ${SYS}/dev/smbus \ - ${SYS}/dev/vx \ ${SYS}/fs/autofs \ ${SYS}/fs/cd9660 \ ${SYS}/fs/cuse \