Source-Changes-HG archive

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

[src/trunk]: src/distrib Sync ramdisks content across i386 and amd64. Biggest...



details:   https://anonhg.NetBSD.org/src/rev/af5596729e1c
branches:  trunk
changeset: 762005:af5596729e1c
user:      jym <jym%NetBSD.org@localhost>
date:      Sun Feb 13 04:14:58 2011 +0000

description:
Sync ramdisks content across i386 and amd64. Biggest change is for amd64,
where configuration for crunchgen(1) is moved from ramdisk/ to common/.

For i386, only mbrlabel(8) and various LFS related binaries are added. Yes,
LFS. It was added to amd64 ramdisk 3 years ago, I believe it's for a good
reason... ?

diffstat:

 distrib/amd64/ramdisks/common/list.ramdisk |  62 ++++++++++++++++++++++++++++-
 distrib/amd64/ramdisks/ramdisk/list        |  52 ++----------------------
 distrib/i386/ramdisks/common/list.ramdisk  |   5 +-
 distrib/i386/ramdisks/ramdisk-big/list     |   7 ++-
 4 files changed, 73 insertions(+), 53 deletions(-)

diffs (202 lines):

diff -r a18aa577518a -r af5596729e1c distrib/amd64/ramdisks/common/list.ramdisk
--- a/distrib/amd64/ramdisks/common/list.ramdisk        Sun Feb 13 03:58:38 2011 +0000
+++ b/distrib/amd64/ramdisks/common/list.ramdisk        Sun Feb 13 04:14:58 2011 +0000
@@ -1,12 +1,68 @@
-#      $NetBSD: list.ramdisk,v 1.12 2010/02/11 09:06:47 roy Exp $
+#      $NetBSD: list.ramdisk,v 1.13 2011/02/13 04:14:58 jym Exp $
+
+SRCDIRS        usr.bin/less
+SRCDIRS        bin sbin usr.bin usr.sbin libexec
+
+# Programs for a minimal ramdisk image
+
+PROG   bin/cat
+PROG   bin/chmod
+PROG   bin/cp
+PROG   bin/ln
+PROG   bin/ls
+PROG   bin/mkdir
+PROG   bin/mv
+PROG   bin/pax         usr/bin/tar
+PROG   bin/pwd
+PROG   bin/rm
+PROG   bin/sh
+PROG   bin/stty
 
-SRCDIRS        bin sbin usr.bin usr.sbin libexec
+PROG   sbin/chown      bin/chgrp
+PROG   sbin/disklabel
+PROG   sbin/dmesg
+PROG   sbin/fsck
+PROG   sbin/fsck_ffs
+PROG   sbin/ifconfig
+PROG   sbin/init
+PROG   sbin/mknod
+PROG   sbin/mount
+PROG   sbin/mount_cd9660
+PROG   sbin/mount_ffs
+# PROG sbin/mount_kernfs
+PROG   sbin/mount_msdos
+PROG   sbin/mount_nfs
+PROG   sbin/mount_tmpfs
+PROG   sbin/newfs      sbin/mount_mfs
+PROG   sbin/ping
+PROG   sbin/reboot     sbin/halt
+PROG   sbin/route
+PROG   sbin/swapctl
+PROG   sbin/umount
+
+PROG   usr/bin/ftp
+PROG   usr/bin/gzip    usr/bin/gzcat usr/bin/gunzip
+PROG   usr/bin/sed
+
+# One of these is rather useful
+# PROG usr/bin/less    usr/bin/more
+# PROG usr/bin/more    usr/bin/less
+
+# sysinst doesn't use installboot
+# PROG usr/sbin/installboot
+
+PROG   usr/sbin/chroot
+
+SPECIAL        ifconfig        srcdir  distrib/utils/x_ifconfig
+SPECIAL        ping            srcdir  distrib/utils/x_ping
+SPECIAL        route           srcdir  distrib/utils/x_route
+# SPECIAL more         srcdir  distrib/utils/more
 
 # init invokes the shell as -sh
 ARGVLN sh -sh
 
 # libhack.o is built by Makefile & included Makefile.inc
-LIBS   libhack.o -lbz2 -lutil -ll -lm
+LIBS   libhack.o -lbz2 -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop
 
 # various files that we need in /etc for the install
 COPY   ${NETBSDSRCDIR}/etc/group               etc/group
diff -r a18aa577518a -r af5596729e1c distrib/amd64/ramdisks/ramdisk/list
--- a/distrib/amd64/ramdisks/ramdisk/list       Sun Feb 13 03:58:38 2011 +0000
+++ b/distrib/amd64/ramdisks/ramdisk/list       Sun Feb 13 04:14:58 2011 +0000
@@ -1,73 +1,31 @@
-#      $NetBSD: list,v 1.12 2011/01/14 10:26:29 tsutsui Exp $
-#
+#      $NetBSD: list,v 1.13 2011/02/13 04:14:58 jym Exp $
 
-SRCDIRS        usr.bin/less
-
-PROG   bin/cat
-PROG   bin/chmod
-PROG   bin/cp
+PROG   bin/chio
 PROG   bin/dd
 PROG   bin/df
 PROG   bin/ed
-PROG   bin/ln
-PROG   bin/ls
-PROG   bin/mkdir
 PROG   bin/mt
-PROG   bin/mv
-PROG   bin/pax         usr/bin/tar
-PROG   bin/pwd
 PROG   bin/rcmd
-PROG   bin/rm
-PROG   bin/sh
-PROG   bin/stty
 PROG   bin/sync
 
 PROG   libexec/lfs_cleanerd
 
-PROG   sbin/chown      bin/chgrp
-PROG   sbin/disklabel
-PROG   sbin/dmesg
 PROG   sbin/fdisk
-PROG   sbin/fsck
-PROG   sbin/fsck_ffs
-PROG   sbin/ifconfig
-PROG   sbin/init
 PROG   sbin/mbrlabel
-PROG   sbin/mknod
-PROG   sbin/mount
-PROG   sbin/mount_cd9660
 PROG   sbin/mount_ext2fs
-PROG   sbin/mount_ffs
-PROG   sbin/mount_kernfs
 PROG   sbin/mount_lfs
-PROG   sbin/mount_msdos
-PROG   sbin/mount_nfs
 PROG   sbin/mount_ntfs
-PROG   sbin/mount_tmpfs
-PROG   sbin/newfs      sbin/mount_mfs
 PROG   sbin/newfs_lfs
-PROG   sbin/ping
 PROG   sbin/raidctl
-PROG   sbin/reboot     sbin/halt
 PROG   sbin/restore    sbin/rrestore
-PROG   sbin/route
+PROG   sbin/scsictl
 PROG   sbin/shutdown
+PROG   sbin/slattach
 PROG   sbin/sysctl
-PROG   sbin/swapctl
-PROG   sbin/umount
 
-PROG   usr/bin/ftp
-PROG   usr/bin/gzip    usr/bin/gzcat usr/bin/gunzip
 PROG   usr/bin/less    usr/bin/more
-PROG   usr/bin/sed
+PROG   usr/bin/tip
 
 PROG   usr/sbin/installboot
 
-PROG   usr/sbin/chroot
 PROG   usr/sbin/wiconfig
-
-SPECIAL        ifconfig        srcdir  distrib/utils/x_ifconfig
-SPECIAL        ping            srcdir  distrib/utils/x_ping
-SPECIAL        route           srcdir  distrib/utils/x_route
-
-LIBS   libhack.o -lbz2 -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop
diff -r a18aa577518a -r af5596729e1c distrib/i386/ramdisks/common/list.ramdisk
--- a/distrib/i386/ramdisks/common/list.ramdisk Sun Feb 13 03:58:38 2011 +0000
+++ b/distrib/i386/ramdisks/common/list.ramdisk Sun Feb 13 04:14:58 2011 +0000
@@ -1,7 +1,7 @@
-#      $NetBSD: list.ramdisk,v 1.17 2011/02/11 23:56:17 jym Exp $
+#      $NetBSD: list.ramdisk,v 1.18 2011/02/13 04:14:58 jym Exp $
 
 SRCDIRS        usr.bin/less
-SRCDIRS        bin sbin usr.bin usr.sbin
+SRCDIRS        bin sbin usr.bin usr.sbin libexec
 
 # Programs for a minimal ramdisk image
 
@@ -75,6 +75,7 @@
 COPY   ${DESTDIR}/usr/mdec/boot                usr/mdec/boot
 COPY   ${DESTDIR}/usr/mdec/bootxx_ffsv1        usr/mdec/bootxx_ffsv1
 COPY   ${DESTDIR}/usr/mdec/bootxx_ffsv2        usr/mdec/bootxx_ffsv2
+COPY   ${DESTDIR}/usr/mdec/bootxx_lfsv2        usr/mdec/bootxx_lfsv2
 COPY   ${DESTDIR}/usr/mdec/mbr                 usr/mdec/mbr
 COPY   ${DESTDIR}/usr/mdec/mbr_ext             usr/mdec/mbr_ext
 COPY   ${DESTDIR}/usr/mdec/mbr_bootsel         usr/mdec/mbr_bootsel
diff -r a18aa577518a -r af5596729e1c distrib/i386/ramdisks/ramdisk-big/list
--- a/distrib/i386/ramdisks/ramdisk-big/list    Sun Feb 13 03:58:38 2011 +0000
+++ b/distrib/i386/ramdisks/ramdisk-big/list    Sun Feb 13 04:14:58 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: list,v 1.4 2009/09/20 22:46:12 abs Exp $
+#      $NetBSD: list,v 1.5 2011/02/13 04:14:58 jym Exp $
 
 PROG   bin/chio
 PROG   bin/dd
@@ -8,9 +8,14 @@
 PROG   bin/rcmd
 PROG   bin/sync
 
+PROG   libexec/lfs_cleanerd
+
 PROG   sbin/fdisk
+PROG   sbin/mbrlabel
 PROG   sbin/mount_ext2fs
+PROG   sbin/mount_lfs
 PROG   sbin/mount_ntfs
+PROG   sbin/newfs_lfs
 PROG   sbin/raidctl
 PROG   sbin/restore    sbin/rrestore
 PROG   sbin/scsictl



Home | Main Index | Thread Index | Old Index