Date: Thu, 21 Feb 2019 20:40:10 -0800 (PST) From: "Rodney W. Grimes" <freebsd@pdx.rh.CN85.dnsmgr.net> To: Kyle Evans <kevans@freebsd.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: Re: svn commit: r344455 - in stable/11: . stand Message-ID: <201902220440.x1M4eAND023763@pdx.rh.CN85.dnsmgr.net> In-Reply-To: <201902220310.x1M3AOpJ053326@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
> 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 Thank you, but you still missed the missing . > > 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 ^.efi? > 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" > > -- Rod Grimes rgrimes@freebsd.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902220440.x1M4eAND023763>