Date: Thu, 17 Oct 2024 12:56:00 -0600 From: Warner Losh <imp@bsdimp.com> To: Jessica Clarke <jrtc27@freebsd.org> 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: <CANCZdfoDVhZ8x2LLh0tGhhzUpHc%2BphUdpeWOD66JzQj34OOZ5Q@mail.gmail.com> In-Reply-To: <8549EB6C-DB57-4ECC-8020-C799F9789D5F@freebsd.org> References: <202410122058.49CKwkrP038188@gitrepo.freebsd.org> <CAMWY7CDGAM_F3cn86DZuUgghF7g8BDnSgTbwr4s_JQPE8uUxKg@mail.gmail.com> <CANCZdfrVapV2VBvLFxAhMpbLeYPJRvV3BT1D3UxBP-nR2zPEiQ@mail.gmail.com> <8549EB6C-DB57-4ECC-8020-C799F9789D5F@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On Thu, Oct 17, 2024 at 12:26 PM Jessica Clarke <jrtc27@freebsd.org> wrote: > On 17 Oct 2024, at 19:20, Warner Losh <imp@bsdimp.com> wrote: > > > > > > > > On Thu, Oct 17, 2024, 11:29 AM 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=1a37caeb076b9d31e13c54691d7f1eeb589798bb > >> > > >> > 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= 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= linux${SFX}_dummy_machdep.c \ > >> > bus_if.h \ > >> > device_if.h \ > >> > vnode_if.h > >> > + > >> > .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" > >> > SRCS+= linux_dummy_x86.c > >> > VDSODEPS=linux_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= 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} == "amd64" > >> > SRCS+= 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/sys/GENERIC/modules/home/wosch/projects/freebsd-src/sys/modules/linux/opt_compat.h > >> -> > /scratch/tmp/wosch/freebsd/home/wosch/projects/freebsd-src/amd64.amd64/sys/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/sys/GENERIC/modules/home/wosch/projects/freebsd-src/sys/modules/linux64/opt_compat.h > >> -> > /scratch/tmp/wosch/freebsd/home/wosch/projects/freebsd-src/amd64.amd64/sys/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? > > Given the script does find -H -type l, it’ll be that they point to > non-existent files. I don’t know what opt_compat.h is for Netflix but > there’s no such thing in-tree, these are the only references to it. > Ah, but there use to be... I rebased a tree that had a number of similar cleanups across its removal and didn't notice. And my checks of my tree turned that file up, but I didn't notice it was in a tree I'd not built out of since before the change: commit 06c07e1203324bfe8ab4526c82dbb750864272d5 Author: Dmitry Chagin <dchagin@FreeBSD.org> Date: Mon Feb 13 19:07:38 2023 +0300 Complete removal of opt_compat.h Since Linux emulation layer build options was removed there is no reason to keep opt_compat.h. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D38548 MFC after: 2 weeks So I've reverted since opt_usb.h was also removed from linuxulator. Warner [-- Attachment #2 --] <div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Thu, Oct 17, 2024 at 12:26 PM Jessica Clarke <<a href="mailto:jrtc27@freebsd.org">jrtc27@freebsd.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">On 17 Oct 2024, at 19:20, Warner Losh <<a href="mailto:imp@bsdimp.com" target="_blank">imp@bsdimp.com</a>> wrote:<br> > <br> > <br> > <br> > On Thu, Oct 17, 2024, 11:29 AM Wolfram Schneider <<a href="mailto:wosch@freebsd.org" target="_blank">wosch@freebsd.org</a>> wrote:<br> >> On Sat, 12 Oct 2024 at 22:58, Warner Losh <<a href="mailto:imp@freebsd.org" target="_blank">imp@freebsd.org</a>> wrote:<br> >> ><br> >> > The branch main has been updated by imp:<br> >> ><br> >> > URL: <a href="https://cgit.FreeBSD.org/src/commit/?id=1a37caeb076b9d31e13c54691d7f1eeb589798bb" rel="noreferrer" target="_blank">https://cgit.FreeBSD.org/src/commit/?id=1a37caeb076b9d31e13c54691d7f1eeb589798bb</a><br>; >> ><br> >> > commit 1a37caeb076b9d31e13c54691d7f1eeb589798bb<br> >> > Author:   Warner Losh <imp@FreeBSD.org><br> >> > AuthorDate: 2024-10-12 20:40:41 +0000<br> >> > Commit:   Warner Losh <imp@FreeBSD.org><br> >> > CommitDate: 2024-10-12 20:40:41 +0000<br> >> ><br> >> >   modules: Add missing opt_*.h files for stand-alone compile<br> >> ><br> >> >   Standalone compile that we at least create these opt_*.h files.<br> >> ><br> >> >   Sponsored by:      Netflix<br> >> > ---<br> >> > sys/modules/linux/Makefile  | 2 ++<br> >> > sys/modules/linux64/Makefile | 5 ++++-<br> >> > 2 files changed, 6 insertions(+), 1 deletion(-)<br> >> ><br> >> > diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile<br> >> > index eb4e17ec706b..36dfbbe2192f 100644<br> >> > --- a/sys/modules/linux/Makefile<br> >> > +++ b/sys/modules/linux/Makefile<br> >> > @@ -33,6 +33,7 @@ SRCS= linux${SFX}_dummy_machdep.c \<br> >> >     linux_uid16.c \<br> >> >     linux_vdso.c \<br> >> >     linux_xattr.c \<br> >> > +    opt_compat.h \<br> >> >     opt_inet.h \<br> >> >     opt_inet6.h \<br> >> >     opt_ktrace.h \<br> >> > @@ -41,6 +42,7 @@ SRCS= linux${SFX}_dummy_machdep.c \<br> >> >     bus_if.h \<br> >> >     device_if.h \<br> >> >     vnode_if.h<br> >> > +<br> >> > .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"<br> >> > SRCS+= linux_dummy_x86.c<br> >> > VDSODEPS=linux_vdso_gettc_x86.inc<br> >> > diff --git a/sys/modules/linux64/Makefile b/sys/modules/linux64/Makefile<br> >> > index b23891a65a4f..119d90126ab3 100644<br> >> > --- a/sys/modules/linux64/Makefile<br> >> > +++ b/sys/modules/linux64/Makefile<br> >> > @@ -28,14 +28,17 @@ SRCS=    linux_dummy_machdep.c \<br> >> >     linux_vdso.c \<br> >> >     linux_timer.c \<br> >> >     linux_xattr.c \<br> >> > -    opt_ktrace.h \<br> >> > +    opt_compat.h \<br> >> >     opt_inet6.h \<br> >> > +    opt_ktrace.h \<br> >> >     opt_posix.h \<br> >> > +    opt_usb.h \<br> >> >     bus_if.h \<br> >> >     device_if.h \<br> >> >     vnode_if.h \<br> >> >     linux_support.S \<br> >> >     linux_vdso_inc.S<br> >> > +<br> >> > .if ${MACHINE_CPUARCH} == "amd64"<br> >> > SRCS+= linux_dummy_x86.c<br> >> > .endif<br> >> <br> >> After this commit I get stale symlinks in /usr/obj<br> >> <br> >> make -j$(nproc) buildworld > log.buildworld 2>&1; make -j$(nproc)<br> >> buildkernel >& log.buildkernel;<br> >> ./tools/build/stale-symlink-buildworld.sh<br> >> <br> >> amd64:<br> >> stale symlink detected: lrwxrwxr-x 1 wosch wheel 95 Oct 17 17:00<br> >> /scratch/tmp/wosch/freebsd/home/wosch/projects/freebsd-src/amd64.amd64/sys/GENERIC/modules/home/wosch/projects/freebsd-src/sys/modules/linux/opt_compat.h<br> >> -> /scratch/tmp/wosch/freebsd/home/wosch/projects/freebsd-src/amd64.amd64/sys/GENERIC/opt_compat.h<br> >> <br> >> stale symlink detected: lrwxrwxr-x 1 wosch wheel 95 Oct 17 17:00<br> >> /scratch/tmp/wosch/freebsd/home/wosch/projects/freebsd-src/amd64.amd64/sys/GENERIC/modules/home/wosch/projects/freebsd-src/sys/modules/linux64/opt_compat.h<br> >> -> /scratch/tmp/wosch/freebsd/home/wosch/projects/freebsd-src/amd64.amd64/sys/GENERIC/opt_compat.h<br> >> <br> >> arm64:<br> >> stale symlink detected: lrwxr-xr-x 1 root wheel 73 Oct 17 17:18<br> >> /usr/obj/home/projects/freebsd-src/arm64.aarch64/sys/GENERIC/modules/home/projects/freebsd-src/sys/modules/linux64/opt_compat.h<br> >> -> /usr/obj/home/projects/freebsd-src/arm64.aarch64/sys/GENERIC/opt_compat.h<br> >> <br> >> see also PR: 276235<br> > <br> > The symlinks look right to me. What makes them stale?<br> <br> Given the script does find -H -type l, it’ll be that they point to<br> non-existent files. I don’t know what opt_compat.h is for Netflix but<br> there’s no such thing in-tree, these are the only references to it.<br></blockquote><div><br></div><div>Ah, but there use to be... I rebased a tree that had a number of similar cleanups across</div><div>its removal and didn't notice. And my checks of my tree turned that file up, but I didn't</div><div>notice it was in a tree I'd not built out of since before the change:</div><div><br></div><div>commit 06c07e1203324bfe8ab4526c82dbb750864272d5<br>Author: Dmitry Chagin <dchagin@FreeBSD.org><br>Date:  Mon Feb 13 19:07:38 2023 +0300<br><br>  Complete removal of opt_compat.h<br><br>  Since Linux emulation layer build options was removed there is no reason<br>  to keep opt_compat.h.<br><br>  Reviewed by:       emaste<br>  Differential Revision:  <a href="https://reviews.freebsd.org/D38548">https://reviews.freebsd.org/D38548</a><br>  MFC after:        2 weeks<br></div><div><br></div><div>So I've reverted since opt_usb.h was also removed from linuxulator.</div><div><br></div><div>Warner</div></div></div>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfoDVhZ8x2LLh0tGhhzUpHc%2BphUdpeWOD66JzQj34OOZ5Q>