Date: Sat, 2 Jan 2021 01:53:38 +0000 From: Graham Perrin <grahamperrin@gmail.com> To: freebsd-current@freebsd.org Subject: Re: mergemaster option -p Message-ID: <2ceaa92e-0b42-43a3-a692-18aa387d551d@gmail.com> In-Reply-To: <87k0swtipr.wl-herbert@gojira.at> References: <c8ed98ef-8324-5a3a-b4ba-850c669b5080@gmail.com> <87lfdctq83.wl-herbert@gojira.at> <a8ca53c1-5c54-41e4-fc44-b833212b1135@gmail.com> <87k0swtipr.wl-herbert@gojira.at>
next in thread | previous in thread | raw e-mail | index | archive | help
On 01/01/2021 22:06, Herbert J. Skuhra wrote: > 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? I do not recall seeing that prompt for the first run. I do recall responding 'yes' during a subsequent run. I did not note the exact name of the file but Makefile.inc1 is familiar. > 2. Do you have (old) files (e.g. Makefile.inc1) or directories > (e.g. etc) in /usr/src? No. Re: <https://www.reddit.com/comments/keme3b/-/gg87nsj/>; and <https://www.reddit.com/comments/keme3b/-/ggk4we2/?context=1>; I was careful to remove everything before builds and installations began. > Is this problem reproducible? Does it work if use -m switch, e.g: > 'mergemaster -m .' or 'mergemaster -m /usr/src/freebsd-current'? I might experiment when I next update the system. In the meantime, is it relevant to note that I prefer nano (not vi) for EDITOR and VISUAL? IIRC – probably reproducible – after previewing the changes to /etc/group I keyed 'm' and that's when the on-screen weirdness began. > Herbert Many thanks for taking an interest. Graham
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?2ceaa92e-0b42-43a3-a692-18aa387d551d>