From owner-svn-src-projects@FreeBSD.ORG Fri Mar 9 17:32:35 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 87A72106564A; Fri, 9 Mar 2012 17:32:35 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 687F38FC0A; Fri, 9 Mar 2012 17:32:35 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q29HWZ9D017544; Fri, 9 Mar 2012 17:32:35 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q29HWZ1Y017535; Fri, 9 Mar 2012 17:32:35 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201203091732.q29HWZ1Y017535@svn.freebsd.org> From: Jung-uk Kim Date: Fri, 9 Mar 2012 17:32:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r232733 - in projects/bigbb/sys/boot: i386 i386/boot2 i386/boot2ufs1 i386/boot2ufs2 pc98 pc98/boot2 pc98/boot2ufs1 pc98/boot2ufs2 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Mar 2012 17:32:35 -0000 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 -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 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"