From owner-freebsd-current@freebsd.org Sat Jan 2 01:53:43 2021 Return-Path: Delivered-To: freebsd-current@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D80CE4BD9BE for ; Sat, 2 Jan 2021 01:53:43 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D74gB63vjz4hNW for ; Sat, 2 Jan 2021 01:53:42 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Received: by mail-wm1-x334.google.com with SMTP id e25so11375267wme.0 for ; Fri, 01 Jan 2021 17:53:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding :content-language; bh=Cwteu1xKTzh/uxRjOcLz7HH1vuet98AzILIWbtfPEL8=; b=JryjyR19FJvHd4tFEWM9l/KbLsCnFgDyWf/MtokVM7ZTRFYC4fN5SOBkRWslgmm/E4 MqAkvl6M1CXjoj0MUmmijzHeeJL2H5vJoeECNFvEWUVlBS26hz3QlUyna6aeoTMPUqfP R3snsaERGZO+BiN83cfOAt2A9dj6GVz7wuTcq94cRrX6ym9WxXXRLfGE9l75qgjPZ1Qp zh3XyGePFSspuqUaw6RKQ6rtmDwCKs/Hli1iBaJtVQyHo2Ie/zplVnKzQuHXylzpZE5H Dk0fcMuI9/3W424EJF3sVOKx/L1dFWtPKZAnTwWKSEaSTI7ulXtBVnoHtN/sYwMyAUZv +HCQ== X-Gm-Message-State: AOAM530bx76LAa06iyx5lZZv5lN8I9QIFBD2MZ/V9Q7UzjDrQFiKPjua diltSJVGhj5A6HDCwZezAm17owFAFi7Ylw== X-Google-Smtp-Source: ABdhPJzzsdS3rmoES5XTPLceN3esMur0ORn95UHSWO6m8H4CSeIM23VM5K6tdCwoIpIALPWqK12raw== X-Received: by 2002:a1c:e306:: with SMTP id a6mr17714982wmh.66.1609552419399; Fri, 01 Jan 2021 17:53:39 -0800 (PST) Received: from [192.168.1.11] (79-66-147-78.dynamic.dsl.as9105.com. [79.66.147.78]) by smtp.gmail.com with ESMTPSA id i7sm78499994wrv.12.2021.01.01.17.53.38 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 01 Jan 2021 17:53:38 -0800 (PST) Subject: Re: mergemaster option -p To: freebsd-current@freebsd.org References: <87lfdctq83.wl-herbert@gojira.at> <87k0swtipr.wl-herbert@gojira.at> From: Graham Perrin Message-ID: <2ceaa92e-0b42-43a3-a692-18aa387d551d@gmail.com> Date: Sat, 2 Jan 2021 01:53:38 +0000 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: <87k0swtipr.wl-herbert@gojira.at> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-GB X-Rspamd-Queue-Id: 4D74gB63vjz4hNW X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.70 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36]; TO_DN_NONE(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; NEURAL_HAM_SHORT(-0.70)[-0.696]; RECEIVED_SPAMHAUS_PBL(0.00)[79.66.147.78:received]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; MID_RHS_MATCH_FROM(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2a00:1450:4864:20::334:from]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; FROM_HAS_DN(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-current@freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[2a00:1450:4864:20::334:from:127.0.2.255]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::334:from]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-current] X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Jan 2021 01:53:43 -0000 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: and 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