Date: Sat, 13 Apr 2024 11:07:25 -0600 From: Warner Losh <imp@bsdimp.com> To: "Bjoern A. Zeeb" <bzeeb-lists@lists.zabbadoz.net> Cc: "Stephen J. Kiernan" <stevek@freebsd.org>, src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 22ca6db50f4e - main - config.mk: Add MK_VIMAGE knob Message-ID: <CANCZdfqJtQgCx%2Bq3KjH50eWtiZxM5eq_wcwwmTowm%2B4OFwkJag@mail.gmail.com> In-Reply-To: <5op16p78-969n-61p6-q049-o34ps2n04677@yvfgf.mnoonqbm.arg> References: <202404091707.439H7vOb043582@gitrepo.freebsd.org> <5op16p78-969n-61p6-q049-o34ps2n04677@yvfgf.mnoonqbm.arg>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On Fri, Apr 12, 2024 at 1:29 PM Bjoern A. Zeeb < bzeeb-lists@lists.zabbadoz.net> wrote: > On Tue, 9 Apr 2024, Stephen J. Kiernan wrote: > > > The branch main has been updated by stevek: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=22ca6db50f4e6bd75a141f57cf953d8de6531a06 > > > > commit 22ca6db50f4e6bd75a141f57cf953d8de6531a06 > > Author: Stephen J. Kiernan <stevek@FreeBSD.org> > > AuthorDate: 2024-04-09 17:04:24 +0000 > > Commit: Stephen J. Kiernan <stevek@FreeBSD.org> > > CommitDate: 2024-04-09 17:05:56 +0000 > > > > config.mk: Add MK_VIMAGE knob > > > > Default to VIMAGE as yes. > > Add VIMAGE to __DEFAULT_DEPENDENT_OPTIONS (to define VIMAGE_SUPPORT) > > > > Only output VIMAGE to opt_global.h when VIMAGE support is wanted. > > > > Obtained from: Juniper Networks, Inc. > > Differential Revision: https://reviews.freebsd.org/D39636 > > --- > > share/mk/src.opts.mk | 2 ++ > > sys/conf/config.mk | 2 ++ > > sys/conf/kern.opts.mk | 4 +++- > > 3 files changed, 7 insertions(+), 1 deletion(-) > > I now see: > > cat: /usr/obj/usr/src/src.git/amd64.amd64/sys/FOO/opt_vimage.h: No such > file or directory > > during builds. I made sure I cleaned the sys/FOO obj tree. Any ideas? > I see this too... :( The problem is that VIMAGE is in opt_global.h, not in opt_vimage, so it was improper to add it here: for var in \ INET \ INET6 \ VIMAGE .if defined(WITHOUT_${var}_SUPPORT) || ${MK_${var}} == "no" MK_${var}_SUPPORT:= no .else .if defined(KERNBUILDDIR) # See if there's an opt_foo.h .if !defined(OPT_${var}) OPT_${var}!= cat ${KERNBUILDDIR}/opt_${var:tl}.h; echo <----------------- opt_vimage.h isn't a thing, it lives in opt_global.h .export OPT_${var} .endif .if ${OPT_${var}} == "" # nothing -> no MK_${var}_SUPPORT:= no .else MK_${var}_SUPPORT:= yes .endif .else # otherwise, yes MK_${var}_SUPPORT:= yes .endif .endif .endfor So prior to this addition, this was abusing our build system somewhat, but it worked. Now, it doesn't work and can only work with more abuse: diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk index 8b1151f3d624..99e4433ec3cf 100644 --- a/sys/conf/kern.opts.mk +++ b/sys/conf/kern.opts.mk @@ -188,9 +188,13 @@ OPT_${opt}:= ${rep} .if defined(WITHOUT_${var}_SUPPORT) || ${MK_${var}} == "no" MK_${var}_SUPPORT:= no .else -.if defined(KERNBUILDDIR) # See if there's an opt_foo.h +.if defined(KERNBUILDDIR) # See if there's an opt_foo.h or opt_global.h .if !defined(OPT_${var}) +.if exists(${KERNBUILDDIR}/opt_${var:tl}.h) OPT_${var}!= cat ${KERNBUILDDIR}/opt_${var:tl}.h; echo +.else +OPT_${var}!= cat ${KERNBUILDDIR}/opt_global.h; echo +.endif .export OPT_${var} .endif .if ${OPT_${var}} == "" # nothing -> no which I think gets us past the present problem... But I think that config(8) should be generating a canonical list of options so we don't have to do this crazy gymnastics of kludgitude. Warner Warner [-- Attachment #2 --] <div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Fri, Apr 12, 2024 at 1:29 PM Bjoern A. Zeeb <<a href="mailto:bzeeb-lists@lists.zabbadoz.net" target="_blank">bzeeb-lists@lists.zabbadoz.net</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 Tue, 9 Apr 2024, Stephen J. Kiernan wrote:<br> <br> > The branch main has been updated by stevek:<br> ><br> > URL: <a href="https://cgit.FreeBSD.org/src/commit/?id=22ca6db50f4e6bd75a141f57cf953d8de6531a06" rel="noreferrer" target="_blank">https://cgit.FreeBSD.org/src/commit/?id=22ca6db50f4e6bd75a141f57cf953d8de6531a06</a><br>; ><br> > commit 22ca6db50f4e6bd75a141f57cf953d8de6531a06<br> > Author: Stephen J. Kiernan <stevek@FreeBSD.org><br> > AuthorDate: 2024-04-09 17:04:24 +0000<br> > Commit: Stephen J. Kiernan <stevek@FreeBSD.org><br> > CommitDate: 2024-04-09 17:05:56 +0000<br> ><br> > <a href="http://config.mk" rel="noreferrer" target="_blank">config.mk</a>: Add MK_VIMAGE knob<br> ><br> > Default to VIMAGE as yes.<br> > Add VIMAGE to __DEFAULT_DEPENDENT_OPTIONS (to define VIMAGE_SUPPORT)<br> ><br> > Only output VIMAGE to opt_global.h when VIMAGE support is wanted.<br> ><br> > Obtained from: Juniper Networks, Inc.<br> > Differential Revision: <a href="https://reviews.freebsd.org/D39636" rel="noreferrer" target="_blank">https://reviews.freebsd.org/D39636</a><br>; > ---<br> > share/mk/<a href="http://src.opts.mk" rel="noreferrer" target="_blank">src.opts.mk</a> | 2 ++<br> > sys/conf/<a href="http://config.mk" rel="noreferrer" target="_blank">config.mk</a> | 2 ++<br> > sys/conf/<a href="http://kern.opts.mk" rel="noreferrer" target="_blank">kern.opts.mk</a> | 4 +++-<br> > 3 files changed, 7 insertions(+), 1 deletion(-)<br> <br> I now see:<br> <br> cat: /usr/obj/usr/src/src.git/amd64.amd64/sys/FOO/opt_vimage.h: No such file or directory<br> <br> during builds. I made sure I cleaned the sys/FOO obj tree. Any ideas?<br></blockquote><div><br></div><div>I see this too... :(</div><div><br></div><div>The problem is that VIMAGE is in opt_global.h, not in opt_vimage, so it was improper to add it here:</div><div>for var in \<br> INET \<br> INET6 \<br> VIMAGE<br>.if defined(WITHOUT_${var}_SUPPORT) || ${MK_${var}} == "no"<br>MK_${var}_SUPPORT:= no<br>.else<br>.if defined(KERNBUILDDIR) # See if there's an opt_foo.h <br>.if !defined(OPT_${var})<br>OPT_${var}!= cat ${KERNBUILDDIR}/opt_${var:tl}.h; echo <----------------- opt_vimage.h isn't a thing, it lives in opt_global.h<br></div>.export OPT_${var}<div>.endif<br>.if ${OPT_${var}} == "" # nothing -> no <br>MK_${var}_SUPPORT:= no<br>.else<br>MK_${var}_SUPPORT:= yes<br>.endif<br>.else # otherwise, yes <br>MK_${var}_SUPPORT:= yes<br>.endif<br>.endif<br>.endfor<br><br></div><div>So prior to this addition, this was abusing our build system somewhat, but it worked. Now, it doesn't work and can only work with more abuse:</div><div><br></div><div>diff --git a/sys/conf/<a href="http://kern.opts.mk">kern.opts.mk</a>; b/sys/conf/<a href="http://kern.opts.mk">kern.opts.mk</a><br>index 8b1151f3d624..99e4433ec3cf 100644<br>--- a/sys/conf/<a href="http://kern.opts.mk">kern.opts.mk</a><br>+++ b/sys/conf/<a href="http://kern.opts.mk">kern.opts.mk</a><br>@@ -188,9 +188,13 @@ OPT_${opt}:= ${rep}<br> .if defined(WITHOUT_${var}_SUPPORT) || ${MK_${var}} == "no"<br> MK_${var}_SUPPORT:= no<br> .else<br>-.if defined(KERNBUILDDIR) # See if there's an opt_foo.h<br>+.if defined(KERNBUILDDIR) # See if there's an opt_foo.h or opt_global.h<br> .if !defined(OPT_${var})<br>+.if exists(${KERNBUILDDIR}/opt_${var:tl}.h)<br> OPT_${var}!= cat ${KERNBUILDDIR}/opt_${var:tl}.h; echo<br>+.else<br>+OPT_${var}!= cat ${KERNBUILDDIR}/opt_global.h; echo<br>+.endif<br> .export OPT_${var}<br> .endif<br> .if ${OPT_${var}} == "" # nothing -> no</div><div><br></div><div>which I think gets us past the present problem...</div><div><br></div><div>But I think that config(8) should be generating a canonical list of options so we don't have to do this crazy gymnastics of kludgitude.</div><div><br></div><div>Warner<br></div><div><br></div><div>Warner <br></div></div></div>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfqJtQgCx%2Bq3KjH50eWtiZxM5eq_wcwwmTowm%2B4OFwkJag>