From owner-p4-projects Fri Nov 15 14:52: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC93A37B404; Fri, 15 Nov 2002 14:51:52 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4407537B401 for ; Fri, 15 Nov 2002 14:51:52 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E1F543E75 for ; Fri, 15 Nov 2002 14:51:51 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAFMnCmV050735 for ; Fri, 15 Nov 2002 14:49:12 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAFMnClh050722 for perforce@freebsd.org; Fri, 15 Nov 2002 14:49:12 -0800 (PST) Date: Fri, 15 Nov 2002 14:49:12 -0800 (PST) Message-Id: <200211152249.gAFMnClh050722@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 21095 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21095 Change 21095 by peter@peter_daintree on 2002/11/15 14:48:39 IFC @21094 Affected files ... .. //depot/projects/ia64/etc/mtree/BSD.usr.dist#15 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_lastlog/pam_lastlog.c#12 integrate .. //depot/projects/ia64/release/Makefile#25 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/common/install.sgml#7 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/sparc64/article.sgml#4 integrate .. //depot/projects/ia64/release/scripts/print-cdrom-packages.sh#16 integrate .. //depot/projects/ia64/share/man/man7/release.7#13 integrate .. //depot/projects/ia64/sys/ia64/ia64/clock.c#11 integrate .. //depot/projects/ia64/sys/ia64/include/_types.h#3 integrate .. //depot/projects/ia64/sys/net/if.c#14 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_snapshot.c#15 integrate .. //depot/projects/ia64/usr.bin/who/who.c#9 integrate .. //depot/projects/ia64/usr.bin/xinstall/xinstall.c#13 integrate .. //depot/projects/ia64/usr.sbin/ppp/physical.c#10 integrate .. //depot/projects/ia64/usr.sbin/pppd/auth.c#5 integrate Differences ... ==== //depot/projects/ia64/etc/mtree/BSD.usr.dist#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.268 2002/10/25 22:00:34 ache Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.269 2002/11/15 18:44:09 ru Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -96,8 +96,6 @@ .. 13.rcs .. - 14.sccs - .. 15.yacc .. 16.lex ==== //depot/projects/ia64/lib/libpam/modules/pam_lastlog/pam_lastlog.c#12 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_lastlog/pam_lastlog.c,v 1.16 2002/05/30 20:48:59 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_lastlog/pam_lastlog.c,v 1.17 2002/11/15 22:41:59 peter Exp $"); #define _BSD_SOURCE ==== //depot/projects/ia64/release/Makefile#25 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.727 2002/11/12 17:51:02 ru Exp $ +# $FreeBSD: src/release/Makefile,v 1.729 2002/11/15 22:03:25 jhb Exp $ # # make release CHROOTDIR=/some/dir BUILDNAME=somename CVSROOT=/cvs/dir \ # [ RELEASETAG=tag ] @@ -104,6 +104,7 @@ .if defined(NOPORTS) && !defined(NODOC) DOMINIMALDOCPORTS= YES .include "Makefile.inc.docports" +RELEASEPORTSMODULE= ${MINIMALDOCPORTS} .endif # Helper variable @@ -273,13 +274,16 @@ FIXIT_TARGET= release.10 .endif -EXTRAS= cdrom.1 ftp.1 +EXTRAS= ftp.1 +.if !defined(NOCDROM) +EXTRAS+= cdrom.1 .if defined(MAKE_ISOS) EXTRAS+= iso.1 .if ${TARGET} != "pc98" BOOTABLE="-b" .endif .endif +.endif .if !defined(NODOC) DOCREL= doc.1 doc.2 @@ -297,6 +301,21 @@ cd ${.CURDIR}/..; ${CROSSMAKE} -f Makefile.inc1 -V WMAKEENV WMAKE= ${WMAKEENV} ${MAKE} +CVS_SRCARGS= -P +.if defined(RELEASETAG) +CVS_SRCARGS+= -r ${RELEASETAG} +.endif + +CVS_DOCARGS= -P +.if defined(DOCRELEASETAG) +CVS_DOCARGS+= -r ${DOCRELEASETAG} +.endif + +CVS_PORTSARGS= -P +.if defined(PORTSRELEASETAG) +CVS_PORTSARGS+= -r ${PORTSRELEASETAG} +.endif + rerelease release: .if !defined(CHROOTDIR) || !defined(BUILDNAME) || !defined(CVSROOT) @echo "To make a release you must set CHROOTDIR, BUILDNAME and CVSROOT" && false @@ -324,12 +343,13 @@ if [ -f /etc/resolv.conf ]; then \ cp -p /etc/resolv.conf ${CHROOTDIR}/etc; \ fi -.if !defined(RELEASETAG) - cd ${CHROOTDIR}/usr && rm -rf src && \ - ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} -P ${RELEASESRCMODULE} + rm -rf ${CHROOTDIR}/usr/src +.if defined(EXTSRCDIR) + cd ${CHROOTDIR}/usr && \ + cp -R ${EXTSRCDIR} src .else - cd ${CHROOTDIR}/usr && rm -rf src && \ - ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} -P -r ${RELEASETAG} ${RELEASESRCMODULE} + cd ${CHROOTDIR}/usr && \ + ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} ${CVS_SRCARGS} ${RELEASESRCMODULE} .endif .if defined(LOCAL_PATCHES) && exists(${LOCAL_PATCHES}) cd ${CHROOTDIR}/usr/src && patch ${PATCH_FLAGS} < ${LOCAL_PATCHES} @@ -337,24 +357,19 @@ .if defined(LOCAL_SCRIPT) && exists(${LOCAL_SCRIPT}) cd ${CHROOTDIR} && env CHROOTDIR=${CHROOTDIR} BUILDNAME=${BUILDNAME} RELEASETAG=${RELEASETAG} ${LOCAL_SCRIPT} .endif + rm -rf ${CHROOTDIR}/usr/ports +.if !defined(NOPORTSATALL) + cd ${CHROOTDIR}/usr && ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} ${CVS_PORTSARGS} ${RELEASEPORTSMODULE} +.endif .if !defined(NOPORTS) -.if defined(PORTSRELEASETAG) - cd ${CHROOTDIR}/usr && rm -rf ports && ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} -P -r ${PORTSRELEASETAG} ${RELEASEPORTSMODULE} && cd ports && ${MAKEREADMES} -.else - cd ${CHROOTDIR}/usr && rm -rf ports && ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} -P ${RELEASEPORTSMODULE} && cd ports && ${MAKEREADMES} + cd ${CHROOTDIR}/usr/ports && ${MAKEREADMES} .endif -.elif defined(DOMINIMALDOCPORTS) && ${DOMINIMALDOCPORTS} == "YES" -.if defined(PORTSRELEASETAG) - cd ${CHROOTDIR}/usr && rm -rf ports && ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} -P -r ${PORTSRELEASETAG} ${MINIMALDOCPORTS} -.else - cd ${CHROOTDIR}/usr && rm -rf ports && ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} -P ${MINIMALDOCPORTS} -.endif -.endif .if !defined(NODOC) -.if defined(DOCRELEASETAG) - cd ${CHROOTDIR}/usr && rm -rf doc && ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} -P -r ${DOCRELEASETAG} ${RELEASEDOCMODULE} + rm -rf ${CHROOTDIR}/usr/doc +.if defined(EXTDOCDIR) + cd ${CHROOTDIR}/usr && cp -R ${EXTDOCDIR} doc .else - cd ${CHROOTDIR}/usr && rm -rf doc && ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} -P ${RELEASEDOCMODULE} + cd ${CHROOTDIR}/usr && ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} ${CVS_DOCARGS} ${RELEASEDOCMODULE} .endif if [ -d ${RELEASEDISTFILES}/ ]; then \ cp -rp ${RELEASEDISTFILES} ${CHROOTDIR}/usr/ports/distfiles; \ @@ -404,7 +419,7 @@ AUTO_KEYBOARD_DETECT BOOT_CONFIG BUILDNAME \ CD_EXTRA_BITS DISTRIBUTIONS DOC_LANG DOMINIMALDOCPORTS \ EXTRA_SRC FIXCRYPTO KERNELS KERNEL_FLAGS \ - MAKE_ISOS NODOC NO_FLOPPIES NOKERBEROS NOPORTS NOSHARED \ + MAKE_ISOS NOCDROM NODOC NO_FLOPPIES NOKERBEROS NOPORTS NOSHARED \ NOSRC NO_SENDMAIL RELEASETAG \ RELNOTES_LANG TARGET TARGET_ARCH WORLD_FLAGS .if defined(${var}) ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/common/install.sgml#7 (text+ko) ==== @@ -1,6 +1,6 @@ + &os; for the &arch.print; requires a 386 or better processor to run (sorry, there is no support for 286 processors) and at least 5 megs of RAM to install and 4 megs of RAM to @@ -81,6 +83,8 @@ most minimal installation. See below for ways of shrinking existing DOS partitions in order to install &os;. + + &os; for the &arch.print; supports the platforms described in HARDWARE.TXT. @@ -101,6 +105,17 @@ necessary to download new firmware from the vendor's Web site. + + + &os; for the &arch.print; supports the platforms + described in HARDWARE.TXT. + + You will need a dedicated disk for + &os;/sparc64. It is not possible to share a disk with another + operating system at this time. + + + If you are not familiar with configuring hardware for &os;, you should be sure to read the HARDWARE.TXT file; @@ -111,7 +126,7 @@ Floppy Disk Image Instructions - Depending on how you choose to install &os;, you may need to + Depending on how you choose to install &os;, you may need to create a set of floppy disks (usually two) to begin the installation process. This section briefly describes how to create these disks, either from a CDROM installation or from the Internet. Note that in @@ -130,7 +145,7 @@ images (for 1.44MB floppies) or kern-small.flp and mfsroot-small.flp images (for 1.2MB floppies). - Getting these images over the network is easy. Simply fetch + Getting these images over the network is easy. Simply fetch the release/floppies/kern.flp and @@ -159,7 +174,7 @@ tools directory on your CDROM or &os; FTP mirror) or the &man.dd.1; command in UNIX. - For example, to create the kernel floppy image from DOS, you'd + For example, to create the kernel floppy image from DOS, you'd do something like this: C> fdimage kern.flp a: @@ -171,18 +186,18 @@ Assuming that you'd copied rawrite.exe and kern.flp into a directory somewhere. You would do the same for mfsroot.flp, of course. - If you're creating the boot floppy from a UNIX machine, you + If you're creating the boot floppy from a UNIX machine, you may find that: &prompt.root; dd if=floppies/kern.flp of=/dev/rfd0 &prompt.root; dd if=floppies/kern.flp of=/dev/rfd0.1440 - or + or &prompt.root; dd if=floppies/kern.flp of=/dev/floppy &prompt.root; dd if=floppies/kern-small.flp of=/dev/rfd0.1200 - work well, depending on your hardware and operating system + work well, depending on your hardware and operating system environment (different versions of UNIX have different names for the floppy drive). @@ -199,6 +214,8 @@ Installing &os; from CDROM or the Internet + + The easiest type of installation is from CDROM. If you have a supported CDROM drive and a &os; installation CDROM, there are 2 ways of starting the @@ -268,6 +285,8 @@ for additional tips on installing via FTP or NFS. + + The easiest type of installation is from CDROM. If you have a supported CDROM drive and a &os; installation CDROM, you can boot &os; directly from the @@ -292,6 +311,59 @@ Insert the mfsroot.flp floppy when prompted and you will end up at the first screen of the install program. + + + + Most &arch; systems are set up to boot automatically from + disk. To install &os;, you need to boot over the network or + from a CDROM, which requires you to break into the PROM + (OpenFirmware). + + To do this, reboot the system, and wait until the boot + message appears. It depends on the model, but should look about + like: + + Sun Blade 100 (UltraSPARC-IIe), Keyboard Present +Copyright 1998-2001 Sun Microsystems, Inc. All rights reserved. +OpenBoot 4.2, 128 MB memory installed, Serial #51090132. +Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4. + + If your system proceeds to boot from disk at this point, you + need to press L1A + or StopA + on the keyboard, or send a BREAK over the + serial console (using for example ~# in + &man.tip.1; or &man.cu.1;) to get to the PROM prompt. It looks + like this: + + + + + + + + ok +ok {0} + + + + This is the prompt used on systems with just one + CPU. + + + + This is the prompt used on SMP systems, the digit + indicates the number of the active CPU. + + + + + At this point, place the CDROM into your + drive, and from the PROM prompt, type boot + cdrom. + Detail on various installation types ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/sparc64/article.sgml#4 (text+ko) ==== @@ -1,4 +1,4 @@ - + - ]>
&artheader; - - This article gives some brief instructions on installing - &os;/&arch; &release.current;. Please keep in mind that this port - is a work in progress, and as such, the installation procedure is - much more involved than for &os;/i386 or &os;/alpha. - -§.sparc64.install; +&abstract; +§.install; +§.layout; +§.upgrade; +§.trouble;
==== //depot/projects/ia64/release/scripts/print-cdrom-packages.sh#16 (text+ko) ==== @@ -2,7 +2,7 @@ # # Author: Jordan Hubbard # Date: Mon Jul 10 01:18:20 2000 -# Version: $FreeBSD: src/release/scripts/print-cdrom-packages.sh,v 1.33 2002/11/14 23:17:00 bmah Exp $ +# Version: $FreeBSD: src/release/scripts/print-cdrom-packages.sh,v 1.34 2002/11/15 19:34:31 bmah Exp $ # # MAINTAINER: jkh # @@ -108,6 +108,7 @@ CDROM_SET_1="${CDROM_SET_1} graphics/xv" CDROM_SET_1="${CDROM_SET_1} irc/xchat" CDROM_SET_1="${CDROM_SET_1} lang/gnat" +CDROM_SET_1="${CDROM_SET_1} lang/perl5" CDROM_SET_1="${CDROM_SET_1} mail/exim" CDROM_SET_1="${CDROM_SET_1} mail/fetchmail" CDROM_SET_1="${CDROM_SET_1} mail/mutt" ==== //depot/projects/ia64/share/man/man7/release.7#13 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man7/release.7,v 1.16 2002/10/22 23:36:10 keramida Exp $ +.\" $FreeBSD: src/share/man/man7/release.7,v 1.17 2002/11/15 20:55:37 jhb Exp $ .\" .Dd March 12, 2002 .Dt RELEASE 7 @@ -260,6 +260,8 @@ .It Va MAKE_ISOS If defined, bootable ISO CD-ROM images will be created from the contents of the CD-ROM stage directory. +.It Va NOCDROM +If defined, the CD-ROM stage directories will not be created. .It Va NODOC If set to .Dq Li YES , @@ -271,6 +273,8 @@ distribution will still be created with the minimal documentation set provided in .Pa src/share/doc . +.It Va NO_FLOPPIES +If defined, no floppy disk image files will be created. .It Va NOPORTS If set to .Dq Li YES ==== //depot/projects/ia64/sys/ia64/ia64/clock.c#11 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/ia64/clock.c,v 1.16 2002/10/04 01:00:35 peter Exp $ */ +/* $FreeBSD: src/sys/ia64/ia64/clock.c,v 1.17 2002/11/15 22:36:57 peter Exp $ */ /* $NetBSD: clock.c,v 1.20 1998/01/31 10:32:47 ross Exp $ */ /* ==== //depot/projects/ia64/sys/ia64/include/_types.h#3 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/ia64/include/_types.h,v 1.3 2002/08/23 22:19:57 marcel Exp $ + * $FreeBSD: src/sys/ia64/include/_types.h,v 1.4 2002/11/15 22:35:34 peter Exp $ */ #ifndef _MACHINE__TYPES_H_ ==== //depot/projects/ia64/sys/net/if.c#14 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if.c 8.5 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/net/if.c,v 1.149 2002/09/24 17:35:08 brooks Exp $ + * $FreeBSD: src/sys/net/if.c,v 1.151 2002/11/15 18:42:10 sam Exp $ */ #include "opt_compat.h" ==== //depot/projects/ia64/sys/ufs/ffs/ffs_snapshot.c#15 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_snapshot.c 8.11 (McKusick) 7/23/00 - * $FreeBSD: src/sys/ufs/ffs/ffs_snapshot.c,v 1.48 2002/10/25 00:20:37 mckusick Exp $ + * $FreeBSD: src/sys/ufs/ffs/ffs_snapshot.c,v 1.49 2002/11/15 22:36:57 peter Exp $ */ #include ==== //depot/projects/ia64/usr.bin/who/who.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.bin/who/who.c,v 1.17 2002/06/20 07:36:22 tjr Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/who/who.c,v 1.18 2002/11/15 22:41:59 peter Exp $"); #include #include ==== //depot/projects/ia64/usr.bin/xinstall/xinstall.c#13 (text+ko) ==== @@ -44,7 +44,7 @@ #endif #include -__FBSDID("$FreeBSD: src/usr.bin/xinstall/xinstall.c,v 1.58 2002/10/31 10:41:51 ru Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/xinstall/xinstall.c,v 1.59 2002/11/15 22:43:56 peter Exp $"); #include #include ==== //depot/projects/ia64/usr.sbin/ppp/physical.c#10 (text+ko) ==== @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $FreeBSD: src/usr.sbin/ppp/physical.c,v 1.53 2002/08/27 20:11:58 brian Exp $ + * $FreeBSD: src/usr.sbin/ppp/physical.c,v 1.54 2002/11/15 22:42:00 peter Exp $ * */ ==== //depot/projects/ia64/usr.sbin/pppd/auth.c#5 (text+ko) ==== @@ -33,7 +33,7 @@ */ #ifndef lint -static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/auth.c,v 1.26 2002/03/05 10:50:55 maxim Exp $"; +static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/auth.c,v 1.27 2002/11/15 22:42:00 peter Exp $"; #endif #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message