Permalink
Browse files

sync with head.

  • Loading branch information...
keiichi
keiichi committed Mar 24, 2008
1 parent a9efae3 commit 5bdd042589af414fde24fe7503752ac72cee2204
Showing 1,808 changed files with 73,434 additions and 49,338 deletions.
View
@@ -454,13 +454,14 @@ BUILDING
Additional make(1) targets are usable specifically from the top source
level to facilitate building the entire NetBSD source tree.
- build Build the entire NetBSD system. This orders portions of
- the source tree such that prerequisites will be built in
- the proper order.
+ build Build the entire NetBSD system (except the kernel). This
+ orders portions of the source tree such that prerequisites
+ will be built in the proper order.
distribution Do a ``make build'', and then install a full distribution
- into DESTDIR, including files in DESTDIR/dev, DESTDIR/etc,
- DESTDIR/root and DESTDIR/var.
+ (which does not include a kernel) into DESTDIR, including
+ files in DESTDIR/dev, DESTDIR/etc, DESTDIR/root and
+ DESTDIR/var.
buildworld As per ``make distribution'', except that it ensures that
DESTDIR is not the root directory.
@@ -484,17 +485,17 @@ BUILDING
to fix them).
sets Create distribution sets from DESTDIR into
- RELEASEDIR/MACHINE/binary/sets. Should be run after ``make
- distribution'' (as ``make build'' does not install all of
- the required files).
+ RELEASEDIR/RELEASEMACHINEDIR/binary/sets. Should be run
+ after ``make distribution'' (as ``make build'' does not
+ install all of the required files).
sourcesets Create source sets of the source tree into
RELEASEDIR/source/sets.
syspkgs Create syspkgs from DESTDIR into
- RELEASEDIR/MACHINE/binary/syspkgs. Should be run after
- ``make distribution'' (as ``make build'' does not install
- all of the required files).
+ RELEASEDIR/RELEASEMACHINEDIR/binary/syspkgs. Should be run
+ after ``make distribution'' (as ``make build'' does not
+ install all of the required files).
release Do a ``make distribution'', build kernels, distribution
media, and install sets (this as per ``make sets''), and
@@ -516,11 +517,11 @@ BUILDING
populated by ``make release'' or equivalent.
Note that other, smaller, CD-ROM images may be created in
- the RELEASEDIR/MACHINE/installation/cdrom directory by
- ``make release''. These smaller images usually contain the
- same tools as the larger images in RELEASEDIR/iso, but do
- not contain additional content such as the distribution
- sets.
+ the RELEASEDIR/RELEASEMACHINEDIR/installation/cdrom direc-
+ tory by ``make release''. These smaller images usually
+ contain the same tools as the larger images in
+ RELEASEDIR/iso, but do not contain additional content such
+ as the distribution sets.
Note that the mac68k port still uses an older method of
creating CD-ROM images. This requires the mkisofs(1) util-
@@ -544,11 +545,11 @@ BUILDING
lent.
Note that other, smaller, CD-ROM images may be created in
- the RELEASEDIR/MACHINE/installation/cdrom directory by
- ``make release''. These smaller images usually contain the
- same tools as the larger images in RELEASEDIR/iso, but do
- not contain additional content such as the distribution
- sets.
+ the RELEASEDIR/RELEASEMACHINEDIR/installation/cdrom direc-
+ tory by ``make release''. These smaller images usually
+ contain the same tools as the larger images in
+ RELEASEDIR/iso, but do not contain additional content such
+ as the distribution sets.
Note that the mac68k port still uses an older method of
creating CD-ROM images. This requires the mkisofs(1) util-
@@ -612,9 +613,10 @@ BUILDING
releasekernel=kconf
Install a gzip(1)ed copy of the kernel built by
- kernel=kconf into RELEASEDIR/MACHINE/binary/kernel, usually
- as netbsd-kconf.gz, although the ``netbsd'' prefix is
- determined from the ``config'' directives in kconf.
+ kernel=kconf into
+ RELEASEDIR/RELEASEMACHINEDIR/binary/kernel, usually as
+ netbsd-kconf.gz, although the ``netbsd'' prefix is deter-
+ mined from the ``config'' directives in kconf.
sets Perform ``make sets''.
@@ -811,4 +813,4 @@ HISTORY
BUGS
A few platforms are not yet using this build system.
-NetBSD September 1, 2007 NetBSD
+NetBSD March 18, 2008 NetBSD
View
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.251 2007/11/12 15:06:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.251.4.1 2008/03/24 07:14:28 keiichi Exp $
#
# This is the top-level makefile for building NetBSD. For an outline of
@@ -51,16 +51,18 @@
# is the not root directory if cross compiling.
# release:
# Does a `make distribution', and then tars up the DESTDIR files
-# into RELEASEDIR/${MACHINE}, in release(7) format.
+# into ${RELEASEDIR}/${RELEASEMACHINEDIR}, in release(7) format.
# (See etc/Makefile for more information on this.)
# regression-tests:
# Runs the regression tests in "regress" on this host.
# sets:
-# Populate ${RELEASEDIR}/${MACHINE}/binary/sets from ${DESTDIR}
+# Populate ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets
+# from ${DESTDIR}
# sourcesets:
# Populate ${RELEASEDIR}/source/sets from ${NETBSDSRCDIR}
# syspkgs:
-# Populate ${RELEASEDIR}/${MACHINE}/binary/syspkgs from ${DESTDIR}
+# Populate ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/syspkgs
+# from ${DESTDIR}
# iso-image:
# Create CD-ROM image in RELEASEDIR/iso.
# RELEASEDIR must already have been populated by `make release'
View
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile,v 1.1.4.2 2008/03/24 07:14:28 keiichi Exp $
+
+PROG= bsdcpio
+SRCS= cmdline.c cpio.c err.c matching.c pathmatch.c
+
+USE_FORT?= yes # complex string handling
+
+.include <bsd.own.mk>
+
+DPSRCS+= config_netbsd.h
+CLEANFILES+= config_netbsd.h
+
+BSDCPIODIR= ${NETBSDSRCDIR}/dist/libarchive
+.PATH: ${BSDCPIODIR}/cpio
+
+WARNS= 4
+DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBZ}
+LDADD= -larchive -lbz2 -lz
+
+CPPFLAGS+= -DPLATFORM_CONFIG_H=\"config_netbsd.h\"
+CPPFLAGS+= -I${.OBJDIR}
+
+config_netbsd.h: ${.CURDIR}/../../lib/libarchive/config_netbsd.h
+ ln -s ${.CURDIR}/../../lib/libarchive/config_netbsd.h ${.TARGET}
+
+.include <bsd.prog.mk>
View
@@ -1,4 +1,4 @@
-/* $NetBSD: time.c,v 1.16 2007/02/24 21:29:13 matt Exp $ */
+/* $NetBSD: time.c,v 1.16.8.1 2008/03/24 07:14:28 keiichi Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)time.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: time.c,v 1.16 2007/02/24 21:29:13 matt Exp $");
+__RCSID("$NetBSD: time.c,v 1.16.8.1 2008/03/24 07:14:28 keiichi Exp $");
#endif
#endif /* not lint */
@@ -158,8 +158,8 @@ prusage(FILE *fp, struct rusage *r0, struct rusage *r1, struct timeval *e,
switch (*++cp) {
case 'D': /* (average) unshared data size */
(void)fprintf(fp, "%ld", t == 0 ? 0L :
- (r1->ru_idrss + r1->ru_isrss -
- (r0->ru_idrss + r0->ru_isrss)) / t);
+ (long)((r1->ru_idrss + r1->ru_isrss -
+ (r0->ru_idrss + r0->ru_isrss)) / t));
break;
case 'E': /* elapsed (wall-clock) time */
pcsecs(fp, (long) ms);
@@ -172,8 +172,8 @@ prusage(FILE *fp, struct rusage *r0, struct rusage *r1, struct timeval *e,
break;
case 'K': /* (average) total data memory used */
(void)fprintf(fp, "%ld", t == 0 ? 0L :
- ((r1->ru_ixrss + r1->ru_isrss + r1->ru_idrss) -
- (r0->ru_ixrss + r0->ru_idrss + r0->ru_isrss)) / t);
+ (long)(((r1->ru_ixrss + r1->ru_isrss + r1->ru_idrss) -
+ (r0->ru_ixrss + r0->ru_idrss + r0->ru_isrss)) / t));
break;
case 'M': /* max. Resident Set Size */
(void)fprintf(fp, "%ld", r1->ru_maxrss / 2L);
@@ -204,7 +204,7 @@ prusage(FILE *fp, struct rusage *r0, struct rusage *r1, struct timeval *e,
break;
case 'X': /* (average) shared text size */
(void)fprintf(fp, "%ld", t == 0 ? 0L :
- (r1->ru_ixrss - r0->ru_ixrss) / t);
+ (long)((r1->ru_ixrss - r0->ru_ixrss) / t));
break;
case 'c': /* num. involuntary context switches */
(void)fprintf(fp, "%ld", r1->ru_nivcsw - r0->ru_nivcsw);
View
@@ -1,4 +1,4 @@
-/* $NetBSD: date.c,v 1.50 2007/02/04 22:11:13 cbiere Exp $ */
+/* $NetBSD: date.c,v 1.50.8.1 2008/03/24 07:14:28 keiichi Exp $ */
/*
* Copyright (c) 1985, 1987, 1988, 1993
@@ -40,7 +40,7 @@ __COPYRIGHT(
#if 0
static char sccsid[] = "@(#)date.c 8.2 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: date.c,v 1.50 2007/02/04 22:11:13 cbiere Exp $");
+__RCSID("$NetBSD: date.c,v 1.50.8.1 2008/03/24 07:14:28 keiichi Exp $");
#endif
#endif /* not lint */
@@ -103,7 +103,7 @@ main(int argc, char *argv[])
break;
case 'r': /* user specified seconds */
rflag = 1;
- tval = strtol(optarg, NULL, 0);
+ tval = strtoll(optarg, NULL, 0);
break;
case 'u': /* do everything in UTC */
(void)putenv("TZ=UTC0");
View
@@ -1,4 +1,4 @@
-/* $NetBSD: netdate.c,v 1.26 2007/02/04 22:21:53 cbiere Exp $ */
+/* $NetBSD: netdate.c,v 1.26.8.1 2008/03/24 07:14:28 keiichi Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)netdate.c 8.2 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: netdate.c,v 1.26 2007/02/04 22:21:53 cbiere Exp $");
+__RCSID("$NetBSD: netdate.c,v 1.26.8.1 2008/03/24 07:14:28 keiichi Exp $");
#endif
#endif /* not lint */
@@ -127,7 +127,7 @@ netsettime(time_t tval)
strncpy(msg.tsp_name, hostname, sizeof(msg.tsp_name));
msg.tsp_name[sizeof(msg.tsp_name) - 1] = '\0';
msg.tsp_seq = htons((uint16_t)0);
- msg.tsp_time.tv_sec = htonl((uint32_t)tval);
+ msg.tsp_time.tv_sec = htonl((uint32_t)tval); /* XXX: y2038 */
msg.tsp_time.tv_usec = htonl((uint32_t)0);
if (connect(s, (const struct sockaddr *)&dest, sizeof(dest)) < 0) {
warn("connect");
View
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.15 2002/08/19 09:56:01 lukem Exp $
+# $NetBSD: Makefile,v 1.15.30.1 2008/03/24 07:14:28 keiichi Exp $
# @(#)Makefile 8.3 (Berkeley) 5/8/95
.include <bsd.own.mk>
PROG= df
.PATH: ${NETBSDSRCDIR}/bin/csh
SRCS= df.c strpct.c
+WARNS=4
.include <bsd.prog.mk>
View
@@ -1,4 +1,4 @@
-.\" $NetBSD: df.1,v 1.41 2007/06/24 01:52:46 christos Exp $
+.\" $NetBSD: df.1,v 1.41.8.1 2008/03/24 07:14:28 keiichi Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,16 +29,16 @@
.\"
.\" @(#)df.1 8.2 (Berkeley) 1/13/92
.\"
-.Dd June 23, 2007
+.Dd March 4, 2008
.Dt DF 1
.Os
.Sh NAME
.Nm df
.Nd display free disk space
.Sh SYNOPSIS
.Nm
-.Op Fl aGklmn
-.Op Fl g | Fl i | Fl P
+.Op Fl agklmn
+.Op Fl G | Fl i | Fl P
.Op Fl t Ar type
.Op Ar file | Ar file_system ...
.Sh DESCRIPTION
@@ -73,26 +73,28 @@ including those that were mounted with the
.Dv MNT_IGNORE
flag.
.It Fl G
-The
-.Fl G
-option causes the numbers to be reported in gigabytes (1024*1024*1024
-bytes).
-.It Fl g
Display all the fields of the structure(s) returned by
.Xr statvfs 2 .
This option cannot be used with the
.Fl i
or
.Fl P
-options.
+options, and it is modelled after the Solaris
+.Fl g
+option.
This option will override the
-.Fl G ,
+.Fl g ,
.Fl h ,
.Fl k ,
and
.Fl m
options, as well as any setting of
.Ev BLOCKSIZE .
+.It Fl g
+The
+.Fl g
+option causes the numbers to be reported in gigabytes (1024*1024*1024
+bytes).
.It Fl h
"Human-readable" output.
Use unit suffixes: Byte, Kilobyte, Megabyte,
@@ -177,7 +179,7 @@ that file system.
If the environment variable
.Ev BLOCKSIZE
is set, and the
-.Fl G ,
+.Fl g ,
.Fl h ,
.Fl k
and
Oops, something went wrong.

0 comments on commit 5bdd042

Please sign in to comment.