CVS commit: src/sys/arch/hp700/dev
Module Name:src Committed By: skrll Date: Fri Jun 18 06:15:31 UTC 2010 Modified Files: src/sys/arch/hp700/dev: uturn.c Log Message: White space. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hp700/dev/uturn.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/dev/uturn.c diff -u src/sys/arch/hp700/dev/uturn.c:1.6 src/sys/arch/hp700/dev/uturn.c:1.7 --- src/sys/arch/hp700/dev/uturn.c:1.6 Sun Nov 15 15:53:05 2009 +++ src/sys/arch/hp700/dev/uturn.c Fri Jun 18 06:15:31 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: uturn.c,v 1.6 2009/11/15 15:53:05 skrll Exp $ */ +/* $NetBSD: uturn.c,v 1.7 2010/06/18 06:15:31 skrll Exp $ */ /* $OpenBSD: uturn.c,v 1.6 2007/12/29 01:26:14 kettenis Exp $ */ @@ -95,7 +95,7 @@ sc-sc_regs = (struct uturn_regs *)ca-ca_hpa; aprint_normal(: %s rev %d\n, - ca-ca_type.iodc_revision 0x10? U2 : UTurn, + ca-ca_type.iodc_revision 0x10 ? U2 : UTurn, ca-ca_type.iodc_revision 0xf); /* keep it real */
CVS commit: src/sys/arch/hp700/dev
Module Name:src
Committed By: skrll
Date: Fri Jun 18 06:30:54 UTC 2010
Modified Files:
src/sys/arch/hp700/dev: uturn.c
Log Message:
Flesh out uturn_regs. Replace magic constant with a define.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hp700/dev/uturn.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp700/dev/uturn.c
diff -u src/sys/arch/hp700/dev/uturn.c:1.7 src/sys/arch/hp700/dev/uturn.c:1.8
--- src/sys/arch/hp700/dev/uturn.c:1.7 Fri Jun 18 06:15:31 2010
+++ src/sys/arch/hp700/dev/uturn.c Fri Jun 18 06:30:53 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uturn.c,v 1.7 2010/06/18 06:15:31 skrll Exp $ */
+/* $NetBSD: uturn.c,v 1.8 2010/06/18 06:30:53 skrll Exp $ */
/* $OpenBSD: uturn.c,v 1.6 2007/12/29 01:26:14 kettenis Exp $ */
@@ -40,11 +40,60 @@
#include hp700/dev/cpudevs.h
+#define UTURNDEBUG
+#ifdef UTURNDEBUG
+
+#define DPRINTF(s) do { \
+ if (uturndebug) \
+ printf s; \
+} while(0)
+
+int uturndebug = 0;
+#else
+#define DPRINTF(s) /* */
+#endif
+
struct uturn_regs {
- uint64_t resv0[2];
- uint64_t status; /* 0x10: */
- uint64_t resv1[5];
- uint64_t debug; /* 0x40: */
+ /* Runway Supervisory Set */
+ int32_t unused1[12];
+ uint32_t io_command; /* Offset 12 */
+#define UTURN_CMD_TLB_PURGE 33 /* Purge I/O TLB entry */
+#define UTURN_CMD_TLB_DIRECT_WRITE 35 /* I/O TLB Writes */
+
+ uint32_t io_status; /* Offset 13 */
+ uint32_t io_control; /* Offset 14 */
+#define UTURN_IOCTRL_TLB_REAL 0x
+#define UTURN_IOCTRL_TLB_ERROR 0x0001
+#define UTURN_IOCTRL_TLB_NORMAL 0x0002
+
+#define UTURN_IOCTRL_MODE_OFF 0x
+#define UTURN_IOCTRL_MODE_INCLUDE 0x0080
+#define UTURN_IOCTRL_MODE_PEEK 0x0180
+
+#define UTURN_VIRTUAL_MODE \
+ (UTURN_IOCTRL_TLB_NORMAL | UTURN_IOCTRL_MODE_INCLUDE)
+
+#define UTURN_REAL_MODE \
+ UTURN_IOCTRL_MODE_INCLUDE
+
+ int32_t unused2[1];
+
+ /* Runway Auxiliary Register Set */
+ uint32_t io_err_resp; /* Offset 0 */
+ uint32_t io_err_info; /* Offset 1 */
+ uint32_t io_err_req; /* Offset 2 */
+ uint32_t io_err_resp_hi; /* Offset 3 */
+ uint32_t io_tlb_entry_m; /* Offset 4 */
+ uint32_t io_tlb_entry_l; /* Offset 5 */
+ uint32_t unused3[1];
+ uint32_t io_pdir_base; /* Offset 7 */
+ uint32_t io_io_low_hv; /* Offset 8 */
+ uint32_t io_io_high_hv; /* Offset 9 */
+ uint32_t unused4[1];
+ uint32_t io_chain_id_mask; /* Offset 11 */
+ uint32_t unused5[2];
+ uint32_t io_io_low; /* Offset 14 */
+ uint32_t io_io_high; /* Offset 15 */
};
struct uturn_softc {
@@ -98,8 +147,7 @@
ca-ca_type.iodc_revision 0x10 ? U2 : UTurn,
ca-ca_type.iodc_revision 0xf);
- /* keep it real */
- ((struct iomod *)ioh)-io_control = 0x80;
+ ((struct iomod *)ioh)-io_control = UTURN_REAL_MODE;
/*
* U2/UTurn is actually a combination of an Upper Bus Converter (UBC)
CVS commit: src/sys/dev/hpc
Module Name:src
Committed By: tsutsui
Date: Fri Jun 18 09:11:44 UTC 2010
Modified Files:
src/sys/dev/hpc: hpcfb.c
Log Message:
Add WSDISPLAYIO_LINEBYTES, which is required by Xorg wsfb server.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/hpc/hpcfb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/hpc/hpcfb.c
diff -u src/sys/dev/hpc/hpcfb.c:1.55 src/sys/dev/hpc/hpcfb.c:1.56
--- src/sys/dev/hpc/hpcfb.c:1.55 Sat May 15 08:53:27 2010
+++ src/sys/dev/hpc/hpcfb.c Fri Jun 18 09:11:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcfb.c,v 1.55 2010/05/15 08:53:27 tsutsui Exp $ */
+/* $NetBSD: hpcfb.c,v 1.56 2010/06/18 09:11:44 tsutsui Exp $ */
/*-
* Copyright (c) 1999
@@ -43,7 +43,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hpcfb.c,v 1.55 2010/05/15 08:53:27 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: hpcfb.c,v 1.56 2010/06/18 09:11:44 tsutsui Exp $);
#ifdef _KERNEL_OPT
#include opt_hpcfb.h
@@ -582,6 +582,10 @@
wdf-cmsize = 256; /* */
return (0);
+ case WSDISPLAYIO_LINEBYTES:
+ *(u_int *)data = dc-dc_rinfo.ri_stride;
+ return 0;
+
case WSDISPLAYIO_SMODE:
if (*(int *)data == WSDISPLAYIO_MODE_EMUL){
if (sc-sc_mapping){
CVS commit: src/external/mit/xorg/server
Module Name:src
Committed By: tsutsui
Date: Fri Jun 18 09:15:23 UTC 2010
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
src/external/mit/xorg/server/xorg-server: Makefile.common
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile
Log Message:
Prepare to build Xorg servers for hpcarm/hpcmips/hpcsh.
XXX: ${MACHINE} dependent definitions in these Makefiles look a bit messy
XXX: like old xfree's NetBSD.cf...
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/xorg-server/Makefile.common
cvs rdiff -u -r1.19 -r1.20 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.42 src/external/mit/xorg/server/drivers/Makefile:1.43
--- src/external/mit/xorg/server/drivers/Makefile:1.42 Fri May 28 04:16:06 2010
+++ src/external/mit/xorg/server/drivers/Makefile Fri Jun 18 09:15:23 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2010/05/28 04:16:06 mrg Exp $
+# $NetBSD: Makefile,v 1.43 2010/06/18 09:15:23 tsutsui Exp $
SUBDIR= \
xf86-input-keyboard \
@@ -161,6 +161,9 @@
xf86-video-trident \
xf86-video-tseng \
+.elif ${MACHINE} == hpcarm || ${MACHINE} == hpcmips || ${MACHINE} == hpcsh
+SUBDIR+= \
+ xf86-video-wsfb
.elif ${MACHINE} == zaurus
SUBDIR+= \
xf86-video-wsfb
Index: src/external/mit/xorg/server/xorg-server/Makefile.common
diff -u src/external/mit/xorg/server/xorg-server/Makefile.common:1.10 src/external/mit/xorg/server/xorg-server/Makefile.common:1.11
--- src/external/mit/xorg/server/xorg-server/Makefile.common:1.10 Sun Dec 13 05:04:36 2009
+++ src/external/mit/xorg/server/xorg-server/Makefile.common Fri Jun 18 09:15:23 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2009/12/13 05:04:36 nonaka Exp $
+# $NetBSD: Makefile.common,v 1.11 2010/06/18 09:15:23 tsutsui Exp $
# These define parts of the Xserver tree that are to be
# conditionally compiled for different platforms. See
@@ -41,6 +41,9 @@
# XFree86 servers all need XFONT as well.
.if ${MACHINE} == i386 || ${MACHINE} == amd64 || \
+${MACHINE} == hpcarm || \
+${MACHINE} == hpcmips || \
+${MACHINE} == hpcsh ||\
${MACHINE} == macppc || ${MACHINE} == cats || \
${MACHINE} == sgimips || ${MACHINE} == shark || \
${MACHINE} == netwinder || ${MACHINE} == sparc64 || \
@@ -50,9 +53,9 @@
XSERVER_XFREE86= yes
.endif
-.if ${MACHINE} == hpcmips || ${MACHINE} == hpcarm || ${MACHINE} == hpcsh
-XSERVER_XHPC= yes
-.endif
+#.if ${MACHINE} == hpcarm || ${MACHINE} == hpcmips || ${MACHINE} == hpcsh
+#XSERVER_XHPC= yes
+#.endif
.if ${MACHINE} == mac68k
XSERVER_XMAC68K= yes
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.19 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.20
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.19 Sun Dec 13 05:04:36 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Fri Jun 18 09:15:23 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2009/12/13 05:04:36 nonaka Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/18 09:15:23 tsutsui Exp $
.include ../../../Makefile.serverlib
.include ../../../Makefile.servermod
@@ -54,7 +54,8 @@
.endfor
.endif
-.if ${MACHINE} == sgimips
+.if ${MACHINE} == hpcmips || \
+${MACHINE} == sgimips
SRCS.bsd+= ppc_video.c stdResource.c pm_noop.c agp_noop.c
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
@@ -62,6 +63,7 @@
.endif
.if ${MACHINE} == cats || \
+${MACHINE} == hpcarm || \
${MACHINE} == shark || \
${MACHINE} == netwinder || \
${MACHINE} == zaurus
@@ -72,6 +74,13 @@
CPPFLAGS.arm_video.c= -Wno-error
.endif
+.if ${MACHINE} == hpcsh
+SRCS.bsd+= ppc_video.c stdResource.c pm_noop.c agp_noop.c
+.for _FN in ${SRCS.bsd}
+CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
+.endfor
+.endif
+
# some platforms will probably need ioperm_noop.c
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bus
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: tsutsui Date: Fri Jun 18 09:18:17 UTC 2010 Modified Files: src/distrib/sets/lists/xcomp: md.hpcarm src/distrib/sets/lists/xserver: md.hpcarm Log Message: Prepare Xorg build for hpcarm. Note old xfree files are still preserved. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/xcomp/md.hpcarm cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/xserver/md.hpcarm Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xcomp/md.hpcarm diff -u src/distrib/sets/lists/xcomp/md.hpcarm:1.1 src/distrib/sets/lists/xcomp/md.hpcarm:1.2 --- src/distrib/sets/lists/xcomp/md.hpcarm:1.1 Sun Mar 14 17:20:08 2010 +++ src/distrib/sets/lists/xcomp/md.hpcarm Fri Jun 18 09:18:16 2010 @@ -1,3 +1,6 @@ -# $NetBSD: md.hpcarm,v 1.1 2010/03/14 17:20:08 mrg Exp $ -./usr/libdata/debug/usr/X11R6/bin/Xhpc.debug -unknown- debug -./usr/libdata/debug/usr/X11R6/bin/Xvfb.debug -unknown- debug +# $NetBSD: md.hpcarm,v 1.2 2010/06/18 09:18:16 tsutsui Exp $ +./usr/libdata/debug/usr/X11R6/bin/Xhpc.debug -unknown- debug,x11 +./usr/libdata/debug/usr/X11R6/bin/Xvfb.debug -unknown- debug,x11 +./usr/libdata/debug/usr/X11R7/bin/Xorg.debug -unknown- debug,xorg +./usr/libdata/debug/usr/X11R7/bin/cvt.debug -unknown- debug,xorg +./usr/libdata/debug/usr/X11R7/bin/gtf.debug -unknown- debug,xorg Index: src/distrib/sets/lists/xserver/md.hpcarm diff -u src/distrib/sets/lists/xserver/md.hpcarm:1.8 src/distrib/sets/lists/xserver/md.hpcarm:1.9 --- src/distrib/sets/lists/xserver/md.hpcarm:1.8 Tue Sep 2 02:17:48 2008 +++ src/distrib/sets/lists/xserver/md.hpcarm Fri Jun 18 09:18:16 2010 @@ -1,6 +1,120 @@ -# $NetBSD: md.hpcarm,v 1.8 2008/09/02 02:17:48 lukem Exp $ +# $NetBSD: md.hpcarm,v 1.9 2010/06/18 09:18:16 tsutsui Exp $ ./usr/X11R6/bin/X -unknown- x11 ./usr/X11R6/bin/Xhpc -unknown- x11 ./usr/X11R6/man/cat1/Xhpc.0-unknown- .cat,x11 ./usr/X11R6/man/html1/Xhpc.html-unknown- html,x11 ./usr/X11R6/man/man1/Xhpc.1-unknown- .man,x11 +./usr/X11R7/bin/X -unknown- xorg +./usr/X11R7/bin/Xorg -unknown- xorg +./usr/X11R7/bin/cvt -unknown- xorg +./usr/X11R7/bin/gtf -unknown- xorg +./usr/X11R7/lib/X11/doc/README.DRI -unknown- xorg +./usr/X11R7/lib/X11/doc/README.rapidaccess -unknown- xorg +./usr/X11R7/lib/modules/drivers/kbd_drv.so -unknown- xorg +./usr/X11R7/lib/modules/drivers/kbd_drv.so.1 -unknown- xorg +./usr/X11R7/lib/modules/drivers/mouse_drv.so -unknown- xorg +./usr/X11R7/lib/modules/drivers/mouse_drv.so.1 -unknown- xorg +./usr/X11R7/lib/modules/drivers/ws_drv.so -unknown- xorg +./usr/X11R7/lib/modules/drivers/ws_drv.so.1 -unknown- xorg +./usr/X11R7/lib/modules/drivers/wsfb_drv.so -unknown- xorg +./usr/X11R7/lib/modules/drivers/wsfb_drv.so.0 -unknown- xorg +./usr/X11R7/lib/modules/extensions/libdbe.a -unknown- xorg +./usr/X11R7/lib/modules/extensions/libdbe.so -unknown- xorg +./usr/X11R7/lib/modules/extensions/libdbe.so.0 -unknown- xorg +./usr/X11R7/lib/modules/extensions/libdbe_g.a -unknown- debuglib,xorg +./usr/X11R7/lib/modules/extensions/libdbe_pic.a -unknown- xorg +./usr/X11R7/lib/modules/extensions/libdri.a -unknown- xorg +./usr/X11R7/lib/modules/extensions/libdri.so -unknown- xorg +./usr/X11R7/lib/modules/extensions/libdri.so.0 -unknown- xorg +./usr/X11R7/lib/modules/extensions/libdri_g.a -unknown- debuglib,xorg +./usr/X11R7/lib/modules/extensions/libdri_pic.a -unknown- xorg +./usr/X11R7/lib/modules/extensions/libdri2.a -unknown- xorg +./usr/X11R7/lib/modules/extensions/libdri2.so -unknown- xorg +./usr/X11R7/lib/modules/extensions/libdri2.so.0 -unknown- xorg +./usr/X11R7/lib/modules/extensions/libdri2_g.a -unknown- debuglib,xorg +./usr/X11R7/lib/modules/extensions/libdri2_pic.a -unknown- xorg +./usr/X11R7/lib/modules/extensions/libextmod.a -unknown- xorg +./usr/X11R7/lib/modules/extensions/libextmod.so -unknown- xorg +./usr/X11R7/lib/modules/extensions/libextmod.so.0 -unknown- xorg +./usr/X11R7/lib/modules/extensions/libextmod_g.a -unknown- debuglib,xorg +./usr/X11R7/lib/modules/extensions/libextmod_pic.a -unknown- xorg +./usr/X11R7/lib/modules/extensions/libglx.a -unknown- xorg +./usr/X11R7/lib/modules/extensions/libglx.so -unknown- xorg +./usr/X11R7/lib/modules/extensions/libglx.so.0 -unknown- xorg +./usr/X11R7/lib/modules/extensions/libglx_pic.a -unknown- xorg +./usr/X11R7/lib/modules/extensions/librecord.a -unknown- xorg +./usr/X11R7/lib/modules/extensions/librecord.so -unknown- xorg +./usr/X11R7/lib/modules/extensions/librecord.so.0 -unknown- xorg +./usr/X11R7/lib/modules/extensions/librecord_g.a -unknown- debuglib,xorg +./usr/X11R7/lib/modules/extensions/librecord_pic.a -unknown- xorg +./usr/X11R7/lib/modules/extensions/libshadow.a -unknown- xorg +./usr/X11R7/lib/modules/extensions/libshadow.so -unknown- xorg +./usr/X11R7/lib/modules/extensions/libshadow.so.0 -unknown- xorg
CVS commit: src/share/mk
Module Name:src
Committed By: jmmv
Date: Fri Jun 18 10:10:57 UTC 2010
Modified Files:
src/share/mk: bsd.test.mk
Log Message:
Add a experimental make test target
make test may yield misleading results but should work in many cases. This
target is supposed to simplify the execution of tests but does not preclude
developers from running the installed versions.
Addresses PR misc/38326.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/share/mk/bsd.test.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.test.mk
diff -u src/share/mk/bsd.test.mk:1.8 src/share/mk/bsd.test.mk:1.9
--- src/share/mk/bsd.test.mk:1.8 Fri Jun 4 08:35:09 2010
+++ src/share/mk/bsd.test.mk Fri Jun 18 10:10:57 2010
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.test.mk,v 1.8 2010/06/04 08:35:09 jmmv Exp $
+# $NetBSD: bsd.test.mk,v 1.9 2010/06/18 10:10:57 jmmv Exp $
#
.include bsd.init.mk
@@ -55,3 +55,55 @@
.if !empty(SCRIPTS) || !empty(PROGS) || !empty(PROGS_CXX)
. include bsd.prog.mk
.endif
+
+#
+# Definition of the make test target and supporting variables.
+#
+# This target, by necessity, can only work for native builds (i.e. a NetBSD
+# host building a release for the same system). The target runs ATF, which is
+# not in the toolchain, and the tests execute code built for the target host.
+#
+# Due to the dependencies of the binaries built by the source tree and how they
+# are used by tests, it is highly possible for a execution of make test to
+# report bogus results unless the new binaries are put in place.
+#
+
+TESTS_PATH += ${DESTDIR}/bin ${DESTDIR}/sbin ${DESTDIR}/usr/bin ${DESTDIR}/usr/sbin
+TESTS_LD_LIBRARY_PATH += ${DESTDIR}/lib ${DESTDIR}/usr/lib
+
+TESTS_ENV += LD_LIBRARY_PATH=${TESTS_LD_LIBRARY_PATH:tW:S/ /:/g}
+TESTS_ENV += PATH=${TESTS_PATH:tW:S/ /:/g}
+
+_TESTS_FIFO = ${.OBJDIR}/atf-run.fifo
+_TESTS_LOG = ${.OBJDIR}/atf-run.log
+CLEANFILES += ${_TESTS_FIFO} ${_TESTS_LOG}
+
+.PHONY: test
+.if ${TESTSDIR} == ${TESTSBASE}
+# Forbid this case. It is likely to cause false positives/negatives and it
+# does not cover all the tests (e.g. it misses testing software in external).
+test:
+ @echo *** Sorry, you cannot use make test from src/tests. Install the
+ @echo *** tests into their final location and run them from /usr/tests
+ @false
+.else
+test:
+ @echo *** WARNING: make test is experimental
+ @echo ***
+ @echo *** Using this test does not preclude you from running the tests
+ @echo *** installed in /usr/tests. This test run may raise false
+ @echo *** positives and/or false negatives.
+ @echo
+ @cd ${DESTDIR}${TESTSDIR}; \
+ mkfifo ${_TESTS_FIFO}; \
+ cat ${_TESTS_FIFO} | tee ${_TESTS_LOG} | \
+ ${TESTS_ENV} ${DESTDIR}/usr/bin/atf-report \
+ ${TESTS_ENV} ${DESTDIR}/usr/bin/atf-run ${_TESTS_FIFO}; \
+ result=$${?}; \
+ wait; \
+ rm -f ${_TESTS_FIFO}; \
+ echo; \
+ echo *** The verbatim output of atf-run has been saved to ${_TESTS_LOG}; \
+ echo *** Once again, note that make test is unsupported.; \
+ test $${result} -eq 0
+.endif
CVS commit: src/share/mk
Module Name:src
Committed By: jmmv
Date: Fri Jun 18 13:14:21 UTC 2010
Modified Files:
src/share/mk: bsd.test.mk
Log Message:
Prevent build breakage if TESTSDIR is not defined (as in
tests/modules/k_helper).
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/share/mk/bsd.test.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.test.mk
diff -u src/share/mk/bsd.test.mk:1.9 src/share/mk/bsd.test.mk:1.10
--- src/share/mk/bsd.test.mk:1.9 Fri Jun 18 10:10:57 2010
+++ src/share/mk/bsd.test.mk Fri Jun 18 13:14:21 2010
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.test.mk,v 1.9 2010/06/18 10:10:57 jmmv Exp $
+# $NetBSD: bsd.test.mk,v 1.10 2010/06/18 13:14:21 jmmv Exp $
#
.include bsd.init.mk
@@ -79,14 +79,15 @@
CLEANFILES += ${_TESTS_FIFO} ${_TESTS_LOG}
.PHONY: test
-.if ${TESTSDIR} == ${TESTSBASE}
+.if defined(TESTSDIR)
+. if ${TESTSDIR} == ${TESTSBASE}
# Forbid this case. It is likely to cause false positives/negatives and it
# does not cover all the tests (e.g. it misses testing software in external).
test:
@echo *** Sorry, you cannot use make test from src/tests. Install the
@echo *** tests into their final location and run them from /usr/tests
@false
-.else
+. else
test:
@echo *** WARNING: make test is experimental
@echo ***
@@ -94,7 +95,8 @@
@echo *** installed in /usr/tests. This test run may raise false
@echo *** positives and/or false negatives.
@echo
- @cd ${DESTDIR}${TESTSDIR}; \
+ @set -e; \
+ cd ${DESTDIR}${TESTSDIR}; \
mkfifo ${_TESTS_FIFO}; \
cat ${_TESTS_FIFO} | tee ${_TESTS_LOG} | \
${TESTS_ENV} ${DESTDIR}/usr/bin/atf-report \
@@ -106,4 +108,8 @@
echo *** The verbatim output of atf-run has been saved to ${_TESTS_LOG}; \
echo *** Once again, note that make test is unsupported.; \
test $${result} -eq 0
+. endif
+.else
+test:
+ @echo *** No TESTSDIR defined; nothing to do.
.endif
CVS commit: src/external/bsd/atf
Module Name:src
Committed By: jmmv
Date: Fri Jun 18 15:39:17 UTC 2010
Added Files:
src/external/bsd/atf: prepare-import.sh
Log Message:
Add a script to help with the import of new atf releases: it extracts a
distfile, places it in dist and cleans up any unnecessary files.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/prepare-import.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/bsd/atf/prepare-import.sh
diff -u /dev/null src/external/bsd/atf/prepare-import.sh:1.1
--- /dev/null Fri Jun 18 15:39:17 2010
+++ src/external/bsd/atf/prepare-import.sh Fri Jun 18 15:39:17 2010
@@ -0,0 +1,108 @@
+#!/bin/sh
+# $NetBSD: prepare-import.sh,v 1.1 2010/06/18 15:39:17 jmmv Exp $
+#
+# Use this script to recreate the 'dist' subdirectory from a newly released
+# distfile. The script takes care of unpacking the distfile, removing any
+# files that are not relevant to NetBSD and checking if there are any new
+# files in the new release that need to be addressed.
+#
+
+set -e
+
+ProgName=${0##*/}
+
+CLEAN_PATTERNS=
+CLEAN_PATTERNS=${CLEAN_PATTERNS} *.m4
+CLEAN_PATTERNS=${CLEAN_PATTERNS} INSTALL
+CLEAN_PATTERNS=${CLEAN_PATTERNS} Makefile*
+CLEAN_PATTERNS=${CLEAN_PATTERNS} admin/[a-qsz]*
+CLEAN_PATTERNS=${CLEAN_PATTERNS} bconfig.h.in
+CLEAN_PATTERNS=${CLEAN_PATTERNS} configure*
+CLEAN_PATTERNS=${CLEAN_PATTERNS} doc/*.sh
+CLEAN_PATTERNS=${CLEAN_PATTERNS} doc/*.xml
+CLEAN_PATTERNS=${CLEAN_PATTERNS} doc/standalone
+CLEAN_PATTERNS=${CLEAN_PATTERNS} doc/text
+CLEAN_PATTERNS=${CLEAN_PATTERNS} m4
+
+err() {
+ echo ${ProgName}: $...@} 12
+ exit 1
+}
+
+log() {
+ echo ${ProgName}: $...@}
+}
+
+backup_dist() {
+ if [ -d dist.old ]; then
+ log Removing dist; dist.old exists
+ rm -rf dist
+ else
+ log Backing up dist as dist.old
+ mv dist dist.old
+ fi
+}
+
+extract_distfile() {
+ local distfile=${1}; shift
+ local distname=${1}; shift
+
+ log Extracting ${distfile}
+ tar -xzf ${distfile}
+ [ -d ${distname} ] || err Distfile did not create ${distname}
+ log Renaming ${distname} to dist
+ mv ${distname} dist
+}
+
+get_distname() {
+ local distfile=${1}; shift
+ basename ${distfile} | sed -e 's,\.tar.*,,'
+}
+
+cleanup_dist() {
+ log Removing unnecessary files from dist
+ ( cd dist rm -rf ${CLEAN_PATTERNS} )
+}
+
+diff_dirs() {
+ local old_dir=${1}; shift
+ local new_dir=${1}; shift
+
+ local old_list=$(mktemp -t atf-import.XX)
+ local new_list=$(mktemp -t atf-import.XX)
+ local diff=$(mktemp -t atf-import.XX)
+ trap rm -f '${old_list}' '${new_list}' '${diff}'; exit 1 \
+ HUP INT QUIT TERM
+
+ ( cd ${old_dir} find . | sort ${old_list} )
+ ( cd ${new_dir} find . | sort ${new_list} )
+
+ diff -u ${old_list} ${new_list} | grep '^+\.' ${diff} || true
+ if [ -s ${diff} ]; then
+ log New files found
+ diff -u ${old_list} ${new_list} | grep '^+\.'
+ log Check if any files have to be cleaned up and update \
+ the prepare-import.sh script accordingly
+ else
+ log No new files; all good!
+ fi
+
+ rm -f ${old_list} ${new_list} ${diff}
+}
+
+main() {
+ [ ${#} -eq 1 ] || err Must provide a distfile name
+ local distfile=${1}; shift
+
+ [ -f Makefile -a -f prepare-import.sh ] || \
+ err Must be run from the src/external/bsd/atf subdirectory
+
+ local distname=$(get_distname ${distfile})
+
+ backup_dist
+ extract_distfile ${distfile} ${distname}
+ cleanup_dist
+ diff_dirs dist.old dist
+}
+
+main $...@}
CVS commit: src/external/bsd/atf/dist
Module Name:src Committed By: jmmv Date: Fri Jun 18 15:41:22 UTC 2010 Removed Files: src/external/bsd/atf/dist: INSTALL Makefile.am Makefile.am.m4 Makefile.in aclocal.m4 bconfig.h.in configure configure.ac src/external/bsd/atf/dist/admin: check-install.sh check-style-c.awk check-style-common.awk check-style-cpp.awk check-style-man.awk check-style-shell.awk check-style.sh choose-revision.sh compile config.guess config.sub depcomp generate-makefile.sh generate-revision-dist.sh generate-revision.sh install-sh ltmain.sh missing src/external/bsd/atf/dist/doc: authors.xml build-xml.sh copying.xml install.xml news.xml readme.xml specification.xml src/external/bsd/atf/dist/doc/standalone: authors.html copying.html install.html news.html readme.html sdocbook.xsl specification.html standalone.css src/external/bsd/atf/dist/doc/text: authors.txt copying.txt install.txt news.txt readme.txt specification.txt src/external/bsd/atf/dist/m4: compiler-flags.m4 cxx-std-funcs.m4 developer-mode.m4 doc-build.m4 libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4 module-application.m4 module-defs.m4 module-env.m4 module-fs.m4 module-sanity.m4 module-signals.m4 runtime-tool.m4 Log Message: Remove unnecessary files The just-commited prepare-import.sh script will take care of spotting extra files that may be unnecessary during a future import. To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/atf/dist/INSTALL \ src/external/bsd/atf/dist/Makefile.am.m4 \ src/external/bsd/atf/dist/bconfig.h.in cvs rdiff -u -r1.1.1.4 -r0 src/external/bsd/atf/dist/Makefile.am \ src/external/bsd/atf/dist/Makefile.in src/external/bsd/atf/dist/configure \ src/external/bsd/atf/dist/configure.ac cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/atf/dist/aclocal.m4 cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/atf/dist/admin/check-install.sh \ src/external/bsd/atf/dist/admin/check-style-common.awk \ src/external/bsd/atf/dist/admin/check-style-cpp.awk \ src/external/bsd/atf/dist/admin/check-style.sh \ src/external/bsd/atf/dist/admin/compile \ src/external/bsd/atf/dist/admin/depcomp \ src/external/bsd/atf/dist/admin/generate-revision.sh \ src/external/bsd/atf/dist/admin/ltmain.sh \ src/external/bsd/atf/dist/admin/missing cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/atf/dist/admin/check-style-c.awk \ src/external/bsd/atf/dist/admin/check-style-man.awk \ src/external/bsd/atf/dist/admin/choose-revision.sh \ src/external/bsd/atf/dist/admin/generate-makefile.sh \ src/external/bsd/atf/dist/admin/generate-revision-dist.sh \ src/external/bsd/atf/dist/admin/install-sh cvs rdiff -u -r1.1.1.3 -r0 \ src/external/bsd/atf/dist/admin/check-style-shell.awk \ src/external/bsd/atf/dist/admin/config.guess \ src/external/bsd/atf/dist/admin/config.sub cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/atf/dist/doc/authors.xml \ src/external/bsd/atf/dist/doc/build-xml.sh \ src/external/bsd/atf/dist/doc/readme.xml \ src/external/bsd/atf/dist/doc/specification.xml cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/atf/dist/doc/copying.xml \ src/external/bsd/atf/dist/doc/install.xml cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/atf/dist/doc/news.xml cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/atf/dist/doc/standalone/authors.html \ src/external/bsd/atf/dist/doc/standalone/readme.html \ src/external/bsd/atf/dist/doc/standalone/sdocbook.xsl \ src/external/bsd/atf/dist/doc/standalone/specification.html \ src/external/bsd/atf/dist/doc/standalone/standalone.css cvs rdiff -u -r1.1.1.2 -r0 \ src/external/bsd/atf/dist/doc/standalone/copying.html \ src/external/bsd/atf/dist/doc/standalone/install.html cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/atf/dist/doc/standalone/news.html cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/atf/dist/doc/text/authors.txt \ src/external/bsd/atf/dist/doc/text/readme.txt \ src/external/bsd/atf/dist/doc/text/specification.txt cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/atf/dist/doc/text/copying.txt \ src/external/bsd/atf/dist/doc/text/install.txt cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/atf/dist/doc/text/news.txt cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/atf/dist/m4/compiler-flags.m4 \ src/external/bsd/atf/dist/m4/cxx-std-funcs.m4 \ src/external/bsd/atf/dist/m4/doc-build.m4 \ src/external/bsd/atf/dist/m4/libtool.m4 \ src/external/bsd/atf/dist/m4/ltoptions.m4 \ src/external/bsd/atf/dist/m4/ltsugar.m4 \ src/external/bsd/atf/dist/m4/ltversion.m4 \ src/external/bsd/atf/dist/m4/lt~obsolete.m4 \ src/external/bsd/atf/dist/m4/module-application.m4 \ src/external/bsd/atf/dist/m4/module-env.m4 \ src/external/bsd/atf/dist/m4/module-sanity.m4 \
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: tsutsui Date: Fri Jun 18 15:55:34 UTC 2010 Modified Files: src/distrib/sets/lists/xcomp: md.hpcmips md.hpcsh src/distrib/sets/lists/xserver: md.hpcmips md.hpcsh Log Message: Prepare Xorg build for hpcmips and hpcsh. Old xfree files are still preserved. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/xcomp/md.hpcmips \ src/distrib/sets/lists/xcomp/md.hpcsh cvs rdiff -u -r1.14 -r1.15 src/distrib/sets/lists/xserver/md.hpcmips cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/xserver/md.hpcsh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xcomp/md.hpcmips diff -u src/distrib/sets/lists/xcomp/md.hpcmips:1.1 src/distrib/sets/lists/xcomp/md.hpcmips:1.2 --- src/distrib/sets/lists/xcomp/md.hpcmips:1.1 Sun Mar 14 17:20:08 2010 +++ src/distrib/sets/lists/xcomp/md.hpcmips Fri Jun 18 15:55:33 2010 @@ -1,3 +1,6 @@ -# $NetBSD: md.hpcmips,v 1.1 2010/03/14 17:20:08 mrg Exp $ -./usr/libdata/debug/usr/X11R6/bin/Xhpc.debug -unknown- debug -./usr/libdata/debug/usr/X11R6/bin/Xvfb.debug -unknown- debug +# $NetBSD: md.hpcmips,v 1.2 2010/06/18 15:55:33 tsutsui Exp $ +./usr/libdata/debug/usr/X11R6/bin/Xhpc.debug -unknown- debug,x11 +./usr/libdata/debug/usr/X11R6/bin/Xvfb.debug -unknown- debug,x11 +./usr/libdata/debug/usr/X11R7/bin/Xorg.debug -unknown- debug,xorg +./usr/libdata/debug/usr/X11R7/bin/cvt.debug -unknown- debug,xorg +./usr/libdata/debug/usr/X11R7/bin/gtf.debug -unknown- debug,xorg Index: src/distrib/sets/lists/xcomp/md.hpcsh diff -u src/distrib/sets/lists/xcomp/md.hpcsh:1.1 src/distrib/sets/lists/xcomp/md.hpcsh:1.2 --- src/distrib/sets/lists/xcomp/md.hpcsh:1.1 Sun Mar 14 17:20:08 2010 +++ src/distrib/sets/lists/xcomp/md.hpcsh Fri Jun 18 15:55:33 2010 @@ -1,3 +1,6 @@ -# $NetBSD: md.hpcsh,v 1.1 2010/03/14 17:20:08 mrg Exp $ -./usr/libdata/debug/usr/X11R6/bin/Xhpc.debug -unknown- debug -./usr/libdata/debug/usr/X11R6/bin/Xvfb.debug -unknown- debug +# $NetBSD: md.hpcsh,v 1.2 2010/06/18 15:55:33 tsutsui Exp $ +./usr/libdata/debug/usr/X11R6/bin/Xhpc.debug -unknown- debug,x11 +./usr/libdata/debug/usr/X11R6/bin/Xvfb.debug -unknown- debug,x11 +./usr/libdata/debug/usr/X11R7/bin/Xorg.debug-unknown- debug,xorg +./usr/libdata/debug/usr/X11R7/bin/cvt.debug -unknown- debug,xorg +./usr/libdata/debug/usr/X11R7/bin/gtf.debug -unknown- debug,xorg Index: src/distrib/sets/lists/xserver/md.hpcmips diff -u src/distrib/sets/lists/xserver/md.hpcmips:1.14 src/distrib/sets/lists/xserver/md.hpcmips:1.15 --- src/distrib/sets/lists/xserver/md.hpcmips:1.14 Tue Sep 2 02:17:48 2008 +++ src/distrib/sets/lists/xserver/md.hpcmips Fri Jun 18 15:55:33 2010 @@ -1,6 +1,120 @@ -# $NetBSD: md.hpcmips,v 1.14 2008/09/02 02:17:48 lukem Exp $ +# $NetBSD: md.hpcmips,v 1.15 2010/06/18 15:55:33 tsutsui Exp $ ./usr/X11R6/bin/X -unknown- x11 ./usr/X11R6/bin/Xhpc -unknown- x11 ./usr/X11R6/man/cat1/Xhpc.0-unknown- .cat,x11 ./usr/X11R6/man/html1/Xhpc.html-unknown- html,x11 ./usr/X11R6/man/man1/Xhpc.1-unknown- .man,x11 +./usr/X11R7/bin/X -unknown- xorg +./usr/X11R7/bin/Xorg -unknown- xorg +./usr/X11R7/bin/cvt -unknown- xorg +./usr/X11R7/bin/gtf -unknown- xorg +./usr/X11R7/lib/X11/doc/README.DRI -unknown- xorg +./usr/X11R7/lib/X11/doc/README.rapidaccess -unknown- xorg +./usr/X11R7/lib/modules/drivers/kbd_drv.so -unknown- xorg +./usr/X11R7/lib/modules/drivers/kbd_drv.so.1 -unknown- xorg +./usr/X11R7/lib/modules/drivers/mouse_drv.so -unknown- xorg +./usr/X11R7/lib/modules/drivers/mouse_drv.so.1 -unknown- xorg +./usr/X11R7/lib/modules/drivers/ws_drv.so -unknown- xorg +./usr/X11R7/lib/modules/drivers/ws_drv.so.1 -unknown- xorg +./usr/X11R7/lib/modules/drivers/wsfb_drv.so -unknown- xorg +./usr/X11R7/lib/modules/drivers/wsfb_drv.so.0 -unknown- xorg +./usr/X11R7/lib/modules/extensions/libdbe.a -unknown- xorg +./usr/X11R7/lib/modules/extensions/libdbe.so -unknown- xorg +./usr/X11R7/lib/modules/extensions/libdbe.so.0 -unknown- xorg +./usr/X11R7/lib/modules/extensions/libdbe_g.a -unknown- debuglib,xorg +./usr/X11R7/lib/modules/extensions/libdbe_pic.a -unknown- xorg +./usr/X11R7/lib/modules/extensions/libdri.a -unknown- xorg +./usr/X11R7/lib/modules/extensions/libdri.so -unknown- xorg +./usr/X11R7/lib/modules/extensions/libdri.so.0 -unknown- xorg +./usr/X11R7/lib/modules/extensions/libdri_g.a -unknown- debuglib,xorg +./usr/X11R7/lib/modules/extensions/libdri_pic.a -unknown- xorg +./usr/X11R7/lib/modules/extensions/libdri2.a -unknown- xorg +./usr/X11R7/lib/modules/extensions/libdri2.so -unknown- xorg +./usr/X11R7/lib/modules/extensions/libdri2.so.0 -unknown- xorg +./usr/X11R7/lib/modules/extensions/libdri2_g.a -unknown- debuglib,xorg +./usr/X11R7/lib/modules/extensions/libdri2_pic.a -unknown- xorg +./usr/X11R7/lib/modules/extensions/libextmod.a
CVS commit: src/external/bsd/atf/dist/tests/atf/atf-report
Module Name:src Committed By: pooka Date: Fri Jun 18 16:13:16 UTC 2010 Modified Files: src/external/bsd/atf/dist/tests/atf/atf-report: t_integration.sh Added Files: src/external/bsd/atf/dist/tests/atf/atf-report: h_xfail.cpp Log Message: Test that xfail failures are reported as xfails and xfail passes are reported as pure fails. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ src/external/bsd/atf/dist/tests/atf/atf-report/h_xfail.cpp cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/atf/dist/tests/atf/atf-report/t_integration.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/atf/dist/tests/atf/atf-report/t_integration.sh diff -u src/external/bsd/atf/dist/tests/atf/atf-report/t_integration.sh:1.2 src/external/bsd/atf/dist/tests/atf/atf-report/t_integration.sh:1.3 --- src/external/bsd/atf/dist/tests/atf/atf-report/t_integration.sh:1.2 Wed Jun 16 15:17:37 2010 +++ src/external/bsd/atf/dist/tests/atf/atf-report/t_integration.sh Fri Jun 18 16:13:16 2010 @@ -34,6 +34,7 @@ cp $(atf_get_srcdir)/h_fail dir1/tp2 cp $(atf_get_srcdir)/h_pass tp3 cp $(atf_get_srcdir)/h_fail tp4 +cp $(atf_get_srcdir)/h_xfail tp6 cat tp5 EOF #! $(atf-config -t atf_shell) @@ -50,6 +51,7 @@ tp: tp3 tp: tp4 tp: tp5 +tp: tp6 EOF cat dir1/Atffile EOF @@ -180,6 +182,9 @@ tc, tp4, main, failed, This always fails tp, tp4, failed tp, tp5, bogus, Invalid format for test case list: 1: Unexpected token \`NEWLINE'; expected \`:' +tc, tp6, xfail_no, failed, Test case is expected to fail but reported success +tc, tp6, xfail_yes, xfail, xfailmen +tp, tp6, failed EOF # NO_CHECK_STYLE_END @@ -199,31 +204,35 @@ # NO_CHECK_STYLE_BEGIN cat expout EOF -dir1/tp1 (1/5): 1 test cases +dir1/tp1 (1/6): 1 test cases main: Passed. -dir1/tp2 (2/5): 1 test cases +dir1/tp2 (2/6): 1 test cases main: Failed: This always fails -tp3 (3/5): 1 test cases +tp3 (3/6): 1 test cases main: Passed. -tp4 (4/5): 1 test cases +tp4 (4/6): 1 test cases main: Failed: This always fails -tp5 (5/5): 0 test cases +tp5 (5/6): 0 test cases tp5: BOGUS TEST PROGRAM: Cannot trust its results because of \`Invalid format for test case list: 1: Unexpected token \`NEWLINE'; expected \`:'' +tp6 (6/6): 2 test cases +xfail_no: Failed: Test case is expected to fail but reported success +xfail_yes: Expected failure: xfailmen + Failed (bogus) test programs: tp5 Failed test cases: -dir1/tp2:main, tp4:main +dir1/tp2:main, tp4:main, tp6:xfail_no -Summary for 5 test programs: +Summary for 6 test programs: 2 passed test cases. -2 failed test cases. -0 expected failures. +3 failed test cases. +1 expected failures. 0 skipped test cases. EOF @@ -272,6 +281,14 @@ tp id=tp5 failedInvalid format for test case list: 1: Unexpected token \`lt;lt;NEWLINEgt;gt;'; expected \`:'/failed /tp +tp id=tp6 +tc id=xfail_no +failedTest case is expected to fail but reported success/failed +/tc +tc id=xfail_yes +xfailxfailmen/xfail +/tc +/tp info class=endinfoAnother value/info /tests-results EOF Added files: Index: src/external/bsd/atf/dist/tests/atf/atf-report/h_xfail.cpp diff -u /dev/null src/external/bsd/atf/dist/tests/atf/atf-report/h_xfail.cpp:1.1 --- /dev/null Fri Jun 18 16:13:16 2010 +++ src/external/bsd/atf/dist/tests/atf/atf-report/h_xfail.cpp Fri Jun 18 16:13:16 2010 @@ -0,0 +1,58 @@ +// +// Automated Testing Framework (atf) +// +// Copyright (c) 2007, 2008 The NetBSD Foundation, Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// 1. Redistributions of source code must retain the above copyright +//notice, this list of conditions and the following disclaimer. +// 2. Redistributions in binary form must reproduce the above copyright +//notice, this list of conditions and the following disclaimer in the +//documentation and/or other materials provided with the distribution. +// +// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND +// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, +// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY +// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +
CVS commit: src/external/bsd/atf/dist/atf-report
Module Name:src
Committed By: pooka
Date: Fri Jun 18 16:13:56 UTC 2010
Modified Files:
src/external/bsd/atf/dist/atf-report: atf-report.cpp
Log Message:
Handle xfail in a few more places. Found by, la la la, the new tests.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/dist/atf-report/atf-report.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-report/atf-report.cpp
diff -u src/external/bsd/atf/dist/atf-report/atf-report.cpp:1.2 src/external/bsd/atf/dist/atf-report/atf-report.cpp:1.3
--- src/external/bsd/atf/dist/atf-report/atf-report.cpp:1.2 Wed Jun 16 15:17:37 2010
+++ src/external/bsd/atf/dist/atf-report/atf-report.cpp Fri Jun 18 16:13:56 2010
@@ -154,6 +154,9 @@
} else if (tcr.get_state() == atf::tests::tcr::skipped_state) {
str += m_tpname + , + m_tcname + , skipped, +
tcr.get_reason();
+} else if (tcr.get_state() == atf::tests::tcr::xfail_state) {
+str += m_tpname + , + m_tcname + , xfail, +
+ tcr.get_reason();
} else
UNREACHABLE;
(*m_os) str std::endl;
@@ -425,6 +428,9 @@
} else if (s == atf::tests::tcr::skipped_state) {
(*m_os) skipped elemval(tcr.get_reason())
/skipped std::endl;
+} else if (s == atf::tests::tcr::xfail_state) {
+(*m_os) xfail elemval(tcr.get_reason())
+ /xfail std::endl;
} else
UNREACHABLE;
(*m_os) /tc std::endl;
CVS commit: src
Module Name:src Committed By: hannken Date: Fri Jun 18 16:29:02 UTC 2010 Modified Files: src/distrib/sets/lists/comp: mi src/doc: CHANGES src/share/man/man9: Makefile vnsubr.9 src/sys/fs/unionfs: unionfs_subr.c src/sys/kern: vfs_subr.c vfs_vnops.c src/sys/sys: lock.h param.h vnode.h Log Message: Remove the concept of recursive vnode locks by eliminating vn_setrecurse(), vn_restorerecurse() and LK_CANRECURSE. Welcome to 5.99.31 Discussed on tech-kern. To generate a diff of this commit: cvs rdiff -u -r1.1467 -r1.1468 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.1404 -r1.1405 src/doc/CHANGES cvs rdiff -u -r1.332 -r1.333 src/share/man/man9/Makefile cvs rdiff -u -r1.38 -r1.39 src/share/man/man9/vnsubr.9 cvs rdiff -u -r1.6 -r1.7 src/sys/fs/unionfs/unionfs_subr.c cvs rdiff -u -r1.404 -r1.405 src/sys/kern/vfs_subr.c cvs rdiff -u -r1.172 -r1.173 src/sys/kern/vfs_vnops.c cvs rdiff -u -r1.83 -r1.84 src/sys/sys/lock.h cvs rdiff -u -r1.365 -r1.366 src/sys/sys/param.h cvs rdiff -u -r1.219 -r1.220 src/sys/sys/vnode.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1467 src/distrib/sets/lists/comp/mi:1.1468 --- src/distrib/sets/lists/comp/mi:1.1467 Fri Jun 18 04:21:22 2010 +++ src/distrib/sets/lists/comp/mi Fri Jun 18 16:29:01 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1467 2010/06/18 04:21:22 mrg Exp $ +# $NetBSD: mi,v 1.1468 2010/06/18 16:29:01 hannken Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -9880,8 +9880,8 @@ ./usr/share/man/cat9/vn_poll.0 comp-sys-catman .cat ./usr/share/man/cat9/vn_rdwr.0 comp-sys-catman .cat ./usr/share/man/cat9/vn_read.0 comp-sys-catman .cat -./usr/share/man/cat9/vn_restorerecurse.0 comp-sys-catman .cat -./usr/share/man/cat9/vn_setrecurse.0 comp-sys-catman .cat +./usr/share/man/cat9/vn_restorerecurse.0 comp-sys-catman obsolete +./usr/share/man/cat9/vn_setrecurse.0 comp-sys-catman obsolete ./usr/share/man/cat9/vn_start_write.0 comp-obsolete obsolete ./usr/share/man/cat9/vn_stat.0 comp-sys-catman .cat ./usr/share/man/cat9/vn_statfile.0 comp-sys-catman .cat @@ -15582,8 +15582,8 @@ ./usr/share/man/html9/vn_poll.html comp-sys-htmlman html ./usr/share/man/html9/vn_rdwr.html comp-sys-htmlman html ./usr/share/man/html9/vn_read.html comp-sys-htmlman html -./usr/share/man/html9/vn_restorerecurse.html comp-sys-htmlman html -./usr/share/man/html9/vn_setrecurse.html comp-sys-htmlman html +./usr/share/man/html9/vn_restorerecurse.html comp-sys-htmlman obsolete +./usr/share/man/html9/vn_setrecurse.html comp-sys-htmlman obsolete ./usr/share/man/html9/vn_stat.html comp-sys-htmlman html ./usr/share/man/html9/vn_statfile.html comp-sys-htmlman html ./usr/share/man/html9/vn_write.html comp-sys-htmlman html @@ -21537,8 +21537,8 @@ ./usr/share/man/man9/vn_poll.9 comp-sys-man .man ./usr/share/man/man9/vn_rdwr.9 comp-sys-man .man ./usr/share/man/man9/vn_read.9 comp-sys-man .man -./usr/share/man/man9/vn_restorerecurse.9 comp-sys-man .man -./usr/share/man/man9/vn_setrecurse.9 comp-sys-man .man +./usr/share/man/man9/vn_restorerecurse.9 comp-sys-man obsolete +./usr/share/man/man9/vn_setrecurse.9 comp-sys-man obsolete ./usr/share/man/man9/vn_start_write.9 comp-obsolete obsolete ./usr/share/man/man9/vn_stat.9 comp-sys-man .man ./usr/share/man/man9/vn_statfile.9 comp-sys-man .man Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1404 src/doc/CHANGES:1.1405 --- src/doc/CHANGES:1.1404 Thu Jun 17 23:58:14 2010 +++ src/doc/CHANGES Fri Jun 18 16:29:01 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1404 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1405 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -633,3 +633,4 @@ ofppc: Support Gigabit Ethernet Controller for MV64361 on PegasosII by mv...@gt. [kiyohara 20100609] arm: Added support for Cortex-A8 CPUs. [jmcneill 20100616] + vnsubr(9): Remove recursive vnode locks. [hannken 20100618] Index: src/share/man/man9/Makefile diff -u src/share/man/man9/Makefile:1.332 src/share/man/man9/Makefile:1.333 --- src/share/man/man9/Makefile:1.332 Tue Jun 8 05:40:27 2010 +++ src/share/man/man9/Makefile Fri Jun 18 16:29:01 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.332 2010/06/08 05:40:27 jruoho Exp $ +# $NetBSD: Makefile,v 1.333 2010/06/18 16:29:01 hannken Exp $ # Makefile for section 9 (kernel function and variable) manual pages. @@ -868,9 +868,7 @@ vnsubr.9 vn_lock.9 \ vnsubr.9 vn_markexec.9 \ vnsubr.9 vn_marktext.9 \ - vnsubr.9 vn_restorerecurse.9 \ vnsubr.9 vn_rdwr.9 \ - vnsubr.9 vn_setrecurse.9 \ vnsubr.9 vn_stat.9 \ vnsubr.9 vn_open.9 \ vnsubr.9 vn_writechk.9 Index: src/share/man/man9/vnsubr.9 diff -u src/share/man/man9/vnsubr.9:1.38
CVS commit: src/sys/rump/include/rump
Module Name:src
Committed By: hannken
Date: Fri Jun 18 16:31:35 UTC 2010
Modified Files:
src/sys/rump/include/rump: rumpdefs.h
Log Message:
Regen (LK_CANRECURSE is gone).
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/include/rump/rumpdefs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/include/rump/rumpdefs.h
diff -u src/sys/rump/include/rump/rumpdefs.h:1.5 src/sys/rump/include/rump/rumpdefs.h:1.6
--- src/sys/rump/include/rump/rumpdefs.h:1.5 Tue Nov 3 18:23:15 2009
+++ src/sys/rump/include/rump/rumpdefs.h Fri Jun 18 16:31:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpdefs.h,v 1.5 2009/11/03 18:23:15 pooka Exp $ */
+/* $NetBSD: rumpdefs.h,v 1.6 2010/06/18 16:31:34 hannken Exp $ */
/*
* AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -29,7 +29,7 @@
#define RUMP_O_DIRECT 0x0008 /* direct I/O hint */
#define RUMP_O_NOCTTY 0x8000 /* don't assign controlling terminal */
-/* NetBSD: vnode.h,v 1.210 2009/10/06 04:28:10 elad Exp */
+/* NetBSD: vnode.h,v 1.220 2010/06/18 16:29:02 hannken Exp */
#ifndef __VTYPE_DEFINED
#define __VTYPE_DEFINED
enum vtype { VNON, VREG, VDIR, VBLK, VCHR, VLNK, VSOCK, VFIFO, VBAD };
@@ -40,14 +40,13 @@
#define EJUSTRETURN -2 /* don't modify regs, just return */
#endif /* EJUSTRETURN */
-/* NetBSD: lock.h,v 1.83 2008/04/28 20:24:10 martin Exp */
+/* NetBSD: lock.h,v 1.84 2010/06/18 16:29:02 hannken Exp */
#define RUMP_LK_TYPE_MASK 0x000f
#define RUMP_LK_SHARED 0x0001
#define RUMP_LK_EXCLUSIVE 0x0002
#define RUMP_LK_RELEASE 0x0006
#define RUMP_LK_EXCLOTHER 0x0008
#define RUMP_LK_NOWAIT 0x0010
-#define RUMP_LK_CANRECURSE 0x0040
#define RUMP_LK_INTERLOCK 0x0001
#define RUMP_LK_RETRY 0x0002
CVS commit: src/usr.bin/mkubootimage
Module Name:src
Committed By: jmcneill
Date: Fri Jun 18 18:55:48 UTC 2010
Added Files:
src/usr.bin/mkubootimage: Makefile crc32.c mkubootimage.c uboot.h
Log Message:
add mkubootimage(1), a tool for creating u-boot compatible images
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/usr.bin/mkubootimage/Makefile \
src/usr.bin/mkubootimage/crc32.c src/usr.bin/mkubootimage/mkubootimage.c \
src/usr.bin/mkubootimage/uboot.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/usr.bin/mkubootimage/Makefile
diff -u /dev/null src/usr.bin/mkubootimage/Makefile:1.1
--- /dev/null Fri Jun 18 18:55:48 2010
+++ src/usr.bin/mkubootimage/Makefile Fri Jun 18 18:55:48 2010
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile,v 1.1 2010/06/18 18:55:48 jmcneill Exp $
+
+PROG= mkubootimage
+SRCS= mkubootimage.c crc32.c
+NOMAN= # defined
+
+.include bsd.prog.mk
Index: src/usr.bin/mkubootimage/crc32.c
diff -u /dev/null src/usr.bin/mkubootimage/crc32.c:1.1
--- /dev/null Fri Jun 18 18:55:48 2010
+++ src/usr.bin/mkubootimage/crc32.c Fri Jun 18 18:55:48 2010
@@ -0,0 +1,98 @@
+/* $NetBSD: crc32.c,v 1.1 2010/06/18 18:55:48 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2002 Marcel Moolenaar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * CRC32 code derived from work by Gary S. Brown.
+ */
+
+#include sys/cdefs.h
+__RCSID($NetBSD: crc32.c,v 1.1 2010/06/18 18:55:48 jmcneill Exp $);
+
+#include sys/types.h
+#include stdint.h
+
+uint32_t crc32(const void *, size_t);
+
+static uint32_t crc32_tab[] = {
+ 0x, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
+ 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
+ 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
+ 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
+ 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
+ 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
+ 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,
+ 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
+ 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,
+ 0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+ 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,
+ 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
+ 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,
+ 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
+ 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
+ 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
+ 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7,
+ 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
+ 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa,
+ 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+ 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
+ 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
+ 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84,
+ 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
+ 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
+ 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
+ 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,
+ 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
+ 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3,
CVS commit: src
Module Name:src
Committed By: jmcneill
Date: Fri Jun 18 18:57:28 UTC 2010
Modified Files:
src/distrib/sets/lists/comp: mi
src/tools: Makefile
src/usr.bin: Makefile
Added Files:
src/tools/mkubootimage: Makefile
Log Message:
hook mkubootimage into the build
To generate a diff of this commit:
cvs rdiff -u -r1.1468 -r1.1469 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.138 -r1.139 src/tools/Makefile
cvs rdiff -u -r0 -r1.1 src/tools/mkubootimage/Makefile
cvs rdiff -u -r1.187 -r1.188 src/usr.bin/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/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1468 src/distrib/sets/lists/comp/mi:1.1469
--- src/distrib/sets/lists/comp/mi:1.1468 Fri Jun 18 16:29:01 2010
+++ src/distrib/sets/lists/comp/mi Fri Jun 18 18:57:27 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1468 2010/06/18 16:29:01 hannken Exp $
+# $NetBSD: mi,v 1.1469 2010/06/18 18:57:27 jmcneill Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -47,6 +47,7 @@
./usr/bin/lordercomp-util-bin
./usr/bin/menuc comp-c-bin
./usr/bin/mkstr comp-c-bin
+./usr/bin/mkubootimagecomp-util-bin
./usr/bin/msgattribcomp-c-bin
./usr/bin/msgc comp-c-bin
./usr/bin/msgcatcomp-c-bin
Index: src/tools/Makefile
diff -u src/tools/Makefile:1.138 src/tools/Makefile:1.139
--- src/tools/Makefile:1.138 Fri Jun 4 08:34:35 2010
+++ src/tools/Makefile Fri Jun 18 18:57:27 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.138 2010/06/04 08:34:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.139 2010/06/18 18:57:27 jmcneill Exp $
.include bsd.own.mk
@@ -115,6 +115,10 @@
SUBDIR+= hp300-mkboot
.endif
+.if ${MACHINE} == evbarm
+SUBDIR+= mkubootimage
+.endif
+
check_MKTOOLS: .PHONY .NOTMAIN
.if ${MKTOOLS:Uyes} == no
@echo '*** WARNING: MKTOOLS is set to no; this will prevent building and'
Index: src/usr.bin/Makefile
diff -u src/usr.bin/Makefile:1.187 src/usr.bin/Makefile:1.188
--- src/usr.bin/Makefile:1.187 Thu Jun 17 06:29:16 2010
+++ src/usr.bin/Makefile Fri Jun 18 18:57:27 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.187 2010/06/17 06:29:16 mrg Exp $
+# $NetBSD: Makefile,v 1.188 2010/06/18 18:57:27 jmcneill Exp $
# from: @(#)Makefile 8.3 (Berkeley) 1/7/94
.include bsd.own.mk
@@ -16,7 +16,8 @@
kdump ktrace ktruss lam last lastcomm ldd leave less \
locale locate lock logger login logname look lorder m4 \
machine mail make man menuc mesg midiplay mixerctl mkcsmapper \
- mkdep mkesdb mkfifo mklocale mkstr mktemp moduli msgc msgs \
+ mkdep mkesdb mkfifo mklocale mkstr mktemp mkubootimage moduli \
+ msgc msgs \
nbperf netgroup netstat newgrp newsyslog nfsstat nice nl nohup nvi \
pagesize passwd paste patch pathchk pkill pmap pmc pr \
printenv printf progress pwhash qsubst quota radioctl rdist \
Added files:
Index: src/tools/mkubootimage/Makefile
diff -u /dev/null src/tools/mkubootimage/Makefile:1.1
--- /dev/null Fri Jun 18 18:57:29 2010
+++ src/tools/mkubootimage/Makefile Fri Jun 18 18:57:28 2010
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2010/06/18 18:57:28 jmcneill Exp $
+
+HOSTPROGNAME= ${_TOOL_PREFIX}mkubootimage
+HOST_SRCDIR= usr.bin/mkubootimage
+
+HOST_CPPFLAGS+= -I${.CURDIR}
+
+.include ${.CURDIR}/../Makefile.host
CVS commit: src/sys/arch/evbarm/conf
Module Name:src
Committed By: jmcneill
Date: Fri Jun 18 19:19:06 UTC 2010
Modified Files:
src/sys/arch/evbarm/conf: mk.beagle
Log Message:
emit u-boot image 'netbsd.ub' as part of beagle kernel build
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/mk.beagle
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/conf/mk.beagle
diff -u src/sys/arch/evbarm/conf/mk.beagle:1.2 src/sys/arch/evbarm/conf/mk.beagle:1.3
--- src/sys/arch/evbarm/conf/mk.beagle:1.2 Tue Oct 28 17:19:37 2008
+++ src/sys/arch/evbarm/conf/mk.beagle Fri Jun 18 19:19:05 2010
@@ -1,15 +1,30 @@
-# $NetBSD: mk.beagle,v 1.2 2008/10/28 17:19:37 matt Exp $
+# $NetBSD: mk.beagle,v 1.3 2010/06/18 19:19:05 jmcneill Exp $
# gcc doesn't know about cortex-a8
CPPFLAGS+= -mcpu=arm1136jf-s
SYSTEM_FIRST_OBJ= beagle_start.o
SYSTEM_FIRST_SFILE= ${THISARM}/beagle/beagle_start.S
+_OSRELEASE!= ${HOST_SH} $S/conf/osrelease.sh
+
+.if ${USETOOLS} == yes
+MKUBOOTIMAGE= ${TOOLDIR}/bin/${_TOOL_PREFIX}mkubootimage
+.else
+MKUBOOTIMAGE= mkubootimage
+.endif
+MKUBOOTIMAGEARGS= -A arm -T kernel -C none
+MKUBOOTIMAGEARGS+= -a $(LOADADDRESS) -e $(LOADADDRESS)
+MKUBOOTIMAGEARGS+= -n NetBSD/$(BOARDTYPE) ${_OSRELEASE}
+
KERNEL_BASE_PHYS=$(LOADADDRESS)
KERNEL_BASE_VIRT=$(LOADADDRESS)
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${OBJCOPY} -S -O binary $@ $...@.bin; \
${OBJCOPY} -S -O binary $@ $...@.bin; \
+ echo ${MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $...@.bin $...@.ub; \
+ ${MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $...@.bin $...@.ub; \
+ echo
EXTRA_KERNELS+= ${KERNELS:@.kern...@${.kernel.}.bin@}
+EXTRA_KERNELS+= ${KERNELS:@.kern...@${.kernel.}.ub@}
CVS commit: src/doc
Module Name:src Committed By: jmcneill Date: Fri Jun 18 19:20:04 UTC 2010 Modified Files: src/doc: CHANGES Log Message: mkubootimage(1): Added tool to generate u-boot kernel images. To generate a diff of this commit: cvs rdiff -u -r1.1405 -r1.1406 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1405 src/doc/CHANGES:1.1406 --- src/doc/CHANGES:1.1405 Fri Jun 18 16:29:01 2010 +++ src/doc/CHANGES Fri Jun 18 19:20:04 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1405 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1406 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -634,3 +634,5 @@ by mv...@gt. [kiyohara 20100609] arm: Added support for Cortex-A8 CPUs. [jmcneill 20100616] vnsubr(9): Remove recursive vnode locks. [hannken 20100618] + mkubootimage(1): Added tool to generate u-boot kernel images. + [jmcneill 20100618]
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: christos
Date: Fri Jun 18 21:10:23 UTC 2010
Modified Files:
src/sys/dev/pci: if_iwn.c if_iwnreg.h if_iwnvar.h
Log Message:
Patch from Sverre Froyen to avoid panic when an ioctl happens while the
driver is initializing.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/pci/if_iwn.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pci/if_iwnreg.h
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/pci/if_iwnvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_iwn.c
diff -u src/sys/dev/pci/if_iwn.c:1.45 src/sys/dev/pci/if_iwn.c:1.46
--- src/sys/dev/pci/if_iwn.c:1.45 Wed May 12 08:26:16 2010
+++ src/sys/dev/pci/if_iwn.c Fri Jun 18 17:10:23 2010
@@ -1,5 +1,5 @@
-/* $NetBSD: if_iwn.c,v 1.45 2010/05/12 12:26:16 christos Exp $ */
-/* $OpenBSD: if_iwn.c,v 1.88 2010/04/10 08:37:36 damien Exp $ */
+/* $NetBSD: if_iwn.c,v 1.46 2010/06/18 21:10:23 christos Exp $ */
+/* $OpenBSD: if_iwn.c,v 1.96 2010/05/13 09:25:03 damien Exp $ */
/*-
* Copyright (c) 2007-2010 Damien Bergamini damien.bergam...@free.fr
@@ -22,7 +22,7 @@
* adapters.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_iwn.c,v 1.45 2010/05/12 12:26:16 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_iwn.c,v 1.46 2010/06/18 21:10:23 christos Exp $);
#define IWN_USE_RBUF /* Use local storage for RX */
#undef IWN_HWCRYPTO /* XXX does not even compile yet */
@@ -32,7 +32,7 @@
#include sys/param.h
#include sys/sockio.h
-#include sys/sysctl.h
+#include sys/proc.h
#include sys/mbuf.h
#include sys/kernel.h
#include sys/socket.h
@@ -96,6 +96,19 @@
PCI_PRODUCT_INTEL_WIFI_LINK_6050_2X2_2,
PCI_PRODUCT_INTEL_WIFI_LINK_6005_2X2_1,
PCI_PRODUCT_INTEL_WIFI_LINK_6005_2X2_2,
+#ifdef notyet
+ /*
+ * XXX NetBSD: the 6005A replaces the two 6005, above
+ * (see OpenBSD rev 1.96).
+ */
+ PCI_PRODUCT_INTEL_WIFI_LINK_6005A_2X2_1,
+ PCI_PRODUCT_INTEL_WIFI_LINK_6005A_2X2_2,
+ PCI_PRODUCT_INTEL_WIFI_LINK_6005B_1X1_1,
+ PCI_PRODUCT_INTEL_WIFI_LINK_6005B_1X1_2,
+ PCI_PRODUCT_INTEL_WIFI_LINK_6005B_2X2_1,
+ PCI_PRODUCT_INTEL_WIFI_LINK_6005B_2X2_2,
+ PCI_PRODUCT_INTEL_WIFI_LINK_6005B_2X2_3
+#endif
};
/*
@@ -263,6 +276,10 @@
static int iwn4965_load_firmware(struct iwn_softc *);
static int iwn5000_load_firmware_section(struct iwn_softc *, uint32_t,
const uint8_t *, int);
+static int iwn_read_firmware_leg(struct iwn_softc *,
+ struct iwn_fw_info *);
+static int iwn_read_firmware_tlv(struct iwn_softc *,
+ struct iwn_fw_info *, uint16_t);
static int iwn5000_load_firmware(struct iwn_softc *);
static int iwn_read_firmware(struct iwn_softc *);
static int iwn_clock_wait(struct iwn_softc *);
@@ -3144,6 +3161,22 @@
int s, error = 0;
s = splnet();
+ /*
+ * Prevent processes from entering this function while another
+ * process is tsleep'ing in it.
+ */
+ if (sc-sc_flags IWN_FLAG_BUSY) {
+ switch (cmd) {
+ case SIOCSIFADDR:
+ /* FALLTHROUGH */
+ case SIOCSIFFLAGS:
+ splx(s);
+ aprint_normal_dev(sc-sc_dev,
+ ioctl while busy cmd = 0x%lx\n, cmd);
+ return EBUSY;
+ }
+ }
+ sc-sc_flags |= IWN_FLAG_BUSY;
switch (cmd) {
case SIOCSIFADDR:
@@ -3190,6 +3223,8 @@
error = iwn_init(ifp);
}
}
+
+ sc-sc_flags = ~IWN_FLAG_BUSY;
splx(s);
return error;
}
@@ -4296,7 +4331,7 @@
tx-lifetime = htole32(IWN_LIFETIME_INFINITE);
if (flags IEEE80211_CHAN_5GHZ) {
- hdr-crc_threshold = htole16(1);
+ hdr-crc_threshold = 0x;
/* Send probe requests at 6Mbps. */
tx-plcp = iwn_rates[IWN_RIDX_OFDM6].plcp;
rs = ic-ic_sup_rates[IEEE80211_MODE_11A];
@@ -4334,6 +4369,10 @@
frm = (uint8_t *)(wh + 1);
frm = ieee80211_add_ssid(frm, NULL, 0);
frm = ieee80211_add_rates(frm, rs);
+#ifndef IEEE80211_NO_HT
+ if (ic-ic_flags IEEE80211_F_HTON)
+ frm = ieee80211_add_htcaps(frm, ic);
+#endif
if (rs-rs_nrates IEEE80211_RATE_SIZE)
frm = ieee80211_add_xrates(frm, rs);
@@ -5242,20 +5281,155 @@
return 0;
}
+/*
+ * Extract text and data sections from a legacy firmware image.
+ */
+static int
+iwn_read_firmware_leg(struct iwn_softc *sc, struct iwn_fw_info *fw)
+{
+ const uint32_t *ptr;
+ size_t hdrlen = 24;
+ uint32_t rev;
+
+ ptr = (const uint32_t *)fw-data;
+ rev = le32toh(*ptr++);
+
+ /* Check firmware API version. */
+ if (IWN_FW_API(rev) = 1) {
+ aprint_error_dev(sc-sc_dev,
+ bad firmware, need API version =2\n);
+ return EINVAL;
+ }
+ if (IWN_FW_API(rev) = 3) {
+ /* Skip build number (version 2 header). */
+ hdrlen += 4;
+ ptr++;
+ }
+ if (fw-size hdrlen) {
+ aprint_error_dev(sc-sc_dev,
+ firmware too short: %zd bytes\n, fw-size);
+ return EINVAL;
+ }
+ fw-main.textsz = le32toh(*ptr++);
+ fw-main.datasz = le32toh(*ptr++);
+ fw-init.textsz = le32toh(*ptr++);
+ fw-init.datasz = le32toh(*ptr++);
+ fw-boot.textsz = le32toh(*ptr++);
+
+ /* Check that all firmware sections fit. */
+ if (fw-size hdrlen + fw-main.textsz +
CVS commit: src/bin/pax
Module Name:src
Committed By: christos
Date: Sat Jun 19 00:43:57 UTC 2010
Modified Files:
src/bin/pax: options.c pax.1
Log Message:
add --use-compress-program to pax, requested by mrg.
To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.107 src/bin/pax/options.c
cvs rdiff -u -r1.57 -r1.58 src/bin/pax/pax.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/pax/options.c
diff -u src/bin/pax/options.c:1.106 src/bin/pax/options.c:1.107
--- src/bin/pax/options.c:1.106 Mon Dec 14 00:04:48 2009
+++ src/bin/pax/options.c Fri Jun 18 20:43:57 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: options.c,v 1.106 2009/12/14 05:04:48 dholland Exp $ */
+/* $NetBSD: options.c,v 1.107 2010/06/19 00:43:57 christos Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = @(#)options.c 8.2 (Berkeley) 4/18/94;
#else
-__RCSID($NetBSD: options.c,v 1.106 2009/12/14 05:04:48 dholland Exp $);
+__RCSID($NetBSD: options.c,v 1.107 2010/06/19 00:43:57 christos Exp $);
#endif
#endif /* not lint */
@@ -240,6 +240,8 @@
OPT_INSECURE },
{ force-local, no_argument, 0,
OPT_FORCE_LOCAL },
+ { use-compress-program, required_argument, 0,
+ OPT_USE_COMPRESS_PROGRAM },
{ 0, 0, 0,
0 },
};
@@ -474,6 +476,7 @@
/*
* use gzip. Non standard option.
*/
+ zflag = 1;
gzip_program = GZIP_CMD;
break;
case 'A':
@@ -642,6 +645,10 @@
case OPT_FORCE_LOCAL:
forcelocal = 0;
break;
+ case OPT_USE_COMPRESS_PROGRAM:
+ zflag = 1;
+ gzip_program = optarg;
+ break;
case '?':
default:
pax_usage();
Index: src/bin/pax/pax.1
diff -u src/bin/pax/pax.1:1.57 src/bin/pax/pax.1:1.58
--- src/bin/pax/pax.1:1.57 Mon Apr 5 17:22:37 2010
+++ src/bin/pax/pax.1 Fri Jun 18 20:43:57 2010
@@ -1,4 +1,4 @@
-.\$NetBSD: pax.1,v 1.57 2010/04/05 21:22:37 joerg Exp $
+.\$NetBSD: pax.1,v 1.58 2010/06/19 00:43:57 christos Exp $
.\
.\ Copyright (c) 1992 Keith Muller.
.\ Copyright (c) 1992, 1993
@@ -33,7 +33,7 @@
.\
.\ @(#)pax.1 8.4 (Berkeley) 4/18/94
.\
-.Dd September 6, 2009
+.Dd June 18, 2010
.Dt PAX 1
.Os
.Sh NAME
@@ -1101,6 +1101,9 @@
files that contain
.Dq ..
can be processed.
+.It Fl -use-compress-program
+Use the named program as the program to decompress the input or compress
+the output.
.El
.Pp
The options that operate on the names of files or archive members
CVS commit: src
Module Name:src
Committed By: mrg
Date: Sat Jun 19 03:50:31 UTC 2010
Modified Files:
src/distrib/sets: sets.subr
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/comp: mi
src/distrib/sets/lists/man: mi
src/external/zlib/pigz/bin/pigz: Makefile
src/share/mk: bsd.README bsd.own.mk
src/usr.bin: Makefile
Log Message:
- always install pigz. hooary!
- kill MKPIGZ.
- add MKPIGZGZIP. if it is no, then only install pigz as pigz. if it is
not no, don't install mrgzip, install pigz as gzip.
in all cases, the z* scripts.
i don't like the name MKPIGZGZIP so if anyone has a better name, feel free
to replace it. i don't care enough since killing the ugly name is just
more incentive to get pigz doing .bz2, .Z and .z.
To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 src/distrib/sets/sets.subr
cvs rdiff -u -r1.869 -r1.870 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.1469 -r1.1470 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.1218 -r1.1219 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.3 -r1.4 src/external/zlib/pigz/bin/pigz/Makefile
cvs rdiff -u -r1.271 -r1.272 src/share/mk/bsd.README
cvs rdiff -u -r1.630 -r1.631 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.188 -r1.189 src/usr.bin/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/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.123 src/distrib/sets/sets.subr:1.124
--- src/distrib/sets/sets.subr:1.123 Fri Jun 18 04:21:21 2010
+++ src/distrib/sets/sets.subr Sat Jun 19 03:50:30 2010
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.123 2010/06/18 04:21:21 mrg Exp $
+# $NetBSD: sets.subr,v 1.124 2010/06/19 03:50:30 mrg Exp $
#
#
@@ -168,7 +168,7 @@
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.123 2010/06/18 04:21:21 mrg Exp $
+# # $NetBSD: sets.subr,v 1.124 2010/06/19 03:50:30 mrg Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -228,7 +228,6 @@
# pcccmds ${MKPCCCMDS} != no
# pf ${MKPF} != no
# pic ${MKPIC} != no
-# pigz ${MKPIGZ} != no
# postfix ${MKPOSTFIX} != no
# profile ${MKPROFILE} != no
# share ${MKSHARE} != no
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.869 src/distrib/sets/lists/base/mi:1.870
--- src/distrib/sets/lists/base/mi:1.869 Fri Jun 18 04:21:21 2010
+++ src/distrib/sets/lists/base/mi Sat Jun 19 03:50:30 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.869 2010/06/18 04:21:21 mrg Exp $
+# $NetBSD: mi,v 1.870 2010/06/19 03:50:30 mrg Exp $
#
# Note: Don't delete entries from here - mark them as obsolete instead,
# unless otherwise stated below.
@@ -540,7 +540,7 @@
./usr/bin/pawd base-amd-bin
./usr/bin/paxctlbase-obsolete obsolete
./usr/bin/pgrep base-util-bin
-./usr/bin/pigz base-util-bin pigz
+./usr/bin/pigz base-util-bin
./usr/bin/pkill base-util-bin
./usr/bin/pmap base-util-bin
./usr/bin/pr base-util-bin
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1469 src/distrib/sets/lists/comp/mi:1.1470
--- src/distrib/sets/lists/comp/mi:1.1469 Fri Jun 18 18:57:27 2010
+++ src/distrib/sets/lists/comp/mi Sat Jun 19 03:50:30 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1469 2010/06/18 18:57:27 jmcneill Exp $
+# $NetBSD: mi,v 1.1470 2010/06/19 03:50:30 mrg Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -3206,7 +3206,7 @@
./usr/libdata/debug/usr/bin/paxctl.debug comp-obsolete obsolete
./usr/libdata/debug/usr/bin/pcc.debug comp-c-debug pcccmds,debug
./usr/libdata/debug/usr/bin/pfbtops.debug comp-groff-debug groff,debug
-./usr/libdata/debug/usr/bin/pigz.debug comp-util-debug debug,pigz
+./usr/libdata/debug/usr/bin/pigz.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/pic.debug comp-groff-debug groff,debug
./usr/libdata/debug/usr/bin/pkill.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/pmap.debug comp-util-debug debug
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1218 src/distrib/sets/lists/man/mi:1.1219
--- src/distrib/sets/lists/man/mi:1.1218 Fri Jun 18 04:21:22 2010
+++ src/distrib/sets/lists/man/mi Sat Jun 19 03:50:31 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1218 2010/06/18 04:21:22 mrg Exp $
+# $NetBSD: mi,v 1.1219 2010/06/19 03:50:31 mrg Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -376,7 +376,7 @@
./usr/share/man/cat1/pcc.0 man-util-catman pcccmds,.cat
./usr/share/man/cat1/pcpp.0 man-util-catman pcccmds,.cat
./usr/share/man/cat1/pgrep.0 man-util-catman .cat
-./usr/share/man/cat1/pigz.0 man-util-catman .cat,pigz
+./usr/share/man/cat1/pigz.0 man-util-catman .cat
./usr/share/man/cat1/pim6stat.0 man-obsolete obsolete
