From nobody Thu Oct 17 18:26:13 2024 X-Original-To: dev-commits-src-main@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 4XTx9v3Msbz5ZKg4 for ; Thu, 17 Oct 2024 18:26:27 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XTx9t4Zjlz4KtJ for ; Thu, 17 Oct 2024 18:26:26 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-431137d12a5so13085705e9.1 for ; Thu, 17 Oct 2024 11:26:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729189585; x=1729794385; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jiJLYUIkBH+ZI7sxgAR9U39g0uj/5blLJCg17Z0ZbO4=; b=sEg6E4dQqnDocgOerKcsLu4TJsQJEFydv7gnjlTkzxD3zaYObSYjKaMQ5xxQklYG8M g5hygicMkYH4CZ/dwHl0fDWlnfA4jRScbu7n//yHdC2lJKRNecSHKvoQi6pKBBQmfTNh FEB11VlbEbxjqDUGPCTCNYNFO+xlmBLqDcEcE472/PE5JDhtTy4uwW+XvSLhrSFlYvRm gktG+p2pBCLmmzl/gjXdEqcCPiqVJs8PuleatcqFa20atUXtM8xNAgk7IrcrcicIHUUH DDeW63iZUnKL4WoE4jwEZtC8CudGr5WBks49ghmJSa8og1X1ikK2jyzzp+IiJBlURPiD sIOg== X-Forwarded-Encrypted: i=1; AJvYcCXLh4/BCjn6wuR2gcHiIoIpXGiQiqoey9/EldGdqYS3ODzYduoj+K1oV7r/ovWBPUFzueFhwAhAU7ketPz9ifSOgWBH4g==@freebsd.org X-Gm-Message-State: AOJu0YxtSqodoO2zyfs6Ba0UmP++eDvWNOd7wXozLTolEI9GtL0l7Q1v QnEn6NVGtevoP0a3UNXZOYl8XnTBCDS55Z9k+xP6LlWk5GShvVlfLamfYVEuDIU= X-Google-Smtp-Source: AGHT+IFoJ8rD7iDgA8tOcJc3kN4iDrva5YFDoZ44bp2bwvM0Jkhexffe1WA1VEIMLbPyshY/W2fwKw== X-Received: by 2002:a05:600c:3d86:b0:431:5655:1ef3 with SMTP id 5b1f17b1804b1-4315655218dmr34132265e9.23.1729189584937; Thu, 17 Oct 2024 11:26:24 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.201]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-431606d55a7sm3243225e9.39.2024.10.17.11.26.24 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Oct 2024 11:26:24 -0700 (PDT) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3818.100.11.1.3\)) Subject: Re: git: 1a37caeb076b - main - modules: Add missing opt_*.h files for stand-alone compile From: Jessica Clarke In-Reply-To: Date: Thu, 17 Oct 2024 19:26:13 +0100 Cc: Wolfram Schneider , Warner Losh , src-committers , "" , "" Content-Transfer-Encoding: quoted-printable Message-Id: <8549EB6C-DB57-4ECC-8020-C799F9789D5F@freebsd.org> References: <202410122058.49CKwkrP038188@gitrepo.freebsd.org> To: Warner Losh X-Mailer: Apple Mail (2.3818.100.11.1.3) X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4XTx9t4Zjlz4KtJ X-Spamd-Bar: ---- On 17 Oct 2024, at 19:20, Warner Losh wrote: >=20 >=20 >=20 > On Thu, Oct 17, 2024, 11:29=E2=80=AFAM Wolfram Schneider = wrote: >> On Sat, 12 Oct 2024 at 22:58, Warner Losh wrote: >> > >> > The branch main has been updated by imp: >> > >> > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D1a37caeb076b9d31e13c54691d7f1eeb= 589798bb >> > >> > commit 1a37caeb076b9d31e13c54691d7f1eeb589798bb >> > Author: Warner Losh >> > AuthorDate: 2024-10-12 20:40:41 +0000 >> > Commit: Warner Losh >> > CommitDate: 2024-10-12 20:40:41 +0000 >> > >> > modules: Add missing opt_*.h files for stand-alone compile >> > >> > Standalone compile that we at least create these opt_*.h files. >> > >> > Sponsored by: Netflix >> > --- >> > sys/modules/linux/Makefile | 2 ++ >> > sys/modules/linux64/Makefile | 5 ++++- >> > 2 files changed, 6 insertions(+), 1 deletion(-) >> > >> > diff --git a/sys/modules/linux/Makefile = b/sys/modules/linux/Makefile >> > index eb4e17ec706b..36dfbbe2192f 100644 >> > --- a/sys/modules/linux/Makefile >> > +++ b/sys/modules/linux/Makefile >> > @@ -33,6 +33,7 @@ SRCS=3D linux${SFX}_dummy_machdep.c \ >> > linux_uid16.c \ >> > linux_vdso.c \ >> > linux_xattr.c \ >> > + opt_compat.h \ >> > opt_inet.h \ >> > opt_inet6.h \ >> > opt_ktrace.h \ >> > @@ -41,6 +42,7 @@ SRCS=3D linux${SFX}_dummy_machdep.c \ >> > bus_if.h \ >> > device_if.h \ >> > vnode_if.h >> > + >> > .if ${MACHINE_CPUARCH} =3D=3D "i386" || ${MACHINE_CPUARCH} =3D=3D = "amd64" >> > SRCS+=3D linux_dummy_x86.c >> > VDSODEPS=3Dlinux_vdso_gettc_x86.inc >> > diff --git a/sys/modules/linux64/Makefile = b/sys/modules/linux64/Makefile >> > index b23891a65a4f..119d90126ab3 100644 >> > --- a/sys/modules/linux64/Makefile >> > +++ b/sys/modules/linux64/Makefile >> > @@ -28,14 +28,17 @@ SRCS=3D linux_dummy_machdep.c \ >> > linux_vdso.c \ >> > linux_timer.c \ >> > linux_xattr.c \ >> > - opt_ktrace.h \ >> > + opt_compat.h \ >> > opt_inet6.h \ >> > + opt_ktrace.h \ >> > opt_posix.h \ >> > + opt_usb.h \ >> > bus_if.h \ >> > device_if.h \ >> > vnode_if.h \ >> > linux_support.S \ >> > linux_vdso_inc.S >> > + >> > .if ${MACHINE_CPUARCH} =3D=3D "amd64" >> > SRCS+=3D linux_dummy_x86.c >> > .endif >>=20 >> After this commit I get stale symlinks in /usr/obj >>=20 >> make -j$(nproc) buildworld > log.buildworld 2>&1; make -j$(nproc) >> buildkernel >& log.buildkernel; >> ./tools/build/stale-symlink-buildworld.sh >>=20 >> amd64: >> stale symlink detected: lrwxrwxr-x 1 wosch wheel 95 Oct 17 17:00 >> = /scratch/tmp/wosch/freebsd/home/wosch/projects/freebsd-src/amd64.amd64/sys= /GENERIC/modules/home/wosch/projects/freebsd-src/sys/modules/linux/opt_com= pat.h >> -> = /scratch/tmp/wosch/freebsd/home/wosch/projects/freebsd-src/amd64.amd64/sys= /GENERIC/opt_compat.h >>=20 >> stale symlink detected: lrwxrwxr-x 1 wosch wheel 95 Oct 17 17:00 >> = /scratch/tmp/wosch/freebsd/home/wosch/projects/freebsd-src/amd64.amd64/sys= /GENERIC/modules/home/wosch/projects/freebsd-src/sys/modules/linux64/opt_c= ompat.h >> -> = /scratch/tmp/wosch/freebsd/home/wosch/projects/freebsd-src/amd64.amd64/sys= /GENERIC/opt_compat.h >>=20 >> arm64: >> stale symlink detected: lrwxr-xr-x 1 root wheel 73 Oct 17 17:18 >> = /usr/obj/home/projects/freebsd-src/arm64.aarch64/sys/GENERIC/modules/home/= projects/freebsd-src/sys/modules/linux64/opt_compat.h >> -> = /usr/obj/home/projects/freebsd-src/arm64.aarch64/sys/GENERIC/opt_compat.h >>=20 >> see also PR: 276235 >=20 > The symlinks look right to me. What makes them stale? Given the script does find -H -type l, it=E2=80=99ll be that they point = to non-existent files. I don=E2=80=99t know what opt_compat.h is for = Netflix but there=E2=80=99s no such thing in-tree, these are the only references to = it. Jess