Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src * Move the rescue bits into their own file.



details:   https://anonhg.NetBSD.org/src/rev/02e9d4696f14
branches:  trunk
changeset: 537852:02e9d4696f14
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sun Oct 06 17:28:46 2002 +0000

description:
* Move the rescue bits into their own file.
* In makeflist, skip rescue bits in arch's that don't yet support it
  (MIPS, currently, due to an objcopy-crunch bug).

diffstat:

 distrib/sets/lists/base/mi        |  127 +-------------------------------------
 distrib/sets/lists/base/rescue.mi |  126 +++++++++++++++++++++++++++++++++++++
 distrib/sets/makeflist            |    7 +-
 rescue/Makefile                   |    4 +-
 4 files changed, 136 insertions(+), 128 deletions(-)

diffs (truncated from 312 to 300 lines):

diff -r f9af55b69ebe -r 02e9d4696f14 distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi        Sun Oct 06 17:19:12 2002 +0000
+++ b/distrib/sets/lists/base/mi        Sun Oct 06 17:28:46 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.355 2002/10/04 18:43:36 elric Exp $
+# $NetBSD: mi,v 1.356 2002/10/06 17:28:47 thorpej Exp $
 .                      base-sys-root
 ./altroot              base-sys-root
 ./bin                  base-sys-root
@@ -67,131 +67,6 @@
 ./libexec              base-sys-root
 ./mnt                  base-sys-root
 ./rescue               base-sys-root
-./rescue/[             base-rescue-root
-./rescue/atactl                base-rescue-root
-./rescue/badsect       base-rescue-root
-./rescue/brconfig      base-rescue-root
-./rescue/bunzip2       base-rescue-root
-./rescue/bzcat         base-rescue-root
-./rescue/bzip2         base-rescue-root
-./rescue/cat           base-rescue-root
-./rescue/ccdconfig     base-rescue-root
-./rescue/chgrp         base-rescue-root
-./rescue/chio          base-rescue-root
-./rescue/chmod         base-rescue-root
-./rescue/chown         base-rescue-root
-./rescue/clri          base-rescue-root
-./rescue/cp            base-rescue-root
-./rescue/csh           base-rescue-root
-./rescue/date          base-rescue-root
-./rescue/dd            base-rescue-root
-./rescue/df            base-rescue-root
-./rescue/disklabel     base-rescue-root
-./rescue/dkctl         base-rescue-root
-./rescue/dmesg         base-rescue-root
-./rescue/domainname    base-rescue-root
-./rescue/dump          base-rescue-root
-./rescue/dump_lfs      base-rescue-root
-./rescue/echo          base-rescue-root
-./rescue/ed            base-rescue-root
-./rescue/expr          base-rescue-root
-./rescue/fsck          base-rescue-root
-./rescue/fsck_ext2fs   base-rescue-root
-./rescue/fsck_ffs      base-rescue-root
-./rescue/fsck_lfs      base-rescue-root
-./rescue/fsck_msdos    base-rescue-root
-./rescue/fsdb          base-rescue-root
-./rescue/fsirand       base-rescue-root
-./rescue/gunzip                base-rescue-root
-./rescue/gzcat         base-rescue-root
-./rescue/gzip          base-rescue-root
-./rescue/halt          base-rescue-root
-./rescue/hostname      base-rescue-root
-./rescue/ifconfig      base-rescue-root
-./rescue/init          base-rescue-root
-./rescue/init.bak      base-rescue-root
-./rescue/ipppctl       base-rescue-root
-./rescue/kdump         base-rescue-root
-./rescue/kill          base-rescue-root
-./rescue/ksh           base-rescue-root
-./rescue/ktrace                base-rescue-root
-./rescue/ktruss                base-rescue-root
-./rescue/ldd           base-rescue-root
-./rescue/lmcctl                base-rescue-root
-./rescue/ln            base-rescue-root
-./rescue/ls            base-rescue-root
-./rescue/mbrlabel      base-rescue-root
-./rescue/mkdir         base-rescue-root
-./rescue/mknod         base-rescue-root
-./rescue/modload       base-rescue-root
-./rescue/modunload     base-rescue-root
-./rescue/mount         base-rescue-root
-./rescue/mount_ados    base-rescue-root
-./rescue/mount_cd9660  base-rescue-root
-./rescue/mount_ext2fs  base-rescue-root
-./rescue/mount_fdesc   base-rescue-root
-./rescue/mount_ffs     base-rescue-root
-./rescue/mount_filecore        base-rescue-root
-./rescue/mount_kernfs  base-rescue-root
-./rescue/mount_lfs     base-rescue-root
-./rescue/mount_mfs     base-rescue-root
-./rescue/mount_msdos   base-rescue-root
-./rescue/mount_nfs     base-rescue-root
-./rescue/mount_ntfs    base-rescue-root
-./rescue/mount_null    base-rescue-root
-./rescue/mount_overlay base-rescue-root
-./rescue/mount_portal  base-rescue-root
-./rescue/mount_procfs  base-rescue-root
-./rescue/mount_ufs     base-rescue-root
-./rescue/mount_umap    base-rescue-root
-./rescue/mount_union   base-rescue-root
-./rescue/mt            base-rescue-root
-./rescue/mv            base-rescue-root
-./rescue/newfs         base-rescue-root
-./rescue/newfs_lfs     base-rescue-root
-./rescue/newfs_msdos   base-rescue-root
-./rescue/pax           base-rescue-root
-./rescue/ping          base-rescue-root
-./rescue/ping6         base-rescue-root
-./rescue/pppoectl      base-rescue-root
-./rescue/ps            base-rescue-root
-./rescue/pwd           base-rescue-root
-./rescue/raidctl       base-rescue-root
-./rescue/rcmd          base-rescue-root
-./rescue/rcorder       base-rescue-root
-./rescue/rcp           base-rescue-root
-./rescue/rdump         base-rescue-root
-./rescue/rdump_lfs     base-rescue-root
-./rescue/reboot                base-rescue-root
-./rescue/restore       base-rescue-root
-./rescue/rm            base-rescue-root
-./rescue/rmdir         base-rescue-root
-./rescue/rndctl                base-rescue-root
-./rescue/route         base-rescue-root
-./rescue/routed                base-rescue-root
-./rescue/rrestore      base-rescue-root
-./rescue/rtsol         base-rescue-root
-./rescue/savecore      base-rescue-root
-./rescue/scsictl       base-rescue-root
-./rescue/setkey                base-rescue-root
-./rescue/sh            base-rescue-root
-./rescue/shutdown      base-rescue-root
-./rescue/slattach      base-rescue-root
-./rescue/sleep         base-rescue-root
-./rescue/stty          base-rescue-root
-./rescue/swapctl       base-rescue-root
-./rescue/swapon                base-rescue-root
-./rescue/sync          base-rescue-root
-./rescue/sysctl                base-rescue-root
-./rescue/systrace      base-rescue-root
-./rescue/tar           base-rescue-root
-./rescue/test          base-rescue-root
-./rescue/ttyflags      base-rescue-root
-./rescue/tunefs                base-rescue-root
-./rescue/umount                base-rescue-root
-./rescue/wdogctl       base-rescue-root
-./rescue/wsconsctl     base-rescue-root
-./rescue/zcat          base-rescue-root
 ./root                 base-sys-root
 ./sbin                 base-sys-root
 ./sbin/atactl          base-sysutil-root
diff -r f9af55b69ebe -r 02e9d4696f14 distrib/sets/lists/base/rescue.mi
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/sets/lists/base/rescue.mi Sun Oct 06 17:28:46 2002 +0000
@@ -0,0 +1,126 @@
+# $NetBSD: rescue.mi,v 1.1 2002/10/06 17:28:47 thorpej Exp $
+./rescue/[             base-rescue-root
+./rescue/atactl                base-rescue-root
+./rescue/badsect       base-rescue-root
+./rescue/brconfig      base-rescue-root
+./rescue/bunzip2       base-rescue-root
+./rescue/bzcat         base-rescue-root
+./rescue/bzip2         base-rescue-root
+./rescue/cat           base-rescue-root
+./rescue/ccdconfig     base-rescue-root
+./rescue/chgrp         base-rescue-root
+./rescue/chio          base-rescue-root
+./rescue/chmod         base-rescue-root
+./rescue/chown         base-rescue-root
+./rescue/clri          base-rescue-root
+./rescue/cp            base-rescue-root
+./rescue/csh           base-rescue-root
+./rescue/date          base-rescue-root
+./rescue/dd            base-rescue-root
+./rescue/df            base-rescue-root
+./rescue/disklabel     base-rescue-root
+./rescue/dkctl         base-rescue-root
+./rescue/dmesg         base-rescue-root
+./rescue/domainname    base-rescue-root
+./rescue/dump          base-rescue-root
+./rescue/dump_lfs      base-rescue-root
+./rescue/echo          base-rescue-root
+./rescue/ed            base-rescue-root
+./rescue/expr          base-rescue-root
+./rescue/fsck          base-rescue-root
+./rescue/fsck_ext2fs   base-rescue-root
+./rescue/fsck_ffs      base-rescue-root
+./rescue/fsck_lfs      base-rescue-root
+./rescue/fsck_msdos    base-rescue-root
+./rescue/fsdb          base-rescue-root
+./rescue/fsirand       base-rescue-root
+./rescue/gunzip                base-rescue-root
+./rescue/gzcat         base-rescue-root
+./rescue/gzip          base-rescue-root
+./rescue/halt          base-rescue-root
+./rescue/hostname      base-rescue-root
+./rescue/ifconfig      base-rescue-root
+./rescue/init          base-rescue-root
+./rescue/init.bak      base-rescue-root
+./rescue/ipppctl       base-rescue-root
+./rescue/kdump         base-rescue-root
+./rescue/kill          base-rescue-root
+./rescue/ksh           base-rescue-root
+./rescue/ktrace                base-rescue-root
+./rescue/ktruss                base-rescue-root
+./rescue/ldd           base-rescue-root
+./rescue/lmcctl                base-rescue-root
+./rescue/ln            base-rescue-root
+./rescue/ls            base-rescue-root
+./rescue/mbrlabel      base-rescue-root
+./rescue/mkdir         base-rescue-root
+./rescue/mknod         base-rescue-root
+./rescue/modload       base-rescue-root
+./rescue/modunload     base-rescue-root
+./rescue/mount         base-rescue-root
+./rescue/mount_ados    base-rescue-root
+./rescue/mount_cd9660  base-rescue-root
+./rescue/mount_ext2fs  base-rescue-root
+./rescue/mount_fdesc   base-rescue-root
+./rescue/mount_ffs     base-rescue-root
+./rescue/mount_filecore        base-rescue-root
+./rescue/mount_kernfs  base-rescue-root
+./rescue/mount_lfs     base-rescue-root
+./rescue/mount_mfs     base-rescue-root
+./rescue/mount_msdos   base-rescue-root
+./rescue/mount_nfs     base-rescue-root
+./rescue/mount_ntfs    base-rescue-root
+./rescue/mount_null    base-rescue-root
+./rescue/mount_overlay base-rescue-root
+./rescue/mount_portal  base-rescue-root
+./rescue/mount_procfs  base-rescue-root
+./rescue/mount_ufs     base-rescue-root
+./rescue/mount_umap    base-rescue-root
+./rescue/mount_union   base-rescue-root
+./rescue/mt            base-rescue-root
+./rescue/mv            base-rescue-root
+./rescue/newfs         base-rescue-root
+./rescue/newfs_lfs     base-rescue-root
+./rescue/newfs_msdos   base-rescue-root
+./rescue/pax           base-rescue-root
+./rescue/ping          base-rescue-root
+./rescue/ping6         base-rescue-root
+./rescue/pppoectl      base-rescue-root
+./rescue/ps            base-rescue-root
+./rescue/pwd           base-rescue-root
+./rescue/raidctl       base-rescue-root
+./rescue/rcmd          base-rescue-root
+./rescue/rcorder       base-rescue-root
+./rescue/rcp           base-rescue-root
+./rescue/rdump         base-rescue-root
+./rescue/rdump_lfs     base-rescue-root
+./rescue/reboot                base-rescue-root
+./rescue/restore       base-rescue-root
+./rescue/rm            base-rescue-root
+./rescue/rmdir         base-rescue-root
+./rescue/rndctl                base-rescue-root
+./rescue/route         base-rescue-root
+./rescue/routed                base-rescue-root
+./rescue/rrestore      base-rescue-root
+./rescue/rtsol         base-rescue-root
+./rescue/savecore      base-rescue-root
+./rescue/scsictl       base-rescue-root
+./rescue/setkey                base-rescue-root
+./rescue/sh            base-rescue-root
+./rescue/shutdown      base-rescue-root
+./rescue/slattach      base-rescue-root
+./rescue/sleep         base-rescue-root
+./rescue/stty          base-rescue-root
+./rescue/swapctl       base-rescue-root
+./rescue/swapon                base-rescue-root
+./rescue/sync          base-rescue-root
+./rescue/sysctl                base-rescue-root
+./rescue/systrace      base-rescue-root
+./rescue/tar           base-rescue-root
+./rescue/test          base-rescue-root
+./rescue/ttyflags      base-rescue-root
+./rescue/tunefs                base-rescue-root
+./rescue/umount                base-rescue-root
+./rescue/wdogctl       base-rescue-root
+./rescue/wsconsctl     base-rescue-root
+./rescue/zcat          base-rescue-root
diff -r f9af55b69ebe -r 02e9d4696f14 distrib/sets/makeflist
--- a/distrib/sets/makeflist    Sun Oct 06 17:19:12 2002 +0000
+++ b/distrib/sets/makeflist    Sun Oct 06 17:28:46 2002 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: makeflist,v 1.51 2002/09/19 22:04:34 lukem Exp $
+# $NetBSD: makeflist,v 1.52 2002/10/06 17:28:47 thorpej Exp $
 #
 # Print out the files in some or all lists.
 # Usage: makeflist [-b] [-x] [-a arch] [-m machine] [-s setsdir] [setname ...]
@@ -99,6 +99,11 @@
 
 for setname in $lists; do
        cat $setd/lists/$setname/mi
+       # XXX MIPS does not support rescue right now.
+       if [ -f $setd/lists/$setname/rescue.mi -a \
+            ${machine_cpu} != "mips" ]; then
+               cat $setd/lists/$setname/rescue.mi
+       fi
        if [ "$machine" != "$machine_arch" ]; then
                # Prefer an ad.${machine_arch} over an ad.${machine_cpu},
                # since the arch-specific one will be more specific than
diff -r f9af55b69ebe -r 02e9d4696f14 rescue/Makefile
--- a/rescue/Makefile   Sun Oct 06 17:19:12 2002 +0000
+++ b/rescue/Makefile   Sun Oct 06 17:28:46 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2002/10/06 17:19:12 thorpej Exp $
+#      $NetBSD: Makefile,v 1.5 2002/10/06 17:28:46 thorpej Exp $



Home | Main Index | Thread Index | Old Index