Module Name: src
Committed By: tsutsui
Date: Sat Sep 11 13:06:37 UTC 2010
Modified Files:
src/distrib/sets/lists/base: md.amd64 md.i386
src/sys/arch/i386/stand/bootxx: Makefile
Added Files:
src/sys/arch/i386/stand/bootxx/bootxx_ext2fs: Makefile
Log Message:
Build and install bootxx_ext2fs, primary boot for ext2fs.
Ext2fs doesn't have enough free space (it has only 1KB)
to store this primary loader, but we can put it into
an independent small 'boot' partition as NetBSD/hp300 does
if it's really necessary.
It could be a fun project to add smaller pre-primary loader
that loads ~8KB primary loader for ext2fs, but probably it's unlikely
because there is a functional wheel named GRUB for ext2fs.
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.136 -r1.137 src/distrib/sets/lists/base/md.i386
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/i386/stand/bootxx/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/arch/i386/stand/bootxx/bootxx_ext2fs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/md.amd64
diff -u src/distrib/sets/lists/base/md.amd64:1.93 src/distrib/sets/lists/base/md.amd64:1.94
--- src/distrib/sets/lists/base/md.amd64:1.93 Sat Aug 7 05:30:58 2010
+++ src/distrib/sets/lists/base/md.amd64 Sat Sep 11 13:06:36 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.93 2010/08/07 05:30:58 agc Exp $
+# $NetBSD: md.amd64,v 1.94 2010/09/11 13:06:36 tsutsui Exp $
./dev/lms0 base-obsolete obsolete
./dev/mms0 base-obsolete obsolete
./libexec/ld.elf_so-i386 base-sys-shlib compat,pic
@@ -263,6 +263,7 @@
./usr/mdec/boot base-sysutil-bin
./usr/mdec/bootxx_cd9660 base-sysutil-bin
./usr/mdec/bootxx_dosfs base-obsolete obsolete
+./usr/mdec/bootxx_ext2fs base-sysutil-bin
./usr/mdec/bootxx_fat16 base-sysutil-bin
./usr/mdec/bootxx_ffsv1 base-sysutil-bin
./usr/mdec/bootxx_ffsv2 base-sysutil-bin
Index: src/distrib/sets/lists/base/md.i386
diff -u src/distrib/sets/lists/base/md.i386:1.136 src/distrib/sets/lists/base/md.i386:1.137
--- src/distrib/sets/lists/base/md.i386:1.136 Tue Aug 18 23:43:31 2009
+++ src/distrib/sets/lists/base/md.i386 Sat Sep 11 13:06:36 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.136 2009/08/18 23:43:31 jmcneill Exp $
+# $NetBSD: md.i386,v 1.137 2010/09/11 13:06:36 tsutsui Exp $
./dev/lms0 base-obsolete obsolete
./dev/mms0 base-obsolete obsolete
./dev/pms0 base-obsolete obsolete
@@ -62,6 +62,7 @@
./usr/mdec/bootwd base-obsolete obsolete
./usr/mdec/bootxx_cd9660 base-sysutil-bin
./usr/mdec/bootxx_dosfs base-obsolete obsolete
+./usr/mdec/bootxx_ext2fs base-sysutil-bin
./usr/mdec/bootxx_fat16 base-sysutil-bin
./usr/mdec/bootxx_ffsv1 base-sysutil-bin
./usr/mdec/bootxx_ffsv2 base-sysutil-bin
Index: src/sys/arch/i386/stand/bootxx/Makefile
diff -u src/sys/arch/i386/stand/bootxx/Makefile:1.12 src/sys/arch/i386/stand/bootxx/Makefile:1.13
--- src/sys/arch/i386/stand/bootxx/Makefile:1.12 Thu May 27 06:58:14 2010
+++ src/sys/arch/i386/stand/bootxx/Makefile Sat Sep 11 13:06:37 2010
@@ -1,8 +1,13 @@
-# $NetBSD: Makefile,v 1.12 2010/05/27 06:58:14 dholland Exp $
+# $NetBSD: Makefile,v 1.13 2010/09/11 13:06:37 tsutsui Exp $
SUBDIR= bootxx_cd9660 bootxx_ffsv1 .WAIT bootxx_ffsv2 bootxx_lfsv1 bootxx_lfsv2
SUBDIR+=bootxx_msdos bootxx_ustarfs
+# Ext2fs doesn't have enough free space (it has only 1KB)
+# to store this primary bootloader, but we can put it into
+# an independent small 'boot' partition as NetBSD/hp300 does.
+SUBDIR+=bootxx_ext2fs
+
LIBOBJ= ${.OBJDIR}
.MAKEOVERRIDES+= LIBOBJ
Added files:
Index: src/sys/arch/i386/stand/bootxx/bootxx_ext2fs/Makefile
diff -u /dev/null src/sys/arch/i386/stand/bootxx/bootxx_ext2fs/Makefile:1.1
--- /dev/null Sat Sep 11 13:06:37 2010
+++ src/sys/arch/i386/stand/bootxx/bootxx_ext2fs/Makefile Sat Sep 11 13:06:37 2010
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2010/09/11 13:06:37 tsutsui Exp $
+
+FS=ext2fs
+
+.include <../Makefile.bootxx>
