From owner-svn-src-all@freebsd.org Fri Feb 22 03:10:25 2019 Return-Path: Delivered-To: svn-src-all@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 CDF7114FCBFE; Fri, 22 Feb 2019 03:10:25 +0000 (UTC) (envelope-from kevans@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 6CB8A76219; Fri, 22 Feb 2019 03:10:25 +0000 (UTC) (envelope-from kevans@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 2A0DD271B2; Fri, 22 Feb 2019 03:10:25 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1M3APgK053327; Fri, 22 Feb 2019 03:10:25 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1M3AOpJ053326; Fri, 22 Feb 2019 03:10:24 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201902220310.x1M3AOpJ053326@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Fri, 22 Feb 2019 03:10:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r344455 - in stable/11: . stand X-SVN-Group: stable-11 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in stable/11: . stand X-SVN-Commit-Revision: 344455 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 6CB8A76219 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.94)[-0.941,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Feb 2019 03:10:26 -0000 Author: kevans Date: Fri Feb 22 03:10:24 2019 New Revision: 344455 URL: https://svnweb.freebsd.org/changeset/base/344455 Log: Direct commit for some clarification/correction The notice in UPDATING stated the wrong direction for the link. Additionally, it's decidedly not a bad idea to throw in a comment mandating that the ordering of LOADER_DEFAULT_INTERP bits remains the same in this branch. This makes it even more obvious from diff review (against head) that this difference is intentional and creates merge conflicts if someone tries to apply the original commit manually. I suspect this won't be a problem given the set of people that maintain loader bits in stable/11, but it does offer a peace of mind. Reported by: rgrimes Modified: stable/11/UPDATING stable/11/stand/defs.mk Modified: stable/11/UPDATING ============================================================================== --- stable/11/UPDATING Thu Feb 21 23:53:52 2019 (r344454) +++ stable/11/UPDATING Fri Feb 22 03:10:24 2019 (r344455) @@ -22,7 +22,7 @@ from older version of current across the gcc/clang cut in build(7), may be used to control which interpreter flavor is used in the default loader to be installed. For systems where Lua and Forth coexist, this switch can also be made on a running system by creating a - link from /boot/loader_${flavor}{,efi} to /boot/loader{,.efi} rather + link from /boot/loader{,.efi} to /boot/loader_${flavor}{,efi} rather than requiring a rebuild. The default flavor in this branch will remain Forth. As indicated in Modified: stable/11/stand/defs.mk ============================================================================== --- stable/11/stand/defs.mk Thu Feb 21 23:53:52 2019 (r344454) +++ stable/11/stand/defs.mk Fri Feb 22 03:10:24 2019 (r344455) @@ -156,6 +156,8 @@ CFLAGS+= -mlittle-endian # # Have a sensible default # +# XXX Do not change the ordering of this chain in this branch. 4th must remain +# the default for the lifetime of stable/11. .if ${MK_FORTH} == "yes" LOADER_DEFAULT_INTERP?=4th .elif ${MK_LOADER_LUA} == "yes"