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 <bsd.arch.inc.mk>
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 <bsd.init.mk>
+
+FILES+= loader.conf
+FILES+= loader.conf.5
+
+FILESDIR_loader.conf= /boot/defaults
+
+.include <bsd.prog.mk>
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
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
