Source-Changes-HG archive

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

[src/trunk]: src/distrib/sun2 Converted sun2 to the new distrib world order. ...



details:   https://anonhg.NetBSD.org/src/rev/38a62f16d46d
branches:  trunk
changeset: 525984:38a62f16d46d
user:      fredette <fredette%NetBSD.org@localhost>
date:      Mon Apr 22 21:17:48 2002 +0000

description:
Converted sun2 to the new distrib world order.  It is now
possible to do full release unprivileged cross-builds.

diffstat:

 distrib/sun2/Makefile               |    4 +-
 distrib/sun2/common/Make.crunch     |   23 ---
 distrib/sun2/common/Make.fsimage    |   42 -----
 distrib/sun2/common/Make.static     |   11 -
 distrib/sun2/common/RunList.awk     |   44 ------
 distrib/sun2/common/RunList.sh      |   14 -
 distrib/sun2/common/install.md      |    4 +-
 distrib/sun2/common/mini_bin.list   |   38 -----
 distrib/sun2/common/mini_sbin.list  |   38 -----
 distrib/sun2/common/mini_usr.list   |   51 -------
 distrib/sun2/common/miniroot.list   |   55 -------
 distrib/sun2/common/ramdisk.list    |   26 ---
 distrib/sun2/common/rd.MAKEDEV      |  261 ------------------------------------
 distrib/sun2/common/rd_bin.conf     |   87 ------------
 distrib/sun2/common/rd_bin.list     |   47 ------
 distrib/sun2/common/rdsetroot.c     |  226 -------------------------------
 distrib/sun2/miniroot/Makefile      |   95 +++---------
 distrib/sun2/miniroot/disktab       |    4 -
 distrib/sun2/miniroot/miniroot.list |  153 +++++++++++++++++++++
 distrib/sun2/ramdisk/Makefile       |  113 ++++----------
 distrib/sun2/ramdisk/ramdisk.list   |  110 +++++++++++++++
 21 files changed, 332 insertions(+), 1114 deletions(-)

diffs (truncated from 1587 to 300 lines):

diff -r a6041767f2cd -r 38a62f16d46d distrib/sun2/Makefile
--- a/distrib/sun2/Makefile     Mon Apr 22 21:15:40 2002 +0000
+++ b/distrib/sun2/Makefile     Mon Apr 22 21:17:48 2002 +0000
@@ -1,10 +1,12 @@
-#      $NetBSD: Makefile,v 1.2 2001/12/17 20:27:39 fredette Exp $
+#      $NetBSD: Makefile,v 1.3 2002/04/22 21:17:48 fredette Exp $
 
 SUBDIR= ramdisk miniroot
 TARGETS= all release
 
 release:
        -mkdir -p ${RELEASEDIR}/installation/netboot
+       cp -p ${DESTDIR}/usr/mdec/bootyy \
+         ${RELEASEDIR}/installation/netboot/
        cp -p ${DESTDIR}/usr/mdec/netboot \
          ${RELEASEDIR}/installation/netboot/
        -mkdir -p ${RELEASEDIR}/installation/tapeimage
diff -r a6041767f2cd -r 38a62f16d46d distrib/sun2/common/Make.crunch
--- a/distrib/sun2/common/Make.crunch   Mon Apr 22 21:15:40 2002 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-#      $NetBSD: Make.crunch,v 1.2 2001/12/17 20:27:39 fredette Exp $
-#
-# This is included by subdirectories building a crunched binary.
-# Assume the following are already defined:  TOP, CBIN
-
-CBIN?=         xxx-crunched
-CRUNCHCONF=    ${TOP}/common/${CBIN}.conf
-CRUNCHGEN?=    crunchgen
-STRIP?=                strip
-
-CLEANFILES+= ${CBIN} ${CBIN}.c ${CBIN}.cache ${CBIN}.mk ${CBIN}.syms
-CLEANFILES+= *.lo *_stub.o *_stub.c
-
-# Keep a copy that is not stripped so I can debug...
-${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
-       -rm -f ${CBIN}
-       ${MAKE} -f ${CBIN}.mk all STRIP=true
-       cp -p ${CBIN} ${CBIN}.syms
-       ${STRIP} ${CBIN}
-
-${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
-       ${CRUNCHGEN} -D ${TOP}/../.. -L ${DESTDIR}/usr/lib ${CRUNCHCONF}
-
diff -r a6041767f2cd -r 38a62f16d46d distrib/sun2/common/Make.fsimage
--- a/distrib/sun2/common/Make.fsimage  Mon Apr 22 21:15:40 2002 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-#
-#      $NetBSD: Make.fsimage,v 1.2 2002/03/06 12:14:26 lukem Exp $
-#
-
-# TOP is assumed to be defined by Makefile including this one.
-# These will be defined by it too:
-
-IMAGE?=                xxx-${DISTRIBREV}
-CBIN?=         xxx-crunched
-
-TREE?=         ${.CURDIR}/${CBIN}.tree
-LISTS?=                ${.CURDIR}/${CBIN}.list
-
-MOUNT_POINT?=  /mnt
-DISKTYPE?=     xxx-disktype
-BDEV?=         /dev/md0a
-CDEV?=         /dev/md0a
-
-IMAGE_DEPS?=   ${CBIN}
-CLEANFILES+=   ${IMAGE}.fs
-
-# These are all the parameters for the root fs:
-NBLKS?=                512
-# args: old fmt, minfree, opt, ...
-NEWFSARGS?= -O -m 0 -o space
-
-do_mount:
-       -newfs -B be ${NEWFSARGS} -s ${NBLKS} ${CDEV} ${DISKTYPE}
-       mount ${BDEV} ${MOUNT_POINT}
-
-do_files:
-       mtree -def ${TREE} -p ${MOUNT_POINT}/ -u
-       TOPDIR=${TOP} CURDIR=${.CURDIR} \
-         OBJDIR=${.OBJDIR} TARGDIR=${MOUNT_POINT} \
-         sh ${TOP}/common/RunList.sh ${LISTS}
-
-do_umount:
-       @echo ""
-       @df -i ${MOUNT_POINT}
-       @echo ""
-       -umount ${MOUNT_POINT}
-
diff -r a6041767f2cd -r 38a62f16d46d distrib/sun2/common/Make.static
--- a/distrib/sun2/common/Make.static   Mon Apr 22 21:15:40 2002 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-#
-# $NetBSD: Make.static,v 1.1 2001/05/18 00:16:38 fredette Exp $
-#
-# This is logically appended to some other makefile, i.e.
-# using:  make -f Makefile -f $(OUTDIR)/Make.static ...
-STRIP_CMD=strip
-
-${OUTDIR}/${PROG} : ${OBJS} ${LIBC} ${DPADD}
-       ${CC} -static ${LDFLAGS} -o ${OUTDIR}/${PROG} ${OBJS} ${LDADD}
-       ${STRIP_CMD} ${OUTDIR}/${PROG}
-
diff -r a6041767f2cd -r 38a62f16d46d distrib/sun2/common/RunList.awk
--- a/distrib/sun2/common/RunList.awk   Mon Apr 22 21:15:40 2002 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-#      $NetBSD: RunList.awk,v 1.1 2001/05/18 00:16:38 fredette Exp $
-
-BEGIN {
-       printf("cd ${CURDIR}\n");
-       printf("\n");
-}
-/^$/ || /^#/ {
-       print $0;
-       next;
-}
-$1 == "COPY" {
-       printf("echo '%s'\n", $0);
-       printf("cp %s ${TARGDIR}/%s\n", $2, $3);
-       next;
-}
-$1 == "LINK" {
-       printf("echo '%s'\n", $0);
-       printf("(cd ${TARGDIR}; ln %s %s)\n", $2, $3);
-       next;
-}
-$1 == "SYMLINK" {
-       printf("echo '%s'\n", $0);
-       printf("(cd ${TARGDIR}; rm -f %s; ln -s %s %s)\n", $3, $2, $3);
-       next;
-}
-$1 == "SPECIAL" {
-       printf("echo '%s'\n", $0);
-       printf("(cd ${TARGDIR};");
-       for (i = 2; i <= NF; i++)
-               printf(" %s", $i);
-       printf(")\n");
-       next;
-}
-{
-       printf("echo '%s'\n", $0);
-       printf("echo 'Unknown keyword \"%s\" at line %d of input.'\n", $1, NR);
-       printf("exit 1\n");
-       exit 1;
-}
-END {
-       printf("\n");
-       printf("exit 0\n");
-       exit 0;
-}
diff -r a6041767f2cd -r 38a62f16d46d distrib/sun2/common/RunList.sh
--- a/distrib/sun2/common/RunList.sh    Mon Apr 22 21:15:40 2002 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-#      $NetBSD: RunList.sh,v 1.1 2001/05/18 00:16:38 fredette Exp $
-
-if [ "X$1" = "X-d" ]; then
-       SHELLCMD=cat
-       shift
-else
-       SHELLCMD="sh -e"
-fi
-
-cat "$@" |
-awk -f ${TOPDIR}/common/RunList.awk |
-${SHELLCMD}
diff -r a6041767f2cd -r 38a62f16d46d distrib/sun2/common/install.md
--- a/distrib/sun2/common/install.md    Mon Apr 22 21:15:40 2002 +0000
+++ b/distrib/sun2/common/install.md    Mon Apr 22 21:17:48 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: install.md,v 1.2 2001/12/17 20:27:39 fredette Exp $
+#      $NetBSD: install.md,v 1.3 2002/04/22 21:17:52 fredette Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -108,7 +108,7 @@
        ( cd /usr/mdec ;\
        cp -p ./ufsboot /mnt/ufsboot ;\
        sync ; sleep 1 ; sync ;\
-       ./installboot -v /mnt/ufsboot bootxx /dev/r${1}a )
+       ./installboot -v /dev/r${1}a bootxx ufsboot )
        echo "done."
 }
 
diff -r a6041767f2cd -r 38a62f16d46d distrib/sun2/common/mini_bin.list
--- a/distrib/sun2/common/mini_bin.list Mon Apr 22 21:15:40 2002 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-#
-# $NetBSD: mini_bin.list,v 1.1 2001/05/18 00:16:38 fredette Exp $
-#
-# miniroot files from /bin:
-# Extras not in ../../miniroot/list:
-#  date ps rmdir
-
-COPY   ${DESTDIR}/bin/cat              bin
-COPY   ${DESTDIR}/bin/chmod            bin
-COPY   ${DESTDIR}/bin/cp               bin
-COPY   ${DESTDIR}/bin/date             bin
-COPY   ${DESTDIR}/bin/dd               bin
-COPY   ${DESTDIR}/bin/df               bin
-COPY   ${DESTDIR}/bin/ed               bin
-COPY   ${DESTDIR}/bin/expr             bin
-COPY   ${DESTDIR}/bin/hostname         bin
-COPY   ${DESTDIR}/bin/kill             bin
-COPY   ${DESTDIR}/bin/ln               bin
-COPY   ${DESTDIR}/bin/ls               bin
-COPY   ${DESTDIR}/bin/mkdir            bin
-COPY   ${DESTDIR}/bin/mt               bin
-COPY   ${DESTDIR}/bin/mv               bin
-COPY   ${DESTDIR}/bin/pax              bin
-COPY   ${DESTDIR}/bin/ps               bin
-COPY   ${DESTDIR}/bin/pwd              bin
-COPY   ${DESTDIR}/bin/rm               bin
-COPY   ${DESTDIR}/bin/rmdir            bin
-COPY   ${DESTDIR}/bin/sh               bin
-COPY   ${DESTDIR}/bin/sleep            bin
-COPY   ${DESTDIR}/bin/stty             bin
-COPY   ${DESTDIR}/bin/sync             bin
-
-COPY   ${DESTDIR}/bin/test             bin
-LINK              bin/test             bin/[
-
-# new, combined pax,tar,cpio
-LINK              bin/pax              usr/bin/tar
-
diff -r a6041767f2cd -r 38a62f16d46d distrib/sun2/common/mini_sbin.list
--- a/distrib/sun2/common/mini_sbin.list        Mon Apr 22 21:15:40 2002 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-#
-# $NetBSD: mini_sbin.list,v 1.1 2001/05/18 00:16:39 fredette Exp $
-#
-# miniroot files from /sbin:
-# Extras not in ../../miniroot/list:
-#  disklabel dmesg edlabel mount_kernfs restore 
-
-COPY   ${DESTDIR}/sbin/dmesg           sbin
-COPY   ${DESTDIR}/sbin/edlabel         sbin
-
-COPY   ${DESTDIR}/sbin/fsck            sbin
-COPY   ${DESTDIR}/sbin/fsck_ffs        sbin
-
-COPY   ${DESTDIR}/sbin/ifconfig        sbin
-COPY   ${DESTDIR}/sbin/init            sbin
-COPY   ${DESTDIR}/sbin/mknod           sbin
-
-COPY   ${DESTDIR}/sbin/mount           sbin
-COPY   ${DESTDIR}/sbin/mount_cd9660    sbin
-COPY   ${DESTDIR}/sbin/mount_ffs       sbin
-COPY   ${DESTDIR}/sbin/mount_kernfs    sbin
-COPY   ${DESTDIR}/sbin/mount_nfs       sbin
-
-COPY   ${DESTDIR}/sbin/newfs           sbin
-COPY   ${DESTDIR}/sbin/ping            sbin
-COPY   ${DESTDIR}/sbin/reboot          sbin
-LINK              sbin/reboot          sbin/halt
-
-COPY   ${DESTDIR}/sbin/restore         sbin
-LINK              sbin/restore         sbin/rrestore
-
-COPY   ${DESTDIR}/sbin/route           sbin
-COPY   ${DESTDIR}/sbin/shutdown        sbin
-COPY   ${DESTDIR}/sbin/slattach        sbin
-COPY   ${DESTDIR}/sbin/swapctl         sbin
-COPY   ${DESTDIR}/sbin/sysctl          sbin
-COPY   ${DESTDIR}/sbin/umount          sbin
-
diff -r a6041767f2cd -r 38a62f16d46d distrib/sun2/common/mini_usr.list
--- a/distrib/sun2/common/mini_usr.list Mon Apr 22 21:15:40 2002 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-#
-#      $NetBSD: mini_usr.list,v 1.2 2001/12/17 20:27:39 fredette Exp $
-#
-# miniroot files from /usr:
-
-# Shared library stuff...
-# libcurses: vi
-# libedit: ftp
-# libtermcap: ftp, less, vi
-# libutil: rdate
-SPECIAL        cd usr; ln -s lib libexec
-#COPY  ${DESTDIR}/usr/libexec/ld.elf_so        usr/lib
-#COPY  ${DESTDIR}/usr/lib/libc.so              usr/lib
-#LINK  usr/lib/libc.so                         usr/lib/libc.so.12
-#COPY  ${DESTDIR}/usr/lib/libcurses.so         usr/lib
-#LINK  usr/lib/libcurses.so                    usr/lib/libcurses.so.4
-#COPY  ${DESTDIR}/usr/lib/libedit.so           usr/lib
-#LINK  usr/lib/libedit.so                      usr/lib/libedit.so.2
-#COPY  ${DESTDIR}/usr/lib/libtermcap.so        usr/lib
-#LINK  usr/lib/libtermcap.so                   usr/lib/libtermcap.so.0
-#COPY  ${DESTDIR}/usr/lib/libutil.so           usr/lib
-#LINK  usr/lib/libutil.so                      usr/lib/libutil.so.6
-



Home | Main Index | Thread Index | Old Index