From owner-svn-src-head@freebsd.org Mon Feb 26 03:16:49 2018 Return-Path: Delivered-To: svn-src-head@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 1CE74F237C3; Mon, 26 Feb 2018 03:16:49 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C6C417EA5E; Mon, 26 Feb 2018 03:16:48 +0000 (UTC) (envelope-from imp@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 C197E15E32; Mon, 26 Feb 2018 03:16:48 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1Q3GmPr022400; Mon, 26 Feb 2018 03:16:48 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1Q3Gmnn022395; Mon, 26 Feb 2018 03:16:48 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201802260316.w1Q3Gmnn022395@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Mon, 26 Feb 2018 03:16:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r330005 - in head/stand: . arm/loader defaults forth mips/uboot X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/stand: . arm/loader defaults forth mips/uboot X-SVN-Commit-Revision: 330005 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Feb 2018 03:16:49 -0000 Author: imp Date: Mon Feb 26 03:16:47 2018 New Revision: 330005 URL: https://svnweb.freebsd.org/changeset/base/330005 Log: Go back to one loader.conf We really only need one loader.conf. The other loader.conf was created because the current one took forever to parse in FORTH. That will be fixed in the next commit. Added: head/stand/defaults/ head/stand/defaults/Makefile (contents, props changed) head/stand/defaults/loader.conf (contents, props changed) - copied, changed from r330004, head/stand/forth/loader.conf head/stand/defaults/loader.conf.5 (contents, props changed) - copied, changed from r330004, head/stand/forth/loader.conf.5 Deleted: head/stand/arm/loader/loader.conf head/stand/forth/loader.conf head/stand/forth/loader.conf.5 head/stand/mips/uboot/loader.conf Modified: head/stand/Makefile head/stand/forth/Makefile Modified: head/stand/Makefile ============================================================================== --- head/stand/Makefile Mon Feb 26 03:16:04 2018 (r330004) +++ head/stand/Makefile Mon Feb 26 03:16:47 2018 (r330005) @@ -13,6 +13,7 @@ SUBDIR+= liblua SUBDIR+= lua .endif +SUBDIR+= defaults SUBDIR+= man .include Added: head/stand/defaults/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/stand/defaults/Makefile Mon Feb 26 03:16:47 2018 (r330005) @@ -0,0 +1,12 @@ +# $FreeBSD$ + +NO_OBJ=t + +.include + +FILES+= loader.conf +FILES+= loader.conf.5 + +FILESDIR_loader.conf= /boot/defaults + +.include Copied and modified: head/stand/defaults/loader.conf (from r330004, head/stand/forth/loader.conf) ============================================================================== Copied and modified: head/stand/defaults/loader.conf.5 (from r330004, head/stand/forth/loader.conf.5) ============================================================================== Modified: head/stand/forth/Makefile ============================================================================== --- head/stand/forth/Makefile Mon Feb 26 03:16:04 2018 (r330004) +++ head/stand/forth/Makefile Mon Feb 26 03:16:47 2018 (r330005) @@ -9,7 +9,6 @@ MAN+= beastie.4th.8 \ check-password.4th.8 \ color.4th.8 \ delay.4th.8 \ - loader.conf.5 \ loader.4th.8 \ menu.4th.8 \ menusets.4th.8 \ @@ -35,10 +34,9 @@ FILES+= screen.4th FILES+= shortcuts.4th FILES+= support.4th FILES+= version.4th -FILESDIR_loader.conf= /boot/defaults # Allow machine specific loader.rc to be installed. -.for f in loader.rc menu.rc loader.conf +.for f in loader.rc menu.rc .if exists(${BOOTSRC}/${MACHINE:C/amd64/i386/}/loader/${f}) FILES+= ${BOOTSRC}/${MACHINE:C/amd64/i386/}/loader/${f} .else