Module Name: src Committed By: tls Date: Sun Aug 10 06:48:45 UTC 2014
Modified Files: src/distrib/sparc64/bootfs [tls-earlyentropy]: boot.cfg src/distrib/sparc64/cdroms/installcd [tls-earlyentropy]: Makefile etc.rc src/distrib/sparc64/xminiroot [tls-earlyentropy]: Makefile Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.24.1 src/distrib/sparc64/bootfs/boot.cfg cvs rdiff -u -r1.16 -r1.16.8.1 src/distrib/sparc64/cdroms/installcd/Makefile cvs rdiff -u -r1.1 -r1.1.24.1 src/distrib/sparc64/cdroms/installcd/etc.rc cvs rdiff -u -r1.30 -r1.30.2.1 src/distrib/sparc64/xminiroot/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/sparc64/bootfs/boot.cfg diff -u src/distrib/sparc64/bootfs/boot.cfg:1.1 src/distrib/sparc64/bootfs/boot.cfg:1.1.24.1 --- src/distrib/sparc64/bootfs/boot.cfg:1.1 Fri Apr 2 21:29:30 2010 +++ src/distrib/sparc64/bootfs/boot.cfg Sun Aug 10 06:48:45 2014 @@ -1 +1 @@ -bootpartition :a +bootpartition=:a Index: src/distrib/sparc64/cdroms/installcd/Makefile diff -u src/distrib/sparc64/cdroms/installcd/Makefile:1.16 src/distrib/sparc64/cdroms/installcd/Makefile:1.16.8.1 --- src/distrib/sparc64/cdroms/installcd/Makefile:1.16 Sat Dec 22 17:51:19 2012 +++ src/distrib/sparc64/cdroms/installcd/Makefile Sun Aug 10 06:48:45 2014 @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.16 2012/12/22 17:51:19 tsutsui Exp $ +# $NetBSD: Makefile,v 1.16.8.1 2014/08/10 06:48:45 tls Exp $ CDBASE= sparc64cd # gives ${CDBASE}.iso CDRELEASE= true # include $RELEASEDIR/$MACHINE # for PRINTOBJDIR .include <bsd.own.mk> -SYSINSTDIR!= cd ${.CURDIR}/../../../utils/sysinst/arch/${MACHINE} && ${PRINTOBJDIR} +SYSINSTDIR!= cd ${.CURDIR}/../../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR} CDRELEASE_NOISOS= true CDBOOTIMAGEDIR!= cd ${NETBSDSRCDIR}/distrib/sparc64/bootfs && ${PRINTOBJDIR} @@ -36,6 +36,7 @@ CDRUNTIME+= ./usr/bin/sed CDRUNTIME+= ./usr/bin/sort CDRUNTIME+= ./usr/bin/tip CDRUNTIME+= ./usr/bin/tput +CDRUNTIME+= ./usr/bin/vi CDRUNTIME+= ./usr/bin/vmstat CDRUNTIME+= ./usr/lib/libbz2.so* CDRUNTIME+= ./usr/lib/libc.so* Index: src/distrib/sparc64/cdroms/installcd/etc.rc diff -u src/distrib/sparc64/cdroms/installcd/etc.rc:1.1 src/distrib/sparc64/cdroms/installcd/etc.rc:1.1.24.1 --- src/distrib/sparc64/cdroms/installcd/etc.rc:1.1 Sun Apr 18 12:58:57 2010 +++ src/distrib/sparc64/cdroms/installcd/etc.rc Sun Aug 10 06:48:45 2014 @@ -1,4 +1,4 @@ -# $NetBSD: etc.rc,v 1.1 2010/04/18 12:58:57 martin Exp $ +# $NetBSD: etc.rc,v 1.1.24.1 2014/08/10 06:48:45 tls Exp $ # # Copyright (c) 1997 Perry E. Metzger # Copyright (c) 1994 Christopher G. Demetriou @@ -44,8 +44,8 @@ mount -t tmpfs tmpfs /tmp mount -t tmpfs tmpfs /var mount -t tmpfs -o union tmpfs /etc -# prepare important directories in the tmpfses, so dhcpcd will work -mkdir -p /var/run /var/db +# prepare important directories in the tmpfses, so dhcpcd and vi will work +mkdir -p /var/run /var/db /var/tmp # create a gettytab to autologin and run sysinst (etc/gettytab is a symlink # to /tmp/gettytab) Index: src/distrib/sparc64/xminiroot/Makefile diff -u src/distrib/sparc64/xminiroot/Makefile:1.30 src/distrib/sparc64/xminiroot/Makefile:1.30.2.1 --- src/distrib/sparc64/xminiroot/Makefile:1.30 Mon Jan 27 08:18:07 2014 +++ src/distrib/sparc64/xminiroot/Makefile Sun Aug 10 06:48:45 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2014/01/27 08:18:07 apb Exp $ +# $NetBSD: Makefile,v 1.30.2.1 2014/08/10 06:48:45 tls Exp $ .include <bsd.own.mk> .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -6,10 +6,19 @@ .include <bsd.kernobj.mk> .include "${.CURDIR}/../instfs/Makefile.instfs" -IMAGE= miniroot.fs -IMAGESIZE= 12m -IMAGEPOSTBUILD= ${TOOL_INSTALLBOOT} -v -m ${MACHINE} ${IMAGE} \ - ${DESTDIR}/usr/mdec/bootblk +IMAGE= miniroot.fs +NUMCYLS= 12 # size of image in MB, tune this if we need more space +SECSPERCYL= 2048 +CYLSIZE= $$(( ${SECSPERCYL} * 512 )) +IMAGESIZE= $$(( ${NUMCYLS} * ${CYLSIZE} )) +IMAGEPOSTBUILD= \ + ${TOOL_INSTALLBOOT} -v -m ${MACHINE} ${IMAGE} \ + ${DESTDIR}/usr/mdec/bootblk && \ + echo "Creating disklabel" && \ + printf 'V nsect %d\nV nhead 1\nV rpm 7200\nV pcyl %d\nV ncyl %d\na 0 %d/0/0\nc 0 %d/0/0\nd 0 %d/0/0\nW\nL\nP\n' \ + ${SECSPERCYL} ${NUMCYLS} ${NUMCYLS} ${NUMCYLS} ${NUMCYLS} ${NUMCYLS} | \ + ${TOOL_SUNLABEL} -nq ${IMAGE} + IMAGE_RELEASEDIR= installation/miniroot CRUNCHBINDIR!= cd ${INSTFSDIR} && ${PRINTOBJDIR} @@ -23,7 +32,7 @@ ${CRUNCHBIN}: ${CRUNCHBINDIR}/${CRUNCHBI netbsd.gz: ${KERNOBJDIR}/GENERIC/netbsd -rm -f ${.TARGET} - ${TOOL_GZIP} -9nc ${.ALLSRC} > ${.TARGET} + ${TOOL_GZIP_N} -9c ${.ALLSRC} > ${.TARGET} clean: localclean