CVS commit: src/doc
Module Name:src Committed By: wiz Date: Wed Sep 19 06:54:04 UTC 2012 Modified Files: src/doc: 3RDPARTY Log Message: less-451 out. To generate a diff of this commit: cvs rdiff -u -r1.966 -r1.967 src/doc/3RDPARTY 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.966 src/doc/3RDPARTY:1.967 --- src/doc/3RDPARTY:1.966 Mon Sep 3 10:31:51 2012 +++ src/doc/3RDPARTY Wed Sep 19 06:54:04 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.966 2012/09/03 10:31:51 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.967 2012/09/19 06:54:04 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -571,7 +571,7 @@ among KAME/*BSD, *BSD-current and recent Package: less Version: less-444 -Current Vers: less-444 +Current Vers: less-451 Maintainer: Mark Nudelman ma...@greenwoodsoftware.com Archive Site: http://www.greenwoodsoftware.com/less/download.html Home Page: http://www.greenwoodsoftware.com/less/
CVS commit: src/sys/arch/sparc64/dev
Module Name:src Committed By: jdc Date: Wed Sep 19 06:55:25 UTC 2012 Modified Files: src/sys/arch/sparc64/dev: ebus.c Log Message: Match the Altera ebus bridge, as found on the Tadpole SPARCle. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/sys/arch/sparc64/dev/ebus.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/sparc64/dev/ebus.c diff -u src/sys/arch/sparc64/dev/ebus.c:1.60 src/sys/arch/sparc64/dev/ebus.c:1.61 --- src/sys/arch/sparc64/dev/ebus.c:1.60 Mon Jan 30 04:25:15 2012 +++ src/sys/arch/sparc64/dev/ebus.c Wed Sep 19 06:55:25 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: ebus.c,v 1.60 2012/01/30 04:25:15 mrg Exp $ */ +/* $NetBSD: ebus.c,v 1.61 2012/09/19 06:55:25 jdc Exp $ */ /* * Copyright (c) 1999, 2000, 2001 Matthew R. Green @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ebus.c,v 1.60 2012/01/30 04:25:15 mrg Exp $); +__KERNEL_RCSID(0, $NetBSD: ebus.c,v 1.61 2012/09/19 06:55:25 jdc Exp $); #include opt_ddb.h @@ -123,6 +123,12 @@ ebus_match(device_t parent, cfdata_t mat return (1); } + /* Or the Altera bridge on SPARCle */ + if (PCI_VENDOR(pa-pa_id) == PCI_VENDOR_ALTERA + PCI_PRODUCT(pa-pa_id) == 0 + strcmp(name, ebus) == 0) + return (1); + return (0); }
CVS commit: src/sys/arch/arm/imx
Module Name:src
Committed By: bsh
Date: Wed Sep 19 07:28:39 UTC 2012
Modified Files:
src/sys/arch/arm/imx: imx51_ccm.c
Log Message:
make Netwalker kernel compile again.
from Kenichi Hashimoto.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/imx/imx51_ccm.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/arm/imx/imx51_ccm.c
diff -u src/sys/arch/arm/imx/imx51_ccm.c:1.2 src/sys/arch/arm/imx/imx51_ccm.c:1.3
--- src/sys/arch/arm/imx/imx51_ccm.c:1.2 Sat Sep 1 00:07:32 2012
+++ src/sys/arch/arm/imx/imx51_ccm.c Wed Sep 19 07:28:38 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: imx51_ccm.c,v 1.2 2012/09/01 00:07:32 matt Exp $ */
+/* $NetBSD: imx51_ccm.c,v 1.3 2012/09/19 07:28:38 bsh Exp $ */
/*
* Copyright (c) 2010, 2011, 2012 Genetec Corporation. All rights reserved.
* Written by Hashimoto Kenichi for Genetec Corporation.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: imx51_ccm.c,v 1.2 2012/09/01 00:07:32 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: imx51_ccm.c,v 1.3 2012/09/19 07:28:38 bsh Exp $);
#include sys/types.h
#include sys/time.h
@@ -141,7 +141,7 @@ imx51_get_clock(enum imx51_clock clk)
bus_space_tag_t iot = ccm_softc-sc_iot;
bus_space_handle_t ioh = ccm_softc-sc_ioh;
- u_int freq;
+ u_int freq = 0;
u_int sel;
uint32_t cacrr; /* ARM clock root register */
uint32_t ccsr;
@@ -164,17 +164,17 @@ imx51_get_clock(enum imx51_clock clk)
/* FALLTHROUGH */
case IMX51CLK_PLL1STEP:
ccsr = bus_space_read_4(iot, ioh, CCMC_CCSR);
- switch (__SHIFTOUT(ccsr, CCSR_STEP_SEL)) {
+ switch (__SHIFTOUT(ccsr, CCSR_STEP_SEL_MASK)) {
case 0:
return imx51_get_clock(IMX51CLK_LP_APM);
case 1:
return 0; /* XXX PLL bypass clock */
case 2:
return ccm_softc-sc_pll[2-1].pll_freq /
- (1 + __SHIFTOUT(ccsr, CCSR_PLL2_DIV_PODF));
+ (1 + __SHIFTOUT(ccsr, CCSR_PLL2_DIV_PODF_MASK));
case 3:
return ccm_softc-sc_pll[3-1].pll_freq /
- (1 + __SHIFTOUT(ccsr CCSR_PLL3_DIV_PODF))
+ (1 + __SHIFTOUT(ccsr, CCSR_PLL3_DIV_PODF_MASK));
}
/*NOTREACHED*/
case IMX51CLK_PLL2SW:
@@ -204,9 +204,8 @@ imx51_get_clock(enum imx51_clock clk)
if ((cbcdr CBCDR_PERIPH_CLK_SEL) == 0)
freq = imx51_get_clock(IMX51CLK_PLL2SW);
else {
- freq = 0;
cbcmr = bus_space_read_4(iot, ioh, CCMC_CBCMR);
- switch (__SHIFTOUT(cbcmr, CBCMR_PERIPH_APM_SEL)) {
+ switch (__SHIFTOUT(cbcmr, CBCMR_PERIPH_APM_SEL_MASK)) {
case 0:
freq = imx51_get_clock(IMX51CLK_PLL1SW);
break;
@@ -225,16 +224,15 @@ imx51_get_clock(enum imx51_clock clk)
case IMX51CLK_MAIN_BUS_CLK:
freq = imx51_get_clock(IMX51CLK_MAIN_BUS_CLK_SRC);
cdcr = bus_space_read_4(iot, ioh, CCMC_CDCR);
- return freq / __SHIFTOUT(cdcr, CDCR_PERIPH_CLK_DVFS_PODF);
+ return freq / __SHIFTOUT(cdcr, CDCR_PERIPH_CLK_DVFS_PODF_MASK);
case IMX51CLK_AHB_CLK_ROOT:
freq = imx51_get_clock(IMX51CLK_MAIN_BUS_CLK);
cbcdr = bus_space_read_4(iot, ioh, CCMC_CBCDR);
- return freq / (1 + __SHIFTOUT(cbcdr, CBCDR_AHB_PODF));
+ return freq / (1 + __SHIFTOUT(cbcdr, CBCDR_AHB_PODF_MASK));
case IMX51CLK_IPG_CLK_ROOT:
freq = imx51_get_clock(IMX51CLK_AHB_CLK_ROOT);
cbcdr = bus_space_read_4(iot, ioh, CCMC_CBCDR);
- return freq / (1 + __SHIFTOUT(cbcdr, CBCDR_IPG_PODF));
-
+ return freq / (1 + __SHIFTOUT(cbcdr, CBCDR_IPG_PODF_MASK));
case IMX51CLK_PERCLK_ROOT:
cbcmr = bus_space_read_4(iot, ioh, CCMC_CBCMR);
if (cbcmr CBCMR_PERCLK_IPG_SEL)
@@ -243,15 +241,16 @@ imx51_get_clock(enum imx51_clock clk)
freq = imx51_get_clock(IMX51CLK_LP_APM);
else
freq = imx51_get_clock(IMX51CLK_MAIN_BUS_CLK_SRC);
+
cbcdr = bus_space_read_4(iot, ioh, CCMC_CBCDR);
#ifdef IMXCCMDEBUG
printf(cbcmr=%x cbcdr=%x\n, cbcmr, cbcdr);
#endif
- freq /= 1 + __SHIFTOUT(cbcdr CBCDR_PERCLK_PRED1);
- freq /= 1 + __SHIFTOUT(cbcdr CBCDR_PERCLK_PRED2);
- freq /= 1 + __SHIFTOUT(cbcdr CBCDR_PERCLK_PODF);
+ freq /= 1 + __SHIFTOUT(cbcdr, CBCDR_PERCLK_PRED1_MASK);
+ freq /= 1 + __SHIFTOUT(cbcdr, CBCDR_PERCLK_PRED2_MASK);
+ freq /= 1 + __SHIFTOUT(cbcdr, CBCDR_PERCLK_PODF_MASK);
return freq;
case IMX51CLK_UART_CLK_ROOT:
cscdr1 = bus_space_read_4(iot, ioh, CCMC_CSCDR1);
@@ -261,9 +260,8 @@ imx51_get_clock(enum imx51_clock clk)
printf(cscdr1=%x cscmr1=%x\n, cscdr1, cscmr1);
#endif
- sel = __SHIFTOUT(cscmr1 CSCMR1_UART_CLK_SEL);
+ sel = __SHIFTOUT(cscmr1, CSCMR1_UART_CLK_SEL_MASK);
- freq = 0; /* shut up GCC */
switch (sel) {
case 0:
case 1:
@@ -275,12 +273,11 @@ imx51_get_clock(enum imx51_clock clk)
break;
}
- return freq / (1 + __SHIFTOUT(cscdr1. CSCDR1_UART_CLK_PRED));
- / (1 + __SHIFTOUT(cscdr1, CSCDR1_UART_CLK_PODF));
+ return freq / (1 + __SHIFTOUT(cscdr1, CSCDR1_UART_CLK_PRED_MASK)) /
+ (1 + __SHIFTOUT(cscdr1, CSCDR1_UART_CLK_PODF_MASK));
case IMX51CLK_IPU_HSP_CLK_ROOT:
- freq = 0;
cbcmr =
CVS commit: src/lib/libpthread/arch/arm
Module Name:src Committed By: matt Date: Wed Sep 19 07:57:14 UTC 2012 Modified Files: src/lib/libpthread/arch/arm: pthread_md.h Log Message: Use .inst instead of wfe/sev to shut up gas. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/lib/libpthread/arch/arm/pthread_md.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libpthread/arch/arm/pthread_md.h diff -u src/lib/libpthread/arch/arm/pthread_md.h:1.7 src/lib/libpthread/arch/arm/pthread_md.h:1.8 --- src/lib/libpthread/arch/arm/pthread_md.h:1.7 Thu Aug 16 04:49:48 2012 +++ src/lib/libpthread/arch/arm/pthread_md.h Wed Sep 19 07:57:14 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: pthread_md.h,v 1.7 2012/08/16 04:49:48 matt Exp $ */ +/* $NetBSD: pthread_md.h,v 1.8 2012/09/19 07:57:14 matt Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -49,8 +49,8 @@ pthread__sp(void) return (ret); } -#define pthread__smt_pause() __asm __volatile(wfe) -#define pthread__smt_wake() __asm __volatile(sev) +#define pthread__smt_pause() __asm __volatile(.inst 0xe320f002) /* wfe */ +#define pthread__smt_wake() __asm __volatile(.inst 0xe320f004) /* sev */ #define pthread__uc_sp(ucp) ((ucp)-uc_mcontext.__gregs[_REG_SP])
CVS commit: src/external/bsd/iscsi/dist/include
Module Name:src Committed By: martin Date: Wed Sep 19 08:42:52 UTC 2012 Modified Files: src/external/bsd/iscsi/dist/include: iscsiutil.h Log Message: Define ISCSI_HTONLL6 and ISCSI_NTOHLL6 (6 byte network byte order accessor macros) dependend on host endianess. Spotted by mhitch, unfortunately not enough to fix iscsi-target problems on sparc64. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/iscsi/dist/include/iscsiutil.h 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/iscsi/dist/include/iscsiutil.h diff -u src/external/bsd/iscsi/dist/include/iscsiutil.h:1.4 src/external/bsd/iscsi/dist/include/iscsiutil.h:1.5 --- src/external/bsd/iscsi/dist/include/iscsiutil.h:1.4 Thu Mar 15 04:06:54 2012 +++ src/external/bsd/iscsi/dist/include/iscsiutil.h Wed Sep 19 08:42:52 2012 @@ -78,10 +78,23 @@ #include syslog.h #endif +#ifdef HAVE_SYS_BYTEORDER_H +# include sys/byteorder.h +# if defined(_BIG_ENDIAN) !defined(_LITTLE_ENDIAN) +#undef _BIG_ENDIAN +#define _BIG_ENDIAN 4321 +#define _BYTE_ORDER _BIG_ENDIAN +# elif defined(_LITTLE_ENDIAN) !defined(_BIG_ENDIAN) +#undef _LITTLE_ENDIAN +#define _LITTLE_ENDIAN 1234 +#define _BYTE_ORDER _LITTLE_ENDIAN +# endif +#endif + /* * */ - +#if _BYTE_ORDER == 1234 #define ISCSI_HTONLL6(x) (uint64_t) \ ( ((uint64_t)( ((uint64_t)(x) (uint64_t)0xff00uLL) 40)) \ | ((uint64_t)( ((uint64_t)(x) (uint64_t)0x00ffuLL) 24)) \ @@ -97,6 +110,10 @@ | ((uint64_t)( ((uint64_t)(x) (uint64_t)0x00ffuLL) 8)) \ | ((uint64_t)( ((uint64_t)(x) (uint64_t)0xff00uLL) 24)) \ | ((uint64_t)( ((uint64_t)(x) (uint64_t)0x00ffuLL) 40))) +#else +#define ISCSI_HTONLL6(x) ((uint64_t)(x)0xuLL) +#define ISCSI_NTOHLL6(x) ((uint64_t)(x)0xuLL) +#endif /* * Debugging Levels
CVS commit: src/tests/lib/libcurses/slave
Module Name:src
Committed By: blymn
Date: Wed Sep 19 11:51:08 UTC 2012
Modified Files:
src/tests/lib/libcurses/slave: curses_commands.c
Log Message:
* Fix mvscanw return
* Fix the *vline family of calls, one argument is chtype not int
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/lib/libcurses/slave/curses_commands.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libcurses/slave/curses_commands.c
diff -u src/tests/lib/libcurses/slave/curses_commands.c:1.6 src/tests/lib/libcurses/slave/curses_commands.c:1.7
--- src/tests/lib/libcurses/slave/curses_commands.c:1.6 Thu Sep 15 11:46:19 2011
+++ src/tests/lib/libcurses/slave/curses_commands.c Wed Sep 19 11:51:08 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: curses_commands.c,v 1.6 2011/09/15 11:46:19 blymn Exp $ */
+/* $NetBSD: curses_commands.c,v 1.7 2012/09/19 11:51:08 blymn Exp $ */
/*-
* Copyright 2009 Brett Lymn bl...@netbsd.org
@@ -3005,7 +3005,8 @@ cmd_mvderwin(int nargs, char **args)
void
cmd_mvhline(int nargs, char **args)
{
- int y, x, ch, n;
+ int y, x, n;
+ chtype *ch;
if (check_arg_count(nargs, 4) == 1)
return;
@@ -3022,11 +3023,7 @@ cmd_mvhline(int nargs, char **args)
return;
}
- if (sscanf(args[2], %d, ch) == 0) {
- report_count(1);
- report_error(BAD ARGUMENT);
- return;
- }
+ ch = (chtype *) args[2];
if (sscanf(args[3], %d, n) == 0) {
report_count(1);
@@ -3035,7 +3032,7 @@ cmd_mvhline(int nargs, char **args)
}
report_count(1);
- report_return(mvhline(y, x, ch, n));
+ report_return(mvhline(y, x, ch[0], n));
}
@@ -3087,7 +3084,7 @@ cmd_mvscanw(int nargs, char **args)
/* XXX - call2 */
report_count(2);
- report_int(mvscanw(y, x, args[2], string));
+ report_return(mvscanw(y, x, args[2], string));
report_status(string);
}
@@ -3095,7 +3092,8 @@ cmd_mvscanw(int nargs, char **args)
void
cmd_mvvline(int nargs, char **args)
{
- int y, x, ch, n;
+ int y, x, n;
+ chtype *ch;
if (check_arg_count(nargs, 4) == 1)
return;
@@ -3112,11 +3110,7 @@ cmd_mvvline(int nargs, char **args)
return;
}
- if (sscanf(args[2], %d, ch) == 0) {
- report_count(1);
- report_error(BAD ARGUMENT);
- return;
- }
+ ch = (chtype *) args[2];
if (sscanf(args[3], %d, n) == 0) {
report_count(1);
@@ -3125,7 +3119,7 @@ cmd_mvvline(int nargs, char **args)
}
report_count(1);
- report_return(mvvline(y, x, ch, n));
+ report_return(mvvline(y, x, ch[0], n));
}
@@ -3176,8 +3170,9 @@ cmd_mvwhline(int nargs, char **args)
void
cmd_mvwvline(int nargs, char **args)
{
- int y, x, ch, n;
+ int y, x, n;
WINDOW *win;
+ chtype *ch;
if (check_arg_count(nargs, 5) == 1)
return;
@@ -3200,11 +3195,7 @@ cmd_mvwvline(int nargs, char **args)
return;
}
- if (sscanf(args[3], %d, ch) == 0) {
- report_count(1);
- report_error(BAD ARGUMENT);
- return;
- }
+ ch = (chtype *) args[3];
if (sscanf(args[4], %d, n) == 0) {
report_count(1);
@@ -3213,7 +3204,7 @@ cmd_mvwvline(int nargs, char **args)
}
report_count(1);
- report_return(mvwvline(win, y, x, ch, n));
+ report_return(mvwvline(win, y, x, ch[0], n));
}
@@ -4421,16 +4412,13 @@ cmd_use_default_colors(int nargs, char *
void
cmd_vline(int nargs, char **args)
{
- int ch, count;
+ int count;
+ chtype *ch;
if (check_arg_count(nargs, 2) == 1)
return;
- if (sscanf(args[0], %d, ch) == 0) {
- report_count(1);
- report_error(BAD ARGUMENT);
- return;
- }
+ ch = (chtype *) args[0];
if (sscanf(args[1], %d, count) == 0) {
report_count(1);
@@ -4439,7 +4427,7 @@ cmd_vline(int nargs, char **args)
}
report_count(1);
- report_return(vline(ch, count));
+ report_return(vline(ch[0], count));
}
@@ -5762,7 +5750,8 @@ void
cmd_wvline(int nargs, char **args)
{
WINDOW *win;
- int ch, n;
+ int n;
+ chtype *ch;
if (check_arg_count(nargs, 3) == 1)
return;
@@ -5773,11 +5762,7 @@ cmd_wvline(int nargs, char **args)
return;
}
- if (sscanf(args[1], %d, ch) == 0) {
- report_count(1);
- report_error(BAD ARGUMENT);
- return;
- }
+ ch = (chtype *) args[1];
if (sscanf(args[2], %d, n) == 0) {
report_count(1);
@@ -5786,7 +5771,7 @@ cmd_wvline(int nargs, char **args)
}
report_count(1);
- report_return(wvline(win, ch, n));
+ report_return(wvline(win, ch[0], n));
}
CVS commit: src/tests/lib/libcurses/director
Module Name:src
Committed By: blymn
Date: Wed Sep 19 11:51:56 UTC 2012
Modified Files:
src/tests/lib/libcurses/director: testlang_parse.y
Log Message:
* Add scanw family function calls as input functions
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/tests/lib/libcurses/director/testlang_parse.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libcurses/director/testlang_parse.y
diff -u src/tests/lib/libcurses/director/testlang_parse.y:1.12 src/tests/lib/libcurses/director/testlang_parse.y:1.13
--- src/tests/lib/libcurses/director/testlang_parse.y:1.12 Thu Sep 15 16:25:17 2011
+++ src/tests/lib/libcurses/director/testlang_parse.y Wed Sep 19 11:51:56 2012
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: testlang_parse.y,v 1.12 2011/09/15 16:25:17 christos Exp $ */
+/* $NetBSD: testlang_parse.y,v 1.13 2012/09/19 11:51:56 blymn Exp $ */
/*-
* Copyright 2009 Brett Lymn bl...@netbsd.org
@@ -149,7 +149,8 @@ static void perform_delay(struct timespe
static const char *input_functions[] = {
getch, getnstr, getstr, mvgetnstr, mvgetstr, mvgetnstr,
- mvgetstr, wgetch, wgetnstr, wgetstr
+ mvgetstr, mvscanw, mvwscanw, scanw, wgetch, wgetnstr,
+ wgetstr
};
static const unsigned ninput_functions =
CVS commit: src/sys/arch/sparc64/dev
Module Name:src Committed By: jdc Date: Wed Sep 19 20:34:58 UTC 2012 Modified Files: src/sys/arch/sparc64/dev: mkclock.c Log Message: Use the PROM mapping for the clock, if it exists. Allows the clock on the Tadpole SPARCle to attach. Idea from r1.43 of OpenBSD sys/arch/sparc64/sparc64/clock.c To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sparc64/dev/mkclock.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/sparc64/dev/mkclock.c diff -u src/sys/arch/sparc64/dev/mkclock.c:1.10 src/sys/arch/sparc64/dev/mkclock.c:1.11 --- src/sys/arch/sparc64/dev/mkclock.c:1.10 Sat Aug 11 21:48:30 2012 +++ src/sys/arch/sparc64/dev/mkclock.c Wed Sep 19 20:34:57 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: mkclock.c,v 1.10 2012/08/11 21:48:30 mrg Exp $ */ +/* $NetBSD: mkclock.c,v 1.11 2012/09/19 20:34:57 jdc Exp $ */ /* * Copyright (c) 1992, 1993 @@ -55,7 +55,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mkclock.c,v 1.10 2012/08/11 21:48:30 mrg Exp $); +__KERNEL_RCSID(0, $NetBSD: mkclock.c,v 1.11 2012/09/19 20:34:57 jdc Exp $); /* * Clock driver for 'mkclock' - Mostek MK48Txx TOD clock. @@ -204,7 +204,11 @@ mkclock_ebus_attach(struct device *paren /* hard code to 8K? */ sz = ea-ea_reg[0].size; - if (bus_space_map(sc-sc_bst, + /* Use the PROM address if there. */ + if (ea-ea_nvaddr) + sparc_promaddr_to_handle(sc-sc_bst, ea-ea_vaddr[0], + sc-sc_bsh); + else if (bus_space_map(sc-sc_bst, EBUS_ADDR_FROM_REG(ea-ea_reg[0]), sz, BUS_SPACE_MAP_LINEAR,
CVS commit: src/sys/compat/linux
Module Name:src
Committed By: pooka
Date: Wed Sep 19 21:19:15 UTC 2012
Modified Files:
src/sys/compat/linux/arch/alpha: syscalls.master
src/sys/compat/linux/arch/amd64: syscalls.master
src/sys/compat/linux/arch/arm: syscalls.master
src/sys/compat/linux/arch/i386: syscalls.master
src/sys/compat/linux/arch/m68k: syscalls.master
src/sys/compat/linux/arch/mips: syscalls.master
src/sys/compat/linux/arch/powerpc: syscalls.master
src/sys/compat/linux/common: linux_misc.c
Log Message:
emulate ppoll which is essentially our pollts
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/compat/linux/arch/alpha/syscalls.master
cvs rdiff -u -r1.40 -r1.41 src/sys/compat/linux/arch/amd64/syscalls.master
cvs rdiff -u -r1.48 -r1.49 src/sys/compat/linux/arch/arm/syscalls.master
cvs rdiff -u -r1.107 -r1.108 src/sys/compat/linux/arch/i386/syscalls.master
cvs rdiff -u -r1.73 -r1.74 src/sys/compat/linux/arch/m68k/syscalls.master
cvs rdiff -u -r1.43 -r1.44 src/sys/compat/linux/arch/mips/syscalls.master
cvs rdiff -u -r1.50 -r1.51 src/sys/compat/linux/arch/powerpc/syscalls.master
cvs rdiff -u -r1.219 -r1.220 src/sys/compat/linux/common/linux_misc.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/compat/linux/arch/alpha/syscalls.master
diff -u src/sys/compat/linux/arch/alpha/syscalls.master:1.76 src/sys/compat/linux/arch/alpha/syscalls.master:1.77
--- src/sys/compat/linux/arch/alpha/syscalls.master:1.76 Fri Nov 18 04:03:50 2011
+++ src/sys/compat/linux/arch/alpha/syscalls.master Wed Sep 19 21:19:14 2012
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.76 2011/11/18 04:03:50 christos Exp $
+ $NetBSD: syscalls.master,v 1.77 2012/09/19 21:19:14 pooka Exp $
;
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -712,7 +712,9 @@
461 UNIMPL fchmodat
462 UNIMPL faccessat
463 UNIMPL pselect6
-464 UNIMPL ppoll
+464 STD { int|linux_sys||ppoll(struct pollfd *fds, int nfds, \
+ struct linux_timespec *timeout, \
+ linux_sigset_t *sigset); }
465 UNIMPL unshare
466 STD { int|linux_sys||set_robust_list( \
struct linux_robust_list_head *head, size_t len); }
Index: src/sys/compat/linux/arch/amd64/syscalls.master
diff -u src/sys/compat/linux/arch/amd64/syscalls.master:1.40 src/sys/compat/linux/arch/amd64/syscalls.master:1.41
--- src/sys/compat/linux/arch/amd64/syscalls.master:1.40 Fri Nov 18 04:03:50 2011
+++ src/sys/compat/linux/arch/amd64/syscalls.master Wed Sep 19 21:19:14 2012
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.40 2011/11/18 04:03:50 christos Exp $
+ $NetBSD: syscalls.master,v 1.41 2012/09/19 21:19:14 pooka Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -476,7 +476,9 @@
268 UNIMPL fchmodat
269 UNIMPL faccessat
270 UNIMPL pselect6
-271 UNIMPL ppoll
+271 STD { int|linux_sys||ppoll(struct pollfd *fds, int nfds, \
+ struct linux_timespec *timeout, \
+ linux_sigset_t *sigset); }
272 UNIMPL unshare
273 STD { int|linux_sys||set_robust_list( \
struct linux_robust_list_head *head, size_t len); }
Index: src/sys/compat/linux/arch/arm/syscalls.master
diff -u src/sys/compat/linux/arch/arm/syscalls.master:1.48 src/sys/compat/linux/arch/arm/syscalls.master:1.49
--- src/sys/compat/linux/arch/arm/syscalls.master:1.48 Fri Nov 18 04:03:50 2011
+++ src/sys/compat/linux/arch/arm/syscalls.master Wed Sep 19 21:19:14 2012
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.48 2011/11/18 04:03:50 christos Exp $
+ $NetBSD: syscalls.master,v 1.49 2012/09/19 21:19:14 pooka Exp $
; Derived from sys/compat/linux/arch/*/syscalls.master
; and from Linux 2.4.12 arch/arm/kernel/calls.S
@@ -517,7 +517,9 @@
333 UNIMPL fchmodat
334 UNIMPL faccessat
335 UNIMPL pselect6
-336 UNIMPL ppoll
+336 STD { int|linux_sys||ppoll(struct pollfd *fds, int nfds, \
+ struct linux_timespec *timeout, \
+ linux_sigset_t *sigset); }
337 UNIMPL unshare
338 STD { int|linux_sys||set_robust_list( \
struct linux_robust_list_head *head, size_t len); }
Index: src/sys/compat/linux/arch/i386/syscalls.master
diff -u src/sys/compat/linux/arch/i386/syscalls.master:1.107 src/sys/compat/linux/arch/i386/syscalls.master:1.108
--- src/sys/compat/linux/arch/i386/syscalls.master:1.107 Fri Nov 18 04:03:50 2011
+++ src/sys/compat/linux/arch/i386/syscalls.master Wed Sep 19 21:19:14 2012
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.107 2011/11/18 04:03:50 christos Exp $
+ $NetBSD: syscalls.master,v 1.108 2012/09/19 21:19:14 pooka Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -490,7 +490,9 @@
306 UNIMPL fchmodat
307 UNIMPL faccessat
308 UNIMPL pselect6
-309 UNIMPL ppoll
+309 STD { int|linux_sys||ppoll(struct pollfd *fds, int nfds, \
+ struct linux_timespec *timeout, \
+ linux_sigset_t *sigset); }
310 UNIMPL unshare
311 STD { int|linux_sys||set_robust_list( \
struct
CVS commit: src
Module Name:src
Committed By: bouyer
Date: Wed Sep 19 21:24:30 UTC 2012
Modified Files:
src/etc: MAKEDEV.tmpl
src/etc/etc.amd64: MAKEDEV.conf
src/etc/etc.i386: MAKEDEV.conf
src/sys/compat/linux/common: linux_ioctl.c
src/sys/conf: majors
src/sys/dev/ic: mfi.c mfireg.h mfivar.h
Added Files:
src/sys/dev/ic: mfiio.h
Log Message:
Add a pass-through ioctl for mfi(4), allowing userland to send raw commands
to the controller. This is compatible with the linux and FreeBSD
implementations.
Add the needed conversion for mfi ioctls in COMPAT_LINUX
Allocate a character major number, and create /dev/mfi0 by default
on amd64 and i386.
This allows (along with a hand-created /emul/linux/proc/devices file)
to run the MegaCLI linux binary provided by LSI.
To generate a diff of this commit:
cvs rdiff -u -r1.158 -r1.159 src/etc/MAKEDEV.tmpl
cvs rdiff -u -r1.18 -r1.19 src/etc/etc.amd64/MAKEDEV.conf
cvs rdiff -u -r1.23 -r1.24 src/etc/etc.i386/MAKEDEV.conf
cvs rdiff -u -r1.56 -r1.57 src/sys/compat/linux/common/linux_ioctl.c
cvs rdiff -u -r1.61 -r1.62 src/sys/conf/majors
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/ic/mfi.c
cvs rdiff -u -r0 -r1.1 src/sys/dev/ic/mfiio.h
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/ic/mfireg.h
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/ic/mfivar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/MAKEDEV.tmpl
diff -u src/etc/MAKEDEV.tmpl:1.158 src/etc/MAKEDEV.tmpl:1.159
--- src/etc/MAKEDEV.tmpl:1.158 Wed Sep 5 08:25:53 2012
+++ src/etc/MAKEDEV.tmpl Wed Sep 19 21:24:28 2012
@@ -1,5 +1,5 @@
#!/bin/sh -
-# $NetBSD: MAKEDEV.tmpl,v 1.158 2012/09/05 08:25:53 martin Exp $
+# $NetBSD: MAKEDEV.tmpl,v 1.159 2012/09/19 21:24:28 bouyer Exp $
#
# Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -254,6 +254,7 @@
# lockstat kernel locking statistics
# magma* Magma multiport serial/parallel cards
# midi* MIDI
+# mfi* LSI MegaRAID/MegaSAS control interface
# mlx* Mylex DAC960 control interface
# mly* Mylex AcceleRAID/eXtremeRAID control interface
# np* UNIBUS Ethernet co-processor interface, for downloading.
@@ -1557,6 +1558,11 @@ iop[0-9]*)
mkdev iop$unit c %iop_chr% $unit
;;
+mfi[0-9]*)
+ unit=${i#mfi}
+ mkdev mfi$unit c %mfi_chr% $unit
+ ;;
+
mlx[0-9]*)
unit=${i#mlx}
mkdev mlx$unit c %mlx_chr% $unit
Index: src/etc/etc.amd64/MAKEDEV.conf
diff -u src/etc/etc.amd64/MAKEDEV.conf:1.18 src/etc/etc.amd64/MAKEDEV.conf:1.19
--- src/etc/etc.amd64/MAKEDEV.conf:1.18 Sat Apr 7 17:22:10 2012
+++ src/etc/etc.amd64/MAKEDEV.conf Wed Sep 19 21:24:29 2012
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.18 2012/04/07 17:22:10 christos Exp $
+# $NetBSD: MAKEDEV.conf,v 1.19 2012/09/19 21:24:29 bouyer Exp $
# As of 2003-04-17, the init case must not create more than 890 entries.
all_md)
@@ -11,7 +11,7 @@ all_md)
makedev bpf
makedev ccd0 md0 ch0 random
makedev cgd0 cgd1
- makedev amr0 iop0 mlx0 mly0 dpti0 dpt0 twe0
+ makedev amr0 iop0 mfi0 mlx0 mly0 dpti0 dpt0 twe0
makedev raid0 raid1 raid2 raid3
makedev ld0 ld1 ld2 ld3
makedev xbd0 xbd1 xbd2 xbd3 xen
Index: src/etc/etc.i386/MAKEDEV.conf
diff -u src/etc/etc.i386/MAKEDEV.conf:1.23 src/etc/etc.i386/MAKEDEV.conf:1.24
--- src/etc/etc.i386/MAKEDEV.conf:1.23 Thu Aug 16 13:31:25 2012
+++ src/etc/etc.i386/MAKEDEV.conf Wed Sep 19 21:24:29 2012
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.23 2012/08/16 13:31:25 abs Exp $
+# $NetBSD: MAKEDEV.conf,v 1.24 2012/09/19 21:24:29 bouyer Exp $
# As of 2005-03-15, the init case must not create more than 1024 entries.
all_md)
@@ -11,7 +11,7 @@ all_md)
makedev bpf
makedev ccd0 md0 ch0 random
makedev cgd0 cgd1
- makedev amr0 iop0 mlx0 mly0 dpti0 dpt0 twe0 icp0
+ makedev amr0 iop0 mfi0 mlx0 mly0 dpti0 dpt0 twe0 icp0
makedev ed0 ed1
makedev raid0 raid1 raid2 raid3
makedev ld0 ld1 ld2 ld3
Index: src/sys/compat/linux/common/linux_ioctl.c
diff -u src/sys/compat/linux/common/linux_ioctl.c:1.56 src/sys/compat/linux/common/linux_ioctl.c:1.57
--- src/sys/compat/linux/common/linux_ioctl.c:1.56 Fri Oct 14 09:23:28 2011
+++ src/sys/compat/linux/common/linux_ioctl.c Wed Sep 19 21:24:29 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_ioctl.c,v 1.56 2011/10/14 09:23:28 hannken Exp $ */
+/* $NetBSD: linux_ioctl.c,v 1.57 2012/09/19 21:24:29 bouyer Exp $ */
/*-
* Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: linux_ioctl.c,v 1.56 2011/10/14 09:23:28 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: linux_ioctl.c,v 1.57 2012/09/19 21:24:29 bouyer Exp $);
#if defined(_KERNEL_OPT)
#include sequencer.h
@@ -63,6 +63,10 @@ __KERNEL_RCSID(0, $NetBSD: linux_ioctl.
#include compat/ossaudio/ossaudio.h
#define LINUX_TO_OSS(v) ((const void *)(v)) /* do nothing, same ioctl() encoding */
+#include dev/ic/mfiio.h
+#define LINUX_MEGARAID_CMD _LINUX_IOWR('M', 1, struct
CVS commit: src/doc
Module Name:src Committed By: bouyer Date: Wed Sep 19 21:26:17 UTC 2012 Modified Files: src/doc: CHANGES Log Message: Note mfi(4) ioctl pass-through To generate a diff of this commit: cvs rdiff -u -r1.1742 -r1.1743 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.1742 src/doc/CHANGES:1.1743 --- src/doc/CHANGES:1.1742 Mon Sep 3 10:31:51 2012 +++ src/doc/CHANGES Wed Sep 19 21:26:17 2012 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1742 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1743 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -116,3 +116,6 @@ Changes from NetBSD 6.0 to NetBSD 7.0: support for Freescale i.MX6. Add new common boot/kvminit code. [matt 20120831] dhcpcd(8): Import dhcpcd-5.6.2 [roy 20120903] + mfi(4): add a command pass-through ioctl, and associated COMPAT_LINUX + support. This allows to use the LSI MegaCLI linux binary + on a NetBSD host. [bouyer 20120919]
CVS commit: src/sys/rump/kern/lib/libsys_linux
Module Name:src
Committed By: pooka
Date: Wed Sep 19 21:45:41 UTC 2012
Added Files:
src/sys/rump/kern/lib/libsys_linux: Makefile component.c shlib_version
syscalls.conf syscalls.master
Log Message:
Add the first attempt at rump kernel support for Linux clients. This has
been lightly tested with unmodified networking applications with both
the client and server on a 64bit le host. Unlike the standard Linux
compat libs where args and syscalls are swizzled around, this compat
lib only massages the arg data types due to the assumption that syscall
numbers come from librumpclient (via librumphijack) and therefore match
the native NetBSD numbers.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/rump/kern/lib/libsys_linux/Makefile \
src/sys/rump/kern/lib/libsys_linux/component.c \
src/sys/rump/kern/lib/libsys_linux/shlib_version \
src/sys/rump/kern/lib/libsys_linux/syscalls.conf \
src/sys/rump/kern/lib/libsys_linux/syscalls.master
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/rump/kern/lib/libsys_linux/Makefile
diff -u /dev/null src/sys/rump/kern/lib/libsys_linux/Makefile:1.1
--- /dev/null Wed Sep 19 21:45:41 2012
+++ src/sys/rump/kern/lib/libsys_linux/Makefile Wed Sep 19 21:45:40 2012
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2012/09/19 21:45:40 pooka Exp $
+#
+
+.PATH: ${.CURDIR}/../../../../compat/linux/common
+
+LIB= rumpkern_sys_linux
+
+SRCS= linux_blkio.c linux_cdrom.c linux_errno.c linux_fdio.c \
+ linux_file.c linux_hdio.c linux_ioctl.c linux_ipc.c linux_misc.c\
+ linux_mtio.c linux_signal.c linux_signo.c linux_socket.c \
+ linux_sysctl.c linux_termios.c linux_time.c linux_file64.c
+
+SRCS+= rump_linux_sysent.c component.c
+
+# XXX
+CPPFLAGS+= -I${.CURDIR}
+
+.include bsd.lib.mk
+.include bsd.klinks.mk
Index: src/sys/rump/kern/lib/libsys_linux/component.c
diff -u /dev/null src/sys/rump/kern/lib/libsys_linux/component.c:1.1
--- /dev/null Wed Sep 19 21:45:41 2012
+++ src/sys/rump/kern/lib/libsys_linux/component.c Wed Sep 19 21:45:40 2012
@@ -0,0 +1,44 @@
+/* $NetBSD: component.c,v 1.1 2012/09/19 21:45:40 pooka Exp $ */
+
+#include sys/param.h
+#include sys/proc.h
+
+#include rump_private.h
+
+extern struct sysent rump_linux_sysent[];
+
+struct emul emul_rump_sys_linux = {
+ .e_name = linux-rump,
+ .e_sysent = rump_linux_sysent,
+ .e_vm_default_addr = uvm_default_mapaddr,
+#ifdef __HAVE_SYSCALL_INTERN
+ .e_syscall_intern = syscall_intern,
+#endif
+};
+
+/*
+ * XXX: the linux emulation code is not split into factions
+ */
+void rumplinux__stub(void);
+void rumplinux__stub(void) {panic(unavailable);}
+__weak_alias(rumpns_linux_machdepioctl,rumplinux__stub);
+__weak_alias(rumpns_nanosleep1,rumplinux__stub);
+__weak_alias(rumpns_vm_map_unlock,rumplinux__stub);
+__weak_alias(rumpns_compat_50_sys_settimeofday,rumplinux__stub);
+__weak_alias(rumpns_oss_ioctl_mixer,rumplinux__stub);
+__weak_alias(rumpns_linux_ioctl_sg,rumplinux__stub);
+__weak_alias(rumpns_oss_ioctl_sequencer,rumplinux__stub);
+__weak_alias(rumpns_uvm_mremap,rumplinux__stub);
+__weak_alias(rumpns_sysent,rumplinux__stub);
+__weak_alias(rumpns_sys_swapctl,rumplinux__stub);
+__weak_alias(rumpns_vm_map_lock,rumplinux__stub);
+__weak_alias(rumpns_compat_50_sys_gettimeofday,rumplinux__stub);
+__weak_alias(rumpns_rusage_to_rusage50,rumplinux__stub);
+__weak_alias(rumpns_sys_obreak,rumplinux__stub);
+__weak_alias(rumpns_do_sys_wait,rumplinux__stub);
+__weak_alias(rumpns_sys_mmap,rumplinux__stub);
+__weak_alias(rumpns_oss_ioctl_audio,rumplinux__stub);
+__weak_alias(rumpns_clock_gettime1,rumplinux__stub);
+__weak_alias(rumpns_uvm_map_lookup_entry,rumplinux__stub);
+__weak_alias(rumpns_clock_settime1,rumplinux__stub);
+__weak_alias(rumpns_clock_getres1,rumplinux__stub);
Index: src/sys/rump/kern/lib/libsys_linux/shlib_version
diff -u /dev/null src/sys/rump/kern/lib/libsys_linux/shlib_version:1.1
--- /dev/null Wed Sep 19 21:45:41 2012
+++ src/sys/rump/kern/lib/libsys_linux/shlib_version Wed Sep 19 21:45:40 2012
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2012/09/19 21:45:40 pooka Exp $
+#
+major=0
+minor=0
Index: src/sys/rump/kern/lib/libsys_linux/syscalls.conf
diff -u /dev/null src/sys/rump/kern/lib/libsys_linux/syscalls.conf:1.1
--- /dev/null Wed Sep 19 21:45:41 2012
+++ src/sys/rump/kern/lib/libsys_linux/syscalls.conf Wed Sep 19 21:45:40 2012
@@ -0,0 +1,16 @@
+# $NetBSD: syscalls.conf,v 1.1 2012/09/19 21:45:40 pooka Exp $
+#
+
+sysnames=rump_linux_syscalls.c
+sysnumhdr=/dev/null
+syssw=rump_linux_sysent.c
+sysarghdr=rump_linux_syscallargs.h
+compatopts=
+libcompatopts=
+
+switchname=rump_linux_sysent
+namesname=rump_linux_syscallnames
+constprefix=RUMP_LINUX_SYS_
+nsysent=512
+
+sys_nosys=linux_sys_nosys
Index: src/sys/rump/kern/lib/libsys_linux/syscalls.master
diff -u /dev/null src/sys/rump/kern/lib/libsys_linux/syscalls.master:1.1
--- /dev/null Wed Sep 19 21:45:41 2012
+++
CVS commit: src
Module Name:src Committed By: abs Date: Wed Sep 19 23:06:22 UTC 2012 Modified Files: src/doc: BUILDING.mdoc src/share/man/man5: mk.conf.5 Log Message: Fix inverted logic description for MKSTRIPIDENT. Noted by Snader_LB on freenode IRC To generate a diff of this commit: cvs rdiff -u -r1.89 -r1.90 src/doc/BUILDING.mdoc cvs rdiff -u -r1.61 -r1.62 src/share/man/man5/mk.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/BUILDING.mdoc diff -u src/doc/BUILDING.mdoc:1.89 src/doc/BUILDING.mdoc:1.90 --- src/doc/BUILDING.mdoc:1.89 Fri May 25 10:47:25 2012 +++ src/doc/BUILDING.mdoc Wed Sep 19 23:06:22 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: BUILDING.mdoc,v 1.89 2012/05/25 10:47:25 wiz Exp $ +.\ $NetBSD: BUILDING.mdoc,v 1.90 2012/09/19 23:06:22 abs Exp $ .\ .\ Copyright (c) 2001-2011 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -33,7 +33,7 @@ .\ Toolchain prefix for commands .ds toolprefix nb . -.Dd May 25, 2012 +.Dd September 19, 2012 .Dt BUILDING 8 .Os NetBSD . @@ -580,9 +580,9 @@ unconditionally. . .It Sy MKSTRIPIDENT .YorN -Indicates whether program binaries and shared libraries should be built -to include RCS IDs for use with -.Xr ident 1 . +Indicates whether RCS IDs, for use with +.Xr ident 1 , +should be stripped from program binaries and shared libraries. .DFLTn . .It Sy MKUNPRIVED Index: src/share/man/man5/mk.conf.5 diff -u src/share/man/man5/mk.conf.5:1.61 src/share/man/man5/mk.conf.5:1.62 --- src/share/man/man5/mk.conf.5:1.61 Sat Jul 14 17:12:27 2012 +++ src/share/man/man5/mk.conf.5 Wed Sep 19 23:06:22 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: mk.conf.5,v 1.61 2012/07/14 17:12:27 wiz Exp $ +.\ $NetBSD: mk.conf.5,v 1.62 2012/09/19 23:06:22 abs Exp $ .\ .\ Copyright (c) 1999-2003 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd July 14, 2012 +.Dd September 19, 2012 .Dt MK.CONF 5 .Os .\ turn off hyphenation @@ -641,9 +641,9 @@ will be built and installed. . .It Sy MKSTRIPIDENT .YorN -Indicates whether program binaries and shared libraries should be built -to include RCS IDs for use with -.Xr ident 1 . +Indicates whether RCS IDs, for use with +.Xr ident 1 , +should be stripped from program binaries and shared libraries. .DFLTn . .It Sy MKUNPRIVED
CVS commit: src/doc
Module Name:src
Committed By: abs
Date: Wed Sep 19 23:08:37 UTC 2012
Modified Files:
src/doc: BUILDING.mdoc
Log Message:
strip trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/doc/BUILDING.mdoc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/BUILDING.mdoc
diff -u src/doc/BUILDING.mdoc:1.90 src/doc/BUILDING.mdoc:1.91
--- src/doc/BUILDING.mdoc:1.90 Wed Sep 19 23:06:22 2012
+++ src/doc/BUILDING.mdoc Wed Sep 19 23:08:37 2012
@@ -1,4 +1,4 @@
-.\ $NetBSD: BUILDING.mdoc,v 1.90 2012/09/19 23:06:22 abs Exp $
+.\ $NetBSD: BUILDING.mdoc,v 1.91 2012/09/19 23:08:37 abs Exp $
.\
.\ Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -287,7 +287,7 @@ can be provided only in the environment
.Fl M
flag of
.Nm build.sh ;
-it cannot usefully be set inside a Makefile, including
+it cannot usefully be set inside a Makefile, including
.Pa mk.conf
or
.Sy ${MAKECONF} .
@@ -744,7 +744,7 @@ If set, then in addition to the effects
.Sy MKUPDATE=yes
above, this implies the effects of
.Sy NOCLEANDIR
-(i.e.,
+(i.e.,
.Dq make cleandir
is avoided).
.DFLTn
@@ -757,7 +757,7 @@ option.
.
.It Sy NBUILDJOBS
Now obsolete.
-Use the
+Use the
.Xr make 1
option
.Fl j ,
@@ -838,9 +838,9 @@ builds are listed here.
.It Fl j Ar njob
Run up to
.Ar njob
-.Xr make 1
+.Xr make 1
subjobs in parallel.
-Makefiles should use .WAIT or have explicit dependencies
+Makefiles should use .WAIT or have explicit dependencies
as necessary to enforce build ordering.
.
.It Fl m Ar dir
@@ -1192,7 +1192,7 @@ must be populated by
.Dq make release
or equivalent.
The build must have been performed with
-.Sy MKUNPRIVED=yes
+.Sy MKUNPRIVED=yes
because
.Dq make install-image
relies on information in
@@ -1225,7 +1225,7 @@ is attempted, RELEASEDIR must be populat
.Dq make release
or equivalent.
The build must have been performed with
-.Sy MKUNPRIVED=yes
+.Sy MKUNPRIVED=yes
because
.Dq make install-image
relies on information in
@@ -1367,7 +1367,7 @@ This command will first run
.Dq make obj
and
.Dq make cleandir
-in the
+in the
.Pa tools
subdirectory unless the
.Fl o
@@ -1501,7 +1501,7 @@ wrapper script so that the resulting nam
.
.It Fl C Ar cdextras
Append
-.Ar cdextras
+.Ar cdextras
to the
.Sy CDEXTRA
variable,
@@ -1549,16 +1549,16 @@ Print a help message.
.It Fl j Ar njob
Run up to
.Ar njob
-.Xr make 1
+.Xr make 1
subjobs in parallel;
-passed through to
+passed through to
.Xr make 1 .
If you see failures for reasons other than running out of memory
while using
.Sy build.sh
with
.Fl j ,
-please save complete build logs
+please save complete build logs
so the failures can be analyzed.
.Pp
To achieve the fastest builds,
@@ -1772,7 +1772,7 @@ Set the environment variable
.Ar var
to an optional
.Ar value .
-This is propagated to the
+This is propagated to the
.Sy \*[toolprefix]make
wrapper.
.
@@ -1806,7 +1806,7 @@ Set
.It Fl Z Ar var
Unset (zap) the environment variable
.Ar var .
-This is propagated to the
+This is propagated to the
.Sy \*[toolprefix]make
wrapper.
.
@@ -1904,7 +1904,7 @@ portion of the release build.
.Bl -tag -width NBUILDJOBS
.
.It Sy NBUILDJOBS
-Use the
+Use the
.Xr make 1
option
.Fl j
CVS commit: src/lib/libutil
Module Name:src Committed By: wiz Date: Wed Sep 19 23:22:57 UTC 2012 Modified Files: src/lib/libutil: stat_flags.3 Log Message: Fix string_to_flags prototype. From Brooks Davis in PR 46986. Bump date. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/lib/libutil/stat_flags.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libutil/stat_flags.3 diff -u src/lib/libutil/stat_flags.3:1.7 src/lib/libutil/stat_flags.3:1.8 --- src/lib/libutil/stat_flags.3:1.7 Sat Aug 6 11:28:24 2011 +++ src/lib/libutil/stat_flags.3 Wed Sep 19 23:22:56 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: stat_flags.3,v 1.7 2011/08/06 11:28:24 jruoho Exp $ +.\ $NetBSD: stat_flags.3,v 1.8 2012/09/19 23:22:56 wiz Exp $ .\ .\ Copyright (c) 1996 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd August 6, 2011 +.Dd September 20, 2012 .Dt STAT_FLAGS 3 .Os .Sh NAME @@ -41,7 +41,7 @@ .Ft char * .Fn flags_to_string u_long flags const char *def .Ft int -.Fn string_to_flags char **stringp u_long *setp u_long clrp +.Fn string_to_flags char **stringp u_long *setp u_long *clrp .Sh DESCRIPTION The .Fn flags_to_string
CVS commit: src/doc
Module Name:src Committed By: abs Date: Wed Sep 19 23:31:36 UTC 2012 Modified Files: src/doc: BUILDING.mdoc Log Message: Adjust postinstall recommendation syntax. based on comment from Snader_LB on IRC To generate a diff of this commit: cvs rdiff -u -r1.91 -r1.92 src/doc/BUILDING.mdoc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/BUILDING.mdoc diff -u src/doc/BUILDING.mdoc:1.91 src/doc/BUILDING.mdoc:1.92 --- src/doc/BUILDING.mdoc:1.91 Wed Sep 19 23:08:37 2012 +++ src/doc/BUILDING.mdoc Wed Sep 19 23:31:36 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: BUILDING.mdoc,v 1.91 2012/09/19 23:08:37 abs Exp $ +.\ $NetBSD: BUILDING.mdoc,v 1.92 2012/09/19 23:31:36 abs Exp $ .\ .\ Copyright (c) 2001-2011 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -1030,10 +1030,10 @@ After performing this operation, it is recommended that you use .Xr etcupdate 8 to update files in -.Sy INSTALLWORLDDIR Ns Pa /etc -and that you use +.Sy INSTALLWORLDDIR Ns Pa /etc , +and .Xr postinstall 8 -to check for inconsistencies (and possibly to fix them). +to check for or fix inconsistencies. .It Sy sets Create distribution sets from .Sy DESTDIR
CVS commit: src
Module Name:src Committed By: abs Date: Wed Sep 19 23:40:03 UTC 2012 Modified Files: src: BUILDING Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.101 -r1.102 src/BUILDING Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/BUILDING diff -u src/BUILDING:1.101 src/BUILDING:1.102 --- src/BUILDING:1.101 Fri May 25 13:47:30 2012 +++ src/BUILDING Wed Sep 19 23:40:03 2012 @@ -313,9 +313,9 @@ CONFIGURATION Default: ``yes'' MKSTRIPIDENT - Can be set to ``yes'' or ``no''. Indicates whether program - binaries and shared libraries should be built to include RCS - IDs for use with ident(1). + Can be set to ``yes'' or ``no''. Indicates whether RCS IDs, + for use with ident(1), should be stripped from program bina- + ries and shared libraries. Default: ``no'' @@ -557,9 +557,8 @@ BUILDING INSTALLWORLDDIR=/, it is highly recommended that you upgrade your kernel and reboot. After performing this operation, it is recommended that you use etcupdate(8) to - update files in INSTALLWORLDDIR/etc and that you use - postinstall(8) to check for inconsistencies (and possibly - to fix them). + update files in INSTALLWORLDDIR/etc, and postinstall(8) to + check for or fix inconsistencies. sets Create distribution sets from DESTDIR into RELEASEDIR/RELEASEMACHINEDIR/binary/sets. Should be run @@ -1003,4 +1002,4 @@ HISTORY The build.sh based build scheme was introduced for NetBSD 1.6 as USE_NEW_TOOLCHAIN, and re-worked to TOOLCHAIN_MISSING after that. -NetBSD May 25, 2012 NetBSD +NetBSDSeptember 19, 2012NetBSD
