Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 01 Jan 2021 23:06:56 +0100
From:      "Herbert J. Skuhra" <herbert@gojira.at>
To:        freebsd-current@freebsd.org
Subject:   Re: mergemaster option -m (was: etcupdate failed to build new tree)
Message-ID:  <87k0swtipr.wl-herbert@gojira.at>
In-Reply-To: <a8ca53c1-5c54-41e4-fc44-b833212b1135@gmail.com>
References:  <c8ed98ef-8324-5a3a-b4ba-850c669b5080@gmail.com> <87lfdctq83.wl-herbert@gojira.at> <a8ca53c1-5c54-41e4-fc44-b833212b1135@gmail.com>

next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, 01 Jan 2021 21:29:45 +0100, Graham Perrin wrote:
> 
> On 01/01/2021 19:24, Herbert J. Skuhra wrote:
> 
> > On Fri, 01 Jan 2021 20:01:16 +0100, Graham Perrin wrote:
> > 
> >> …
> >> 
> >> I did try `mergemaster -p` and somehow (!) ended up with an empty
> >> `/etc/group` file. Dug myself out of that hole, I'll prefer to
> >> continue using etcupdate.
> > -m /path/to/sources
> >                   Specify the path to the directory where you want to do the
> >                   make(1).
> 
> 
> Thank you, what path would you suggest?
> 
> (Given the previous weirdness, I want to make no guesses here.)

1. Your SOURCEDIR is /usr/src/freebsd-current and not /usr/src.

Unlike etcupdate mergemaster checks for Makefile1.inc in the working
directory and asks to set SOURCEDIR accordingly:

*** /usr/src was not found.
    Found Makefile.inc1 in the current directory.
    Would you like to set SOURCEDIR to /mnt2/src? [no and exit]

Did you see this prompt?

2. Do you have (old) files (e.g. Makefile.inc1) or directories
(e.g. etc) in /usr/src?

Is this problem reproducible? Does it work if use -m switch, e.g:
'mergemaster -m .' or 'mergemaster -m /usr/src/freebsd-current'?

--
Herbert



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?87k0swtipr.wl-herbert>