Date: Tue, 18 Jun 2019 05:59:24 +0000 (UTC) From: Gordon Tetlow <gordon@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r349169 - user/cperciva/freebsd-update-build/scripts Message-ID: <201906180559.x5I5xOHM012899@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906180559.x5I5xOHM012899>