CVS commit: src/etc/etc.evbmips
Module Name:src Committed By: matt Date: Fri May 1 23:55:14 UTC 2015 Modified Files: src/etc/etc.evbmips: Makefile.inc Log Message: Build ERLITE and INSTALL_ERLITE if mips64eb To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/etc/etc.evbmips/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/etc.evbmips/Makefile.inc diff -u src/etc/etc.evbmips/Makefile.inc:1.19 src/etc/etc.evbmips/Makefile.inc:1.20 --- src/etc/etc.evbmips/Makefile.inc:1.19 Mon Apr 6 14:18:08 2015 +++ src/etc/etc.evbmips/Makefile.inc Fri May 1 23:55:14 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.19 2015/04/06 14:18:08 joerg Exp $ +# $NetBSD: Makefile.inc,v 1.20 2015/05/01 23:55:14 matt Exp $ # # etc.evbmips/Makefile.inc -- evbmips-specific etc Makefile targets # @@ -25,6 +25,9 @@ KERNEL_SETS+= P5064-64 KERNEL_SETS+= LOONGSON BUILD_KERNELS+= INSTALL_LOONGSON KERNEL_SETS+= GDIUM64 +.else +KERNEL_SETS+= ERLITE +BUILD_KERNELS+= INSTALL_ERLITE .endif .else KERNEL_SETS= ALCHEMY DB120 DBAU1500 DBAU1550 MALTA RB433UAH
CVS commit: src/etc/etc.evbmips
Module Name:src Committed By: matt Date: Fri May 1 23:55:14 UTC 2015 Modified Files: src/etc/etc.evbmips: Makefile.inc Log Message: Build ERLITE and INSTALL_ERLITE if mips64eb To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/etc/etc.evbmips/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
re: CVS commit: src/sys/arch/mips/include
If reasonably possible, use MACHINE=MACHINE_ARCH=whatever config.guess uses for the platform. A lot of the different MACHINE values are due to historical reasons annd wouldn't happen again. I think keeping evb* for boards makes sense, though. I agree. MACHINE=evbavr32 and MACHINE_ARCH=avr32 make the most sense. i'm not convinced. i find it annoying that, for instance, RPI is in evbarm. it's not an eval board in the original sense. i don't think having evb prefix buys anything useful, and would rather they were both just avr32. .mrg.
CVS commit: src
Module Name:src
Committed By: christos
Date: Fri May 1 14:17:56 UTC 2015
Modified Files:
src/common/lib/libc/stdlib: strtoi.c strtou.c
src/distrib/sets/lists/debug: mi
src/distrib/sets/lists/tests: mi
src/lib/libc/include: namespace.h
src/lib/libc/stdlib: Makefile.inc strtol.3 strtoul.3
src/tests/lib/libc/stdlib: Makefile
Added Files:
src/lib/libc/stdlib: strtoi.3 strtou.3
src/tests/lib/libc/stdlib: t_strtoi.c
Log Message:
- new test for strtoi
- namespace protection for strto{i,u}
- separate manpages for strto{i,u} from the ones for strto{u,}l
From: Kamil Rytarowski
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/common/lib/libc/stdlib/strtoi.c \
src/common/lib/libc/stdlib/strtou.c
cvs rdiff -u -r1.112 -r1.113 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.616 -r1.617 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.177 -r1.178 src/lib/libc/include/namespace.h
cvs rdiff -u -r1.89 -r1.90 src/lib/libc/stdlib/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/lib/libc/stdlib/strtoi.3 \
src/lib/libc/stdlib/strtou.3
cvs rdiff -u -r1.31 -r1.32 src/lib/libc/stdlib/strtol.3
cvs rdiff -u -r1.29 -r1.30 src/lib/libc/stdlib/strtoul.3
cvs rdiff -u -r1.24 -r1.25 src/tests/lib/libc/stdlib/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/stdlib/t_strtoi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/stdlib/strtoi.c
diff -u src/common/lib/libc/stdlib/strtoi.c:1.1 src/common/lib/libc/stdlib/strtoi.c:1.2
--- src/common/lib/libc/stdlib/strtoi.c:1.1 Fri Jan 16 13:35:28 2015
+++ src/common/lib/libc/stdlib/strtoi.c Fri May 1 10:17:56 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: strtoi.c,v 1.1 2015/01/16 18:35:28 christos Exp $ */
+/* $NetBSD: strtoi.c,v 1.2 2015/05/01 14:17:56 christos Exp $ */
/*-
* Copyright (c) 2005 The DragonFly Project. All rights reserved.
@@ -35,7 +35,11 @@
#endif
#include sys/cdefs.h
-__RCSID($NetBSD: strtoi.c,v 1.1 2015/01/16 18:35:28 christos Exp $);
+__RCSID($NetBSD: strtoi.c,v 1.2 2015/05/01 14:17:56 christos Exp $);
+
+#ifdef _LIBC
+#include namespace.h
+#endif
#if defined(_KERNEL)
#include sys/param.h
@@ -57,6 +61,9 @@ __RCSID($NetBSD: strtoi.c,v 1.1 2015/01
#define __TYPE intmax_t
#define __WRAPPED strtoimax
-#if !HAVE_STRTOI
#include _strtoi.h
+
+#ifdef _LIBC
+__weak_alias(strtoi, _strtoi)
+__weak_alias(strtoi_l, _strtoi_l)
#endif
Index: src/common/lib/libc/stdlib/strtou.c
diff -u src/common/lib/libc/stdlib/strtou.c:1.1 src/common/lib/libc/stdlib/strtou.c:1.2
--- src/common/lib/libc/stdlib/strtou.c:1.1 Fri Jan 16 13:35:28 2015
+++ src/common/lib/libc/stdlib/strtou.c Fri May 1 10:17:56 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: strtou.c,v 1.1 2015/01/16 18:35:28 christos Exp $ */
+/* $NetBSD: strtou.c,v 1.2 2015/05/01 14:17:56 christos Exp $ */
/*-
* Copyright (c) 2005 The DragonFly Project. All rights reserved.
@@ -35,7 +35,11 @@
#endif
#include sys/cdefs.h
-__RCSID($NetBSD: strtou.c,v 1.1 2015/01/16 18:35:28 christos Exp $);
+__RCSID($NetBSD: strtou.c,v 1.2 2015/05/01 14:17:56 christos Exp $);
+
+#ifdef _LIBC
+#include namespace.h
+#endif
#if defined(_KERNEL)
#include sys/param.h
@@ -57,6 +61,9 @@ __RCSID($NetBSD: strtou.c,v 1.1 2015/01
#define __TYPE uintmax_t
#define __WRAPPED strtoumax
-#if !HAVE_STRTOU
#include _strtoi.h
+
+#ifdef _LIBC
+__weak_alias(strtou, _strtou)
+__weak_alias(strtou_l, _strtou_l)
#endif
Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.112 src/distrib/sets/lists/debug/mi:1.113
--- src/distrib/sets/lists/debug/mi:1.112 Fri Apr 17 06:00:02 2015
+++ src/distrib/sets/lists/debug/mi Fri May 1 10:17:56 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.112 2015/04/17 10:00:02 pgoyette Exp $
+# $NetBSD: mi,v 1.113 2015/05/01 14:17:56 christos Exp $
./etc/mtree/set.debug comp-sys-root
./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib
@@ -1947,6 +1947,7 @@
./usr/libdata/debug/usr/tests/lib/libc/stdlib/t_posix_memalign.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/stdlib/t_random.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/stdlib/t_strtod.debug tests-lib-debug debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/stdlib/t_strtoi.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/stdlib/t_strtol.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/stdlib/t_strtox.debug tests-obsolete obsolete
./usr/libdata/debug/usr/tests/lib/libc/stdlib/t_system.debug tests-lib-debug debug,atf
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.616 src/distrib/sets/lists/tests/mi:1.617
--- src/distrib/sets/lists/tests/mi:1.616 Thu Apr 9 12:47:57 2015
+++ src/distrib/sets/lists/tests/mi Fri May 1 10:17:56 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.616 2015/04/09 16:47:57
CVS commit: src
Module Name:src
Committed By: christos
Date: Fri May 1 14:17:56 UTC 2015
Modified Files:
src/common/lib/libc/stdlib: strtoi.c strtou.c
src/distrib/sets/lists/debug: mi
src/distrib/sets/lists/tests: mi
src/lib/libc/include: namespace.h
src/lib/libc/stdlib: Makefile.inc strtol.3 strtoul.3
src/tests/lib/libc/stdlib: Makefile
Added Files:
src/lib/libc/stdlib: strtoi.3 strtou.3
src/tests/lib/libc/stdlib: t_strtoi.c
Log Message:
- new test for strtoi
- namespace protection for strto{i,u}
- separate manpages for strto{i,u} from the ones for strto{u,}l
From: Kamil Rytarowski
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/common/lib/libc/stdlib/strtoi.c \
src/common/lib/libc/stdlib/strtou.c
cvs rdiff -u -r1.112 -r1.113 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.616 -r1.617 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.177 -r1.178 src/lib/libc/include/namespace.h
cvs rdiff -u -r1.89 -r1.90 src/lib/libc/stdlib/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/lib/libc/stdlib/strtoi.3 \
src/lib/libc/stdlib/strtou.3
cvs rdiff -u -r1.31 -r1.32 src/lib/libc/stdlib/strtol.3
cvs rdiff -u -r1.29 -r1.30 src/lib/libc/stdlib/strtoul.3
cvs rdiff -u -r1.24 -r1.25 src/tests/lib/libc/stdlib/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/stdlib/t_strtoi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src
Committed By: hikaru
Date: Fri May 1 07:23:47 UTC 2015
Modified Files:
src/sys/arch/evbmips/conf: ERLITE
src/sys/arch/mips/cavium: octeon1p_iobus.c
src/sys/arch/mips/conf: files.octeon
Added Files:
src/sys/arch/mips/cavium/dev: octeon_dwctwo.c
Removed Files:
src/sys/arch/mips/cavium/dev: octeon_usbc.c octeon_usbn.c
Log Message:
Use dwc2 instead of octeon_usbc, and unify octeon_usbn to new octeon_dwctwo.
Internal USB memory stick of EdgeRouter Lite works now.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbmips/conf/ERLITE
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mips/cavium/octeon1p_iobus.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/mips/cavium/dev/octeon_dwctwo.c
cvs rdiff -u -r1.1 -r0 src/sys/arch/mips/cavium/dev/octeon_usbc.c \
src/sys/arch/mips/cavium/dev/octeon_usbn.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mips/conf/files.octeon
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/evbmips/conf/ERLITE
diff -u src/sys/arch/evbmips/conf/ERLITE:1.1 src/sys/arch/evbmips/conf/ERLITE:1.2
--- src/sys/arch/evbmips/conf/ERLITE:1.1 Wed Apr 29 08:32:00 2015
+++ src/sys/arch/evbmips/conf/ERLITE Fri May 1 07:23:47 2015
@@ -1,11 +1,11 @@
-# $NetBSD: ERLITE,v 1.1 2015/04/29 08:32:00 hikaru Exp $
+# $NetBSD: ERLITE,v 1.2 2015/05/01 07:23:47 hikaru Exp $
include arch/mips/conf/std.octeon
include arch/evbmips/conf/files.octeon
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident ERLITE-$Revision: 1.1 $
+#ident ERLITE-$Revision: 1.2 $
maxusers 32
@@ -131,11 +131,15 @@ octeon_rnm* at iobus?
octeon_gmx* at iobus?
cnmac* at octeon_gmx?
-#octeon_usbn* at iobus?
-#usb* at octeon_usbn?
+dwctwo* at iobus?
+usb* at dwctwo?
-#uhub* at usb?
-#ugen* at uhub? port ?
+uhub* at usb?
+
+# USB Mass Storage
+umass* at uhub? port ? configuration ? interface ?
+scsibus* at umass? channel ?
+sd* at scsibus? target ? lun ? # SCSI disk drives
atphy* at mii? phy ? # Attansic/Atheros PHYs
ukphy* at mii? phy ? # generic unknown PHYs
Index: src/sys/arch/mips/cavium/octeon1p_iobus.c
diff -u src/sys/arch/mips/cavium/octeon1p_iobus.c:1.1 src/sys/arch/mips/cavium/octeon1p_iobus.c:1.2
--- src/sys/arch/mips/cavium/octeon1p_iobus.c:1.1 Wed Apr 29 08:32:00 2015
+++ src/sys/arch/mips/cavium/octeon1p_iobus.c Fri May 1 07:23:47 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: octeon1p_iobus.c,v 1.1 2015/04/29 08:32:00 hikaru Exp $ */
+/* $NetBSD: octeon1p_iobus.c,v 1.2 2015/05/01 07:23:47 hikaru Exp $ */
/*
* Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: octeon1p_iobus.c,v 1.1 2015/04/29 08:32:00 hikaru Exp $);
+__KERNEL_RCSID(0, $NetBSD: octeon1p_iobus.c,v 1.2 2015/05/01 07:23:47 hikaru Exp $);
#include sys/param.h
#include sys/systm.h
@@ -127,7 +127,7 @@ static const struct iobus_unit iobus_uni
};
static const struct iobus_dev iobus_dev_octeon_usbn = {
- .name = octeon_usbn,
+ .name = dwctwo,
.nunits = USBN_NUNITS,
.units = iobus_units_octeon_usbn
};
Index: src/sys/arch/mips/conf/files.octeon
diff -u src/sys/arch/mips/conf/files.octeon:1.1 src/sys/arch/mips/conf/files.octeon:1.2
--- src/sys/arch/mips/conf/files.octeon:1.1 Wed Apr 29 08:32:00 2015
+++ src/sys/arch/mips/conf/files.octeon Fri May 1 07:23:47 2015
@@ -1,4 +1,4 @@
-# $NetBSD: files.octeon,v 1.1 2015/04/29 08:32:00 hikaru Exp $
+# $NetBSD: files.octeon,v 1.2 2015/05/01 07:23:47 hikaru Exp $
file arch/mips/mips/locore_octeon.S
file arch/mips/mips/bus_dma.c
@@ -65,10 +65,8 @@ device cnmac: ether, ifnet, arp, mii
attach cnmac at octeon_gmx
file arch/mips/cavium/dev/if_cnmac.c cnmac
-device octeon_usbn: usbus, usbroothub, usb_dma
-attach octeon_usbn at iobus
-file arch/mips/cavium/dev/octeon_usbn.c octeon_usbn
-file arch/mips/cavium/dev/octeon_usbc.c octeon_usbn
+attach dwctwo at iobus with octeon_dwctwo
+file arch/mips/cavium/dev/octeon_dwctwo.c octeon_dwctwo
# Boot-Bus
Added files:
Index: src/sys/arch/mips/cavium/dev/octeon_dwctwo.c
diff -u /dev/null src/sys/arch/mips/cavium/dev/octeon_dwctwo.c:1.1
--- /dev/null Fri May 1 07:23:47 2015
+++ src/sys/arch/mips/cavium/dev/octeon_dwctwo.c Fri May 1 07:23:47 2015
@@ -0,0 +1,416 @@
+/* $NetBSD: octeon_dwctwo.c,v 1.1 2015/05/01 07:23:47 hikaru Exp $ */
+
+/*
+ * Copyright (c) 2015 Masao Uebayashi uebay...@tombiinc.com
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED AS IS AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT,
CVS commit: src/sys/arch
Module Name:src Committed By: hikaru Date: Fri May 1 07:23:47 UTC 2015 Modified Files: src/sys/arch/evbmips/conf: ERLITE src/sys/arch/mips/cavium: octeon1p_iobus.c src/sys/arch/mips/conf: files.octeon Added Files: src/sys/arch/mips/cavium/dev: octeon_dwctwo.c Removed Files: src/sys/arch/mips/cavium/dev: octeon_usbc.c octeon_usbn.c Log Message: Use dwc2 instead of octeon_usbc, and unify octeon_usbn to new octeon_dwctwo. Internal USB memory stick of EdgeRouter Lite works now. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbmips/conf/ERLITE cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mips/cavium/octeon1p_iobus.c cvs rdiff -u -r0 -r1.1 src/sys/arch/mips/cavium/dev/octeon_dwctwo.c cvs rdiff -u -r1.1 -r0 src/sys/arch/mips/cavium/dev/octeon_usbc.c \ src/sys/arch/mips/cavium/dev/octeon_usbn.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mips/conf/files.octeon Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/dwc2
Module Name:src
Committed By: hikaru
Date: Fri May 1 06:58:40 UTC 2015
Modified Files:
src/sys/external/bsd/dwc2: dwc2var.h
src/sys/external/bsd/dwc2/dist: dwc2_core.c
Log Message:
Support external DMA mode and provide an interface for DMA address configuration
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/dwc2/dwc2var.h
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/dwc2/dist/dwc2_core.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/external/bsd/dwc2/dwc2var.h
diff -u src/sys/external/bsd/dwc2/dwc2var.h:1.3 src/sys/external/bsd/dwc2/dwc2var.h:1.4
--- src/sys/external/bsd/dwc2/dwc2var.h:1.3 Tue Oct 22 12:57:40 2013
+++ src/sys/external/bsd/dwc2/dwc2var.h Fri May 1 06:58:40 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2var.h,v 1.3 2013/10/22 12:57:40 skrll Exp $ */
+/* $NetBSD: dwc2var.h,v 1.4 2015/05/01 06:58:40 hikaru Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -77,6 +77,7 @@ typedef struct dwc2_softc {
bus_space_handle_t sc_ioh;
bus_dma_tag_t sc_dmat;
struct dwc2_core_params *sc_params;
+ int (*sc_set_dma_addr)(device_t, bus_addr_t, int);
/*
* Private
Index: src/sys/external/bsd/dwc2/dist/dwc2_core.c
diff -u src/sys/external/bsd/dwc2/dist/dwc2_core.c:1.6 src/sys/external/bsd/dwc2/dist/dwc2_core.c:1.7
--- src/sys/external/bsd/dwc2/dist/dwc2_core.c:1.6 Thu Apr 3 06:34:58 2014
+++ src/sys/external/bsd/dwc2/dist/dwc2_core.c Fri May 1 06:58:40 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2_core.c,v 1.6 2014/04/03 06:34:58 skrll Exp $ */
+/* $NetBSD: dwc2_core.c,v 1.7 2015/05/01 06:58:40 hikaru Exp $ */
/*
* core.c - DesignWare HS OTG Controller common routines
@@ -43,7 +43,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dwc2_core.c,v 1.6 2014/04/03 06:34:58 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: dwc2_core.c,v 1.7 2015/05/01 06:58:40 hikaru Exp $);
#include sys/types.h
#include sys/bus.h
@@ -312,8 +312,13 @@ static int dwc2_gahbcfg_init(struct dwc2
switch (hsotg-hw_params.arch) {
case GHWCFG2_EXT_DMA_ARCH:
- dev_err(hsotg-dev, External DMA Mode not supported\n);
- return -EINVAL;
+ dev_dbg(hsotg-dev, External DMA Mode\n);
+ if (hsotg-core_params-ahbcfg != -1) {
+ ahbcfg = GAHBCFG_CTRL_MASK;
+ ahbcfg |= hsotg-core_params-ahbcfg
+ ~GAHBCFG_CTRL_MASK;
+ }
+ break;
case GHWCFG2_INT_DMA_ARCH:
dev_dbg(hsotg-dev, Internal DMA Mode\n);
@@ -1396,10 +1401,18 @@ void dwc2_hc_start_transfer(struct dwc2_
} else {
dma_addr = chan-xfer_dma;
}
- DWC2_WRITE_4(hsotg, HCDMA(chan-hc_num), (u32)dma_addr);
- if (dbg_hc(chan))
- dev_vdbg(hsotg-dev, Wrote %08lx to HCDMA(%d)\n,
- (unsigned long)dma_addr, chan-hc_num);
+ if (hsotg-hsotg_sc-sc_set_dma_addr == NULL) {
+ DWC2_WRITE_4(hsotg, HCDMA(chan-hc_num),
+ (u32)dma_addr);
+ if (dbg_hc(chan))
+dev_vdbg(hsotg-dev,
+Wrote %08lx to HCDMA(%d)\n,
+ (unsigned long)dma_addr,
+chan-hc_num);
+ } else {
+ (void)(*hsotg-hsotg_sc-sc_set_dma_addr)(
+ hsotg-dev, dma_addr, chan-hc_num);
+ }
}
/* Start the split */
CVS commit: src/sys/external/bsd/dwc2
Module Name:src Committed By: hikaru Date: Fri May 1 06:58:40 UTC 2015 Modified Files: src/sys/external/bsd/dwc2: dwc2var.h src/sys/external/bsd/dwc2/dist: dwc2_core.c Log Message: Support external DMA mode and provide an interface for DMA address configuration To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/dwc2/dwc2var.h cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/dwc2/dist/dwc2_core.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: hkenken Date: Fri May 1 07:22:42 UTC 2015 Modified Files: src/sys/arch/evbarm/conf: NETWALKER Log Message: remove DIAGNOSTIC To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbarm/conf/NETWALKER 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/NETWALKER diff -u src/sys/arch/evbarm/conf/NETWALKER:1.33 src/sys/arch/evbarm/conf/NETWALKER:1.34 --- src/sys/arch/evbarm/conf/NETWALKER:1.33 Fri Apr 10 10:58:07 2015 +++ src/sys/arch/evbarm/conf/NETWALKER Fri May 1 07:22:42 2015 @@ -1,4 +1,4 @@ -# $NetBSD: NETWALKER,v 1.33 2015/04/10 10:58:07 hkenken Exp $ +# $NetBSD: NETWALKER,v 1.34 2015/05/01 07:22:42 hkenken Exp $ # # NETWALKER -- http://www.sharp.co.jp/netwalker/ # @@ -16,7 +16,7 @@ options IMX51 options CONSDEVNAME=\imxuart\,CONADDR=0x73fbc000 options CONSPEED=115200 # Console speed -options DIAGNOSTIC # internal consistency checks +# Development and Debugging options #optionsDEBUG #options KGDB makeoptions DEBUG=-g # compile full symbol table
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: hkenken Date: Fri May 1 07:22:42 UTC 2015 Modified Files: src/sys/arch/evbarm/conf: NETWALKER Log Message: remove DIAGNOSTIC To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbarm/conf/NETWALKER Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Fri May 1 17:48:36 UTC 2015
Modified Files:
src/usr.sbin/sysinst: savenewlabel.c
Log Message:
As pointed out by John D. Baker: replace all / characters in packnames
(which might be automatically generated from controller names like
PERC 5/i) with a space before using the string as a file name.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/savenewlabel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/savenewlabel.c
diff -u src/usr.sbin/sysinst/savenewlabel.c:1.2 src/usr.sbin/sysinst/savenewlabel.c:1.3
--- src/usr.sbin/sysinst/savenewlabel.c:1.2 Sun Aug 3 16:09:38 2014
+++ src/usr.sbin/sysinst/savenewlabel.c Fri May 1 17:48:36 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: savenewlabel.c,v 1.2 2014/08/03 16:09:38 martin Exp $ */
+/* $NetBSD: savenewlabel.c,v 1.3 2015/05/01 17:48:36 martin Exp $ */
/*
* Copyright 1997 Jonathan Stone
@@ -36,7 +36,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: savenewlabel.c,v 1.2 2014/08/03 16:09:38 martin Exp $);
+__RCSID($NetBSD: savenewlabel.c,v 1.3 2015/05/01 17:48:36 martin Exp $);
#endif
#include sys/types.h
@@ -59,6 +59,7 @@ savenewlabel(partinfo *lp, int nparts)
{
FILE *f;
char *f_name = malloc(STRSIZE * sizeof(char));
+ char *sane_packname, *p;
int i;
pm_devs_t *pm_i;
@@ -73,7 +74,12 @@ savenewlabel(partinfo *lp, int nparts)
snprintf(pm_i-bsddiskname, DISKNAME_SIZE, disk %c, i);
}
- snprintf(f_name, STRSIZE, /tmp/disktab.%s, pm-bsddiskname);
+ sane_packname = strdup(pm-bsddiskname);
+ for (p = sane_packname; *p; p++)
+ if (*p == '/')
+ *p = ' ';
+ snprintf(f_name, STRSIZE, /tmp/disktab.%s, sane_packname);
+ free(sane_packname);
/*
N.B. disklabels only support up to 2TB (32-bit field for sectors).
CVS commit: src/distrib/arc/ramdisk
Module Name:src
Committed By: christos
Date: Fri May 1 16:22:49 UTC 2015
Modified Files:
src/distrib/arc/ramdisk: Makefile
Log Message:
make bigger.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/distrib/arc/ramdisk/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/arc/ramdisk/Makefile
diff -u src/distrib/arc/ramdisk/Makefile:1.23 src/distrib/arc/ramdisk/Makefile:1.24
--- src/distrib/arc/ramdisk/Makefile:1.23 Mon Aug 12 12:31:28 2013
+++ src/distrib/arc/ramdisk/Makefile Fri May 1 12:22:49 2015
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.23 2013/08/12 16:31:28 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2015/05/01 16:22:49 christos Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
IMAGE= ramdisk.fs
-IMAGESIZE= 2660k
+IMAGESIZE= 2860k
MAKEFS_FLAGS= -f 15
WARNS= 1
CVS commit: src/distrib/arc/ramdisk
Module Name:src Committed By: christos Date: Fri May 1 16:22:49 UTC 2015 Modified Files: src/distrib/arc/ramdisk: Makefile Log Message: make bigger. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/distrib/arc/ramdisk/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/dev/bluetooth
On Fri, May 01, 2015 at 08:42:57AM +0200, Maxime Villard wrote: Yes, ffs_oldfscompat_read() should theoretically be called before ffs_superblock_validate(), otherwise, several fields being overwritten, you either end up with unsanitized values or your disk gets kicked out. I am not sure what ffs_oldfscompat_read() does, but several people (me included) have now unmountable disks that used to work fine in production before, and it is not quite clear what causes the inconsistency, see the thread at https://mail-index.netbsd.org/current-users/2015/04/30/msg027310.html I am pretty sure (but not 100%) that my root filesystem in question has been created past the newfs change cited in that thread, but it is clear that a -current newfs would not trigger the issue. Martin
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Fri May 1 17:48:36 UTC 2015 Modified Files: src/usr.sbin/sysinst: savenewlabel.c Log Message: As pointed out by John D. Baker: replace all / characters in packnames (which might be automatically generated from controller names like PERC 5/i) with a space before using the string as a file name. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/savenewlabel.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/bin/stty
Module Name:src
Committed By: christos
Date: Fri May 1 17:01:08 UTC 2015
Modified Files:
src/bin/stty: modes.c
Log Message:
Simplify by splitting the simple mode setting and the special ones.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/bin/stty/modes.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/stty/modes.c
diff -u src/bin/stty/modes.c:1.17 src/bin/stty/modes.c:1.18
--- src/bin/stty/modes.c:1.17 Sun Oct 15 20:37:55 2006
+++ src/bin/stty/modes.c Fri May 1 13:01:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: modes.c,v 1.17 2006/10/16 00:37:55 christos Exp $ */
+/* $NetBSD: modes.c,v 1.18 2015/05/01 17:01:08 christos Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)modes.c 8.3 (Berkeley) 4/2/94;
#else
-__RCSID($NetBSD: modes.c,v 1.17 2006/10/16 00:37:55 christos Exp $);
+__RCSID($NetBSD: modes.c,v 1.18 2015/05/01 17:01:08 christos Exp $);
#endif
#endif /* not lint */
@@ -42,12 +42,18 @@ __RCSID($NetBSD: modes.c,v 1.17 2006/10
#include stddef.h
#include string.h
+#include stdbool.h
#include stty.h
#include extern.h
struct modes {
const char *name;
+ tcflag_t flag;
+};
+
+struct specialmodes {
+ const char *name;
tcflag_t set;
tcflag_t unset;
};
@@ -57,18 +63,24 @@ struct modes {
* options, i.e. foo must immediately precede -foo.
*/
const struct modes cmodes[] = {
+ { cstopb, CSTOPB },
+ { cread, CREAD },
+ { parenb, PARENB },
+ { parodd, PARODD },
+ { hupcl, HUPCL },
+ { hup, HUPCL },
+ { clocal, CLOCAL },
+ { crtscts, CRTSCTS },
+ { mdmbuf, MDMBUF },
+ { cdtrcts, CDTRCTS },
+ { .name = NULL },
+};
+
+const struct specialmodes cspecialmodes[] = {
{ cs5, CS5, CSIZE },
{ cs6, CS6, CSIZE },
{ cs7, CS7, CSIZE },
{ cs8, CS8, CSIZE },
- { cstopb, CSTOPB, 0 },
- { -cstopb, 0, CSTOPB },
- { cread, CREAD, 0 },
- { -cread, 0, CREAD },
- { parenb, PARENB, 0 },
- { -parenb, 0, PARENB },
- { parodd, PARODD, 0 },
- { -parodd, 0, PARODD },
{ parity, PARENB | CS7, PARODD | CSIZE },
{ -parity, CS8, PARODD | PARENB | CSIZE },
{ evenp, PARENB | CS7, PARODD | CSIZE },
@@ -77,166 +89,136 @@ const struct modes cmodes[] = {
{ -oddp, CS8, PARODD | PARENB | CSIZE },
{ pass8, CS8, PARODD | PARENB | CSIZE },
{ -pass8, PARENB | CS7, PARODD | CSIZE },
- { hupcl, HUPCL, 0 },
- { -hupcl, 0, HUPCL },
- { hup, HUPCL, 0 },
- { -hup, 0, HUPCL },
- { clocal, CLOCAL, 0 },
- { -clocal, 0, CLOCAL },
- { crtscts, CRTSCTS, 0 },
- { -crtscts, 0, CRTSCTS },
- { mdmbuf, MDMBUF, 0 },
- { -mdmbuf, 0, MDMBUF },
- { cdtrcts, CDTRCTS, 0 },
- { -cdtrcts, 0, CDTRCTS },
{ .name = NULL },
};
const struct modes imodes[] = {
- { ignbrk, IGNBRK, 0 },
- { -ignbrk, 0, IGNBRK },
- { brkint, BRKINT, 0 },
- { -brkint, 0, BRKINT },
- { ignpar, IGNPAR, 0 },
- { -ignpar, 0, IGNPAR },
- { parmrk, PARMRK, 0 },
- { -parmrk, 0, PARMRK },
- { inpck, INPCK, 0 },
- { -inpck, 0, INPCK },
- { istrip, ISTRIP, 0 },
- { -istrip, 0, ISTRIP },
- { inlcr, INLCR, 0 },
- { -inlcr, 0, INLCR },
- { igncr, IGNCR, 0 },
- { -igncr, 0, IGNCR },
- { icrnl, ICRNL, 0 },
- { -icrnl, 0, ICRNL },
- { ixon, IXON, 0 },
- { -ixon, 0, IXON },
- { flow, IXON, 0 },
- { -flow, 0, IXON },
- { ixoff, IXOFF, 0 },
- { -ixoff, 0, IXOFF },
- { tandem, IXOFF, 0 },
- { -tandem, 0, IXOFF },
- { ixany, IXANY, 0 },
- { -ixany, 0, IXANY },
+ { ignbrk, IGNBRK },
+ { brkint, BRKINT },
+ { ignpar, IGNPAR },
+ { parmrk, PARMRK },
+ { inpck, INPCK },
+ { istrip, ISTRIP },
+ { inlcr, INLCR },
+ { igncr, IGNCR },
+ { icrnl, ICRNL },
+ { ixon, IXON },
+ { flow, IXON },
+ { ixoff, IXOFF },
+ { tandem, IXOFF },
+ { ixany, IXANY },
+ { imaxbel, IMAXBEL },
+ { .name = NULL },
+};
+
+const struct specialmodes ispecialmodes[] = {
{ decctlq, 0, IXANY },
{ -decctlq, IXANY, 0 },
- { imaxbel, IMAXBEL, 0 },
- { -imaxbel, 0, IMAXBEL },
{ .name = NULL },
};
const struct modes lmodes[] = {
- { echo, ECHO, 0 },
- { -echo, 0, ECHO },
- { echoe, ECHOE, 0 },
- { -echoe, 0, ECHOE },
- { crterase, ECHOE, 0 },
- { -crterase, 0, ECHOE },
- { crtbs, ECHOE, 0 }, /* crtbs not supported, close enough */
- { -crtbs, 0, ECHOE },
- { echok, ECHOK, 0 },
- { -echok, 0, ECHOK },
- { echoke, ECHOKE, 0 },
- { -echoke, 0, ECHOKE },
- { crtkill, ECHOKE, 0 },
- { -crtkill, 0, ECHOKE },
- { altwerase, ALTWERASE, 0 },
- { -altwerase, 0, ALTWERASE },
- { iexten, IEXTEN, 0 },
- { -iexten, 0, IEXTEN },
- { echonl, ECHONL, 0 },
- { -echonl, 0, ECHONL },
- { echoctl, ECHOCTL, 0 },
- { -echoctl, 0, ECHOCTL },
- { ctlecho, ECHOCTL, 0 },
- { -ctlecho, 0, ECHOCTL },
- { echoprt, ECHOPRT, 0 },
- { -echoprt, 0, ECHOPRT },
- { prterase, ECHOPRT, 0 },
- { -prterase, 0, ECHOPRT },
- { isig, ISIG, 0 },
- { -isig, 0, ISIG },
- { icanon, ICANON, 0 },
- { -icanon, 0, ICANON },
- { noflsh, NOFLSH, 0 },
- { -noflsh, 0, NOFLSH },
- { tostop, TOSTOP, 0 },
- { -tostop, 0, TOSTOP },
- { flusho, FLUSHO, 0 },
- { -flusho, 0, FLUSHO
CVS commit: src/bin/stty
Module Name:src Committed By: christos Date: Fri May 1 17:01:08 UTC 2015 Modified Files: src/bin/stty: modes.c Log Message: Simplify by splitting the simple mode setting and the special ones. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/bin/stty/modes.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: matt Date: Fri May 1 20:15:43 UTC 2015 Added Files: src/sys/arch/evbmips/conf: INSTALL_ERLITE Log Message: Add INSTALL kernel for ERLITE To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/evbmips/conf/INSTALL_ERLITE Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/evbmips/conf/INSTALL_ERLITE diff -u /dev/null src/sys/arch/evbmips/conf/INSTALL_ERLITE:1.1 --- /dev/null Fri May 1 20:15:43 2015 +++ src/sys/arch/evbmips/conf/INSTALL_ERLITE Fri May 1 20:15:43 2015 @@ -0,0 +1,14 @@ +# $NetBSD: INSTALL_ERLITE,v 1.1 2015/05/01 20:15:43 matt Exp $ + +include arch/evbmips/conf/ERLITE + +#ident INSTALL_ERLITE-$Revision: 1.1 $ + +# Enable the hooks used for initializing the root memory-disk. +# The ramdisk size must be kept in sync manually with the size of +# the `ramdisk' image (which is built in distrib/evbmips/ramdisk/ramdisk). +pseudo-device md# memory disk device +options MEMORY_DISK_HOOKS +options MEMORY_DISK_IS_ROOT # force root on memory disk +options MEMORY_DISK_SERVER=0 # no userspace memory disk +options MEMORY_DISK_ROOT_SIZE=12288 # size of memory disk, in blocks
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: matt Date: Fri May 1 20:15:43 UTC 2015 Added Files: src/sys/arch/evbmips/conf: INSTALL_ERLITE Log Message: Add INSTALL kernel for ERLITE To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/evbmips/conf/INSTALL_ERLITE Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/arch/mips/include
On May 1, 2015, at 11:37 AM, Christos Zoulas chris...@netbsd.org wrote: Module Name: src Committed By: christos Date: Fri May 1 18:37:40 UTC 2015 Modified Files: src/sys/arch/mips/include: locore.h Log Message: change #error to KASSERT To generate a diff of this commit: cvs rdiff -u -r1.95 -r1.96 src/sys/arch/mips/include/locore.h This change is incorrect. #error is the right thing for this case.
CVS commit: src/external/bsd/openresolv/dist
Module Name:src Committed By: roy Date: Fri May 1 18:23:11 UTC 2015 Modified Files: src/external/bsd/openresolv/dist: resolvconf.8.in resolvconf.conf.5.in Log Message: Sync To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openresolv/dist/resolvconf.8.in cvs rdiff -u -r1.11 -r1.12 \ src/external/bsd/openresolv/dist/resolvconf.conf.5.in 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/openresolv/dist/resolvconf.8.in diff -u src/external/bsd/openresolv/dist/resolvconf.8.in:1.4 src/external/bsd/openresolv/dist/resolvconf.8.in:1.5 --- src/external/bsd/openresolv/dist/resolvconf.8.in:1.4 Tue Oct 28 22:39:25 2014 +++ src/external/bsd/openresolv/dist/resolvconf.8.in Fri May 1 18:23:11 2015 @@ -1,4 +1,4 @@ -.\ Copyright (c) 2007-2014 Roy Marples +.\ Copyright (c) 2007-2015 Roy Marples .\ All rights reserved .\ .\ Redistribution and use in source and binary forms, with or without @@ -22,8 +22,8 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd October 26, 2014 -.Dt RESOLVCONF 8 SMM +.Dd April 27, 2014 +.Dt RESOLVCONF 8 .Os .Sh NAME .Nm resolvconf @@ -34,11 +34,14 @@ .Nm .Op Fl m Ar metric .Op Fl p -.Fl a Ar interface No Ns Pa file +.Op Fl x +.Fl a Ar interface Ns Op Ar .protocol +.No Ns Pa file .Nm .Op Fl f -.Fl d Ar interface +.Fl d Ar interface Ns Op Ar .protocol .Nm +.Op Fl x .Fl il Ar pattern .Nm .Fl u @@ -63,7 +66,7 @@ file to via .Xr stdin 3 with the argument -.Fl a Ar interface +.Fl a Ar interface Ns Op Ar .protocol instead of the filesystem. .Nm then updates @@ -105,13 +108,21 @@ for how to configure .Nm to use a local name server. .Pp +.Nm +can mark an interfaces +.Pa resolv.conf +as exclusive. +Only the latest exclusive interface is used for processing, otherwise all are. +.Pp When an interface goes down, it should then call .Nm with -.Fl d Ar interface +.Fl d Ar interface.* arguments to delete the .Pa resolv.conf -file for the +file(s) for all the +.Ar protocols +on the .Ar interface . .Pp Here are some more options that @@ -133,7 +144,7 @@ is used to add interfaces. Ignore non existant interfaces. Only really useful for deleting interfaces. .It Fl i Ar pattern -List the interfaces, optionally matching +List the interfaces and protocols, optionally matching .Ar pattern , we have .Pa resolv.conf @@ -144,7 +155,8 @@ List the files we have. If .Ar pattern -is specified then we list the files for the interfaces that match it. +is specified then we list the files for the interfaces and protocols +that match it. .It Fl m Ar metric Set the metric of the interface when adding it, default of 0. Lower metrics take precedence. @@ -160,6 +172,10 @@ to update all its subscribers. .Nm does not update the subscribers when adding a resolv.conf that matches what it already has for that interface. +.It Fl x +Mark the interface +.Pa resolv.conf +as exclusive when adding, otherwise only use the latest exclusive interface. .El .Pp .Nm @@ -190,6 +206,29 @@ the operating systems lexical order. See .Xr resolvconf.conf 5 for details on these lists. +.Sh PROTOCOLS +Here are some suggested protocol tags to use for each +.Pa resolv.conf +file registered on an +.Ar interface Ns No :- +.Bl -tag -width indent +.It dhcp +Dynamic Host Configuration Protocol. +Initial versions of +.Nm +did not recommend a +.Ar protocol +tag be appended to the +.Ar interface +name. +When the protocol is absent, it is assumed to be the DHCP protocol. +.It ppp +Point-to-Point Protocol. +.It ra +IPv6 Router Advertisement. +.It dhcp6 +Dynamic Host Configuration Protocol, version 6. +.El .Sh IMPLEMENTATION NOTES If a subscriber has the executable bit then it is executed otherwise it is assumed to be a shell script and sourced into the current environment in a @@ -217,6 +256,10 @@ for the metric. Marks the interface .Pa resolv.conf as private. +.It Va IF_EXCLUSIVE +Marks the interface +.Pa resolv.conf +as exclusive. .El .Sh FILES .Bl -ohang Index: src/external/bsd/openresolv/dist/resolvconf.conf.5.in diff -u src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.11 src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.12 --- src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.11 Tue Oct 28 22:39:25 2014 +++ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Fri May 1 18:23:11 2015 @@ -1,4 +1,4 @@ -.\ Copyright (c) 2009-2014 Roy Marples +.\ Copyright (c) 2009-2015 Roy Marples .\ All rights reserved .\ .\ Redistribution and use in source and binary forms, with or without @@ -22,8 +22,8 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd October 28, 2014 -.Dt RESOLVCONF.CONF 5 SMM +.Dd March 20, 2015 +.Dt RESOLVCONF.CONF 5 .Os .Sh NAME .Nm resolvconf.conf @@ -49,7 +49,7 @@ After updating this file, you may wish t
CVS commit: src/doc
Module Name:src Committed By: roy Date: Fri May 1 18:26:58 UTC 2015 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note import of openresolv-3.7.0 To generate a diff of this commit: cvs rdiff -u -r1.1222 -r1.1223 src/doc/3RDPARTY cvs rdiff -u -r1.2072 -r1.2073 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/3RDPARTY diff -u src/doc/3RDPARTY:1.1222 src/doc/3RDPARTY:1.1223 --- src/doc/3RDPARTY:1.1222 Tue Apr 28 17:01:40 2015 +++ src/doc/3RDPARTY Fri May 1 18:26:58 2015 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1222 2015/04/28 17:01:40 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1223 2015/05/01 18:26:58 roy Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -971,8 +971,8 @@ Location: external/bsd/openpam/dist Notes: Package: openresolv -Version: 3.6.1 -Current Vers: 3.6.1 +Version: 3.7.0 +Current Vers: 3.7.0 Maintainer: roy Archive Site: ftp://roy.marples.name/pub/openresolv/ Home Page: http://roy.marples.name/projects/openresolv/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2072 src/doc/CHANGES:1.2073 --- src/doc/CHANGES:1.2072 Tue Apr 28 17:01:40 2015 +++ src/doc/CHANGES Fri May 1 18:26:58 2015 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2072 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2073 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -155,3 +155,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: Enable DMA for sdhc0 and sdhc1 on BEAGLEBONE [bouyer 20150414] xz(1): Import of XZ 5.2.1. [christos 20150417] libc: Update to tzcode2015d. [christos 20150428] + openresolv(8): Import openresolv-3.7.0 [roy 20150501]
CVS import: src/external/bsd/openresolv/dist
Module Name:src Committed By: roy Date: Fri May 1 18:21:18 UTC 2015 Update of /cvsroot/src/external/bsd/openresolv/dist In directory ivanova.netbsd.org:/tmp/cvs-serv29775 Log Message: Import openresolv-3.7.0 with the following change: * -x marks the resolv.conf as exclusive. Only the latest resolv.conf will be processed, if none then as normal. Status: Vendor Tag: roy Release Tags: openresolv-3-7-0 U src/external/bsd/openresolv/dist/README U src/external/bsd/openresolv/dist/resolvconf.in C src/external/bsd/openresolv/dist/resolvconf.8.in C src/external/bsd/openresolv/dist/resolvconf.conf.5.in U src/external/bsd/openresolv/dist/libc.in U src/external/bsd/openresolv/dist/dnsmasq.in U src/external/bsd/openresolv/dist/named.in U src/external/bsd/openresolv/dist/pdnsd.in U src/external/bsd/openresolv/dist/unbound.in 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jroy:yesterday -jroy src/external/bsd/openresolv/dist
CVS commit: src/external/bsd/openresolv/dist
Module Name:src Committed By: roy Date: Fri May 1 18:23:11 UTC 2015 Modified Files: src/external/bsd/openresolv/dist: resolvconf.8.in resolvconf.conf.5.in Log Message: Sync To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openresolv/dist/resolvconf.8.in cvs rdiff -u -r1.11 -r1.12 \ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: src/external/bsd/openresolv/dist
Module Name:src Committed By: roy Date: Fri May 1 18:21:18 UTC 2015 Update of /cvsroot/src/external/bsd/openresolv/dist In directory ivanova.netbsd.org:/tmp/cvs-serv29775 Log Message: Import openresolv-3.7.0 with the following change: * -x marks the resolv.conf as exclusive. Only the latest resolv.conf will be processed, if none then as normal. Status: Vendor Tag: roy Release Tags: openresolv-3-7-0 U src/external/bsd/openresolv/dist/README U src/external/bsd/openresolv/dist/resolvconf.in C src/external/bsd/openresolv/dist/resolvconf.8.in C src/external/bsd/openresolv/dist/resolvconf.conf.5.in U src/external/bsd/openresolv/dist/libc.in U src/external/bsd/openresolv/dist/dnsmasq.in U src/external/bsd/openresolv/dist/named.in U src/external/bsd/openresolv/dist/pdnsd.in U src/external/bsd/openresolv/dist/unbound.in 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jroy:yesterday -jroy src/external/bsd/openresolv/dist
CVS commit: src/doc
Module Name:src Committed By: roy Date: Fri May 1 18:26:58 UTC 2015 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note import of openresolv-3.7.0 To generate a diff of this commit: cvs rdiff -u -r1.1222 -r1.1223 src/doc/3RDPARTY cvs rdiff -u -r1.2072 -r1.2073 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mips/include
Module Name:src Committed By: christos Date: Fri May 1 18:37:40 UTC 2015 Modified Files: src/sys/arch/mips/include: locore.h Log Message: change #error to KASSERT To generate a diff of this commit: cvs rdiff -u -r1.95 -r1.96 src/sys/arch/mips/include/locore.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mips/include
Module Name:src Committed By: christos Date: Fri May 1 18:37:40 UTC 2015 Modified Files: src/sys/arch/mips/include: locore.h Log Message: change #error to KASSERT To generate a diff of this commit: cvs rdiff -u -r1.95 -r1.96 src/sys/arch/mips/include/locore.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/arch/mips/include/locore.h diff -u src/sys/arch/mips/include/locore.h:1.95 src/sys/arch/mips/include/locore.h:1.96 --- src/sys/arch/mips/include/locore.h:1.95 Wed Apr 29 04:32:00 2015 +++ src/sys/arch/mips/include/locore.h Fri May 1 14:37:40 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.h,v 1.95 2015/04/29 08:32:00 hikaru Exp $ */ +/* $NetBSD: locore.h,v 1.96 2015/05/01 18:37:40 christos Exp $ */ /* * This file should not be included by MI code!!! @@ -332,7 +332,7 @@ mips64_ld_a64(uint64_t addr) #elif defined(_LP64) rv = *(volatile uint64_t *)addr; #else -#error unknown ABI + KASSERT(0); // LKM, STANDALONE, MODULE #endif return (rv); } @@ -345,7 +345,7 @@ mips64_sd_a64(uint64_t addr, uint64_t va #elif defined(_LP64) *(volatile uint64_t *)addr = val; #else -#error unknown ABI + KASSERT(0); // LKM, STANDALONE, MODULE #endif } #endif /* (MIPS64 + MIPS64R2) 0 */
Re: CVS commit: src/sys/dev/pci
On 2015/05/01 1:09, SAITOH Masanobu wrote: Module Name:src Committed By: msaitoh Date: Thu Apr 30 16:09:06 UTC 2015 Modified Files: src/sys/dev/pci: if_bge.c if_bgereg.h Log Message: Use another firmware command in bge_asf_driver_up(). This change fixes a bug that watchdog timeout occurs every 20-30 minutes on HP ML110 G6 reported enami@ in PR#49657. The value of this command is the same as Linux. I've cvs admin-ed now. To generate a diff of this commit: cvs rdiff -u -r1.284 -r1.285 src/sys/dev/pci/if_bge.c cvs rdiff -u -r1.89 -r1.90 src/sys/dev/pci/if_bgereg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. -- --- SAITOH Masanobu (msai...@execsw.org msai...@netbsd.org)
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Fri May 1 08:06:00 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Ticket #727 To generate a diff of this commit: cvs rdiff -u -r1.1.2.275 -r1.1.2.276 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/rpi
Module Name:src Committed By: skrll Date: Fri May 1 09:59:11 UTC 2015 Modified Files: src/sys/arch/evbarm/rpi: rpi_machdep.c Log Message: Disable non-boot CPUs on RPI2 - there are still issues with interrupt handling. To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 src/sys/arch/evbarm/rpi/rpi_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/rpi
Module Name:src Committed By: skrll Date: Fri May 1 09:59:11 UTC 2015 Modified Files: src/sys/arch/evbarm/rpi: rpi_machdep.c Log Message: Disable non-boot CPUs on RPI2 - there are still issues with interrupt handling. To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 src/sys/arch/evbarm/rpi/rpi_machdep.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/evbarm/rpi/rpi_machdep.c diff -u src/sys/arch/evbarm/rpi/rpi_machdep.c:1.61 src/sys/arch/evbarm/rpi/rpi_machdep.c:1.62 --- src/sys/arch/evbarm/rpi/rpi_machdep.c:1.61 Sun Apr 12 17:32:39 2015 +++ src/sys/arch/evbarm/rpi/rpi_machdep.c Fri May 1 09:59:11 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: rpi_machdep.c,v 1.61 2015/04/12 17:32:39 skrll Exp $ */ +/* $NetBSD: rpi_machdep.c,v 1.62 2015/05/01 09:59:11 skrll Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rpi_machdep.c,v 1.61 2015/04/12 17:32:39 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: rpi_machdep.c,v 1.62 2015/05/01 09:59:11 skrll Exp $); #include opt_arm_debug.h #include opt_bcm283x.h @@ -534,6 +534,11 @@ rpi_bootstrap(void) __func__, i); } } + + /* + * XXXNH: Disable non-boot CPUs for now + */ + arm_cpu_hatched = 0; #endif }
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Fri May 1 08:06:00 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Ticket #727 To generate a diff of this commit: cvs rdiff -u -r1.1.2.275 -r1.1.2.276 src/doc/CHANGES-7.0 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-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.275 src/doc/CHANGES-7.0:1.1.2.276 --- src/doc/CHANGES-7.0:1.1.2.275 Thu Apr 30 19:43:53 2015 +++ src/doc/CHANGES-7.0 Fri May 1 08:06:00 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.275 2015/04/30 19:43:53 snj Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.276 2015/05/01 08:06:00 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -22756,3 +22756,9 @@ external/bsd/blacklist/bin/blacklistd.co blacklistd and friends will actually be in NetBSD 7. [riz, ticket #726] +usr.bin/calendar/calendars/calendar.usholiday 1.5 + + Update for 2015 dates. + [snj, ticket #727] + +
CVS commit: [netbsd-7] src/usr.bin/calendar/calendars
Module Name:src Committed By: martin Date: Fri May 1 08:03:36 UTC 2015 Modified Files: src/usr.bin/calendar/calendars [netbsd-7]: calendar.usholiday Log Message: Pull up following revision(s) (requested by snj in ticket #727): usr.bin/calendar/calendars/calendar.usholiday: revision 1.5 Update for 2015 dates. From Jeff Woodall in PR misc/49587, with a typo fixed in Election Day (and the even years bit removed). To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.10.1 \ src/usr.bin/calendar/calendars/calendar.usholiday Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/calendar/calendars/calendar.usholiday diff -u src/usr.bin/calendar/calendars/calendar.usholiday:1.4 src/usr.bin/calendar/calendars/calendar.usholiday:1.4.10.1 --- src/usr.bin/calendar/calendars/calendar.usholiday:1.4 Sat May 5 01:29:56 2012 +++ src/usr.bin/calendar/calendars/calendar.usholiday Fri May 1 08:03:35 2015 @@ -1,31 +1,33 @@ 01/01 New Year's Day 01/14 Julian Calendar New Year's Day +01/19* Martin Luther King Day (3rd Monday of January) 02/02 Groundhog Day 02/14 St. Valentine's Day -02/18* President's Day (3rd Monday of February) +02/16* President's Day (3rd Monday of February) 03/05 Mother-in-Law Day +03/08* Daylight Savings Time begins; clocks move forward (2nd Sunday of March) 03/17 St. Patrick's Day 03/20* Vernal Equinox 04/01 April Fool's Day 04/15 Income Tax Day -03/10* Daylight Savings Time begins; clocks move forward (2nd Sunday of March) -04/28* Arbor Day (varies from state to state) -05/12* Mother's Day (2nd Sunday of May) -05/18* Armed Forces Day (3rd Saturday of May) -05/27* Memorial Day (Last Monday of May) -06/16* Father's Day (3rd Sunday of June) +04/22 Earth Day +04/24* Arbor Day (varies from state to state) +05/10* Mother's Day (2nd Sunday of May) +05/16* Armed Forces Day (3rd Saturday of May) +05/25* Memorial Day (Last Monday of May) +06/21* Father's Day (3rd Sunday of June) 06/21* Summer Solstice 07/04 Independence Day -09/02* Labor Day (1st Monday of September) -09/08* Grandparent's Day (2nd Sunday of September; varies from state to state) -09/22* Autumnal Equinox -10/14* Columbus Day (2nd Monday of October) -11/03* Daylight Savings Time ends; clocks move back (First Sunday in November) +09/07* Labor Day (1st Monday of September) +09/13* Grandparent's Day (2nd Sunday of September; varies from state to state) +09/23* Autumnal Equinox +10/12* Columbus Day (2nd Monday of October) 10/31 All Hallows Eve (Halloween) -11/04* Election Day (1st Tuesday after 1st Monday for even years) +11/01* Daylight Savings Time ends; clocks move back (First Sunday in November) +11/03* Election Day (1st Tuesday after 1st Monday) 11/11 Veterans' Day -11/28* Thanksgiving Day (Fourth Thursday in November) -12/21* Winter Solstice +11/26* Thanksgiving Day (Fourth Thursday in November) +12/22* Winter Solstice 12/24 Christmas Eve 12/25 Christmas 12/31 New Year's Eve
CVS commit: [netbsd-7] src/usr.bin/calendar/calendars
Module Name:src Committed By: martin Date: Fri May 1 08:03:36 UTC 2015 Modified Files: src/usr.bin/calendar/calendars [netbsd-7]: calendar.usholiday Log Message: Pull up following revision(s) (requested by snj in ticket #727): usr.bin/calendar/calendars/calendar.usholiday: revision 1.5 Update for 2015 dates. From Jeff Woodall in PR misc/49587, with a typo fixed in Election Day (and the even years bit removed). To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.10.1 \ src/usr.bin/calendar/calendars/calendar.usholiday Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: matt Date: Fri May 1 21:34:17 UTC 2015 Modified Files: src/sys/arch/evbmips/conf: files.octeon Log Message: Add md_root.c To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbmips/conf/files.octeon 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/evbmips/conf/files.octeon diff -u src/sys/arch/evbmips/conf/files.octeon:1.1 src/sys/arch/evbmips/conf/files.octeon:1.2 --- src/sys/arch/evbmips/conf/files.octeon:1.1 Wed Apr 29 08:32:00 2015 +++ src/sys/arch/evbmips/conf/files.octeon Fri May 1 21:34:17 2015 @@ -1,4 +1,4 @@ -# $NetBSD: files.octeon,v 1.1 2015/04/29 08:32:00 hikaru Exp $ +# $NetBSD: files.octeon,v 1.2 2015/05/01 21:34:17 matt Exp $ file arch/evbmips/cavium/autoconf.c file arch/evbmips/cavium/machdep.c @@ -11,3 +11,6 @@ file arch/evbmips/evbmips/interrupt.c device cpu attach cpu at mainbus file arch/evbmips/evbmips/cpu.c cpu + +# Memory Disk +file dev/md_root.cmemory_disk_hooks
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: matt Date: Fri May 1 21:34:17 UTC 2015 Modified Files: src/sys/arch/evbmips/conf: files.octeon Log Message: Add md_root.c To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbmips/conf/files.octeon Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/csu/arch/mips
Module Name:src Committed By: matt Date: Fri May 1 21:35:56 UTC 2015 Modified Files: src/lib/csu/arch/mips: crti.S Log Message: Make sure .init and .fini are word (4byte) aligned. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/csu/arch/mips/crti.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/csu/arch/mips/crti.S diff -u src/lib/csu/arch/mips/crti.S:1.2 src/lib/csu/arch/mips/crti.S:1.3 --- src/lib/csu/arch/mips/crti.S:1.2 Sun Jun 30 08:00:34 2013 +++ src/lib/csu/arch/mips/crti.S Fri May 1 21:35:56 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: crti.S,v 1.2 2013/06/30 08:00:34 matt Exp $ */ +/* $NetBSD: crti.S,v 1.3 2015/05/01 21:35:56 matt Exp $ */ /*- * Copyright (c) 2011 The NetBSD Foundation, Inc. @@ -31,11 +31,12 @@ #include mips/asm.h -RCSID($NetBSD: crti.S,v 1.2 2013/06/30 08:00:34 matt Exp $) +RCSID($NetBSD: crti.S,v 1.3 2015/05/01 21:35:56 matt Exp $) #include sysident.S .section .init, ax, @progbits + .p2align 2 NESTED_NOPROFILE(_init, CALLFRAME_SIZ, ra) SETUP_GP PTR_SUBU sp, sp, CALLFRAME_SIZ # allocate stack frame @@ -48,6 +49,7 @@ NESTED_NOPROFILE(_init, CALLFRAME_SIZ, r END(_init) .section .fini, ax, @progbits + .p2align 2 NESTED_NOPROFILE(_fini, CALLFRAME_SIZ, ra) SETUP_GP PTR_SUBU sp, sp, CALLFRAME_SIZ # allocate stack frame
CVS commit: src/lib/csu/arch/mips
Module Name:src Committed By: matt Date: Fri May 1 21:35:56 UTC 2015 Modified Files: src/lib/csu/arch/mips: crti.S Log Message: Make sure .init and .fini are word (4byte) aligned. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/csu/arch/mips/crti.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev
Module Name:src Committed By: mlelstv Date: Fri May 1 12:30:28 UTC 2015 Modified Files: src/sys/dev: dksubr.c Log Message: correctly return -1 on error in dk_size To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/sys/dev/dksubr.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/dksubr.c diff -u src/sys/dev/dksubr.c:1.58 src/sys/dev/dksubr.c:1.59 --- src/sys/dev/dksubr.c:1.58 Wed Dec 31 19:52:05 2014 +++ src/sys/dev/dksubr.c Fri May 1 12:30:28 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: dksubr.c,v 1.58 2014/12/31 19:52:05 christos Exp $ */ +/* $NetBSD: dksubr.c,v 1.59 2015/05/01 12:30:28 mlelstv Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 1999, 2002, 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: dksubr.c,v 1.58 2014/12/31 19:52:05 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: dksubr.c,v 1.59 2015/05/01 12:30:28 mlelstv Exp $); #include sys/param.h #include sys/systm.h @@ -275,7 +275,7 @@ dk_size(struct dk_intf *di, struct dk_so (lp-d_secsize / DEV_BSIZE); if (!is_open di-di_close(dev, 0, S_IFBLK, curlwp)) - return 1; + return -1; return size; }
CVS commit: src/sys/dev
Module Name:src Committed By: mlelstv Date: Fri May 1 12:30:28 UTC 2015 Modified Files: src/sys/dev: dksubr.c Log Message: correctly return -1 on error in dk_size To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/sys/dev/dksubr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/dev/bluetooth
Le 30/04/2015 16:07, Christos Zoulas a écrit : On Apr 30, 8:57am, m...@m00nbsd.net (Maxime Villard) wrote: -- Subject: Re: CVS commit: src/sys/dev/bluetooth How about helping investigate what's wrong with: /* Check the size of cylinder groups */ fs_cgsize = ffs_fragroundup(fs, CGSIZE(fs)); if (fs-fs_cgsize != fs_cgsize) return 0; christos Yes, ffs_oldfscompat_read() should theoretically be called before ffs_superblock_validate(), otherwise, several fields being overwritten, you either end up with unsanitized values or your disk gets kicked out. It's true for almost all the changes I have made so far, and it is true for this one too: fs_qfmask is overwritten for FS_44INODEFMT compat. But given how broken it was (and is still a bit), how untested the whole FFS code was, and given the glamorous XXX in ffs_oldfscompat_read, I didn't touch this.
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: gson
Date: Fri May 1 13:48:05 UTC 2015
Modified Files:
src/usr.sbin/sysinst: msg.mi.en
Log Message:
Shorten the message System configuration files (/etc) to just
Configuration files (/etc) so that it doesn't overflow into the
Selected column, overwriting the Yes or No so that there is
no way to know if the set is selected or not.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/sysinst/msg.mi.en
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/msg.mi.en
diff -u src/usr.sbin/sysinst/msg.mi.en:1.8 src/usr.sbin/sysinst/msg.mi.en:1.9
--- src/usr.sbin/sysinst/msg.mi.en:1.8 Thu Apr 30 06:37:26 2015
+++ src/usr.sbin/sysinst/msg.mi.en Fri May 1 13:48:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.en,v 1.8 2015/04/30 06:37:26 snj Exp $ */
+/* $NetBSD: msg.mi.en,v 1.9 2015/05/01 13:48:05 gson Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -712,7 +712,7 @@ message set_base
{Base}
message set_system
-{System configuration files (/etc)}
+{Configuration files (/etc)}
message set_compiler
{Compiler tools}
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: gson Date: Fri May 1 13:48:05 UTC 2015 Modified Files: src/usr.sbin/sysinst: msg.mi.en Log Message: Shorten the message System configuration files (/etc) to just Configuration files (/etc) so that it doesn't overflow into the Selected column, overwriting the Yes or No so that there is no way to know if the set is selected or not. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/sysinst/msg.mi.en Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
