Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/distrib/sparc64 major overhaul; convert to NDWO.
details: https://anonhg.NetBSD.org/src/rev/71ad9084f0b3
branches: trunk
changeset: 526664:71ad9084f0b3
user: lukem <lukem%NetBSD.org@localhost>
date: Tue May 07 14:41:36 2002 +0000
description:
major overhaul; convert to NDWO.
this needs to build two images and one gzipped tar file:
- install.fs: to mdset into netbsd.INSTALL
- inst.tgz: contents of install.fs
- miniroot.fs: install.fs + gzipped GENERIC kernel. created using a
copy of the crunched ramdiskbin built for install.fs
share much of the miniroot.fs build goop from ../instfs/*
diffstat:
distrib/sparc64/Makefile | 9 +-
distrib/sparc64/Makefile.inc | 4 -
distrib/sparc64/instfs/Makefile | 43 ++---
distrib/sparc64/instfs/Makefile.instfs | 21 ++
distrib/sparc64/instfs/disktab.preinstall | 31 +++
distrib/sparc64/instfs/dot.profile | 77 +++++++++
distrib/sparc64/instfs/exclude | 1 -
distrib/sparc64/instfs/list | 107 ++++++++++++
distrib/sparc64/instfs/termcap.mini | 202 ++++++++++++++++++++++++
distrib/sparc64/list2sh.awk | 55 ------
distrib/sparc64/runlist.sh | 13 -
distrib/sparc64/xminiroot/Makefile | 115 +-----------
distrib/sparc64/xminiroot/disktab | 34 ----
distrib/sparc64/xminiroot/disktab.preinstall | 31 ---
distrib/sparc64/xminiroot/dist/base_obsolete | 1 -
distrib/sparc64/xminiroot/dist/comp_obsolete | 1 -
distrib/sparc64/xminiroot/dist/games_obsolete | 1 -
distrib/sparc64/xminiroot/dist/man_obsolete | 1 -
distrib/sparc64/xminiroot/dist/misc_obsolete | 1 -
distrib/sparc64/xminiroot/dist/secr_obsolete | 1 -
distrib/sparc64/xminiroot/dist/xbase_obsolete | 1 -
distrib/sparc64/xminiroot/dist/xserver_obsolete | 1 -
distrib/sparc64/xminiroot/dot.profile.m4 | 78 ---------
distrib/sparc64/xminiroot/list.m4 | 127 ---------------
distrib/sparc64/xminiroot/list.miniroot | 3 +
distrib/sparc64/xminiroot/mtree.conf | 92 ----------
distrib/sparc64/xminiroot/ramdiskbin.m4 | 57 ------
distrib/sparc64/xminiroot/termcap.mini | 202 ------------------------
28 files changed, 481 insertions(+), 829 deletions(-)
diffs (truncated from 1449 to 300 lines):
diff -r 25303699ca06 -r 71ad9084f0b3 distrib/sparc64/Makefile
--- a/distrib/sparc64/Makefile Tue May 07 14:27:25 2002 +0000
+++ b/distrib/sparc64/Makefile Tue May 07 14:41:36 2002 +0000
@@ -1,5 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2001/08/23 15:56:55 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2002/05/07 14:41:36 lukem Exp $
-SUBDIR= xminiroot instfs
+SUBDIR= instfs .WAIT xminiroot
+TARGETS+= release
.include <bsd.subdir.mk>
+
+# installation/miniroot/miniroot.fs.gz ffs+/netbsd
+# installation/misc/instfs.tgz ffs-/netbsd
+# binary/kernel/netbsd.INSTALL.gz mdset INSTALL with ffs-/netbsd
diff -r 25303699ca06 -r 71ad9084f0b3 distrib/sparc64/Makefile.inc
--- a/distrib/sparc64/Makefile.inc Tue May 07 14:27:25 2002 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.1 2001/07/23 14:54:25 eeh Exp $
-
-.include "../../Makefile.inc"
-.include <bsd.own.mk>
diff -r 25303699ca06 -r 71ad9084f0b3 distrib/sparc64/instfs/Makefile
--- a/distrib/sparc64/instfs/Makefile Tue May 07 14:27:25 2002 +0000
+++ b/distrib/sparc64/instfs/Makefile Tue May 07 14:41:36 2002 +0000
@@ -1,37 +1,28 @@
-# $NetBSD: Makefile,v 1.8 2002/05/02 18:02:55 lukem Exp $
-#
-# instfs.tgz is the filesystem image for disk 2 of the floppy based
-# installation method.
-# It is constructed by tarring up the contents of the miniroot with
-# the exeption of the kernel and boot program.
-#
+# $NetBSD: Makefile,v 1.9 2002/05/07 14:41:37 lukem Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
-TOP= ${.CURDIR}/..
-MINIROOT= ${.CURDIR}/../xminiroot
-
-.include "${TOP}/Makefile.inc"
+.include <bsd.kernobj.mk>
-MINIROOT_DIR!= cd ${MINIROOT} && ${PRINTOBJDIR}
-MINIROOT_IMAGE= ${MINIROOT_DIR}/miniroot.fs
-MINIROOT_KERNEL=${MINIROOT_DIR}/netbsd.INSTALL
+.include "${.CURDIR}/../instfs/Makefile.instfs"
+IMAGE= install.fs
+IMAGESIZE= 3m
-MOUNT_POINT?= ${MINIROOT_DIR}/mountpoint
-INSTFS?= instfs.tgz
+IMAGETAR= instfs.tgz
+IMAGETAR_RELEASEDIR= installation/misc
-all: ${INSTFS}
-
-${INSTFS}: ${MINIROOT_IMAGE}
- (cd ${MOUNT_POINT}; \
- tar -z -X ${.CURDIR}/exclude -c -f ${.OBJDIR}/${.TARGET} .)
+MDSETTARGETS= INSTALL ${IMAGE} -
+MDSET_RELEASEDIR= binary/kernel
-clean cleandir distclean:
- /bin/rm -f *.core ${INSTFS}
+# Use stubs to eliminate some large stuff from libc
+HACKSRC= ${DISTRIBDIR}/utils/libhack
+.include "${HACKSRC}/Makefile.inc"
+${CRUNCHBIN}: libhack.o
-release: check_RELEASEDIR .WAIT ${INSTFS} ${MINIROOT_KERNEL}
- ${RELEASE_INSTALL} ${INSTFS} $(RELEASEDIR)/installation/misc
- gzip -9 -c ${MINIROOT_KERNEL} > $(RELEASEDIR)/binary/kernel/netbsd.INSTALL.gz
+.include "${DISTRIBDIR}/common/Makefile.crunch"
+.include "${DISTRIBDIR}/common/Makefile.makedev"
+.include "${DISTRIBDIR}/common/Makefile.image"
+.include "${DISTRIBDIR}/common/Makefile.mdset"
.include <bsd.prog.mk>
diff -r 25303699ca06 -r 71ad9084f0b3 distrib/sparc64/instfs/Makefile.instfs
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/sparc64/instfs/Makefile.instfs Tue May 07 14:41:36 2002 +0000
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile.instfs,v 1.1 2002/05/07 14:41:37 lukem Exp $
+
+INSTFSDIR= ${.CURDIR}/../instfs
+
+MAKEFS_FLAGS= -o bsize=16k,fsize=2k -f 15
+
+WARNS= 1
+DBG= -Os
+
+CRUNCHBIN= ramdiskbin
+LISTS= ${INSTFSDIR}/list ${DISTRIBDIR}/common/list.sysinst
+MTREECONF= ${DISTRIBDIR}/common/mtree.common
+IMAGEENDIAN= be
+MAKEDEVTARGETS= ramdisk
+PARSELISTENV= INSTFSDIR=${INSTFSDIR:Q}
+IMAGEDEPENDS= ${CRUNCHBIN} \
+ ${INSTFSDIR}/disktab.preinstall ${INSTFSDIR}/dot.profile \
+ ${INSTFSDIR}/termcap.mini \
+ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
+ ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/etc/protocols \
+ ${NETBSDSRCDIR}/etc/services
diff -r 25303699ca06 -r 71ad9084f0b3 distrib/sparc64/instfs/disktab.preinstall
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/sparc64/instfs/disktab.preinstall Tue May 07 14:41:36 2002 +0000
@@ -0,0 +1,31 @@
+# $NetBSD: disktab.preinstall,v 1.1 2002/05/07 14:41:37 lukem Exp $
+#
+# Disk geometry and partition layout tables.
+# Key:
+# dt controller type
+# ty type of disk (fixed, removeable, simulated)
+# d[0-4] drive-type-dependent parameters
+# ns #sectors/track
+# nt #tracks/cylinder
+# nc #cylinders/disk
+# sc #sectors/cylinder, nc*nt default
+# su #sectors/unit, sc*nc default
+# se sector size, DEV_BSIZE default
+# rm rpm, 3600 default
+# sf supports bad144-style bad sector forwarding
+# sk sector skew per track, default 0
+# cs sector skew per cylinder, default 0
+# hs headswitch time, default 0
+# ts one-cylinder seek time, default 0
+# il sector interleave (n:1), 1 default
+# bs boot block size, default BBSIZE
+# sb superblock size, default SBSIZE
+# o[a-h] partition offsets in sectors
+# p[a-h] partition sizes in sectors
+# b[a-h] partition block sizes in bytes
+# f[a-h] partition fragment sizes in bytes
+# t[a-h] partition types (filesystem, swap, etc)
+#
+# All partition sizes reserve space for bad sector tables.
+# (5 cylinders needed for maintenance + replacement sectors)
+#
diff -r 25303699ca06 -r 71ad9084f0b3 distrib/sparc64/instfs/dot.profile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/sparc64/instfs/dot.profile Tue May 07 14:41:36 2002 +0000
@@ -0,0 +1,77 @@
+# $NetBSD: dot.profile,v 1.1 2002/05/07 14:41:37 lukem Exp $
+#
+# Copyright (c) 1997 Perry E. Metzger
+# Copyright (c) 1994 Christopher G. Demetriou
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+# must display the following acknowledgement:
+# This product includes software developed for the
+# NetBSD Project. See http://www.netbsd.org/ for
+# information about NetBSD.
+# 4. The name of the author may not be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
+
+PATH=/sbin:/bin:/usr/bin:/usr/sbin:/
+export PATH
+
+TERM=sun
+export TERM
+HOME=/
+export HOME
+BLOCKSIZE=1k
+export BLOCKSIZE
+EDITOR=ed
+export EDITOR
+
+umask 022
+
+if [ "X${DONEPROFILE}" = "X" ]; then
+ DONEPROFILE=YES
+ export DONEPROFILE
+
+ # set up some sane defaults
+ echo 'erase ^?, werase ^W, kill ^U, intr ^C'
+ stty newcrt werase ^W intr ^C kill ^U erase ^? 9600
+ echo ''
+
+ echo -n "Terminal type (just hit ENTER for '$TERM'): "
+ read ans
+ if [ -n "$ans" ];then
+ TERM=$ans
+ fi
+
+ # mount the kern_fs so that we can find the root device, and also
+ # examine the dmesg state
+ mount -t kernfs /kern /kern
+
+ # hack to get around bugs in kernfs's rootdev/rrootdev lookup.
+ ls -l /dev/* > /dev/null 2>&1
+
+ # mount the ramdisk read write
+ mount -t ffs -u /kern/rootdev /
+
+ # run the installation or upgrade script.
+ sysinst
+fi
diff -r 25303699ca06 -r 71ad9084f0b3 distrib/sparc64/instfs/exclude
--- a/distrib/sparc64/instfs/exclude Tue May 07 14:27:25 2002 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-netbsd
diff -r 25303699ca06 -r 71ad9084f0b3 distrib/sparc64/instfs/list
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/sparc64/instfs/list Tue May 07 14:41:36 2002 +0000
@@ -0,0 +1,107 @@
+# $NetBSD: list,v 1.1 2002/05/07 14:41:37 lukem Exp $
+
+SRCDIRS bin sbin libexec usr.bin/less usr.bin usr.sbin gnu/usr.bin
+
+PROG bin/cat
+PROG bin/chmod
+PROG bin/cp
+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/rcp
+PROG bin/rm
+PROG bin/sh
+PROG bin/stty
+PROG bin/sync
+
+PROG sbin/dhclient
+PROG sbin/disklabel
+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_ext2fs
+PROG sbin/mount_ffs
+PROG sbin/mount_kernfs
+PROG sbin/mount_lfs
+PROG sbin/mount_msdos
+PROG sbin/mount_nfs
+PROG sbin/newfs sbin/mount_mfs
+PROG sbin/newfs_lfs
+PROG sbin/ping
+PROG sbin/reboot sbin/halt
+PROG sbin/restore sbin/rrestore
+PROG sbin/route
+PROG sbin/shutdown
+PROG sbin/slattach
+PROG sbin/swapctl
+PROG sbin/sysctl
+PROG sbin/umount
+
+PROG usr/bin/ftp
+PROG usr/bin/getopt
+PROG usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
+PROG usr/bin/less usr/bin/more
+PROG usr/bin/sed
+PROG usr/bin/tip
+
+MTREE ./usr/libexec type=dir uname=root gname=wheel mode=0755
+PROG usr/libexec/lfs_cleanerd
+
+PROG usr/sbin/chat
+PROG usr/sbin/chown usr/bin/chgrp
+PROG usr/sbin/chroot
+PROG usr/sbin/installboot
+PROG usr/sbin/pppd
+
+# init invokes the shell as -sh
Home |
Main Index |
Thread Index |
Old Index