From owner-freebsd-current@freebsd.org Fri Apr 23 16:46:33 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 9E34E5F8D39 for ; Fri, 23 Apr 2021 16:46:33 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4FRgD9441yz4r8K for ; Fri, 23 Apr 2021 16:46:33 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: by mailman.nyi.freebsd.org (Postfix) id 8B8505F900E; Fri, 23 Apr 2021 16:46:33 +0000 (UTC) Delivered-To: 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 8B4DA5F8FAE for ; Fri, 23 Apr 2021 16:46:33 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FRgD93YXvz4r6C; Fri, 23 Apr 2021 16:46:33 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro.local (ralph.baldwin.cx [66.234.199.215]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 09B8EFF82; Fri, 23 Apr 2021 16:46:32 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Subject: Re: "etcupdate -p" vs. $OLDTREE? To: =?UTF-8?Q?Olivier_Cochard-Labb=c3=a9?= , David Wolfskill , FreeBSD Current References: From: John Baldwin Message-ID: <857f55df-b4d3-865c-f2f1-f03bd490dad6@FreeBSD.org> Date: Fri, 23 Apr 2021 09:46:32 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:78.0) Gecko/20100101 Thunderbird/78.9.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit 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: Fri, 23 Apr 2021 16:46:33 -0000 On 4/23/21 6:59 AM, Olivier Cochard-Labbé wrote: > On Fri, Apr 23, 2021 at 1:10 PM David Wolfskill > wrote: > >> After the set of updates to etcupdate (main-n246232-0611aec3cf3a .. >> main-n246235-ba30215ae0ef), I find that "etcupdate -B -p" is working as >> expected, but after the following "make installworld", a subsequent >> "etcupdate -B" chugs along for a bit, then stops, whining: >> >> No previous tree to compare against, a sane comparison is not possible. >> >> >> > Same problem here while using /usr/src/tools/build/beinstall.sh: > (...) > Skipping blacklisted certificate > /usr/share/certs/trusted/Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem > (/etc/ssl[0/1831]sted/ee1365c0.0) > Skipping blacklisted certificate > /usr/share/certs/trusted/Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem > (/etc/ssl/blacklisted/dc45b0bd.0) > Scanning /usr/local/share/certs for certificates... > + [ -n etcupdate ] > + update_etcupdate > + /usr/src/usr.sbin/etcupdate/etcupdate.sh -s /usr/src -D > /tmp/beinstall.MZ4oy8/mnt -F > No previous tree to compare against, a sane comparison is not possible. > + return 1 > + [ 1 -ne 0 ] > + errx 'etcupdate (post-world) failed!' > + cleanup > (...) Sorry, this should be fixed. beinstall.sh still has a bug in that it needs this change: diff --git a/tools/build/beinstall.sh b/tools/build/beinstall.sh index 46c65d87e61a..fab21edc0fd5 100755 --- a/tools/build/beinstall.sh +++ b/tools/build/beinstall.sh @@ -133,7 +133,7 @@ update_mergemaster() { update_etcupdate_pre() { ${ETCUPDATE_CMD} -p -s ${srcdir} -D ${BE_MNTPT} ${ETCUPDATE_FLAGS} || return $? - ${ETCUPDATE_CMD} resolve -D ${BE_MNTPT} || return $? + ${ETCUPDATE_CMD} resolve -p -D ${BE_MNTPT} || return $? } update_etcupdate() { -- John Baldwin