Date: Thu, 17 Oct 2024 19:26:13 +0100 From: Jessica Clarke <jrtc27@freebsd.org> To: Warner Losh <imp@bsdimp.com> Cc: Wolfram Schneider <wosch@freebsd.org>, Warner Losh <imp@freebsd.org>, src-committers <src-committers@freebsd.org>, "<dev-commits-src-all@freebsd.org>" <dev-commits-src-all@freebsd.org>, "<dev-commits-src-main@freebsd.org>" <dev-commits-src-main@freebsd.org> Subject: Re: git: 1a37caeb076b - main - modules: Add missing opt_*.h files for stand-alone compile Message-ID: <8549EB6C-DB57-4ECC-8020-C799F9789D5F@freebsd.org> In-Reply-To: <CANCZdfrVapV2VBvLFxAhMpbLeYPJRvV3BT1D3UxBP-nR2zPEiQ@mail.gmail.com> References: <202410122058.49CKwkrP038188@gitrepo.freebsd.org> <CAMWY7CDGAM_F3cn86DZuUgghF7g8BDnSgTbwr4s_JQPE8uUxKg@mail.gmail.com> <CANCZdfrVapV2VBvLFxAhMpbLeYPJRvV3BT1D3UxBP-nR2zPEiQ@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On 17 Oct 2024, at 19:20, Warner Losh <imp@bsdimp.com> wrote: >=20 >=20 >=20 > On Thu, Oct 17, 2024, 11:29=E2=80=AFAM Wolfram Schneider = <wosch@freebsd.org> wrote: >> On Sat, 12 Oct 2024 at 22:58, Warner Losh <imp@freebsd.org> wrote: >> > >> > The branch main has been updated by imp: >> > >> > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D1a37caeb076b9d31e13c54691d7f1eeb= 589798bb >> > >> > commit 1a37caeb076b9d31e13c54691d7f1eeb589798bb >> > Author: Warner Losh <imp@FreeBSD.org> >> > AuthorDate: 2024-10-12 20:40:41 +0000 >> > Commit: Warner Losh <imp@FreeBSD.org> >> > 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?8549EB6C-DB57-4ECC-8020-C799F9789D5F>