From owner-svn-src-user@freebsd.org Fri Sep 11 16:03:10 2020 Return-Path: Delivered-To: svn-src-user@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 A02CE3DEDE5 for ; Fri, 11 Sep 2020 16:03:10 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bp0sV3gcKz4Wj9; Fri, 11 Sep 2020 16:03:10 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 61663265B5; Fri, 11 Sep 2020 16:03:10 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08BG3ANO059663; Fri, 11 Sep 2020 16:03:10 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08BG3A4Q059662; Fri, 11 Sep 2020 16:03:10 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <202009111603.08BG3A4Q059662@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Fri, 11 Sep 2020 16:03:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r365635 - in user/cperciva/freebsd-update-build/scripts/12.2-BETA1: . amd64 i386 X-SVN-Group: user X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: in user/cperciva/freebsd-update-build/scripts/12.2-BETA1: . amd64 i386 X-SVN-Commit-Revision: 365635 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Sep 2020 16:03:10 -0000 Author: gordon Date: Fri Sep 11 16:03:09 2020 New Revision: 365635 URL: https://svnweb.freebsd.org/changeset/base/365635 Log: Add 12.2-BETA1 configuration. Added: user/cperciva/freebsd-update-build/scripts/12.2-BETA1/ user/cperciva/freebsd-update-build/scripts/12.2-BETA1/amd64/ user/cperciva/freebsd-update-build/scripts/12.2-BETA1/amd64/build.conf (contents, props changed) user/cperciva/freebsd-update-build/scripts/12.2-BETA1/i386/ user/cperciva/freebsd-update-build/scripts/12.2-BETA1/i386/build.conf (contents, props changed) Added: user/cperciva/freebsd-update-build/scripts/12.2-BETA1/amd64/build.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/cperciva/freebsd-update-build/scripts/12.2-BETA1/amd64/build.conf Fri Sep 11 16:03:09 2020 (r365635) @@ -0,0 +1,10 @@ +export RELH=08e1486d99eae751a4d81849ffbf2cd1cb2595480203786f7a30a1564ce2536fe153e369464be207df21889d96a8aa6fac2aad4117fce3dc56c7c16f4abe2138 +export FTP=https://people.freebsd.org/~gjb/12.2-BETA1 + +# Components of the world, source, and kernels +export WORLDPARTS="base base-dbg doc lib32 lib32-dbg" +export SOURCEPARTS="src" +export KERNELPARTS="kernel kernel-dbg" + +# EOL date +export EOL=1601164800 Added: user/cperciva/freebsd-update-build/scripts/12.2-BETA1/i386/build.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/cperciva/freebsd-update-build/scripts/12.2-BETA1/i386/build.conf Fri Sep 11 16:03:09 2020 (r365635) @@ -0,0 +1,10 @@ +export RELH=38797cd93023ad640d2ff42cc712d7039f1280119746c00b0e27fed929329e84f450bd3aa8a368a629b908b2b60e04e8c67ca681ff49b62ea4b334b0c2778a33 +export FTP=https://people.freebsd.org/~gjb/12.2-BETA1 + +# Components of the world, source, and kernels +export WORLDPARTS="base base-dbg doc" +export SOURCEPARTS="src" +export KERNELPARTS="kernel kernel-dbg" + +# EOL date +export EOL=1601164800 From owner-svn-src-user@freebsd.org Sat Sep 12 15:18:56 2020 Return-Path: Delivered-To: svn-src-user@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 7C6F83DACF7 for ; Sat, 12 Sep 2020 15:18:56 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bpbqx4lblz45sK; Sat, 12 Sep 2020 15:18:53 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9DA7517134; Sat, 12 Sep 2020 15:18:52 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08CFIquv024561; Sat, 12 Sep 2020 15:18:52 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08CFIqmE024560; Sat, 12 Sep 2020 15:18:52 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <202009121518.08CFIqmE024560@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Sat, 12 Sep 2020 15:18:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r365660 - user/cperciva/freebsd-update-build/patches/12.2-BETA1 X-SVN-Group: user X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: user/cperciva/freebsd-update-build/patches/12.2-BETA1 X-SVN-Commit-Revision: 365660 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Sep 2020 15:18:56 -0000 Author: gordon Date: Sat Sep 12 15:18:52 2020 New Revision: 365660 URL: https://svnweb.freebsd.org/changeset/base/365660 Log: Add needed patch for 12.2-BETA1 to prevent spurious changes through freebsd-update processing. Added: user/cperciva/freebsd-update-build/patches/12.2-BETA1/ user/cperciva/freebsd-update-build/patches/12.2-BETA1/0-newvers Added: user/cperciva/freebsd-update-build/patches/12.2-BETA1/0-newvers ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/cperciva/freebsd-update-build/patches/12.2-BETA1/0-newvers Sat Sep 12 15:18:52 2020 (r365660) @@ -0,0 +1,14 @@ +--- sys/conf/newvers.sh.orig 2020-09-12 08:05:28.983303000 +0000 ++++ sys/conf/newvers.sh 2020-09-12 08:06:24.743930000 +0000 +@@ -49,7 +49,10 @@ + + TYPE="FreeBSD" + REVISION="12.2" +-BRANCH=${BRANCH_OVERRIDE:-BETA1} ++BRANCH="BETA1" ++if [ -n "${BRANCH_OVERRIDE}" ]; then ++ BRANCH=${BRANCH_OVERRIDE} ++fi + RELEASE="${REVISION}-${BRANCH}" + VERSION="${TYPE} ${RELEASE}" + From owner-svn-src-user@freebsd.org Sat Sep 12 15:31:23 2020 Return-Path: Delivered-To: svn-src-user@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 B419E3DAFA2 for ; Sat, 12 Sep 2020 15:31:23 +0000 (UTC) (envelope-from asomers@gmail.com) Received: from mail-oi1-f172.google.com (mail-oi1-f172.google.com [209.85.167.172]) (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 4Bpc6M2qSbz461V; Sat, 12 Sep 2020 15:31:23 +0000 (UTC) (envelope-from asomers@gmail.com) Received: by mail-oi1-f172.google.com with SMTP id i17so12706659oig.10; Sat, 12 Sep 2020 08:31:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=SjGM1AB59+Mq5x9o+CiryOzphthxkFlx8bcKGvDRybc=; b=if7FZJI7J9VgKhPPgsP1gAnR7smx811AHyru1SIP+4ToXVK2eUgLDMGeDSFyDn1G57 mC9pPBQOuxW2dK4GS4DS2IjMGy95WQU5vqlGc4i2QPCzvIdFkc2+GqXJhYhlHYLGzInf riV2iZJe1OXoEB/axUmf8Ke5sEzI4QU8gD8FU5D7uQeyFStfm/HFXC693J6n448rljDf z047w7beddsvAL03FAz6QZNPBbBIqqFNr/TkeFlxiLNQx7czcrkrJVKEbchRlcIbRXAm 25Bi+a5GJmUe4SQ/T1m+kclvNm0CQTFVH6wJxujQ2ez7+wrvMT+85Wb1eJO5CsgG25KR LAyw== X-Gm-Message-State: AOAM533Z8XqIWVEiMckZdSZ5OHt+x17JtsCh//k7MNcszH0g3r67SHsM EaRzEDuj+Grj1JLqWnzkq0ogZZiKHQZ0bvdTLuNoMFNG X-Google-Smtp-Source: ABdhPJxBSu7774XOy16nFK4/8KDM4R/v84ygrIqhsVDnrx2xOoKzaj8bOuOOlovl3/wnxsxVtN3+0H0Z7fsRjO3REco= X-Received: by 2002:aca:7588:: with SMTP id q130mr4166650oic.73.1599924681779; Sat, 12 Sep 2020 08:31:21 -0700 (PDT) MIME-Version: 1.0 References: <202009121518.08CFIqmE024560@repo.freebsd.org> In-Reply-To: <202009121518.08CFIqmE024560@repo.freebsd.org> From: Alan Somers Date: Sat, 12 Sep 2020 09:31:10 -0600 Message-ID: Subject: Re: svn commit: r365660 - user/cperciva/freebsd-update-build/patches/12.2-BETA1 To: Gordon Tetlow Cc: src-committers , svn-src-user@freebsd.org X-Rspamd-Queue-Id: 4Bpc6M2qSbz461V X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Sep 2020 15:31:23 -0000 On Sat, Sep 12, 2020 at 9:19 AM Gordon Tetlow wrote: > Author: gordon > Date: Sat Sep 12 15:18:52 2020 > New Revision: 365660 > URL: https://svnweb.freebsd.org/changeset/base/365660 > > Log: > Add needed patch for 12.2-BETA1 to prevent spurious changes through > freebsd-update processing. > > Added: > user/cperciva/freebsd-update-build/patches/12.2-BETA1/ > user/cperciva/freebsd-update-build/patches/12.2-BETA1/0-newvers > What kinds of spurious changes do you see without this patch? From owner-svn-src-user@freebsd.org Sat Sep 12 16:35:08 2020 Return-Path: Delivered-To: svn-src-user@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 14C233DD098 for ; Sat, 12 Sep 2020 16:35:08 +0000 (UTC) (envelope-from 01000174832b94db-36e5b9c0-c71a-4023-b4eb-afa0ea3d1210-000000@amazonses.com) Received: from a8-237.smtp-out.amazonses.com (a8-237.smtp-out.amazonses.com [54.240.8.237]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4BpdWt66Llz4CnL for ; Sat, 12 Sep 2020 16:35:06 +0000 (UTC) (envelope-from 01000174832b94db-36e5b9c0-c71a-4023-b4eb-afa0ea3d1210-000000@amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=ae7m2yrxjw65l2cqdpjxuucyrvy564tn; d=tarsnap.com; t=1599928505; h=Subject:To:Cc:References:From:Message-ID:Date:MIME-Version:In-Reply-To:Content-Type:Content-Transfer-Encoding; bh=yjnlbkj/QKyBjBxhK5227d6oqyONZm/s2XQmDvnnT1w=; b=gxO6adStBGr7Qm+E7bfL53yr9aBhC8LqZ4vN+Implo7rWdQ242lbN2P9lW91DafP RVZoR4HknEo5eDgF2/F2ucTRKB6XOY9qM12ZEClnhrxflMZBKtoHTwdMKtFjH1cNeJW WJlTIhc1I4gLWGpxiAVKLIDVoVJ+GgEuXytpsGJU= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=224i4yxa5dv7c2xz3womw6peuasteono; d=amazonses.com; t=1599928505; h=Subject:To:Cc:References:From:Message-ID:Date:MIME-Version:In-Reply-To:Content-Type:Content-Transfer-Encoding:Feedback-ID; bh=yjnlbkj/QKyBjBxhK5227d6oqyONZm/s2XQmDvnnT1w=; b=DeuvEFm/rTaBbHFKYxt2HBP1gaVsYReMlNNHCExi5+oXTlKAv2Re2yk7+s7rOrUZ Oiez4kaBXNhN0TCYULswyUiTIiWG7DkIFmArw4HF6Vw++z6bOv1uSVh2r+aBUh/T+x0 grlTELuOxTmhIhyOymojMzO+RljTfc5skqG4EokY= Subject: Re: svn commit: r365660 - user/cperciva/freebsd-update-build/patches/12.2-BETA1 To: Alan Somers , Gordon Tetlow Cc: src-committers , svn-src-user@freebsd.org References: <202009121518.08CFIqmE024560@repo.freebsd.org> From: Colin Percival Autocrypt: addr=cperciva@tarsnap.com; prefer-encrypt=mutual; keydata= mQGhBElrAAcRBACDfDys4ZtK+ErCJ1HAzYeteKpm3OEsvT/49AjUTLihkF79HhIKrCQU+1KC zv7BwHCMLb6hq30As9L7iFKG7n5QFLFC4Te/VcITUnWHMG/c3ViLOfJGvi+9/nOEHaM1dVJY D6tEp5yM1nHmVQpo9932j4KGuGFR0LhOK5IHXOSfGwCgxSFDPdgxe2OEjWxjGgY+oV3EafcD +JROXCTjlcQiG/OguQH4Vks3mhHfFnEppLxTkDuYgHZQiUtpcT9ssH5khgqoTyMar05OUdAj ZIhNbWDh4LgTj+7ZmvLhXT5Zxw8LX9d7T36aTB8XDQSenDqEtinMWOb0TCBBLbsB8EFG1WTT ESbZci9jJS5yhtktuZoY/eM8uXMD/3k4FWFO80VRRkELSp+XSy/VlSQjyi/rhl2nQq/oOA9F oJbDaB0yq9VNhxP+uFBzBWSqeIX0t1ZWLtNfVFr4TRP5hihI5ICrg/0OpqgisKsU2NFe9xyO hyJLYmfD8ebpDJ/9k30C7Iju9pVrwLm1QgS4S2fqJRcR+U4WbjvP7CgStCVDb2xpbiBQZXJj aXZhbCA8Y3BlcmNpdmFAdGFyc25hcC5jb20+iGEEExECACEFAklrALYCGwMHCwkIBwMCAQQV AggDBBYCAwECHgECF4AACgkQOM7KaQxqam6/igCgn+z2k3V5ggNppmWrZstt1U2lugsAoL7L wS9V9yLtil3oWmHtwpUqYruEuQINBElrAAcQCAD3ZLMIsP4CIDoJORg+YY0lqLVBgcnF7pFb 4Uy2+KvdWofN+DKH61rZLjgXXkNE9M4EQC1B4lGttBP8IY2gs41y3AUogGdyFbidq99rCBz7 LTsgARHwFxZoaHmXyiZLEU1QZuMqwPZV1mCviRhN5E3rRqYNXVcrnXAAuhBpvNyj/ntHvcDN 2/m+ochiuBYueU4kX3lHya7sOj+mTsndcWmQ9soOUyr8O0r/BG088bMn4qqtUw4dl5/pglXk jbl7uOOPinKf0WVd2r6M0wLPJCD4NPHrCWRLLLAjwfjrtoSRvXxDbXhCdgGBa72+K8eYLzVs hgq7tJOoBWzjVK6XRxR7AAMGB/9Mo3iJ2DxqDecd02KCB5BsFDICbJGhPltU7FwrtbC7djSb XUrwsEVLHi4st4cbdGNCWCrp0BRezXZKohKnNAPFOTK++ZfgeKxrV2sJod+Q9RILF86tQ4XF 7A7Yme5hy92t/WgiU4vc/fWbgP8gV/19f8nunaT2E9NSa70mZFjZNu4iuwThoUUO5CV3Wo0Y UISsnRK8XD1+LR3A2qVyLiFRwh/miC1hgLFCTGCQ3GLxZeZzIpYSlGdQJ0L5lixW5ZQD9r1I 8i/8zhE6qRFAM0upUMI3Gt1Oq2w03DiXrZU0Fu/R8Rm8rlnkQKA+95mRTUq1xL5P5NZIi4gJ Z569OPMFiEkEGBECAAkFAklrAAcCGwwACgkQOM7KaQxqam41igCfbaldnFTu5uAdrnrghESv EI3CAo8AoLkNMks1pThl2BJNRm4CtTK9xZeH Message-ID: <01000174832b94db-36e5b9c0-c71a-4023-b4eb-afa0ea3d1210-000000@email.amazonses.com> Date: Sat, 12 Sep 2020 16:35:05 +0000 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-SES-Outgoing: 2020.09.12-54.240.8.237 Feedback-ID: 1.us-east-1.Lv9FVjaNvvR5llaqfLoOVbo2VxOELl7cjN0AOyXnPlk=:AmazonSES X-Rspamd-Queue-Id: 4BpdWt66Llz4CnL X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=pass header.d=tarsnap.com header.s=ae7m2yrxjw65l2cqdpjxuucyrvy564tn header.b=gxO6adSt; dkim=pass header.d=amazonses.com header.s=224i4yxa5dv7c2xz3womw6peuasteono header.b=DeuvEFm/; dmarc=pass (policy=none) header.from=tarsnap.com; spf=pass (mx1.freebsd.org: domain of 01000174832b94db-36e5b9c0-c71a-4023-b4eb-afa0ea3d1210-000000@amazonses.com designates 54.240.8.237 as permitted sender) smtp.mailfrom=01000174832b94db-36e5b9c0-c71a-4023-b4eb-afa0ea3d1210-000000@amazonses.com X-Spamd-Result: default: False [-0.92 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.99)[-0.993]; R_DKIM_ALLOW(-0.20)[tarsnap.com:s=ae7m2yrxjw65l2cqdpjxuucyrvy564tn,amazonses.com:s=224i4yxa5dv7c2xz3womw6peuasteono]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:54.240.0.0/18]; MIME_GOOD(-0.10)[text/plain]; NEURAL_HAM_LONG(-0.99)[-0.990]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[tarsnap.com:+,amazonses.com:+]; DMARC_POLICY_ALLOW(-0.50)[tarsnap.com,none]; RCVD_IN_DNSWL_NONE(0.00)[54.240.8.237:from]; NEURAL_HAM_SHORT(-0.74)[-0.736]; FORGED_SENDER(0.30)[cperciva@tarsnap.com,01000174832b94db-36e5b9c0-c71a-4023-b4eb-afa0ea3d1210-000000@amazonses.com]; RCVD_COUNT_ZERO(0.00)[0]; RWL_MAILSPIKE_POSSIBLE(0.00)[54.240.8.237:from]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:14618, ipnet:54.240.8.0/21, country:US]; FORGED_MUA_THUNDERBIRD_MSGID_UNKNOWN(2.50)[]; FROM_NEQ_ENVFROM(0.00)[cperciva@tarsnap.com,01000174832b94db-36e5b9c0-c71a-4023-b4eb-afa0ea3d1210-000000@amazonses.com]; MAILMAN_DEST(0.00)[svn-src-user] X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Sep 2020 16:35:08 -0000 On 2020-09-12 08:31, Alan Somers wrote: > On Sat, Sep 12, 2020 at 9:19 AM Gordon Tetlow > wrote: > > Author: gordon > Date: Sat Sep 12 15:18:52 2020 > New Revision: 365660 > URL: https://svnweb.freebsd.org/changeset/base/365660 > > Log: >   Add needed patch for 12.2-BETA1 to prevent spurious changes through >   freebsd-update processing. > > Added: >   user/cperciva/freebsd-update-build/patches/12.2-BETA1/ >   user/cperciva/freebsd-update-build/patches/12.2-BETA1/0-newvers > > What kinds of spurious changes do you see without this patch? There's three issues: 1. The code which selects which file to install as /etc/pkg/FreeBSD.conf doesn't recognize a fake branch name and installs the "latest" file instead of the "quarterly" file. 2. The branch name gets into /bin/freebsd-version, which is technically correct, but confuses freebsd-update's "don't update files if the only change is the version number" code. 3. The branch name gets into every single .o file in the kernel build, and at this point all hell breaks loose. -- Colin Percival Security Officer Emeritus, FreeBSD | The power to serve Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid From owner-svn-src-user@freebsd.org Sat Sep 12 23:04:14 2020 Return-Path: Delivered-To: svn-src-user@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 811833E5070 for ; Sat, 12 Sep 2020 23:04:14 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bpp8t2pbvz4d5J; Sat, 12 Sep 2020 23:04:14 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 43C591CC08; Sat, 12 Sep 2020 23:04:14 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08CN4E7P019134; Sat, 12 Sep 2020 23:04:14 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08CN4EKj019133; Sat, 12 Sep 2020 23:04:14 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <202009122304.08CN4EKj019133@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Sat, 12 Sep 2020 23:04:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r365674 - user/cperciva/freebsd-update-build X-SVN-Group: user X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: user/cperciva/freebsd-update-build X-SVN-Commit-Revision: 365674 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Sep 2020 23:04:14 -0000 Author: gordon Date: Sat Sep 12 23:04:13 2020 New Revision: 365674 URL: https://svnweb.freebsd.org/changeset/base/365674 Log: Add parallelization. Use a couple of simple shell constructs to monitor the number of jobs running at any given time and if we exceed the maximum (based on CPUs since this is a CPU bound process), we sleep and recheck if any of our children have finished. Modified: user/cperciva/freebsd-update-build/build-upgrade-patches.sh Modified: user/cperciva/freebsd-update-build/build-upgrade-patches.sh ============================================================================== --- user/cperciva/freebsd-update-build/build-upgrade-patches.sh Sat Sep 12 21:50:25 2020 (r365673) +++ user/cperciva/freebsd-update-build/build-upgrade-patches.sh Sat Sep 12 23:04:13 2020 (r365674) @@ -12,6 +12,21 @@ OLDRELS=$3 WWWDIR=${BASEDIR}/pub +MAXJOBS=$(( $(sysctl -n hw.ncpu) - 2 )) +if [ $MAXJOBS -lt 1 ]; then + MAXJOBS=1 +fi + +genpatch() { + tempdir=$(mktemp -d -t genpatch) + + gunzip < ${WWWDIR}/${OR}/${ARCH}/f/${OH}.gz > ${tempdir}/${OH} + gunzip < ${WWWDIR}/${NR}/${ARCH}/f/${NH}.gz > ${tempdir}/${NH} + bsdiff ${tempdir}/${OH} ${tempdir}/${NH} ${WWWDIR}/to-${TARGETREL}/${ARCH}/bp/${OH}-${NH} + rm ${tempdir}/${OH} ${tempdir}/${NH} + rmdir ${tempdir} +} + mkdir -p ${WWWDIR}/to-${TARGETREL}/${ARCH}/bp/ for V in ${OLDRELS}; do zcat ${WWWDIR}/${V}/${ARCH}/m/* | @@ -43,10 +58,17 @@ zcat ${WWWDIR}/${TARGETREL}/${ARCH}/m/* | if [ ${OH} = ${NH} ]; then continue fi - gunzip < ${WWWDIR}/${OR}/${ARCH}/f/${OH}.gz > ${OH} - gunzip < ${WWWDIR}/${NR}/${ARCH}/f/${NH}.gz > ${NH} - bsdiff ${OH} ${NH} ${WWWDIR}/to-${TARGETREL}/${ARCH}/bp/${OH}-${NH} - rm ${OH} ${NH} + + genpatch & + + jobs="$(jobs)" + numjobs=$(echo "$jobs" | wc -l) + while [ $numjobs -ge $MAXJOBS ]; do + sleep 2 + + jobs="$(jobs)" + numjobs=$(echo "$jobs" | wc -l) + done done rm hashtab From owner-svn-src-user@freebsd.org Sat Sep 12 23:06:36 2020 Return-Path: Delivered-To: svn-src-user@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 EBA913E4D73 for ; Sat, 12 Sep 2020 23:06:36 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BppCc5ygQz4cjx; Sat, 12 Sep 2020 23:06:36 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B0C2F1CA0E; Sat, 12 Sep 2020 23:06:36 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08CN6afR019285; Sat, 12 Sep 2020 23:06:36 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08CN6aFr019284; Sat, 12 Sep 2020 23:06:36 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <202009122306.08CN6aFr019284@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Sat, 12 Sep 2020 23:06:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r365675 - user/cperciva/freebsd-update-build X-SVN-Group: user X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: user/cperciva/freebsd-update-build X-SVN-Commit-Revision: 365675 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Sep 2020 23:06:37 -0000 Author: gordon Date: Sat Sep 12 23:06:36 2020 New Revision: 365675 URL: https://svnweb.freebsd.org/changeset/base/365675 Log: Forgot to add the wait to the end of the script. Modified: user/cperciva/freebsd-update-build/build-upgrade-patches.sh Modified: user/cperciva/freebsd-update-build/build-upgrade-patches.sh ============================================================================== --- user/cperciva/freebsd-update-build/build-upgrade-patches.sh Sat Sep 12 23:04:13 2020 (r365674) +++ user/cperciva/freebsd-update-build/build-upgrade-patches.sh Sat Sep 12 23:06:36 2020 (r365675) @@ -71,4 +71,5 @@ zcat ${WWWDIR}/${TARGETREL}/${ARCH}/m/* | done done +wait rm hashtab From owner-svn-src-user@freebsd.org Sat Sep 12 23:23:16 2020 Return-Path: Delivered-To: svn-src-user@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 D0BEB3E5263 for ; Sat, 12 Sep 2020 23:23:16 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BppZr4v5Nz4dwt; Sat, 12 Sep 2020 23:23:16 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8B5591CD4D; Sat, 12 Sep 2020 23:23:16 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08CNNGKm032276; Sat, 12 Sep 2020 23:23:16 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08CNNG9f032275; Sat, 12 Sep 2020 23:23:16 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <202009122323.08CNNG9f032275@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Sat, 12 Sep 2020 23:23:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r365676 - user/cperciva/freebsd-update-build X-SVN-Group: user X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: user/cperciva/freebsd-update-build X-SVN-Commit-Revision: 365676 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Sep 2020 23:23:16 -0000 Author: gordon Date: Sat Sep 12 23:23:16 2020 New Revision: 365676 URL: https://svnweb.freebsd.org/changeset/base/365676 Log: Add additional output to show we are actually doing something. Modified: user/cperciva/freebsd-update-build/build-upgrade-patches.sh Modified: user/cperciva/freebsd-update-build/build-upgrade-patches.sh ============================================================================== --- user/cperciva/freebsd-update-build/build-upgrade-patches.sh Sat Sep 12 23:06:36 2020 (r365675) +++ user/cperciva/freebsd-update-build/build-upgrade-patches.sh Sat Sep 12 23:23:16 2020 (r365676) @@ -27,6 +27,7 @@ genpatch() { rmdir ${tempdir} } +echo -n "Building hash table..." mkdir -p ${WWWDIR}/to-${TARGETREL}/${ARCH}/bp/ for V in ${OLDRELS}; do zcat ${WWWDIR}/${V}/${ARCH}/m/* | @@ -38,7 +39,9 @@ for V in ${OLDRELS}; do lam -s "${V}|" - done | sort -k 2,2 -t '|' > hashtab +echo "done" +echo "Starting patch generation" zcat ${WWWDIR}/${TARGETREL}/${ARCH}/m/* | cut -f 3,4,9 -d '|' | fgrep '|f|' | @@ -71,5 +74,7 @@ zcat ${WWWDIR}/${TARGETREL}/${ARCH}/m/* | done done +echo -n "Finished spawning children, waiting for them to finish..." wait +echo "done" rm hashtab