svn commit: r281002 - in head/sys/boot: arm/uboot forth i386/loader mips/beri/loader pc98/loader powerpc/kboot powerpc/ofw powerpc/ps3 sparc64/loader
Jung-uk Kim
jkim at FreeBSD.org
Thu Apr 2 20:07:10 UTC 2015
Author: jkim
Date: Thu Apr 2 20:07:05 2015
New Revision: 281002
URL: https://svnweb.freebsd.org/changeset/base/281002
Log:
Install newly added brand-*.4th and logo-*.4th files and reduce duplication.
Reviewed by: dteske
Pointy hat to: dteske
Added:
head/sys/boot/forth/Makefile.inc (contents, props changed)
Modified:
head/sys/boot/arm/uboot/Makefile
head/sys/boot/i386/loader/Makefile
head/sys/boot/mips/beri/loader/Makefile
head/sys/boot/pc98/loader/Makefile
head/sys/boot/powerpc/kboot/Makefile
head/sys/boot/powerpc/ofw/Makefile
head/sys/boot/powerpc/ps3/Makefile
head/sys/boot/sparc64/loader/Makefile
Modified: head/sys/boot/arm/uboot/Makefile
==============================================================================
--- head/sys/boot/arm/uboot/Makefile Thu Apr 2 19:10:33 2015 (r281001)
+++ head/sys/boot/arm/uboot/Makefile Thu Apr 2 20:07:05 2015 (r281002)
@@ -136,12 +136,7 @@ ldscript.generated::
fi
.if !defined(LOADER_ONLY)
-.PATH: ${.CURDIR}/../../forth
-FILES+= loader.help loader.4th support.4th loader.conf
-FILES+= screen.4th frames.4th beastie.4th
-FILES+= brand.4th check-password.4th color.4th delay.4th
-FILES+= menu.4th menu-commands.4th menusets.4th shortcuts.4th version.4th
-FILESDIR_loader.conf= /boot/defaults
+.include "${.CURDIR}/../../forth/Makefile.inc"
# Put sample loader.rc and menu.rc on disk but don't enable them
# by default.
Added: head/sys/boot/forth/Makefile.inc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/boot/forth/Makefile.inc Thu Apr 2 20:07:05 2015 (r281002)
@@ -0,0 +1,26 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../forth
+FILES+= beastie.4th
+FILES+= brand.4th
+FILES+= brand-fbsd.4th
+FILES+= check-password.4th
+FILES+= color.4th
+FILES+= delay.4th
+FILES+= frames.4th
+FILES+= loader.4th
+FILES+= loader.conf
+FILES+= loader.help
+FILES+= logo-beastie.4th
+FILES+= logo-beastiebw.4th
+FILES+= logo-fbsdbw.4th
+FILES+= logo-orb.4th
+FILES+= logo-orbbw.4th
+FILES+= menu.4th
+FILES+= menu-commands.4th
+FILES+= menusets.4th
+FILES+= screen.4th
+FILES+= shortcuts.4th
+FILES+= support.4th
+FILES+= version.4th
+FILESDIR_loader.conf= /boot/defaults
Modified: head/sys/boot/i386/loader/Makefile
==============================================================================
--- head/sys/boot/i386/loader/Makefile Thu Apr 2 19:10:33 2015 (r281001)
+++ head/sys/boot/i386/loader/Makefile Thu Apr 2 20:07:05 2015 (r281002)
@@ -105,13 +105,8 @@ FILES= ${LOADER}
FILESMODE_${LOADER}= ${BINMODE} -b
.if !defined(LOADER_ONLY)
-.PATH: ${.CURDIR}/../../forth
-FILES+= loader.help loader.4th support.4th loader.conf
-FILES+= screen.4th frames.4th beastie.4th
-FILES+= brand.4th check-password.4th color.4th delay.4th
-FILES+= menu.4th menu-commands.4th menusets.4th shortcuts.4th version.4th
-FILES+= pcibios.4th
-FILESDIR_loader.conf= /boot/defaults
+.include "${.CURDIR}/../../forth/Makefile.inc"
+FILES+= pcibios.4th
.if !exists(${DESTDIR}/boot/loader.rc)
FILES+= loader.rc
Modified: head/sys/boot/mips/beri/loader/Makefile
==============================================================================
--- head/sys/boot/mips/beri/loader/Makefile Thu Apr 2 19:10:33 2015 (r281001)
+++ head/sys/boot/mips/beri/loader/Makefile Thu Apr 2 20:07:05 2015 (r281002)
@@ -121,12 +121,7 @@ loader.help: help.common help.mips
cat ${.ALLSRC} | \
awk -f ${.CURDIR}/../../../common/merge_help.awk > ${.TARGET}
-.PATH: ${.CURDIR}/../../../forth
-FILES= loader.help loader.4th support.4th loader.conf
-FILES+= screen.4th frames.4th
-FILES+= beastie.4th brand.4th check-password.4th color.4th delay.4th
-FILES+= menu.4th menu-commands.4th menusets.4th shortcuts.4th version.4th
-FILESDIR_loader.conf= /boot/defaults
+.include "${.CURDIR}/../../forth/Makefile.inc"
.if !exists(${DESTDIR}/boot/loader.rc)
FILES+= loader.rc
Modified: head/sys/boot/pc98/loader/Makefile
==============================================================================
--- head/sys/boot/pc98/loader/Makefile Thu Apr 2 19:10:33 2015 (r281001)
+++ head/sys/boot/pc98/loader/Makefile Thu Apr 2 20:07:05 2015 (r281002)
@@ -86,12 +86,7 @@ FILES= ${LOADER}
# XXX INSTALLFLAGS_loader= -b
FILESMODE_${LOADER}= ${BINMODE} -b
-.PATH: ${.CURDIR}/../../forth
-FILES+= loader.help loader.4th support.4th loader.conf
-FILES+= screen.4th frames.4th beastie.4th
-FILES+= brand.4th check-password.4th color.4th delay.4th
-FILES+= menu.4th menu-commands.4th menusets.4th shortcuts.4th version.4th
-FILESDIR_loader.conf= /boot/defaults
+.include "${.CURDIR}/../../forth/Makefile.inc"
.if !exists(${DESTDIR}/boot/loader.rc)
FILES+= ${.CURDIR}/../../i386/loader/loader.rc
Modified: head/sys/boot/powerpc/kboot/Makefile
==============================================================================
--- head/sys/boot/powerpc/kboot/Makefile Thu Apr 2 19:10:33 2015 (r281001)
+++ head/sys/boot/powerpc/kboot/Makefile Thu Apr 2 20:07:05 2015 (r281002)
@@ -113,12 +113,7 @@ loader.help: help.common help.kboot ${.C
cat ${.ALLSRC} | \
awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
-.PATH: ${.CURDIR}/../../forth
-FILES= loader.help loader.4th support.4th loader.conf
-FILES+= screen.4th frames.4th
-FILES+= beastie.4th brand.4th check-password.4th color.4th delay.4th
-FILES+= menu.4th menu-commands.4th menusets.4th shortcuts.4th version.4th
-FILESDIR_loader.conf= /boot/defaults
+.include "${.CURDIR}/../../forth/Makefile.inc"
.if !exists(${DESTDIR}/boot/loader.rc)
FILES+= loader.rc
Modified: head/sys/boot/powerpc/ofw/Makefile
==============================================================================
--- head/sys/boot/powerpc/ofw/Makefile Thu Apr 2 19:10:33 2015 (r281001)
+++ head/sys/boot/powerpc/ofw/Makefile Thu Apr 2 20:07:05 2015 (r281002)
@@ -108,12 +108,7 @@ loader.help: help.common help.ofw ${.CUR
cat ${.ALLSRC} | \
awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
-.PATH: ${.CURDIR}/../../forth
-FILES= loader.help loader.4th support.4th loader.conf
-FILES+= screen.4th frames.4th
-FILES+= beastie.4th brand.4th check-password.4th color.4th delay.4th
-FILES+= menu.4th menu-commands.4th menusets.4th shortcuts.4th version.4th
-FILESDIR_loader.conf= /boot/defaults
+.include "${.CURDIR}/../../forth/Makefile.inc"
.if !exists(${DESTDIR}/boot/loader.rc)
FILES+= loader.rc
Modified: head/sys/boot/powerpc/ps3/Makefile
==============================================================================
--- head/sys/boot/powerpc/ps3/Makefile Thu Apr 2 19:10:33 2015 (r281001)
+++ head/sys/boot/powerpc/ps3/Makefile Thu Apr 2 20:07:05 2015 (r281002)
@@ -110,12 +110,7 @@ loader.help: help.common help.ps3 ${.CUR
cat ${.ALLSRC} | \
awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
-.PATH: ${.CURDIR}/../../forth
-FILES= loader.help loader.4th support.4th loader.conf
-FILES+= screen.4th frames.4th
-FILES+= beastie.4th brand.4th check-password.4th color.4th delay.4th
-FILES+= menu.4th menu-commands.4th menusets.4th shortcuts.4th version.4th
-FILESDIR_loader.conf= /boot/defaults
+.include "${.CURDIR}/../../forth/Makefile.inc"
.if !exists(${DESTDIR}/boot/loader.rc)
FILES+= loader.rc
Modified: head/sys/boot/sparc64/loader/Makefile
==============================================================================
--- head/sys/boot/sparc64/loader/Makefile Thu Apr 2 19:10:33 2015 (r281001)
+++ head/sys/boot/sparc64/loader/Makefile Thu Apr 2 20:07:05 2015 (r281002)
@@ -95,12 +95,7 @@ loader.help: help.common help.sparc64
cat ${.ALLSRC} | \
awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
-.PATH: ${.CURDIR}/../../forth
-FILES= loader.help loader.4th support.4th loader.conf
-FILES+= screen.4th frames.4th
-FILES+= beastie.4th brand.4th check-password.4th color.4th delay.4th
-FILES+= menu.4th menu-commands.4th menusets.4th shortcuts.4th version.4th
-FILESDIR_loader.conf= /boot/defaults
+.include "${.CURDIR}/../../forth/Makefile.inc"
.if !exists(${DESTDIR}/boot/loader.rc)
FILES+= loader.rc
More information about the svn-src-all
mailing list