From nobody Thu Oct 17 18:20:04 2024 X-Original-To: dev-commits-src-all@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 4XTx2q4c7Sz5ZJs5 for ; Thu, 17 Oct 2024 18:20:19 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) (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 4XTx2p2XQLz4K9W for ; Thu, 17 Oct 2024 18:20:18 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pf1-x42f.google.com with SMTP id d2e1a72fcca58-71e579abb99so881852b3a.2 for ; Thu, 17 Oct 2024 11:20:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1729189217; x=1729794017; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=OujFCyRD9/bGHhZBxfS/h+Ld/xrgT3Vb5iFzLkw+eys=; b=o80C2XUp4wYHjo4WHwgOAsKYTmyGFEKW5i1hCfkDVUhi7wVRWohoPh4zgojQY13v9M 5vfHjVr/U9OMoxbXpqVvFsPa/WLrHpapmKpMZ5QXYpm9ye94mQPkY6jMW+qkN7O1A3Vr QsclcmL+aDTzKM/cxAynwSaiAR/f+2rkmh150YURD9buDEOfAYLfn0bii/1fwaRXGwNv r/KCl79AV0gj7VBrE9TGDWA55pBDeQouQYLGbPwb/XQEZIPB/GWJOjvoHaO+mD7kYLcb EvnvlZp9C4CWUCISVqsaI12iwluP82r/M3b+ch5NZZ8sf3WLWgfe940F9GZ0FOXKa6sz spFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729189217; x=1729794017; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=OujFCyRD9/bGHhZBxfS/h+Ld/xrgT3Vb5iFzLkw+eys=; b=R9yhpAT8Tmf8D2ebrX1kuTrkbvKSWwz+3IwLc46wHivIsuIBy1QY9WvEjAgfsLZGT0 4stEKh3C1h/Wjw3UD6XSUyEBS8nPMWoNh7Ec4LNpmtVOytUaBtBwSckNVbM43XfQc/Ny wMrMVI44jcjDI31Ify0VVVOie4L3rtNGakeAxElVWrnBCB+jDRIFxRnuBISmJXzbAy+S NNl7HXMgVLimffges6AIGQyokXCB7w9OeB2NGY0KekHnH78fgek0FD2YVjx/BGzZxlq4 JSrSsVrQ4vre7GJqMQ/FRPx2RBMpF446pepHs6JBOtYWK1k2jIxsQEWqUDP/+qPvnzDO ky3A== X-Forwarded-Encrypted: i=1; AJvYcCUXd7BRagrqI6aYbAOq31bxDq749H5l1kPnHVeZvikMvqdv57E55Nm0zS9cgyMhHkDoNm0KYRJH3r93Zf8npvQicypK@freebsd.org X-Gm-Message-State: AOJu0YwRG7QvGW7L3bTYyToCg0Oirmgla4sdFv82p4UJ3oLXe8s3zcYM CZntYfIFGIDoeHv824xZDcYpYEeTKoLBKQtA1yY9FLTspvLHebYOUUNIvsPrB5aZa5d2WuIFNNd wbPx+7zhtni3u7X79WoMvvCJevKShiQiT7YiW2Q== X-Google-Smtp-Source: AGHT+IHVNYrLW0Kl7tlopYDP05azYEkKTx3/Hx55VhqXvU1SJVNHT9GJS4aPAhmeIYQ71j0Sng3wiuGCcMaGJYPRxzM= X-Received: by 2002:a05:6a21:918b:b0:1d8:d6aa:995d with SMTP id adf61e73a8af0-1d905ea1dbbmr13140987637.1.1729189216811; Thu, 17 Oct 2024 11:20:16 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <202410122058.49CKwkrP038188@gitrepo.freebsd.org> In-Reply-To: From: Warner Losh Date: Thu, 17 Oct 2024 12:20:04 -0600 Message-ID: Subject: Re: git: 1a37caeb076b - main - modules: Add missing opt_*.h files for stand-alone compile To: Wolfram Schneider Cc: Warner Losh , src-committers , "" , "" Content-Type: multipart/alternative; boundary="000000000000049b280624b03d26" 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:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4XTx2p2XQLz4K9W X-Spamd-Bar: ---- --000000000000049b280624b03d26 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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=3D1a37caeb076b9d31e13c54691d7f1ee= b589798bb > > > > 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 "amd= 64" > > SRCS+=3D linux_dummy_x86.c > > VDSODEPS=3Dlinux_vdso_gettc_x86.inc > > diff --git a/sys/modules/linux64/Makefile b/sys/modules/linux64/Makefil= e > > 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 > > After this commit I get stale symlinks in /usr/obj > > make -j$(nproc) buildworld > log.buildworld 2>&1; make -j$(nproc) > buildkernel >& log.buildkernel; > ./tools/build/stale-symlink-buildworld.sh > > 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/sy= s/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/sy= s/GENERIC/opt_compat.h > > stale symlink detected: lrwxrwxr-x 1 wosch wheel 95 Oct 17 17:00 > > /scratch/tmp/wosch/freebsd/home/wosch/projects/freebsd-src/amd64.amd64/sy= s/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/sy= s/GENERIC/opt_compat.h > > 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 > > see also PR: 276235 > The symlinks look right to me. What makes them stale? Warner > -Wolfram > > -- > Wolfram Schneider https://wolfram.schneider.org > --000000000000049b280624b03d26 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Thu, Oct 17, 2024, 11:29=E2=80=AFAM Wolfram Schneid= er <wosch@freebsd.org> wrote= :
On Sat, 12 Oct 2024 at 22:58, War= ner Losh <imp@freebsd.org> wrote:
>
> The branch main has been updated by imp:
>
> URL: https://cgit.FreeBSD.org/src/commit/?id=3D1a37caeb076b9d31e13c54691d7f1e= eb589798bb
>
> commit 1a37caeb076b9d31e13c54691d7f1eeb589798bb
> Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> AuthorDate: 2024-10-12 20:40:41 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> CommitDate: 2024-10-12 20:40:41 +0000
>
>=C2=A0 =C2=A0 =C2=A0modules: Add missing opt_*.h files for stand-alone = compile
>
>=C2=A0 =C2=A0 =C2=A0Standalone compile that we at least create these op= t_*.h files.
>
>=C2=A0 =C2=A0 =C2=A0Sponsored by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0Netflix
> ---
>=C2=A0 sys/modules/linux/Makefile=C2=A0 =C2=A0| 2 ++
>=C2=A0 sys/modules/linux64/Makefile | 5 ++++-
>=C2=A0 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 \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0linux_uid16.c \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0linux_vdso.c \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0linux_xattr.c \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0opt_compat.h \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0opt_inet.h \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0opt_inet6.h \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0opt_ktrace.h \
> @@ -41,6 +42,7 @@ SRCS=3D linux${SFX}_dummy_machdep.c \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0bus_if.h \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0device_if.h \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0vnode_if.h
> +
>=C2=A0 .if ${MACHINE_CPUARCH} =3D=3D "i386" || ${MACHINE_CPUA= RCH} =3D=3D "amd64"
>=C2=A0 SRCS+=3D linux_dummy_x86.c
>=C2=A0 VDSODEPS=3Dlinux_vdso_gettc_x86.inc
> diff --git a/sys/modules/linux64/Makefile b/sys/modules/linux64/Makefi= le
> index b23891a65a4f..119d90126ab3 100644
> --- a/sys/modules/linux64/Makefile
> +++ b/sys/modules/linux64/Makefile
> @@ -28,14 +28,17 @@ SRCS=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0linux_dummy_mach= dep.c \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0linux_vdso.c \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0linux_timer.c \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0linux_xattr.c \
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0opt_ktrace.h \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0opt_compat.h \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0opt_inet6.h \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0opt_ktrace.h \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0opt_posix.h \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0opt_usb.h \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0bus_if.h \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0device_if.h \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0vnode_if.h \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0linux_support.S \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0linux_vdso_inc.S
> +
>=C2=A0 .if ${MACHINE_CPUARCH} =3D=3D "amd64"
>=C2=A0 SRCS+=3D linux_dummy_x86.c
>=C2=A0 .endif

After this commit I get stale symlinks in /usr/obj

make -j$(nproc) buildworld=C2=A0 > log.buildworld 2>&1; make -j$(= nproc)
buildkernel >& log.buildkernel;
./tools/build/stale-symlink-buildworld.sh

amd64:
stale symlink detected: lrwxrwxr-x=C2=A0 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_compa= t.h
-> /scratch/tmp/wosch/freebsd/home/wosch/projects/freebsd-src/amd64.amd6= 4/sys/GENERIC/opt_compat.h

stale symlink detected: lrwxrwxr-x=C2=A0 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_com= pat.h
-> /scratch/tmp/wosch/freebsd/home/wosch/projects/freebsd-src/amd64.amd6= 4/sys/GENERIC/opt_compat.h

arm64:
stale symlink detected: lrwxr-xr-x=C2=A0 1 root wheel 73 Oct 17 17:18
/usr/obj/home/projects/freebsd-src/arm64.aarch64/sys/GENERIC/modules/home/p= rojects/freebsd-src/sys/modules/linux64/opt_compat.h
-> /usr/obj/home/projects/freebsd-src/arm64.aarch64/sys/GENERIC/opt_comp= at.h

see also PR: 276235

The symlinks look right to me. What makes them stale?

Warner=C2=A0


-Wolfram

--
Wolfram Schneider <wosch@FreeBSD.org> https://wolfram.= schneider.org
--000000000000049b280624b03d26--