svn commit: r232733 - in projects/bigbb/sys/boot: i386 i386/boot2
i386/boot2ufs1 i386/boot2ufs2 pc98 pc98/boot2 pc98/boot2ufs1
pc98/boot2ufs2
Jung-uk Kim
jkim at FreeBSD.org
Fri Mar 9 17:32:35 UTC 2012
Author: jkim
Date: Fri Mar 9 17:32:34 2012
New Revision: 232733
URL: http://svn.freebsd.org/changeset/base/232733
Log:
Add UFS2-only boot2 and restore UFS1+UFS2 boot2 to prevent POLA violation.
Added:
projects/bigbb/sys/boot/i386/boot2ufs2/
projects/bigbb/sys/boot/i386/boot2ufs2/Makefile (contents, props changed)
projects/bigbb/sys/boot/pc98/boot2ufs2/
projects/bigbb/sys/boot/pc98/boot2ufs2/Makefile (contents, props changed)
Modified:
projects/bigbb/sys/boot/i386/Makefile
projects/bigbb/sys/boot/i386/boot2/Makefile
projects/bigbb/sys/boot/i386/boot2ufs1/Makefile
projects/bigbb/sys/boot/pc98/Makefile
projects/bigbb/sys/boot/pc98/boot2/Makefile
projects/bigbb/sys/boot/pc98/boot2ufs1/Makefile
Modified: projects/bigbb/sys/boot/i386/Makefile
==============================================================================
--- projects/bigbb/sys/boot/i386/Makefile Fri Mar 9 17:19:50 2012 (r232732)
+++ projects/bigbb/sys/boot/i386/Makefile Fri Mar 9 17:32:34 2012 (r232733)
@@ -2,8 +2,8 @@
.include <bsd.own.mk>
-SUBDIR= mbr pmbr boot0 boot0sio btx boot2 boot2ufs1 cdboot gptboot \
- kgzldr libi386 libfirewire loader
+SUBDIR= mbr pmbr boot0 boot0sio btx boot2 boot2ufs1 boot2ufs2 cdboot \
+ gptboot kgzldr libi386 libfirewire loader
# special boot programs, 'self-extracting boot2+loader'
SUBDIR+= pxeldr
Modified: projects/bigbb/sys/boot/i386/boot2/Makefile
==============================================================================
--- projects/bigbb/sys/boot/i386/boot2/Makefile Fri Mar 9 17:19:50 2012 (r232732)
+++ projects/bigbb/sys/boot/i386/boot2/Makefile Fri Mar 9 17:32:34 2012 (r232733)
@@ -20,26 +20,10 @@ ORG1= 0x7c00
ORG2= 0x2000
# Decide level of UFS support.
-BOOT2_UFS?= UFS2_ONLY
-#BOOT2_UFS?= UFS1_AND_UFS2
-
-.if ${BOOT2_UFS} == UFS1_ONLY
-BOOT_SUFFIX= .ufs1
-BOOT2_SUFFIX= ufs1
-.elif ${BOOT2_UFS} == UFS2_ONLY
-BOOT_SUFFIX= .ufs2
-BOOT2_SUFFIX= ufs2
-LINKS= ${BINDIR}/boot${BOOT_SUFFIX} ${BINDIR}/boot \
- ${BINDIR}/boot1${BOOT2_SUFFIX} ${BINDIR}/boot1 \
- ${BINDIR}/boot2${BOOT2_SUFFIX} ${BINDIR}/boot2
-.endif
+BOOT2_UFS?= UFS1_AND_UFS2
# Decide boot block size.
-.if ${BOOT2_UFS} == UFS2_ONLY
-BOOT_NSECT= 32
-.else
-BOOT_NSECT= 16
-.endif
+BOOT_NSECT?= 16
BOOT2_SIZE= (${BOOT_NSECT}-1)*512
CFLAGS= -Os \
Modified: projects/bigbb/sys/boot/i386/boot2ufs1/Makefile
==============================================================================
--- projects/bigbb/sys/boot/i386/boot2ufs1/Makefile Fri Mar 9 17:19:50 2012 (r232732)
+++ projects/bigbb/sys/boot/i386/boot2ufs1/Makefile Fri Mar 9 17:32:34 2012 (r232733)
@@ -3,5 +3,8 @@
.PATH: ${.CURDIR}/../boot2
BOOT2_UFS= UFS1_ONLY
+BOOT_SUFFIX= .ufs1
+BOOT2_SUFFIX= ufs1
+BOOT_NSECT= 16
.include "${.CURDIR}/../boot2/Makefile"
Added: projects/bigbb/sys/boot/i386/boot2ufs2/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/bigbb/sys/boot/i386/boot2ufs2/Makefile Fri Mar 9 17:32:34 2012 (r232733)
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../boot2
+
+BOOT2_UFS= UFS2_ONLY
+BOOT_SUFFIX= .ufs2
+BOOT2_SUFFIX= ufs2
+BOOT_NSECT= 32
+
+.include "${.CURDIR}/../boot2/Makefile"
Modified: projects/bigbb/sys/boot/pc98/Makefile
==============================================================================
--- projects/bigbb/sys/boot/pc98/Makefile Fri Mar 9 17:19:50 2012 (r232732)
+++ projects/bigbb/sys/boot/pc98/Makefile Fri Mar 9 17:32:34 2012 (r232733)
@@ -1,6 +1,6 @@
# $FreeBSD$
-SUBDIR= boot0 boot0.5 pc98boot btx boot2 boot2ufs1 cdboot kgzldr \
- libpc98 loader
+SUBDIR= boot0 boot0.5 pc98boot btx boot2 boot2ufs1 boot2ufs2 cdboot \
+ kgzldr libpc98 loader
.include <bsd.subdir.mk>
Modified: projects/bigbb/sys/boot/pc98/boot2/Makefile
==============================================================================
--- projects/bigbb/sys/boot/pc98/boot2/Makefile Fri Mar 9 17:19:50 2012 (r232732)
+++ projects/bigbb/sys/boot/pc98/boot2/Makefile Fri Mar 9 17:32:34 2012 (r232733)
@@ -17,26 +17,10 @@ ORG1= 0
ORG2= 0x2000
# Decide level of UFS support.
-BOOT2_UFS?= UFS2_ONLY
-#BOOT2_UFS?= UFS1_AND_UFS2
-
-.if ${BOOT2_UFS} == UFS1_ONLY
-BOOT_SUFFIX= .ufs1
-BOOT2_SUFFIX= ufs1
-.elif ${BOOT2_UFS} == UFS2_ONLY
-BOOT_SUFFIX= .ufs2
-BOOT2_SUFFIX= ufs2
-LINKS= ${BINDIR}/boot${BOOT_SUFFIX} ${BINDIR}/boot \
- ${BINDIR}/boot1${BOOT2_SUFFIX} ${BINDIR}/boot1 \
- ${BINDIR}/boot2${BOOT2_SUFFIX} ${BINDIR}/boot2
-.endif
+BOOT2_UFS?= UFS1_AND_UFS2
# Decide boot block size.
-.if ${BOOT2_UFS} == UFS2_ONLY
-BOOT_NSECT= 32
-.else
-BOOT_NSECT= 16
-.endif
+BOOT_NSECT?= 16
BOOT2_SIZE= (${BOOT_NSECT}-1)*512
CFLAGS= -Os \
Modified: projects/bigbb/sys/boot/pc98/boot2ufs1/Makefile
==============================================================================
--- projects/bigbb/sys/boot/pc98/boot2ufs1/Makefile Fri Mar 9 17:19:50 2012 (r232732)
+++ projects/bigbb/sys/boot/pc98/boot2ufs1/Makefile Fri Mar 9 17:32:34 2012 (r232733)
@@ -3,5 +3,8 @@
.PATH: ${.CURDIR}/../boot2
BOOT2_UFS= UFS1_ONLY
+BOOT_SUFFIX= .ufs1
+BOOT2_SUFFIX= ufs1
+BOOT_NSECT= 16
.include "${.CURDIR}/../boot2/Makefile"
Added: projects/bigbb/sys/boot/pc98/boot2ufs2/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/bigbb/sys/boot/pc98/boot2ufs2/Makefile Fri Mar 9 17:32:34 2012 (r232733)
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../boot2
+
+BOOT2_UFS= UFS2_ONLY
+BOOT_SUFFIX= .ufs2
+BOOT2_SUFFIX= ufs2
+BOOT_NSECT= 32
+
+.include "${.CURDIR}/../boot2/Makefile"
More information about the svn-src-projects
mailing list