Date: Fri, 23 Apr 2021 09:46:32 -0700 From: John Baldwin <jhb@FreeBSD.org> To: =?UTF-8?Q?Olivier_Cochard-Labb=c3=a9?= <olivier@freebsd.org>, David Wolfskill <david@catwhisker.org>, FreeBSD Current <current@freebsd.org> Subject: Re: "etcupdate -p" vs. $OLDTREE? Message-ID: <857f55df-b4d3-865c-f2f1-f03bd490dad6@FreeBSD.org> In-Reply-To: <CA%2Bq%2BTcrE7=KxpnnUyt_be3PerpcwJHnhO=fb=9UMY%2B3Pb5AD_Q@mail.gmail.com> References: <YIKq/DWSiMqt0iNp@albert.catwhisker.org> <CA%2Bq%2BTcrE7=KxpnnUyt_be3PerpcwJHnhO=fb=9UMY%2B3Pb5AD_Q@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On 4/23/21 6:59 AM, Olivier Cochard-Labbé wrote:
> On Fri, Apr 23, 2021 at 1:10 PM David Wolfskill <david@catwhisker.org>
> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?857f55df-b4d3-865c-f2f1-f03bd490dad6>