From owner-svn-src-user@freebsd.org Tue Jun 18 05:59:25 2019 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 31A3815CFD07 for ; Tue, 18 Jun 2019 05:59:25 +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) server-signature RSA-PSS (4096 bits) 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 CBB9F9315B; Tue, 18 Jun 2019 05:59:24 +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 9C93E8F0B; Tue, 18 Jun 2019 05:59:24 +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 x5I5xObK012900; Tue, 18 Jun 2019 05:59:24 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x5I5xOHM012899; Tue, 18 Jun 2019 05:59:24 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <201906180559.x5I5xOHM012899@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Tue, 18 Jun 2019 05:59:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r349169 - user/cperciva/freebsd-update-build/scripts X-SVN-Group: user X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: user/cperciva/freebsd-update-build/scripts X-SVN-Commit-Revision: 349169 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: CBB9F9315B X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.971,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 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: Tue, 18 Jun 2019 05:59:25 -0000 Author: gordon Date: Tue Jun 18 05:59:24 2019 New Revision: 349169 URL: https://svnweb.freebsd.org/changeset/base/349169 Log: Add the ability to switch the uarch flag to keep 12.0 from breaking. Modified: user/cperciva/freebsd-update-build/scripts/build.subr Modified: user/cperciva/freebsd-update-build/scripts/build.subr ============================================================================== --- user/cperciva/freebsd-update-build/scripts/build.subr Tue Jun 18 04:32:19 2019 (r349168) +++ user/cperciva/freebsd-update-build/scripts/build.subr Tue Jun 18 05:59:24 2019 (r349169) @@ -581,8 +581,16 @@ indexfiles () { grep -vE '/obj$' | while read F; do eval $(stat -s ${F}) - # Remove the uarch flag as that is problematic - st_flags=$(($st_flags & ~04000)) + # In 12.0, we accidentally shipped with everything marked + # with the uarch flag. We needed to preserve the behavior + # for only that release. + if [ -n "$PRESERVE_UARCH" ]; then + # Unconditionally set the uarch flag + st_flags=$(($st_flags | 04000)) + else + # Remove the uarch flag as that is problematic + st_flags=$(($st_flags & ~04000)) + fi st_mode_mid=$(( ($st_mode & 07000) >> 9)) st_mode_low=$(($st_mode & 0777)) if [ -L ${F} ]; then