Date: Sat, 31 Aug 2019 08:24:46 +0200 From: Gary Jennejohn <gljennjohn@gmail.com> To: Kyle Evans <kevans@freebsd.org> Cc: John Baldwin <jhb@freebsd.org>, current <current@freebsd.org> Subject: Re: problem with LOCAL_MODULES Message-ID: <20190831082446.2a8de0f0@ernst.home> In-Reply-To: <CACNAnaEaJ1uotqTAZoiYti5hEH-v0Bh9AEesF5BuMbOrQfN1_g@mail.gmail.com> References: <20190816120524.21b7fd19@ernst.home> <e1010b9b-26a6-9ce6-873c-10e503dc2030@FreeBSD.org> <CACNAnaGhfs8ynJJ9t5y0JSwCcP%2BB7nEeoH9L2tbGvjw=YE6yYg@mail.gmail.com> <7b46b0a5-903f-5d8d-c7df-9eafda504445@FreeBSD.org> <CACNAnaEKzMDihnYBgG5Jv%2BZyJfXm21NpAuRTUJ5cZ4-2v0H8Cg@mail.gmail.com> <CACNAnaEaJ1uotqTAZoiYti5hEH-v0Bh9AEesF5BuMbOrQfN1_g@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, 30 Aug 2019 14:33:06 -0500
Kyle Evans <kevans@freebsd.org> wrote:
> On Fri, Aug 30, 2019 at 2:26 PM Kyle Evans <kevans@freebsd.org> wrote:
> >
> > On Fri, Aug 30, 2019 at 2:11 PM John Baldwin <jhb@freebsd.org> wrote:
> > >
> > > On 8/30/19 10:42 AM, Kyle Evans wrote:
> > > > On Fri, Aug 16, 2019 at 7:38 PM John Baldwin <jhb@freebsd.org> wrote:
> > > >>
> > > >> On 8/16/19 3:05 AM, Gary Jennejohn wrote:
> > > >>> I tried to build a kernel today and it failed in modules-all even
> > > >>> though I had LOCAL_MODULES="" in /etc/src.conf, as recommended by
> > > >>> jhb.
> > > >>>
> > > >>> That's wrong. It has to be LOCAL_MODULES=, otherwise
> > > >>> /sys/conf/kern.post.mk seems to conclude that there should be a
> > > >>> module under /usr/local/sys/modules with the name "".
> > > >>
> > > >> I think this will permit both versions to work:
> > > >>
> > > >> Index: sys/conf/kern.post.mk
> > > >> ===================================================================
> > > >> --- kern.post.mk (revision 351151)
> > > >> +++ kern.post.mk (working copy)
> > > >> @@ -76,6 +76,7 @@ modules-${target}:
> > > >> cd $S/modules; ${MKMODULESENV} ${MAKE} \
> > > >> ${target:S/^reinstall$/install/:S/^clobber$/cleandir/}
> > > >> .endif
> > > >> +.if !empty(LOCAL_MODULES)
> > > >> .for module in ${LOCAL_MODULES}
> > > >> @${ECHODIR} "===> ${module} (${target:S/^reinstall$/install/:S/^clobber$/cleandir/})"
> > > >> @cd ${LOCAL_MODULES_DIR}/${module}; ${MKMODULESENV} ${MAKE} \
> > > >> @@ -83,6 +84,7 @@ modules-${target}:
> > > >> ${target:S/^reinstall$/install/:S/^clobber$/cleandir/}
> > > >> .endfor
> > > >> .endif
> > > >> +.endif
> > > >> .endfor
> > > >>
> > > >> # Handle ports (as defined by the user) that build kernel modules
> > > >>
> > > >
> > > > I think I'd like to see this with !empty(LOCAL_MODULES) &&
> > > > EXISTS(${LOCAL_MODULES_DIR}) or maybe just the latter condition to
> > > > prevent accidental foot-shooting... I was testing a problem with doing
> > > > this stuff in a poudriere build for swills@ and set LOCAL_MODULES=""
> > > > only to get an error because LOCAL_MODULES_DIR doesn't yet exist on
> > > > the machine I was testing with -- which we can trivially avoid.
> > >
> > > Did this work for you? Gary said in a followup that it didn't work,
> > > so that's why I hadn't committed it.
> > >
> >
> > Hmm... I went back and tested his exact scenario, and no-
> > LOCAL_MODULES isn't empty at this point because word processing that
> > leaves us with an empty string hasn't yet been done. An .if
> > !empty(module) inside the loop is much happier- I'm not seeing any
> > modifiers that would give us the behavior we wanted for figuring this
> > out before entering the loop.
>
> It turns out I'm silly... this is sufficient for both of our problems
> (because it's the same problem) and hopefully my mail client doesn't
> goof this up:
>
> diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk
> index ff10daf1a0a..09bfffad095 100644
> --- a/sys/conf/kern.post.mk
> +++ b/sys/conf/kern.post.mk
> @@ -77,10 +77,12 @@ modules-${target}:
> ${target:S/^reinstall$/install/:S/^clobber$/cleandir/}
> .endif
> .for module in ${LOCAL_MODULES}
> +.if !empty(module)
> @${ECHODIR} "===> ${module}
> (${target:S/^reinstall$/install/:S/^clobber$/cleandir/})"
> @cd ${LOCAL_MODULES_DIR}/${module}; ${MKMODULESENV} ${MAKE} \
> DIRPRFX="${module}/" \
> ${target:S/^reinstall$/install/:S/^clobber$/cleandir/}
> +.endif
> .endfor
> .endif
> .endfor
Yes, this patch works correctly.
--
Gary Jennejohn
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20190831082446.2a8de0f0>