Date: Tue, 14 Aug 2018 08:43:29 -0600 From: Warner Losh <imp@bsdimp.com> To: FreeBSD Current <freebsd-current@freebsd.org> Subject: Mergemaster tweak Message-ID: <CANCZdfpVWsGqvaZ_OrUYSPUjGBGNQRD5mgjdR3iq1tATX1hZvQ@mail.gmail.com>
next in thread | raw e-mail | index | archive | help
I never have /usr/src on my system (other than the directory that mtree creates). So when I run mergemaster it's always failing until I remember to add the -m . (or was it -t ., I sometimes forget). Given the recent ntpd stuff, I was annoyed enough with this default behavior to create a fix for it, which I've uploaded to https://reviews.freebsd.org/D16709 for review. Basically, if the proposed SOURCEDIR doesn't have a Makefile.inc1, but . does, then it prompts to use that. If it can't find one, it errors out early as a nice side effect. Please comment on the review. Thanks! Warner
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfpVWsGqvaZ_OrUYSPUjGBGNQRD5mgjdR3iq1tATX1hZvQ>