PERFORCE change 46161 for review
Peter Wemm
peter at FreeBSD.org
Thu Jan 29 17:59:02 PST 2004
http://perforce.freebsd.org/chv.cgi?CH=46161
Change 46161 by peter at peter_daintree on 2004/01/29 17:58:29
IFC @46160
Affected files ...
.. //depot/projects/hammer/etc/mtree/BSD.local.dist#14 integrate
.. //depot/projects/hammer/etc/mtree/BSD.usr.dist#18 integrate
.. //depot/projects/hammer/etc/namedb/named.root#3 integrate
.. //depot/projects/hammer/lib/libc/locale/setlocale.3#7 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_kern.c#10 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_rwlock.c#3 integrate
.. //depot/projects/hammer/release/Makefile#44 integrate
.. //depot/projects/hammer/sbin/mount/mount.8#7 integrate
.. //depot/projects/hammer/sbin/mount/mount.c#11 integrate
.. //depot/projects/hammer/sbin/routed/Makefile#2 integrate
.. //depot/projects/hammer/sbin/sunlabel/Makefile#7 integrate
.. //depot/projects/hammer/sbin/sunlabel/sunlabel.8#1 branch
.. //depot/projects/hammer/share/colldef/Makefile#11 integrate
.. //depot/projects/hammer/share/colldef/kk_KZ.PT154.src#1 branch
.. //depot/projects/hammer/share/colldef/map.PT154#1 branch
.. //depot/projects/hammer/share/mklocale/Makefile#10 integrate
.. //depot/projects/hammer/share/mklocale/kk_KZ.PT154.src#1 branch
.. //depot/projects/hammer/share/monetdef/Makefile#10 integrate
.. //depot/projects/hammer/share/monetdef/kk_KZ.PT154.src#1 branch
.. //depot/projects/hammer/share/msgdef/Makefile#10 integrate
.. //depot/projects/hammer/share/msgdef/kk_KZ.PT154.src#1 branch
.. //depot/projects/hammer/share/numericdef/Makefile#9 integrate
.. //depot/projects/hammer/share/numericdef/kk_KZ.PT154.src#1 branch
.. //depot/projects/hammer/share/syscons/keymaps/INDEX.keymaps#8 integrate
.. //depot/projects/hammer/share/syscons/keymaps/Makefile#9 integrate
.. //depot/projects/hammer/share/syscons/keymaps/kk.pt154.io.kbd#1 branch
.. //depot/projects/hammer/share/syscons/keymaps/kk.pt154.kst.kbd#1 branch
.. //depot/projects/hammer/share/timedef/Makefile#10 integrate
.. //depot/projects/hammer/share/timedef/kk_KZ.PT154.src#1 branch
.. //depot/projects/hammer/sys/amd64/acpica/madt.c#29 integrate
.. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#32 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#55 integrate
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#54 integrate
.. //depot/projects/hammer/sys/conf/files.powerpc#6 integrate
.. //depot/projects/hammer/sys/conf/systags.sh#2 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-all.h#13 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#26 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-pci.h#16 integrate
.. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#6 integrate
.. //depot/projects/hammer/sys/dev/isp/isp_target.c#6 integrate
.. //depot/projects/hammer/sys/dev/sound/driver.c#2 integrate
.. //depot/projects/hammer/sys/i386/conf/GENERIC#19 integrate
.. //depot/projects/hammer/sys/i386/conf/NOTES#29 integrate
.. //depot/projects/hammer/sys/kern/kern_sig.c#32 integrate
.. //depot/projects/hammer/sys/powerpc/include/vmparam.h#2 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/pmap.c#17 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/uma_machdep.c#1 branch
.. //depot/projects/hammer/sys/vm/vm_glue.c#21 integrate
.. //depot/projects/hammer/tools/regression/atm/Funcs.sh#1 branch
.. //depot/projects/hammer/tools/regression/atm/README#1 branch
.. //depot/projects/hammer/tools/regression/atm/RunTest.sh#1 branch
.. //depot/projects/hammer/tools/regression/atm/harp/atm_udp.ng#1 branch
.. //depot/projects/hammer/tools/regression/atm/harp/memory_leak.sh#1 branch
.. //depot/projects/hammer/tools/regression/atm/proto_sscfu/RunTest.sh#1 branch
.. //depot/projects/hammer/tools/regression/atm/proto_sscop/RunTest.sh#1 branch
.. //depot/projects/hammer/tools/regression/atm/proto_uni/RunTest.sh#1 branch
.. //depot/projects/hammer/tools/regression/usr.bin/make/Makefile#6 integrate
Differences ...
==== //depot/projects/hammer/etc/mtree/BSD.local.dist#14 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.106 2003/12/20 11:05:34 ache Exp $
+# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.107 2004/01/29 16:17:25 ache Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -389,6 +389,8 @@
..
ja_JP.eucJP
..
+ kk_KZ.PT154
+ ..
ko_KR.CP949
..
ko_KR.eucKR
==== //depot/projects/hammer/etc/mtree/BSD.usr.dist#18 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.291 2004/01/21 13:15:19 ru Exp $
+# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.292 2004/01/29 16:17:25 ache Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -459,6 +459,8 @@
..
ja_JP.eucJP
..
+ kk_KZ.PT154
+ ..
ko_KR.CP949
..
ko_KR.eucKR
@@ -819,6 +821,8 @@
..
ja_JP.eucJP
..
+ kk_KZ.PT154
+ ..
ko_KR.CP949
..
ko_KR.eucKR
==== //depot/projects/hammer/etc/namedb/named.root#3 (text+ko) ====
@@ -1,5 +1,5 @@
;
-; $FreeBSD: src/etc/namedb/named.root,v 1.10 2002/11/06 09:21:39 dougb Exp $
+; $FreeBSD: src/etc/namedb/named.root,v 1.11 2004/01/29 16:24:30 dougb Exp $
;
; This file holds the information on root name servers needed to
@@ -11,9 +11,10 @@
; under anonymous FTP as
; file /domain/named.root
; on server FTP.INTERNIC.NET
+; -OR- RS.INTERNIC.NET
;
-; last update: Nov 5, 2002
-; related version of root zone: 2002110501
+; last update: Jan 29, 2004
+; related version of root zone: 2004012900
;
;
; formerly NS.INTERNIC.NET
@@ -24,7 +25,7 @@
; formerly NS1.ISI.EDU
;
. 3600000 NS B.ROOT-SERVERS.NET.
-B.ROOT-SERVERS.NET. 3600000 A 128.9.0.107
+B.ROOT-SERVERS.NET. 3600000 A 192.228.79.201
;
; formerly C.PSI.NET
;
@@ -61,22 +62,22 @@
. 3600000 NS I.ROOT-SERVERS.NET.
I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17
;
-; operated by VeriSign, Inc.
+; operated by VeriSign, Inc.
;
. 3600000 NS J.ROOT-SERVERS.NET.
J.ROOT-SERVERS.NET. 3600000 A 192.58.128.30
;
-; housed in LINX, operated by RIPE NCC
+; operated by RIPE NCC
;
. 3600000 NS K.ROOT-SERVERS.NET.
K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129
;
-; operated by IANA
+; operated by ICANN
;
. 3600000 NS L.ROOT-SERVERS.NET.
L.ROOT-SERVERS.NET. 3600000 A 198.32.64.12
;
-; housed in Japan, operated by WIDE
+; operated by WIDE
;
. 3600000 NS M.ROOT-SERVERS.NET.
M.ROOT-SERVERS.NET. 3600000 A 202.12.27.33
==== //depot/projects/hammer/lib/libc/locale/setlocale.3#7 (text+ko) ====
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)setlocale.3 8.1 (Berkeley) 6/9/93
-.\" $FreeBSD: src/lib/libc/locale/setlocale.3,v 1.29 2003/12/07 06:00:00 tjr Exp $
+.\" $FreeBSD: src/lib/libc/locale/setlocale.3,v 1.30 2004/01/29 09:27:24 ache Exp $
.\"
.Dd November 21, 2003
.Dt SETLOCALE 3
@@ -171,7 +171,8 @@
.Xr strxfrm 3 ,
.Xr euc 5 ,
.Xr utf2 5 ,
-.Xr utf8 5
+.Xr utf8 5 ,
+.Xr environ 7
.Sh STANDARDS
The
.Fn setlocale
==== //depot/projects/hammer/lib/libthr/thread/thr_kern.c#10 (text+ko) ====
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libthr/thread/thr_kern.c,v 1.16 2003/12/30 08:34:57 mtm Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_kern.c,v 1.17 2004/01/29 09:44:36 mtm Exp $
*/
#include <sys/cdefs.h>
@@ -137,6 +137,17 @@
remaining = *abstime;
timespecsub(&remaining, &now);
ts = &remaining;
+
+ /*
+ * If the absolute timeout has already passed set the
+ * relative timeout to 0 sec. so that sigtimedwait()
+ * returns immediately.
+ * NOTE: timespecsub() makes sure the tv_nsec member >= 0.
+ */
+ if (ts->tv_sec < 0) {
+ ts->tv_sec = 0;
+ ts->tv_nsec = 0;
+ }
} else
ts = NULL;
==== //depot/projects/hammer/lib/libthr/thread/thr_rwlock.c#3 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libthr/thread/thr_rwlock.c,v 1.4 2004/01/19 14:51:45 mtm Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_rwlock.c,v 1.5 2004/01/29 12:03:17 mtm Exp $
*/
#include <errno.h>
@@ -42,17 +42,29 @@
*/
enum rwlock_type {RWT_READ, RWT_WRITE};
+/* hack to accomodate libc */
+static struct umtx init_lock = UMTX_INITIALIZER;
+
+/*
+ * Single underscore versions are for libc useage. So, use double
+ * underscores for applications.
+ */
+__weak_reference(__pthread_rwlock_rdlock, pthread_rwlock_rdlock);
+__weak_reference(__pthread_rwlock_timedrdlock, pthread_rwlock_timedrdlock);
+__weak_reference(__pthread_rwlock_timedwrlock, pthread_rwlock_timedwrlock);
+__weak_reference(__pthread_rwlock_tryrdlock, pthread_rwlock_tryrdlock);
+__weak_reference(__pthread_rwlock_trywrlock, pthread_rwlock_trywrlock);
+__weak_reference(__pthread_rwlock_wrlock, pthread_rwlock_wrlock);
+
+/*
+ * No difference between libc and application usage.
+ */
__weak_reference(_pthread_rwlock_destroy, pthread_rwlock_destroy);
__weak_reference(_pthread_rwlock_init, pthread_rwlock_init);
-__weak_reference(_pthread_rwlock_rdlock, pthread_rwlock_rdlock);
-__weak_reference(_pthread_rwlock_timedrdlock, pthread_rwlock_timedrdlock);
-__weak_reference(_pthread_rwlock_timedwrlock, pthread_rwlock_timedwrlock);
-__weak_reference(_pthread_rwlock_tryrdlock, pthread_rwlock_tryrdlock);
-__weak_reference(_pthread_rwlock_trywrlock, pthread_rwlock_trywrlock);
__weak_reference(_pthread_rwlock_unlock, pthread_rwlock_unlock);
-__weak_reference(_pthread_rwlock_wrlock, pthread_rwlock_wrlock);
static int insert_rwlock(struct pthread_rwlock *, enum rwlock_type);
+static int rwlock_init_static(struct pthread_rwlock **rwlock);
static int rwlock_rdlock_common(pthread_rwlock_t *, int,
const struct timespec *);
static int rwlock_wrlock_common(pthread_rwlock_t *, int,
@@ -212,22 +224,56 @@
}
int
+__pthread_rwlock_rdlock (pthread_rwlock_t *rwlock)
+{
+ return (rwlock_rdlock_common(rwlock, 0, NULL));
+}
+
+int
_pthread_rwlock_rdlock (pthread_rwlock_t *rwlock)
{
- return (rwlock_rdlock_common(rwlock, 0, NULL));
+ int error;
+
+ error = rwlock_init_static(rwlock);
+ if (error == 0)
+ error = rwlock_rdlock_common(rwlock, 0, NULL);
+ return (error);
+}
+
+int
+__pthread_rwlock_timedrdlock(pthread_rwlock_t *rwlock,
+ const struct timespec *timeout)
+{
+ return (rwlock_rdlock_common(rwlock, 0, timeout));
}
int
_pthread_rwlock_timedrdlock(pthread_rwlock_t *rwlock,
const struct timespec *timeout)
{
- return (rwlock_rdlock_common(rwlock, 0, timeout));
+ int error;
+
+ error = rwlock_init_static(rwlock);
+ if (error == 0)
+ rwlock_rdlock_common(rwlock, 0, timeout);
+ return (error);
+}
+
+int
+__pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock)
+{
+ return (rwlock_rdlock_common(rwlock, 1, NULL));
}
int
_pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock)
{
- return (rwlock_rdlock_common(rwlock, 1, NULL));
+ int error;
+
+ error = rwlock_init_static(rwlock);
+ if (error == 0)
+ rwlock_rdlock_common(rwlock, 1, NULL);
+ return (error);
}
int
@@ -293,22 +339,56 @@
}
int
+__pthread_rwlock_wrlock (pthread_rwlock_t *rwlock)
+{
+ return (rwlock_wrlock_common(rwlock, 0, NULL));
+}
+
+int
_pthread_rwlock_wrlock (pthread_rwlock_t *rwlock)
{
- return (rwlock_wrlock_common(rwlock, 0, NULL));
+ int error;
+
+ error = rwlock_init_static(rwlock);
+ if (error == 0)
+ error = rwlock_wrlock_common(rwlock, 0, NULL);
+ return (error);
+}
+
+int
+__pthread_rwlock_timedwrlock (pthread_rwlock_t *rwlock,
+ const struct timespec *timeout)
+{
+ return (rwlock_wrlock_common(rwlock, 0, timeout));
}
int
_pthread_rwlock_timedwrlock (pthread_rwlock_t *rwlock,
const struct timespec *timeout)
{
- return (rwlock_wrlock_common(rwlock, 0, timeout));
+ int error;
+
+ error = rwlock_init_static(rwlock);
+ if (error == 0)
+ rwlock_wrlock_common(rwlock, 0, timeout);
+ return (error);
+}
+
+int
+__pthread_rwlock_trywrlock (pthread_rwlock_t *rwlock)
+{
+ return (rwlock_wrlock_common(rwlock, 1, NULL));
}
int
_pthread_rwlock_trywrlock (pthread_rwlock_t *rwlock)
{
- return (rwlock_wrlock_common(rwlock, 1, NULL));
+ int error;
+
+ error = rwlock_init_static(rwlock);
+ if (error == 0)
+ rwlock_wrlock_common(rwlock, 1, NULL);
+ return (error);
}
/*
@@ -440,3 +520,30 @@
LIST_INSERT_HEAD(curthread->rwlockList, rh, rh_link);
return (0);
}
+
+/*
+ * libc version.
+ * There are several users of rwlocks in libc that depend on
+ * a bogus PTHREAD_RWLOCK_INITIALIZER to do for rwlocks that
+ * a similarly named symbol does for statically initialized mutexes.
+ * However, this symbol does not seem to be a valid POSIX symbol. Rather
+ * than fix libc, I choose to "fix" libthr.
+ */
+static int
+rwlock_init_static(struct pthread_rwlock **rwlock)
+{
+ int error;
+
+ /*
+ * The initial check is done without locks to not
+ * pessimize the common path.
+ */
+ error = 0;
+ if (*rwlock == PTHREAD_RWLOCK_INITIALIZER) {
+ UMTX_LOCK(&init_lock);
+ if (*rwlock == PTHREAD_RWLOCK_INITIALIZER)
+ error = _pthread_rwlock_init(rwlock, NULL);
+ UMTX_UNLOCK(&init_lock);
+ }
+ return (error);
+}
==== //depot/projects/hammer/release/Makefile#44 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.837 2004/01/28 09:19:16 ru Exp $
+# $FreeBSD: src/release/Makefile,v 1.840 2004/01/29 19:01:58 jhb Exp $
#
# make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
# [RELEASETAG=tag]
@@ -171,11 +171,11 @@
.endif
FLOPPYSIZE= 1440
FLOPPYSPLITSIZE= 1392
-MFSSIZE= 4320
FLOPPYINODE= 40000
+FLOPPYLABEL= fd1440
BOOTINODE= 80000
+MFSSIZE= 4320
MFSINODE= 8000
-FLOPPYLABEL= fd1440
MFSLABEL= minimum3
.elif ${TARGET_ARCH} == "alpha"
MFSSIZE= 4320
@@ -190,9 +190,9 @@
MINIROOT=
NO_FLOPPIES=
.elif ${TARGET_ARCH} == "ia64"
+MFSSIZE= 8192
MFSINODE= 8192
MFSLABEL= auto
-MFSSIZE= 8192
NO_FLOPPIES=
.elif ${TARGET_ARCH} == "amd64"
MFSSIZE= 4096
@@ -245,7 +245,7 @@
.endif
.endif
-.if !defined(NOFLOPPIES)
+.if !defined(NO_FLOPPIES)
EXTRAS= floppies.1 floppies.2 floppies.3
.endif
EXTRAS+= ftp.1
@@ -254,9 +254,7 @@
.if defined(MAKE_ISOS)
EXTRAS+= iso.1
.endif
-.if ${TARGET} == "i386" && defined(EMUL_BOOT)
-BOOTABLE="-eb"
-.elif ${TARGET} == "pc98"
+.if ${TARGET} == "pc98"
BOOTABLE=
.else
BOOTABLE="-b"
@@ -497,7 +495,7 @@
.endif
mkdir ${RD}/trees
mkdir ${RD}/kernels
- for i in ${DISTRIBUTIONS} special; do \
+ for i in ${DISTRIBUTIONS}; do \
mkdir ${RD}/trees/$$i && \
mtree -deU -f ${MTREEFILES}/BSD.root.dist \
-p ${RD}/trees/$$i > /dev/null && \
@@ -653,12 +651,6 @@
# Build the memory root filesystem.
release.9:
-.if exists(${.CURDIR}/../sys/boot/${TARGET}/loader)
- cd ${.CURDIR}/../sys/boot/${TARGET}/loader; \
- ${WMAKE} clean cleandepend; \
- ${WMAKE} -DNOMAN -DNOFORTH all; \
- ${WMAKE} -DNOMAN -DNOFORTH install DESTDIR=${RD}/trees/special
-.endif
cp ${RD}/trees/base/etc/disktab /etc
rm -rf ${RD}/mfsfd
mkdir ${RD}/mfsfd
@@ -718,7 +710,7 @@
@mkdir -p ${RD}/mfsroot
sh -e ${DOFS_SH} ${RD}/mfsroot/mfsroot ${RD} ${MNT} \
${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL}
- @gzip -9nv ${RD}/mfsroot/mfsroot
+ @gzip -9fnv ${RD}/mfsroot/mfsroot
touch ${.TARGET}
KERNFLOPPYSET= ${RD}/floppyset/kern/kernel.gz
@@ -758,7 +750,7 @@
KERNFILE="${KERNFLOPPYSET}.split ${KERNFLOPPYSET}.boot" \
MFSROOTFILE="${MFSROOTFLOPPYSET}.split ${MFSROOTFLOPPYSET}.boot"
.if defined(SMALLFLOPPYSIZE)
- @cd ${.CURDIR} && ${MAKE} buildBootFloppy FSIMAGE="boot" \
+ @cd ${.CURDIR} && ${MAKE} buildBootFloppy FSIMAGE="boot-small" \
KERNFILE="${SMALLKERNFLOPPYSET}.split ${SMALLKERNFLOPPYSET}.boot" \
MFSROOTFILE="${SMALLMFSROOTFLOPPYSET}.split ${SMALLMFSROOTFLOPPYSET}.boot" \
FDSIZE="SMALL"
@@ -768,7 +760,7 @@
KERNFILE="${KERNFLOPPYSET}.split ${KERNFLOPPYSET}.boot" \
MFSROOTFILE=${RD}/mfsroot/mfsroot.gz
.if defined(SMALLFLOPPYSIZE)
- @cd ${.CURDIR} && ${MAKE} buildBootFloppy FSIMAGE="boot" \
+ @cd ${.CURDIR} && ${MAKE} buildBootFloppy FSIMAGE="boot-small" \
KERNFILE="${SMALLKERNFLOPPYSET}.split ${SMALLKERNFLOPPYSET}.boot" \
MFSROOTFILE=${RD}/mfsroot/mfsroot.gz \
FDSIZE="SMALL"
@@ -911,15 +903,6 @@
.endif
.endif
@cp -Rp ${CD_DISC2}/boot ${CD_DISC1}
-.if ${TARGET} == "i386" && defined(EMUL_BOOT) && !defined(NO_FLOPPIES)
- # In case bootable ISO with floppy emulation is desired.
-.if defined(CD_BOOT)
- @mkdir -p ${CD_BOOT}/floppies
- @cp ${CD_DISC1}/floppies/boot.flp ${CD_BOOT}/floppies
-.endif
- @mkdir -p ${CD_DISC2}/floppies
- @cp ${CD_DISC1}/floppies/boot.flp ${CD_DISC2}/floppies
-.endif
.endif
touch ${.TARGET}
@@ -1082,7 +1065,7 @@
.if !defined(SPLITFILE)
@echo "SPLITFILE undefined in ${.TARGET}" && exit 1
.endif
- ${.CURDIR}/scripts/split-file.sh ${SPLITFILE} \
+ sh ${.CURDIR}/scripts/split-file.sh ${SPLITFILE} \
${RD}/floppyset/${FLOPPYBASE} ${FLPSPLITSIZE} "${FLOPPYDESC}"
( splitfile=${SPLITDIR}/`basename ${SPLITFILE}`.split ; \
lines=`cat $${splitfile} | wc -l`; \
@@ -1105,6 +1088,7 @@
.if make(buildBootFloppy)
IMAGEDIR= ${RD}/image.${FSIMAGE}
HINTSFILE= ${.CURDIR}/../sys/${TARGET}/conf/GENERIC.hints
+ACPI_KO= ${RD}/trees/base/boot/kernel/acpi.ko
IMAGEFILE= ${RD}/floppies/${FSIMAGE}.flp
.if defined(FDSIZE) && ${FDSIZE} == "SMALL"
FLPSIZE= ${SMALLFLOPPYSIZE}
@@ -1132,9 +1116,9 @@
@mkdir -p ${IMAGEDIR}/boot
.if ${TARGET} == "i386"
@${WMAKEENV} kgzip -v -l ${RD}/trees/base/usr/lib/kgzldr.o -o \
- ${IMAGEDIR}/boot/loader ${RD}/trees/special/boot/loader
+ ${IMAGEDIR}/boot/loader ${RD}/trees/base/boot/loader
.else
- @cp ${RD}/trees/special/boot/loader ${IMAGEDIR}/boot
+ @cp ${RD}/trees/base/boot/loader ${IMAGEDIR}/boot
.endif
@[ -r ${HINTSFILE} ] && \
sed -e '/^hint/s/^/set /' -e '/^#/d' ${HINTSFILE} > \
@@ -1144,8 +1128,11 @@
@echo "echo \\007\\007" >> ${IMAGEDIR}/boot/loader.rc
@echo "echo Please insert boot floppy and press enter:" >> ${IMAGEDIR}/boot/loader.rc
@echo "read" >> ${IMAGEDIR}/boot/loader.rc
+.if exists(${ACPI_KO})
+ @gzip -9nc ${ACPI_KO} > ${IMAGEDIR}/acpi.ko.gz
+ @echo "load /acpi.ko" >> ${IMAGEDIR}/boot/loader.rc
+.endif
@echo "load -t mfs_root /mfsroot" >> ${IMAGEDIR}/boot/loader.rc
- @echo "set hint.acpi.0.disabled=1" >> ${IMAGEDIR}/boot/loader.rc
@echo "echo \\007\\007" >> ${IMAGEDIR}/boot/loader.rc
@echo "autoboot 10" >> ${IMAGEDIR}/boot/loader.rc
.if ${TARGET_ARCH} == "i386" && ${AUTO_KEYBOARD_DETECT}
==== //depot/projects/hammer/sbin/mount/mount.8#7 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)mount.8 8.8 (Berkeley) 6/16/94
-.\" $FreeBSD: src/sbin/mount/mount.8,v 1.60 2003/10/22 18:25:49 seanc Exp $
+.\" $FreeBSD: src/sbin/mount/mount.8,v 1.62 2004/01/29 15:14:03 guido Exp $
.\"
.Dd April 7, 2003
.Dt MOUNT 8
@@ -42,6 +42,7 @@
.Nm
.Op Fl adfpruvw
.Op Fl F Ar fstab
+.Op Fl o Ar options
.Op Fl t Ar ufs | external_type
.Nm
.Op Fl dfpruvw
==== //depot/projects/hammer/sbin/mount/mount.c#11 (text+ko) ====
@@ -42,7 +42,7 @@
static char sccsid[] = "@(#)mount.c 8.25 (Berkeley) 5/8/95";
#endif
static const char rcsid[] =
- "$FreeBSD: src/sbin/mount/mount.c,v 1.58 2004/01/07 05:37:56 anholt Exp $";
+ "$FreeBSD: src/sbin/mount/mount.c,v 1.61 2004/01/29 15:14:03 guido Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -210,6 +210,8 @@
if (!(init_flags & MNT_UPDATE) &&
ismounted(fs, mntbuf, mntsize))
continue;
+ options = update_options(options, fs->fs_mntops,
+ mntbuf->f_flags);
if (mountfs(fs->fs_vfstype, fs->fs_spec,
fs->fs_file, init_flags, options,
fs->fs_mntops))
@@ -704,7 +706,7 @@
(void)fprintf(stderr, "%s\n%s\n%s\n",
"usage: mount [-dfpruvw] [-o options] [-t ufs | external_type] special node",
-" mount [-adfpruvw] [ -F fstab] [-t ufs | external_type]",
+" mount [-adfpruvw] [ -F fstab] [-o options] [-t ufs | external_type]",
" mount [-dfpruvw] special | node");
exit(1);
}
==== //depot/projects/hammer/sbin/routed/Makefile#2 (text+ko) ====
@@ -1,6 +1,5 @@
# Make `routed` for FreeBSD
-# $FreeBSD: src/sbin/routed/Makefile,v 1.12 2001/12/04 02:19:56 obrien Exp $
-# $FreeBSD: src/sbin/routed/Makefile,v 1.12 2001/12/04 02:19:56 obrien Exp $
+# $FreeBSD: src/sbin/routed/Makefile,v 1.13 2004/01/29 14:36:16 ru Exp $
PROG= routed
SRCS= if.c input.c main.c output.c parms.c radix.c rdisc.c table.c trace.c
==== //depot/projects/hammer/sbin/sunlabel/Makefile#7 (text+ko) ====
@@ -1,16 +1,20 @@
-# $FreeBSD: src/sbin/sunlabel/Makefile,v 1.8 2003/05/17 19:05:17 ru Exp $
+# $FreeBSD: src/sbin/sunlabel/Makefile,v 1.10 2004/01/29 18:15:19 obrien Exp $
+
+.PATH: ${.CURDIR}/../../sys/geom
+
+PROG= sunlabel
+SRCS= sunlabel.c geom_sunlabel_enc.c
+MAN= sunlabel.8
-PROG=sunlabel
-SRCS=sunlabel.c geom_sunlabel_enc.c
-NOMAN=
-WARNS=5
+WARNS?= 5
DPADD= ${LIBGEOM}
LDADD= -lgeom
-.PATH: ${.CURDIR}/../../sys/geom
-
.include <bsd.prog.mk>
test: ${PROG}
sh ${.CURDIR}/runtest.sh
+
+testx: ${PROG}
+ sh -x ${.CURDIR}/runtest.sh
==== //depot/projects/hammer/share/colldef/Makefile#11 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/colldef/Makefile,v 1.62 2003/12/20 11:18:42 ache Exp $
+# $FreeBSD: src/share/colldef/Makefile,v 1.63 2004/01/29 16:28:20 ache Exp $
#
NOMAN=YES
@@ -21,6 +21,7 @@
hy_AM.ARMSCII-8 \
is_IS.ISO8859-1 \
is_IS.ISO8859-15 \
+ kk_KZ.PT154 \
la_LN.ISO8859-1 \
la_LN.ISO8859-15 \
la_LN.ISO8859-2 \
@@ -79,6 +80,7 @@
hy_AM.ARMSCII-8.out: map.ARMSCII-8
is_IS.ISO8859-15.out: map.ISO8859-15
is_IS.ISO8859-1.out: map.ISO8859-1
+kk_KZ.PT154.out: map.PT154
la_LN.ISO8859-15.out: map.ISO8859-15
la_LN.ISO8859-1.out: map.ISO8859-1
la_LN.ISO8859-2.out: map.ISO8859-2
==== //depot/projects/hammer/share/mklocale/Makefile#10 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/mklocale/Makefile,v 1.57 2003/12/20 11:18:42 ache Exp $
+# $FreeBSD: src/share/mklocale/Makefile,v 1.58 2004/01/29 16:28:20 ache Exp $
NOMAN=YES
CLEANFILES+= ${LOCALES:S/$/.out/g}
@@ -11,6 +11,7 @@
hy_AM.ARMSCII-8 \
ja_JP.SJIS \
ja_JP.eucJP \
+ kk_KZ.PT154 \
ko_KR.CP949 \
ko_KR.eucKR \
la_LN.ISO8859-1 \
==== //depot/projects/hammer/share/monetdef/Makefile#10 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/monetdef/Makefile,v 1.51 2003/12/20 11:18:42 ache Exp $
+# $FreeBSD: src/share/monetdef/Makefile,v 1.52 2004/01/29 16:28:20 ache Exp $
NOMAN=YES
CLEANFILES+= ${LOCALES:S/$/.out/g}
@@ -34,6 +34,7 @@
is_IS.ISO8859-1 \
it_IT.ISO8859-1 \
ja_JP.eucJP \
+ kk_KZ.PT154 \
ko_KR.eucKR \
lt_LT.ISO8859-13 \
nl_BE.ISO8859-1 \
==== //depot/projects/hammer/share/msgdef/Makefile#10 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/msgdef/Makefile,v 1.52 2003/12/20 11:18:43 ache Exp $
+# $FreeBSD: src/share/msgdef/Makefile,v 1.53 2004/01/29 16:28:21 ache Exp $
NOMAN=YES
CLEANFILES+= ${LOCALES:S/$/.out/g}
@@ -29,6 +29,7 @@
hy_AM.ARMSCII-8 \
is_IS.ISO8859-1 \
it_IT.ISO8859-1 \
+ kk_KZ.PT154 \
lt_LT.ISO8859-13 \
nl_NL.ISO8859-1 \
no_NO.ISO8859-1 \
==== //depot/projects/hammer/share/numericdef/Makefile#9 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/numericdef/Makefile,v 1.51 2003/12/20 11:18:43 ache Exp $
+# $FreeBSD: src/share/numericdef/Makefile,v 1.52 2004/01/29 16:28:21 ache Exp $
NOMAN=YES
CLEANFILES+= ${LOCALES:S/$/.out/g}
@@ -25,6 +25,7 @@
is_IS.ISO8859-1 \
it_IT.ISO8859-1 \
ja_JP.eucJP \
+ kk_KZ.PT154 \
ko_KR.eucKR \
lt_LT.ISO8859-13 \
nl_NL.ISO8859-1 \
==== //depot/projects/hammer/share/syscons/keymaps/INDEX.keymaps#8 (text+ko) ====
@@ -1,10 +1,10 @@
-# $FreeBSD: src/share/syscons/keymaps/INDEX.keymaps,v 1.53 2003/12/20 11:18:43 ache Exp $
+# $FreeBSD: src/share/syscons/keymaps/INDEX.keymaps,v 1.54 2004/01/29 16:28:22 ache Exp $
#
# database for kbdmap(8)
#
# Format <file>:<lang>:<description>
#
-# lang: ar bg cs da de el en es fi fr hr hu hy is it iw ja ko nl no pl
+# lang: ar bg cs da de el en es fi fr hr hu hy is it iw ja kk ko nl no pl
# pt ro ru sh sk sl sv tr uk zh
# lang: lang,lang
#
@@ -222,6 +222,9 @@
jp.pc98.iso.kbd:en:Japanese PC-98x1 (ISO)
+kk.pt154.kst.kbd:en:Kazakh PT154 codepage
+kk.pt154.io.kbd:en:Kazakh PT154 codepage
+
latinamerican.kbd:en:Latin American
latinamerican.kbd:de:Latein Amerikanisch
latinamerican.kbd:pt,es:América Latina
==== //depot/projects/hammer/share/syscons/keymaps/Makefile#9 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/syscons/keymaps/Makefile,v 1.66 2004/01/19 13:40:51 ru Exp $
+# $FreeBSD: src/share/syscons/keymaps/Makefile,v 1.67 2004/01/29 16:28:22 ache Exp $
FILES= INDEX.keymaps \
be.iso.kbd be.iso.acc.kbd \
@@ -23,6 +23,7 @@
it.iso.kbd \
iw.iso8.kbd \
jp.106.kbd jp.106x.kbd jp.pc98.kbd jp.pc98.iso.kbd \
+ kk.pt154.kst.kbd kk.pt154.io.kbd \
latinamerican.kbd latinamerican.iso.acc.kbd \
lt.iso4.kbd \
norwegian.iso.kbd norwegian.dvorak.kbd \
==== //depot/projects/hammer/share/timedef/Makefile#10 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/timedef/Makefile,v 1.39 2003/12/20 11:18:43 ache Exp $
+# $FreeBSD: src/share/timedef/Makefile,v 1.40 2004/01/29 16:28:22 ache Exp $
NOMAN=YES
CLEANFILES+= ${LOCALES:S/$/.out/g}
@@ -28,6 +28,7 @@
ja_JP.eucJP \
ja_JP.SJIS \
it_IT.ISO8859-1 \
+ kk_KZ.PT154 \
ko_KR.eucKR \
la_LN.ISO8859-1 \
lt_LT.ISO8859-4 \
==== //depot/projects/hammer/sys/amd64/acpica/madt.c#29 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.10 2003/12/09 03:04:19 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.11 2004/01/30 00:24:45 peter Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#32 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.6 2004/01/28 23:51:16 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.7 2004/01/30 00:24:45 peter Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#55 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.233 2004/01/28 23:51:16 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.234 2004/01/30 00:24:45 peter Exp $");
#include "opt_cpu.h"
#include "opt_kstack_pages.h"
==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#54 (text+ko) ====
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.450 2004/01/01 07:08:52 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.451 2004/01/30 00:24:45 peter Exp $");
/*
* Manages physical address maps.
==== //depot/projects/hammer/sys/conf/files.powerpc#6 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.powerpc,v 1.34 2004/01/21 05:19:59 grehan Exp $
+# $FreeBSD: src/sys/conf/files.powerpc,v 1.35 2004/01/29 00:32:22 grehan Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -58,6 +58,7 @@
powerpc/powerpc/sys_machdep.c standard
powerpc/powerpc/swtch.S standard
powerpc/powerpc/trap.c standard
+powerpc/powerpc/uma_machdep.c standard
powerpc/powerpc/vm_machdep.c standard
powerpc/powerpc/db_disasm.c optional ddb
==== //depot/projects/hammer/sys/conf/systags.sh#2 (text+ko) ====
@@ -32,7 +32,7 @@
# SUCH DAMAGE.
#
# @(#)systags.sh 8.1 (Berkeley) 6/10/93
-# $FreeBSD: src/sys/conf/systags.sh,v 1.7 1999/08/28 00:41:02 peter Exp $
+# $FreeBSD: src/sys/conf/systags.sh,v 1.8 2004/01/29 14:58:22 kensmith Exp $
#
# systags.sh - construct a system tags file using dependence relations
# in a .depend file
@@ -41,7 +41,7 @@
rm -f tags tags.tmp tags.cfiles tags.sfiles tags.hfiles
MACHINE=`uname -m`
-sed -e "s, machine/, ../../$MACHINE/include/,g" \
+sed -e "s, machine/, ../../../$MACHINE/include/,g" \
-e 's,[a-z][^/ ]*/\.\./,,g' .depend | awk '{
for (i = 1; i <= NF; ++i) {
t = substr($i, length($i) - 1)
==== //depot/projects/hammer/sys/dev/ata/ata-all.h#13 (text+ko) ====
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.72 2004/01/28 20:38:51 sos Exp $
+ * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.73 2004/01/29 15:03:01 sos Exp $
*/
/* ATA register defines */
@@ -135,7 +135,6 @@
#define ATA_BMCMD_START_STOP 0x01
#define ATA_BMCMD_WRITE_READ 0x08
-#define ATA_BMCTL_PORT 0x09
#define ATA_BMDEVSPEC_0 0x0a
#define ATA_BMSTAT_PORT 0x0b
#define ATA_BMSTAT_ACTIVE 0x01
==== //depot/projects/hammer/sys/dev/ata/ata-chipset.c#26 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.59 2004/01/28 21:54:40 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.60 2004/01/29 15:03:01 sos Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -1196,6 +1196,7 @@
}
break;
}
+
ctlr->setmode = ata_promise_setmode;
return 0;
}
@@ -1212,8 +1213,8 @@
}
ch->r_io[ATA_ALTSTAT].res = ctlr->r_io2;
ch->r_io[ATA_ALTSTAT].offset = 0x238 + (ch->unit << 7);
- ch->r_io[ATA_BMCTL_PORT].res = ctlr->r_io2;
- ch->r_io[ATA_BMCTL_PORT].offset = 0x260 + (ch->unit << 7);
+ ch->r_io[ATA_BMCMD_PORT].res = ctlr->r_io2;
+ ch->r_io[ATA_BMCMD_PORT].offset = 0x260 + (ch->unit << 7);
ch->r_io[ATA_BMDTP_PORT].res = ctlr->r_io2;
ch->r_io[ATA_BMDTP_PORT].offset = 0x244 + (ch->unit << 7);
ch->r_io[ATA_BMDEVSPEC_0].res = ctlr->r_io2;
@@ -1357,7 +1358,7 @@
case PRMIO:
if (mode > ATA_UDMA2 &&
- (ATA_IDX_INL(atadev->channel, ATA_BMCTL_PORT) & 0x01000000)) {
+ (ATA_IDX_INL(atadev->channel, ATA_BMCMD_PORT) & 0x01000000)) {
ata_prtdev(atadev,
"DMA limited to UDMA33, non-ATA66 cable or device\n");
mode = ATA_UDMA2;
@@ -1445,8 +1446,8 @@
ata_promise_mio_dmastart(struct ata_channel *ch)
{
ATA_IDX_OUTL(ch, ATA_BMDTP_PORT, ch->dma->mdmatab);
- ATA_IDX_OUTL(ch, ATA_BMCTL_PORT,
- (ATA_IDX_INL(ch, ATA_BMCTL_PORT) & ~0x000000c0) |
+ ATA_IDX_OUTL(ch, ATA_BMCMD_PORT,
+ (ATA_IDX_INL(ch, ATA_BMCMD_PORT) & ~0x000000c0) |
((ch->dma->flags & ATA_DMA_READ) ? 0x00000080 : 0x000000c0));
return 0;
}
@@ -1454,8 +1455,8 @@
static int
ata_promise_mio_dmastop(struct ata_channel *ch)
{
- ATA_IDX_OUTL(ch, ATA_BMCTL_PORT,
- ATA_IDX_INL(ch, ATA_BMCTL_PORT) & ~0x00000080);
+ ATA_IDX_OUTL(ch, ATA_BMCMD_PORT,
+ ATA_IDX_INL(ch, ATA_BMCMD_PORT) & ~0x00000080);
return 0;
}
==== //depot/projects/hammer/sys/dev/ata/ata-pci.h#16 (text+ko) ====
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list