CVS commit: src/sys/conf
Module Name:src Committed By: nia Date: Tue Jun 29 10:24:41 UTC 2021 Modified Files: src/sys/conf: majors.usb Log Message: mark urio/uscanner device majors obsolete To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/conf/majors.usb Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/majors.usb diff -u src/sys/conf/majors.usb:1.2 src/sys/conf/majors.usb:1.3 --- src/sys/conf/majors.usb:1.2 Mon Feb 3 13:28:11 2020 +++ src/sys/conf/majors.usb Tue Jun 29 10:24:41 2021 @@ -1,4 +1,4 @@ -# $NetBSD: majors.usb,v 1.2 2020/02/03 13:28:11 kre Exp $ +# $NetBSD: majors.usb,v 1.3 2021/06/29 10:24:41 nia Exp $ # # MI major assignments for USB devices # @@ -7,5 +7,5 @@ device-major uhid char 221 uhid device-major ulpt char 222 ulpt device-major ugen char 223 ugen device-major ucom char 224 ucom -#device-major urio char 225 urio -device-major uscanner char 226 uscanner +#device-major obsolete char 225 obsolete (urio) +#device-major obsolete char 226 obsolete (uscanner)
CVS commit: src/sys/conf
Module Name:src Committed By: simonb Date: Sat May 29 12:03:34 UTC 2021 Modified Files: src/sys/conf: files Log Message: Put the MSGBUFSIZE option in opt_param.h so that changes of its setting in kernel config files will be picked up automatically without needing a "make clean". Added to opt_param.h since ports define their default MSGBUFSIZE settings in their (or equivalent). To generate a diff of this commit: cvs rdiff -u -r1.1284 -r1.1285 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1284 src/sys/conf/files:1.1285 --- src/sys/conf/files:1.1284 Wed May 19 03:44:46 2021 +++ src/sys/conf/files Sat May 29 12:03:34 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1284 2021/05/19 03:44:46 yamaguchi Exp $ +# $NetBSD: files,v 1.1285 2021/05/29 12:03:34 simonb Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20171118 @@ -18,6 +18,7 @@ devclass bus # (note, these are case-sensitive) # defparam opt_param.h MAXUSERS +defparam opt_param.h MSGBUFSIZE defflagINSECURE defflagKTRACE defflagMBUFTRACE
CVS commit: src/sys/conf
Module Name:src
Committed By: nakayama
Date: Fri May 21 11:28:11 UTC 2021
Modified Files:
src/sys/conf: newvers_stand.mk
Log Message:
Fix previous to use the proper version file path.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/conf/newvers_stand.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/newvers_stand.mk
diff -u src/sys/conf/newvers_stand.mk:1.3 src/sys/conf/newvers_stand.mk:1.4
--- src/sys/conf/newvers_stand.mk:1.3 Mon May 17 20:10:27 2021
+++ src/sys/conf/newvers_stand.mk Fri May 21 11:28:11 2021
@@ -1,4 +1,4 @@
-# $NetBSD: newvers_stand.mk,v 1.3 2021/05/17 20:10:27 nakayama Exp $
+# $NetBSD: newvers_stand.mk,v 1.4 2021/05/21 11:28:11 nakayama Exp $
VERSIONFILE?=version
VERSIONMACHINE?=${MACHINE}
@@ -20,6 +20,6 @@ VERSIONFLAGS+=-d
vers.c: ${VERSIONFILE} ${_NETBSD_VERSION_DEPENDS}
${_MKTARGET_CREATE}
${HOST_SH} ${S}/conf/newvers_stand.sh \
- -m ${VERSIONMACHINE} ${VERSIONFLAGS} ${VERSIONFILE} ${NEWVERSWHAT}
+ -m ${VERSIONMACHINE} ${VERSIONFLAGS} ${.ALLSRC:[1]} ${NEWVERSWHAT}
.endif
CVS commit: src/sys/conf
Module Name:src
Committed By: nakayama
Date: Mon May 17 20:10:27 UTC 2021
Modified Files:
src/sys/conf: newvers_stand.mk
Log Message:
Make vers.c depend on ${_NETBSD_VERSION_DEPENDS}.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/conf/newvers_stand.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/newvers_stand.mk
diff -u src/sys/conf/newvers_stand.mk:1.2 src/sys/conf/newvers_stand.mk:1.3
--- src/sys/conf/newvers_stand.mk:1.2 Sun Apr 9 14:52:14 2017
+++ src/sys/conf/newvers_stand.mk Mon May 17 20:10:27 2021
@@ -1,4 +1,4 @@
-# $NetBSD: newvers_stand.mk,v 1.2 2017/04/09 14:52:14 christos Exp $
+# $NetBSD: newvers_stand.mk,v 1.3 2021/05/17 20:10:27 nakayama Exp $
VERSIONFILE?=version
VERSIONMACHINE?=${MACHINE}
@@ -17,9 +17,9 @@ VERSIONFLAGS+=-d
. endif
.endif
-vers.c: ${VERSIONFILE}
+vers.c: ${VERSIONFILE} ${_NETBSD_VERSION_DEPENDS}
${_MKTARGET_CREATE}
${HOST_SH} ${S}/conf/newvers_stand.sh \
- -m ${VERSIONMACHINE} ${VERSIONFLAGS} ${.ALLSRC} ${NEWVERSWHAT}
+ -m ${VERSIONMACHINE} ${VERSIONFLAGS} ${VERSIONFILE} ${NEWVERSWHAT}
.endif
CVS commit: src/sys/conf
Module Name:src
Committed By: rillig
Date: Sun May 2 20:11:43 UTC 2021
Modified Files:
src/sys/conf: lint.mk
Log Message:
sys/conf/lint.mk: fix order of command line options
The option -o must come before the first filename.
Now it is possible to lint kern_exec.c at least. The next failure is in
netbsd32_machdep.c:
netbsd32_machdep.c(395): error: illegal bit-field size: 255 [36]
That line in netbsd32_process_read_fpregs reads:
__CTASSERT(sizeof(*regs) == sizeof(struct save87));
This is probably a bug in lint. The struct save87 contains 3 uint16_t,
followed by a union containing a uint64_t, followed by a packed struct
with size 10. The combination of packed and padding is suspicious.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/conf/lint.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/lint.mk
diff -u src/sys/conf/lint.mk:1.3 src/sys/conf/lint.mk:1.4
--- src/sys/conf/lint.mk:1.3 Sun May 2 19:51:57 2021
+++ src/sys/conf/lint.mk Sun May 2 20:11:43 2021
@@ -1,4 +1,4 @@
-# $NetBSD: lint.mk,v 1.3 2021/05/02 19:51:57 rillig Exp $
+# $NetBSD: lint.mk,v 1.4 2021/05/02 20:11:43 rillig Exp $
##
## lint
@@ -9,7 +9,7 @@
ALLSFILES?= ${MD_SFILES} ${SFILES}
LINTSTUBS?= ${ALLSFILES:T:R:C/^.*$/LintStub_&.c/g}
KERNLINTFLAGS?= -bceghnxzFS
-NORMAL_LN?= ${LINT} ${KERNLINTFLAGS} ${CPPFLAGS:M-[IDU]*} -i $< -o $@
+NORMAL_LN?= ${LINT} ${KERNLINTFLAGS} ${CPPFLAGS:M-[IDU]*} -o $@ -i $<
_lsrc=${CFILES} ${LINTSTUBS} ${MI_CFILES} ${MD_CFILES}
LOBJS?= ${_lsrc:T:S/.c$/.ln/g} ${LIBKERNLN} ${SYSLIBCOMPATLN}
CVS commit: src/sys/conf
Module Name:src
Committed By: rillig
Date: Sun May 2 19:51:57 UTC 2021
Modified Files:
src/sys/conf: lint.mk
Log Message:
sys/conf/lint.mk: allow GCC extensions in the kernel
The syntax errors due to the __asm statements are now gone. The file
kern_exec.c only produces a few warnings now. But after running that
file through lint1, the main lint complains about wrong usage. This is
due to this call:
${LINT} ... -i $< -o $@
The main lint has never supported -o after the first filename, so it
complains. It would have been helpful if lint had given any hint as to
which option was invalid. Anyway, the next step is to reorder the
arguments. As it is now, the code can never have worked.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/conf/lint.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/lint.mk
diff -u src/sys/conf/lint.mk:1.2 src/sys/conf/lint.mk:1.3
--- src/sys/conf/lint.mk:1.2 Sun May 2 19:29:30 2021
+++ src/sys/conf/lint.mk Sun May 2 19:51:57 2021
@@ -1,4 +1,4 @@
-# $NetBSD: lint.mk,v 1.2 2021/05/02 19:29:30 rillig Exp $
+# $NetBSD: lint.mk,v 1.3 2021/05/02 19:51:57 rillig Exp $
##
## lint
@@ -8,7 +8,7 @@
.PATH: $S
ALLSFILES?= ${MD_SFILES} ${SFILES}
LINTSTUBS?= ${ALLSFILES:T:R:C/^.*$/LintStub_&.c/g}
-KERNLINTFLAGS?= -bcehnxzFS
+KERNLINTFLAGS?= -bceghnxzFS
NORMAL_LN?= ${LINT} ${KERNLINTFLAGS} ${CPPFLAGS:M-[IDU]*} -i $< -o $@
_lsrc=${CFILES} ${LINTSTUBS} ${MI_CFILES} ${MD_CFILES}
CVS commit: src/sys/conf
Module Name:src
Committed By: rillig
Date: Sun May 2 19:29:30 UTC 2021
Modified Files:
src/sys/conf: lint.mk
Log Message:
sys/conf/lint.mk: a small step for linting the kernel
Due to the missing path, the following commands had failed:
$ cd src/sys/arch/amd64/compile/GENERIC
$ nbmake-amd64-lint kern_exec.ln
nbmake: don't know how to make kern/kern_exec.c. Stop
After fixing the path, "make kern_exec.ln" fails with:
sys/kern/kern_exec.c(65): error: syntax error '"' [249]
The affected line contains:
__KERNEL_RCSID(0, "...");
The macro __KERNEL_RCSID expands to __asm("some strings"). Since
KERNLINTFLAGS is missing the -g, lint does not recognize __asm as
keyword and tries to parse it as an identifier instead, expecting a
variable or function declaration.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/conf/lint.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/lint.mk
diff -u src/sys/conf/lint.mk:1.1 src/sys/conf/lint.mk:1.2
--- src/sys/conf/lint.mk:1.1 Sat Aug 29 16:27:07 2015
+++ src/sys/conf/lint.mk Sun May 2 19:29:30 2021
@@ -1,10 +1,11 @@
-# $NetBSD: lint.mk,v 1.1 2015/08/29 16:27:07 uebayasi Exp $
+# $NetBSD: lint.mk,v 1.2 2021/05/02 19:29:30 rillig Exp $
##
## lint
##
.if !target(lint)
+.PATH: $S
ALLSFILES?= ${MD_SFILES} ${SFILES}
LINTSTUBS?= ${ALLSFILES:T:R:C/^.*$/LintStub_&.c/g}
KERNLINTFLAGS?= -bcehnxzFS
CVS commit: src/sys/conf
Module Name:src
Committed By: simonb
Date: Tue Apr 6 15:05:12 UTC 2021
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
Revert rev 1.278 which tried to call ctfmerge only once - this has
caused kernels with embedded symbol tables to explode in size.
To generate a diff of this commit:
cvs rdiff -u -r1.279 -r1.280 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.279 src/sys/conf/Makefile.kern.inc:1.280
--- src/sys/conf/Makefile.kern.inc:1.279 Mon Apr 5 22:52:03 2021
+++ src/sys/conf/Makefile.kern.inc Tue Apr 6 15:05:12 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.279 2021/04/05 22:52:03 christos Exp $
+# $NetBSD: Makefile.kern.inc,v 1.280 2021/04/06 15:05:12 simonb Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -210,6 +210,11 @@ _MD_OBJS= ${MD_OBJS}
SYSTEM_LIB= ${MD_LIBS} ${LIBKERN}
SYSTEM_OBJ?= ${_MD_OBJS} ${OBJS} ${SYSTEM_LIB}
SYSTEM_DEP+= Makefile ${SYSTEM_OBJ:O}
+.if defined(CTFMERGE)
+SYSTEM_CTFMERGE= ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ${SYSTEM_OBJ} ${EXTRA_OBJ} vers.o
+.else
+SYSTEM_CTFMERGE= ${_MKSHECHO}
+.endif
REMOVE_SWAP= [@]
.for k in ${KERNELS}
@@ -237,7 +242,7 @@ LINKFLAGS?= ${LINKFORMAT} ${LINKSCRIPT}
LINKFLAGS_DEBUG?= -X
SYSTEM_LD_TAIL?=@${TOOL_SED} '/const char sccs/!d;s/.*@(.)//;s/" "//;s/\\.*//' vers.c && \
- ${SIZE} $@ && chmod 755 $@
+ ${SIZE} $@ && ${SYSTEM_CTFMERGE} && chmod 755 $@
SYSTEM_LD_TAIL_DEBUG?=&& \
echo mv -f $@ $@.gdb && mv -f $@ $@.gdb && \
echo ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb && \
@@ -260,11 +265,6 @@ LINKFLAGS+= ${LINKFLAGS_NORMAL}
SYSTEM_LD_HEAD+= ${SYSTEM_LD_HEAD_EXTRA}
SYSTEM_LD_TAIL_STAGE1= ${SYSTEM_LD_TAIL}
SYSTEM_LD_TAIL_STAGE2= ${SYSTEM_LD_TAIL}
-.if defined(CTFMERGE)
-SYSTEM_LD_TAIL_STAGE2+= && echo ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ... \
- && ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} \
- ${SYSTEM_OBJ} ${EXTRA_OBJ} vers.o
-.endif
.if defined(COPY_SYMTAB)
SYSTEM_LD_TAIL_STAGE2+= && echo ${DBSYM} $@ && ${DBSYM} $@
.if !empty(DEBUG:M-g)
CVS commit: src/sys/conf
Module Name:src
Committed By: christos
Date: Mon Apr 5 22:52:03 UTC 2021
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
Don't use /usr/bin/time (it is not portable)
To generate a diff of this commit:
cvs rdiff -u -r1.278 -r1.279 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.278 src/sys/conf/Makefile.kern.inc:1.279
--- src/sys/conf/Makefile.kern.inc:1.278 Mon Apr 5 02:22:00 2021
+++ src/sys/conf/Makefile.kern.inc Mon Apr 5 18:52:03 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.278 2021/04/05 06:22:00 simonb Exp $
+# $NetBSD: Makefile.kern.inc,v 1.279 2021/04/05 22:52:03 christos Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -262,7 +262,7 @@ SYSTEM_LD_TAIL_STAGE1= ${SYSTEM_LD_TAIL}
SYSTEM_LD_TAIL_STAGE2= ${SYSTEM_LD_TAIL}
.if defined(CTFMERGE)
SYSTEM_LD_TAIL_STAGE2+= && echo ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ... \
- && time -t ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} \
+ && ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} \
${SYSTEM_OBJ} ${EXTRA_OBJ} vers.o
.endif
.if defined(COPY_SYMTAB)
CVS commit: src/sys/conf
Module Name:src
Committed By: simonb
Date: Mon Apr 5 06:22:00 UTC 2021
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
Move the ctfmerge call from SYSTEM_LD_TAIL (used by both STAGE1 and STAGE2)
to SYSTEM_LD_TAIL_STAGE2 only. ctfmerge is slow enough that just calling
it once is enough.
To generate a diff of this commit:
cvs rdiff -u -r1.277 -r1.278 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.277 src/sys/conf/Makefile.kern.inc:1.278
--- src/sys/conf/Makefile.kern.inc:1.277 Sun Jan 31 23:17:21 2021
+++ src/sys/conf/Makefile.kern.inc Mon Apr 5 06:22:00 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.277 2021/01/31 23:17:21 rillig Exp $
+# $NetBSD: Makefile.kern.inc,v 1.278 2021/04/05 06:22:00 simonb Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -210,11 +210,6 @@ _MD_OBJS= ${MD_OBJS}
SYSTEM_LIB= ${MD_LIBS} ${LIBKERN}
SYSTEM_OBJ?= ${_MD_OBJS} ${OBJS} ${SYSTEM_LIB}
SYSTEM_DEP+= Makefile ${SYSTEM_OBJ:O}
-.if defined(CTFMERGE)
-SYSTEM_CTFMERGE= ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ${SYSTEM_OBJ} ${EXTRA_OBJ} vers.o
-.else
-SYSTEM_CTFMERGE= ${_MKSHECHO}
-.endif
REMOVE_SWAP= [@]
.for k in ${KERNELS}
@@ -242,7 +237,7 @@ LINKFLAGS?= ${LINKFORMAT} ${LINKSCRIPT}
LINKFLAGS_DEBUG?= -X
SYSTEM_LD_TAIL?=@${TOOL_SED} '/const char sccs/!d;s/.*@(.)//;s/" "//;s/\\.*//' vers.c && \
- ${SIZE} $@ && ${SYSTEM_CTFMERGE} && chmod 755 $@
+ ${SIZE} $@ && chmod 755 $@
SYSTEM_LD_TAIL_DEBUG?=&& \
echo mv -f $@ $@.gdb && mv -f $@ $@.gdb && \
echo ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb && \
@@ -265,6 +260,11 @@ LINKFLAGS+= ${LINKFLAGS_NORMAL}
SYSTEM_LD_HEAD+= ${SYSTEM_LD_HEAD_EXTRA}
SYSTEM_LD_TAIL_STAGE1= ${SYSTEM_LD_TAIL}
SYSTEM_LD_TAIL_STAGE2= ${SYSTEM_LD_TAIL}
+.if defined(CTFMERGE)
+SYSTEM_LD_TAIL_STAGE2+= && echo ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ... \
+ && time -t ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} \
+ ${SYSTEM_OBJ} ${EXTRA_OBJ} vers.o
+.endif
.if defined(COPY_SYMTAB)
SYSTEM_LD_TAIL_STAGE2+= && echo ${DBSYM} $@ && ${DBSYM} $@
.if !empty(DEBUG:M-g)
CVS commit: src/sys/conf
Module Name:src Committed By: dbj Date: Sat Feb 6 16:03:31 UTC 2021 Modified Files: src/sys/conf: files Log Message: defflag USBHIST_PRINT To generate a diff of this commit: cvs rdiff -u -r1.1278 -r1.1279 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1278 src/sys/conf/files:1.1279 --- src/sys/conf/files:1.1278 Sat Jan 16 23:51:50 2021 +++ src/sys/conf/files Sat Feb 6 16:03:31 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1278 2021/01/16 23:51:50 chs Exp $ +# $NetBSD: files,v 1.1279 2021/02/06 16:03:31 dbj Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20171118 @@ -235,6 +235,7 @@ file kern/kern_history.c kernhist # # top level usb debug defines defflag opt_usb.h USB_DEBUG: KERNHIST +defflag opt_usb.h USBHIST_PRINT defparam opt_usb.h USBHIST_SIZE #
CVS commit: src/sys/conf
Module Name:src
Committed By: rillig
Date: Sun Jan 31 23:17:21 UTC 2021
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
sys/conf: remove useless dollars from Makefile.kern.inc
When parsing a variable modifier such as :C or :S, all '$' but the very
last are silently swallowed.
See usr.bin/make/unit-tests/varmod-subst.mk for details.
Since August 2020, make has a strict lint mode that is activated by
passing it the option -dL. In that mode, these redundant '$' are not
accepted anymore.
To generate a diff of this commit:
cvs rdiff -u -r1.276 -r1.277 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.276 src/sys/conf/Makefile.kern.inc:1.277
--- src/sys/conf/Makefile.kern.inc:1.276 Sun Sep 6 07:20:29 2020
+++ src/sys/conf/Makefile.kern.inc Sun Jan 31 23:17:21 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.276 2020/09/06 07:20:29 mrg Exp $
+# $NetBSD: Makefile.kern.inc,v 1.277 2021/01/31 23:17:21 rillig Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -282,7 +282,7 @@ SYSTEM_LD_TAIL_STAGE2+= ${SYSTEM_LD_TAIL
# Generate list of *.o files to pass to ${LD}, preserving order.
# x/y/z/a.[csS] -> a.[csS]
# a.[csS] -> a.o
-OBJS= ${ALLFILES:C|^.*/([^/]*\.[csS])$$|\1|:C|^(.*)\.[csS]$$|\1.o|}
+OBJS= ${ALLFILES:C|^.*/([^/]*\.[csS])$|\1|:C|^(.*)\.[csS]$|\1.o|}
CFILES= ${ALLFILES:M*.c}
SFILES= ${ALLFILES:M*.[sS]}
@@ -297,7 +297,7 @@ SSRCS= ${_MD_SFILES} ${_SFILES}
SRCS= ${CSRCS} ${SSRCS}
.else # ___USE_SUFFIX_RULES___
-OBJS= ${ALLFILES:C|\.[csS]$$|.o|}
+OBJS= ${ALLFILES:C|\.[csS]$|.o|}
SRCS= ${ALLFILES:M*.[csS]}
.endif # ___USE_SUFFIX_RULES___
CVS commit: src/sys/conf
Module Name:src Committed By: mrg Date: Fri Jan 1 08:02:16 UTC 2021 Modified Files: src/sys/conf: copyright Log Message: welcome 2021. YES. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/conf/copyright Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/copyright diff -u src/sys/conf/copyright:1.18 src/sys/conf/copyright:1.19 --- src/sys/conf/copyright:1.18 Wed Jan 1 06:14:29 2020 +++ src/sys/conf/copyright Fri Jan 1 08:02:16 2021 @@ -1,5 +1,5 @@ Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, -2018, 2019, 2020 The NetBSD Foundation, Inc. All rights reserved. +2018, 2019, 2020, 2021 The NetBSD Foundation, Inc. All rights reserved. Copyright (c) 1982, 1986, 1989, 1991, 1993 The Regents of the University of California. All rights reserved.
CVS commit: src/sys/conf
Module Name:src Committed By: roy Date: Sun Sep 27 19:08:11 UTC 2020 Modified Files: src/sys/conf: files Log Message: Wups, forgot to commit this with vether. To generate a diff of this commit: cvs rdiff -u -r1.1275 -r1.1276 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1275 src/sys/conf/files:1.1276 --- src/sys/conf/files:1.1275 Thu Aug 20 21:21:31 2020 +++ src/sys/conf/files Sun Sep 27 19:08:11 2020 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1275 2020/08/20 21:21:31 riastradh Exp $ +# $NetBSD: files,v 1.1276 2020/09/27 19:08:11 roy Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20171118 @@ -1420,6 +1420,7 @@ defpseudo pppoe: ifnet, ether, sppp defpseudo tun: ifnet defpseudo vlan: ifnet, ether defpseudo bridge: ifnet, ether +defpseudo vether: ifnet, ether defpseudo bpfilter: ifnet, bpf_filter defpseudo strip: ifnet defpseudo gre: ifnet
CVS commit: src/sys/conf
Module Name:src Committed By: riastradh Date: Fri Aug 28 14:58:25 UTC 2020 Modified Files: src/sys/conf: majors Log Message: Nix trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.95 -r1.96 src/sys/conf/majors Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/majors diff -u src/sys/conf/majors:1.95 src/sys/conf/majors:1.96 --- src/sys/conf/majors:1.95 Sun Jul 26 14:51:18 2020 +++ src/sys/conf/majors Fri Aug 28 14:58:25 2020 @@ -1,4 +1,4 @@ -# $NetBSD: majors,v 1.95 2020/07/26 14:51:18 jdolecek Exp $ +# $NetBSD: majors,v 1.96 2020/08/28 14:58:25 riastradh Exp $ # # Device majors for Machine-Independent drivers. # @@ -28,10 +28,10 @@ device-major bthub char 175 bthu device-major amr char 176 amr vector=1 device-major lockstat char 177 lockstat single device-major putterchar 178 putter -device-major srt char 179 srt +device-major srt char 179 srt device-major drm char 180 drmbase | drmkms device-major bio char 181 bio single -device-major altmemchar 182 block 182 altmem +device-major altmemchar 182 block 182 altmem device-major twa char 187 twa device-major cpuctlchar 188single device-major pad char 189 pad vector=4,linkzero @@ -59,10 +59,10 @@ device-major lua char 209 lua # NOTE: # The following ranges are reserved for devices that have historical MD # definition, but are for "partially" MI use. -# +# # Any new port should use these "previously not" MI definitions instead of # separate MD values. -# +# # New MI devices should go to this file instead of majors.* # # 210-219 reserved for previously not MI ws devices
CVS commit: src/sys/conf
Module Name:src
Committed By: jdolecek
Date: Wed Jul 22 19:37:59 UTC 2020
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
enable -Walloca, warn if something uses alloca()
To generate a diff of this commit:
cvs rdiff -u -r1.274 -r1.275 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.274 src/sys/conf/Makefile.kern.inc:1.275
--- src/sys/conf/Makefile.kern.inc:1.274 Thu Jun 25 14:52:26 2020
+++ src/sys/conf/Makefile.kern.inc Wed Jul 22 19:37:59 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.274 2020/06/25 14:52:26 jdolecek Exp $
+# $NetBSD: Makefile.kern.inc,v 1.275 2020/07/22 19:37:59 jdolecek Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -104,12 +104,14 @@ CFLAGS+= -ffreestanding -fno-zero-initia
CFLAGS+= ${${ACTIVE_CC} == "gcc":? -fno-delete-null-pointer-checks :}
CFLAGS+= ${DEBUG} ${COPTS}
AFLAGS+= -D_LOCORE -Wa,--fatal-warnings
+
# example usage to find largest stack users in kernel compile directory:
#find . -name \*.su | xargs awk '{ printf "%6d %s\n", $2, $1 }' | sort -n
.if ${MACHINE} != "vax"
# GCC/vax 8.4 does not support -fstack-usage.
CFLAGS+= ${${ACTIVE_CC} == "gcc":? -fstack-usage -Wstack-usage=3584 :}
.endif
+CWARNFLAGS+= -Walloca
# XXX
.if defined(HAVE_GCC) || defined(HAVE_LLVM)
CVS commit: src/sys/conf
Module Name:src
Committed By: christos
Date: Thu Jul 9 02:13:58 UTC 2020
Modified Files:
src/sys/conf: assym.mk
Log Message:
factor out common code.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/conf/assym.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/assym.mk
diff -u src/sys/conf/assym.mk:1.6 src/sys/conf/assym.mk:1.7
--- src/sys/conf/assym.mk:1.6 Wed Jul 8 15:39:22 2020
+++ src/sys/conf/assym.mk Wed Jul 8 22:13:58 2020
@@ -1,11 +1,11 @@
-# $NetBSD: assym.mk,v 1.6 2020/07/08 19:39:22 uwe Exp $
+# $NetBSD: assym.mk,v 1.7 2020/07/09 02:13:58 christos Exp $
+
+GENASSYM_FLAGS=${CFLAGS:N-Wa,*:N-fstack-usage*} ${CPPFLAGS} ${GENASSYM_CPPFLAGS}
assym.h: ${GENASSYM_CONF} ${GENASSYM_EXTRAS} $S/conf/genassym.cf
${_MKTARGET_CREATE}
cat ${GENASSYM_CONF} ${GENASSYM_EXTRAS} $S/conf/genassym.cf | \
- ${GENASSYM} -- ${CC} ${CFLAGS:N-Wa,*:N-fstack-usage*} \
- ${CPPFLAGS} ${PROF} \
- ${GENASSYM_CPPFLAGS} > assym.h.tmp && \
+ ${GENASSYM} -- ${CC} ${GENASSYM_FLAGS} ${PROF} > assym.h.tmp && \
mv -f assym.h.tmp assym.h
.if !defined(___USE_SUFFIX_RULES___)
@@ -19,8 +19,7 @@ ${SRCS:M*.[sS]:C|\.[Ss]|.d|}: assym.h
assym.d: assym.h
${_MKTARGET_CREATE}
cat ${GENASSYM_CONF} ${GENASSYM_EXTRAS} | \
- ${GENASSYM} -- ${MKDEP} -f assym.dep -- \
- ${CFLAGS:N-Wa,*:N-fstack-usage*} ${CPPFLAGS} ${GENASSYM_CPPFLAGS}
+ ${GENASSYM} -- ${MKDEP} -f assym.dep -- ${GENASSYM_FLAGS}
${TOOL_SED} -e 's/.*\.o:.*\.c/assym.h:/' < assym.dep >${.TARGET}
rm -f assym.dep
@@ -30,8 +29,6 @@ DEPS+= assym.d
.SUFFIXES: .genassym .assym.h
.genassym.assym.h:
${_MKTARGET_CREATE}
- ${GENASSYM} -- ${CC} ${CFLAGS:N-Wa,*:N-fstack-usage*} \
- ${CPPFLAGS} ${PROF} \
- ${GENASSYM_CPPFLAGS} < $< > $@
+ ${GENASSYM} -- ${CC} ${GENASSYM_FLAGS} ${PROF} < $< > $@
mv -f $@.tmp $@
.endif # ___USE_SUFFIX_RULES___
CVS commit: src/sys/conf
Module Name:src
Committed By: uwe
Date: Wed Jul 8 19:39:22 UTC 2020
Modified Files:
src/sys/conf: assym.mk
Log Message:
Drop -fstack-usage* from CFLAGS passed genassym.
We don't want it to create a "-.su" file.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/conf/assym.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/assym.mk
diff -u src/sys/conf/assym.mk:1.5 src/sys/conf/assym.mk:1.6
--- src/sys/conf/assym.mk:1.5 Thu Sep 10 13:11:39 2015
+++ src/sys/conf/assym.mk Wed Jul 8 19:39:22 2020
@@ -1,9 +1,10 @@
-# $NetBSD: assym.mk,v 1.5 2015/09/10 13:11:39 uebayasi Exp $
+# $NetBSD: assym.mk,v 1.6 2020/07/08 19:39:22 uwe Exp $
assym.h: ${GENASSYM_CONF} ${GENASSYM_EXTRAS} $S/conf/genassym.cf
${_MKTARGET_CREATE}
cat ${GENASSYM_CONF} ${GENASSYM_EXTRAS} $S/conf/genassym.cf | \
- ${GENASSYM} -- ${CC} ${CFLAGS:N-Wa,*} ${CPPFLAGS} ${PROF} \
+ ${GENASSYM} -- ${CC} ${CFLAGS:N-Wa,*:N-fstack-usage*} \
+ ${CPPFLAGS} ${PROF} \
${GENASSYM_CPPFLAGS} > assym.h.tmp && \
mv -f assym.h.tmp assym.h
@@ -19,7 +20,7 @@ assym.d: assym.h
${_MKTARGET_CREATE}
cat ${GENASSYM_CONF} ${GENASSYM_EXTRAS} | \
${GENASSYM} -- ${MKDEP} -f assym.dep -- \
- ${CFLAGS:N-Wa,*} ${CPPFLAGS} ${GENASSYM_CPPFLAGS}
+ ${CFLAGS:N-Wa,*:N-fstack-usage*} ${CPPFLAGS} ${GENASSYM_CPPFLAGS}
${TOOL_SED} -e 's/.*\.o:.*\.c/assym.h:/' < assym.dep >${.TARGET}
rm -f assym.dep
@@ -29,7 +30,8 @@ DEPS+= assym.d
.SUFFIXES: .genassym .assym.h
.genassym.assym.h:
${_MKTARGET_CREATE}
- ${GENASSYM} -- ${CC} ${CFLAGS:N-Wa,*} ${CPPFLAGS} ${PROF} \
+ ${GENASSYM} -- ${CC} ${CFLAGS:N-Wa,*:N-fstack-usage*} \
+ ${CPPFLAGS} ${PROF} \
${GENASSYM_CPPFLAGS} < $< > $@
mv -f $@.tmp $@
.endif # ___USE_SUFFIX_RULES___
CVS commit: src/sys/conf
Module Name:src
Committed By: jdolecek
Date: Thu Jun 25 14:52:26 UTC 2020
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
enable gcc stack usage limit for kernel functions, set to 3.5 KiB for now
as that seems to be enough to accomodate the current biggest stack usages
there are about six functions which use over 3KiB local stack, and
about a dozen between 2-3 KiB, so pushing this further needs more work
if desired
compile tested on amd64, i386, sparc64, sparc, powerpc (evbppc - BookE),
m68k (mac68k)
To generate a diff of this commit:
cvs rdiff -u -r1.273 -r1.274 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.273 src/sys/conf/Makefile.kern.inc:1.274
--- src/sys/conf/Makefile.kern.inc:1.273 Fri Jun 19 00:58:17 2020
+++ src/sys/conf/Makefile.kern.inc Thu Jun 25 14:52:26 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.273 2020/06/19 00:58:17 simonb Exp $
+# $NetBSD: Makefile.kern.inc,v 1.274 2020/06/25 14:52:26 jdolecek Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -108,7 +108,7 @@ AFLAGS+= -D_LOCORE -Wa,--fatal-warnings
#find . -name \*.su | xargs awk '{ printf "%6d %s\n", $2, $1 }' | sort -n
.if ${MACHINE} != "vax"
# GCC/vax 8.4 does not support -fstack-usage.
-CFLAGS+= ${${ACTIVE_CC} == "gcc":? -fstack-usage :}
+CFLAGS+= ${${ACTIVE_CC} == "gcc":? -fstack-usage -Wstack-usage=3584 :}
.endif
# XXX
CVS commit: src/sys/conf
Module Name:src
Committed By: simonb
Date: Fri Jun 19 00:58:17 UTC 2020
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
Use -fstack-usage only if we are using gcc.
Pointed out by maxv@
To generate a diff of this commit:
cvs rdiff -u -r1.272 -r1.273 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.272 src/sys/conf/Makefile.kern.inc:1.273
--- src/sys/conf/Makefile.kern.inc:1.272 Thu Jun 18 11:50:44 2020
+++ src/sys/conf/Makefile.kern.inc Fri Jun 19 00:58:17 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.272 2020/06/18 11:50:44 rin Exp $
+# $NetBSD: Makefile.kern.inc,v 1.273 2020/06/19 00:58:17 simonb Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -108,7 +108,7 @@ AFLAGS+= -D_LOCORE -Wa,--fatal-warnings
#find . -name \*.su | xargs awk '{ printf "%6d %s\n", $2, $1 }' | sort -n
.if ${MACHINE} != "vax"
# GCC/vax 8.4 does not support -fstack-usage.
-CFLAGS+= -fstack-usage
+CFLAGS+= ${${ACTIVE_CC} == "gcc":? -fstack-usage :}
.endif
# XXX
CVS commit: src/sys/conf
Module Name:src
Committed By: rin
Date: Thu Jun 18 11:50:45 UTC 2020
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
Discard -fstack-usage for vax, for which GCC does not support that option
at the moment.
To generate a diff of this commit:
cvs rdiff -u -r1.271 -r1.272 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.271 src/sys/conf/Makefile.kern.inc:1.272
--- src/sys/conf/Makefile.kern.inc:1.271 Wed Jun 17 02:40:43 2020
+++ src/sys/conf/Makefile.kern.inc Thu Jun 18 11:50:44 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.271 2020/06/17 02:40:43 simonb Exp $
+# $NetBSD: Makefile.kern.inc,v 1.272 2020/06/18 11:50:44 rin Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -106,7 +106,10 @@ CFLAGS+= ${DEBUG} ${COPTS}
AFLAGS+= -D_LOCORE -Wa,--fatal-warnings
# example usage to find largest stack users in kernel compile directory:
#find . -name \*.su | xargs awk '{ printf "%6d %s\n", $2, $1 }' | sort -n
+.if ${MACHINE} != "vax"
+# GCC/vax 8.4 does not support -fstack-usage.
CFLAGS+= -fstack-usage
+.endif
# XXX
.if defined(HAVE_GCC) || defined(HAVE_LLVM)
CVS commit: src/sys/conf
Module Name:src
Committed By: simonb
Date: Wed Jun 17 02:40:43 UTC 2020
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
Add -fstack-usage to kernel builds. Produces .su files that can be
analysed to find large stack users.
To generate a diff of this commit:
cvs rdiff -u -r1.270 -r1.271 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.270 src/sys/conf/Makefile.kern.inc:1.271
--- src/sys/conf/Makefile.kern.inc:1.270 Thu May 21 18:44:19 2020
+++ src/sys/conf/Makefile.kern.inc Wed Jun 17 02:40:43 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.270 2020/05/21 18:44:19 christos Exp $
+# $NetBSD: Makefile.kern.inc,v 1.271 2020/06/17 02:40:43 simonb Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -104,6 +104,9 @@ CFLAGS+= -ffreestanding -fno-zero-initia
CFLAGS+= ${${ACTIVE_CC} == "gcc":? -fno-delete-null-pointer-checks :}
CFLAGS+= ${DEBUG} ${COPTS}
AFLAGS+= -D_LOCORE -Wa,--fatal-warnings
+# example usage to find largest stack users in kernel compile directory:
+#find . -name \*.su | xargs awk '{ printf "%6d %s\n", $2, $1 }' | sort -n
+CFLAGS+= -fstack-usage
# XXX
.if defined(HAVE_GCC) || defined(HAVE_LLVM)
@@ -338,8 +341,8 @@ ${_s:T:R}.o: ${_s}
.if !target(__CLEANKERNEL)
__CLEANKERNEL: .USE
${_MKMSG} "${.TARGET}ing the kernel objects"
- rm -f ${KERNELS} *.map eddep tags *.[io] *.ko *.ln [a-z]*.s vers.c \
- [Ee]rrs linterrs makelinks assym.h.tmp assym.h \
+ rm -f ${KERNELS} *.map *.[io] *.ko *.ln [a-z]*.s *.su vers.c \
+ eddep tags [Ee]rrs linterrs makelinks assym.h.tmp assym.h \
${EXTRA_KERNELS} ${EXTRA_CLEAN}
.endif
CVS commit: src/sys/conf
Module Name:src
Committed By: christos
Date: Thu May 21 18:44:19 UTC 2020
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
Do the chmod last so that the kernels get consistent permissions for MKREPRO
Reported by wiz@.
To generate a diff of this commit:
cvs rdiff -u -r1.269 -r1.270 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.269 src/sys/conf/Makefile.kern.inc:1.270
--- src/sys/conf/Makefile.kern.inc:1.269 Sat Apr 4 15:50:54 2020
+++ src/sys/conf/Makefile.kern.inc Thu May 21 14:44:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.269 2020/04/04 19:50:54 christos Exp $
+# $NetBSD: Makefile.kern.inc,v 1.270 2020/05/21 18:44:19 christos Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -233,12 +233,12 @@ LINKFLAGS?= ${LINKFORMAT} ${LINKSCRIPT}
LINKFLAGS_DEBUG?= -X
SYSTEM_LD_TAIL?=@${TOOL_SED} '/const char sccs/!d;s/.*@(.)//;s/" "//;s/\\.*//' vers.c && \
- ${SIZE} $@ && chmod 755 $@ && \
- ${SYSTEM_CTFMERGE}
+ ${SIZE} $@ && ${SYSTEM_CTFMERGE} && chmod 755 $@
SYSTEM_LD_TAIL_DEBUG?=&& \
echo mv -f $@ $@.gdb && mv -f $@ $@.gdb && \
echo ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb && \
- ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb
+ ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb && \
+ chmod 755 $@ $@.gdb
LINKFLAGS_NORMAL?= -S
STRIPFLAGS?= -g
CVS commit: src/sys/conf
Module Name:src Committed By: jdolecek Date: Sat Apr 4 19:02:53 UTC 2020 Modified Files: src/sys/conf: files Log Message: remove also files.netsmb from here To generate a diff of this commit: cvs rdiff -u -r1.1263 -r1.1264 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1263 src/sys/conf/files:1.1264 --- src/sys/conf/files:1.1263 Sat Apr 4 15:43:22 2020 +++ src/sys/conf/files Sat Apr 4 19:02:53 2020 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1263 2020/04/04 15:43:22 jdolecek Exp $ +# $NetBSD: files,v 1.1264 2020/04/04 19:02:53 jdolecek Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20171118 @@ -261,7 +261,6 @@ include "netinet/files.netinet" include "netinet6/files.netinet6" include "netipsec/files.netipsec" include "netmpls/files.netmpls" -include "netsmb/files.netsmb" include "net/npf/files.npf" include "netinet/files.ipfilter"
CVS commit: src/sys/conf
Module Name:src Committed By: nisimura Date: Tue Mar 31 03:42:10 UTC 2020 Modified Files: src/sys/conf: files Log Message: dme needs mii To generate a diff of this commit: cvs rdiff -u -r1.1261 -r1.1262 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1261 src/sys/conf/files:1.1262 --- src/sys/conf/files:1.1261 Sun Mar 8 00:18:41 2020 +++ src/sys/conf/files Tue Mar 31 03:42:10 2020 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1261 2020/03/08 00:18:41 christos Exp $ +# $NetBSD: files,v 1.1262 2020/03/31 03:42:10 nisimura Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20171118 @@ -1366,7 +1366,7 @@ file dev/ic/bwi.c bwi # DM9000 Ethernet controllers # -device dme: arp, ether, ifnet +device dme: arp, ether, ifnet, mii file dev/ic/dm9000.c dme # NVM Express Controller
CVS commit: src/sys/conf
Module Name:src Committed By: christos Date: Sun Mar 8 00:18:41 UTC 2020 Modified Files: src/sys/conf: files Log Message: undo previous since config has been fixed To generate a diff of this commit: cvs rdiff -u -r1.1260 -r1.1261 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1260 src/sys/conf/files:1.1261 --- src/sys/conf/files:1.1260 Sat Mar 7 13:08:47 2020 +++ src/sys/conf/files Sat Mar 7 19:18:41 2020 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1260 2020/03/07 18:08:47 thorpej Exp $ +# $NetBSD: files,v 1.1261 2020/03/08 00:18:41 christos Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20171118 @@ -169,13 +169,11 @@ defflagCOMPAT_ULTRIX: COMPAT_50 # other users of COMPAT_NETBSD32 need EXEC_AOUT ifdef mips defflagCOMPAT_NETBSD32 -else -ifdef aarch64 +elifdef aarch64 defflagCOMPAT_NETBSD32 else defflagCOMPAT_NETBSD32 : EXEC_AOUT endif -endif defflagCOMPAT_SYSV defflagSYSV_IPC : SYSVSHM, SYSVSEM, SYSVMSG
CVS commit: src/sys/conf
Module Name:src Committed By: thorpej Date: Sat Mar 7 18:08:48 UTC 2020 Modified Files: src/sys/conf: files Log Message: Fix MIPS builds by working around an apparent bug in config(8)'s elif handling. To generate a diff of this commit: cvs rdiff -u -r1.1259 -r1.1260 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1259 src/sys/conf/files:1.1260 --- src/sys/conf/files:1.1259 Thu Mar 5 21:08:36 2020 +++ src/sys/conf/files Sat Mar 7 18:08:47 2020 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1259 2020/03/05 21:08:36 pgoyette Exp $ +# $NetBSD: files,v 1.1260 2020/03/07 18:08:47 thorpej Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20171118 @@ -169,11 +169,13 @@ defflagCOMPAT_ULTRIX: COMPAT_50 # other users of COMPAT_NETBSD32 need EXEC_AOUT ifdef mips defflagCOMPAT_NETBSD32 -elifdef aarch64 +else +ifdef aarch64 defflagCOMPAT_NETBSD32 else defflagCOMPAT_NETBSD32 : EXEC_AOUT endif +endif defflagCOMPAT_SYSV defflagSYSV_IPC : SYSVSHM, SYSVSEM, SYSVMSG
CVS commit: src/sys/conf
Module Name:src
Committed By: mrg
Date: Sat Mar 7 00:53:25 UTC 2020
Modified Files:
src/sys/conf: copts.mk
Log Message:
XXX:
turn off -Wunused-but-set-variable for mips' linux_machdep.c and GCC 8.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/conf/copts.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/copts.mk
diff -u src/sys/conf/copts.mk:1.4 src/sys/conf/copts.mk:1.5
--- src/sys/conf/copts.mk:1.4 Mon Sep 30 00:06:02 2019
+++ src/sys/conf/copts.mk Sat Mar 7 00:53:24 2020
@@ -1,4 +1,4 @@
-# $NetBSD: copts.mk,v 1.4 2019/09/30 00:06:02 mrg Exp $
+# $NetBSD: copts.mk,v 1.5 2020/03/07 00:53:24 mrg Exp $
# MI per-file compiler options required.
@@ -12,4 +12,9 @@ COPTS.radeon_cs.c+= -Wno-error=implicit-
COPTS.via_dmablit.c+= -Wno-error=implicit-fallthrough
.endif
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 8 && ${ACTIVE_CC} == "gcc" && \
+(${MACHINE_ARCH} == "mipseb" || ${MACHINE_ARCH} == "mipsel")
+COPTS.linux_machdep.c+= -Wno-error=unused-but-set-variable
+.endif
+
.endif
CVS commit: src/sys/conf
Module Name:src Committed By: pgoyette Date: Thu Mar 5 21:08:36 UTC 2020 Modified Files: src/sys/conf: files Log Message: Also exclude EXEC_AOUT stuff for aarch64 XXX Pullup-9 and -8 To generate a diff of this commit: cvs rdiff -u -r1.1258 -r1.1259 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1258 src/sys/conf/files:1.1259 --- src/sys/conf/files:1.1258 Thu Mar 5 13:11:30 2020 +++ src/sys/conf/files Thu Mar 5 21:08:36 2020 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1258 2020/03/05 13:11:30 pgoyette Exp $ +# $NetBSD: files,v 1.1259 2020/03/05 21:08:36 pgoyette Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20171118 @@ -165,10 +165,12 @@ defflagCOMPAT_LINUX: COMPAT_NETBSD, defflagCOMPAT_SUNOS: COMPAT_09, COMPAT_43 defflagCOMPAT_ULTRIX: COMPAT_50 -# mips64 has COMPAT_NETBSD32 but cannot have EXEC_AOUT; all other users -# of COMPAT_NETBSD32 need EXEC_AOUT +# mips64 and aarch64 have COMPAT_NETBSD32 but cannot have EXEC_AOUT; all +# other users of COMPAT_NETBSD32 need EXEC_AOUT ifdef mips defflagCOMPAT_NETBSD32 +elifdef aarch64 +defflagCOMPAT_NETBSD32 else defflagCOMPAT_NETBSD32 : EXEC_AOUT endif
CVS commit: src/sys/conf
Module Name:src Committed By: pgoyette Date: Thu Mar 5 13:11:31 UTC 2020 Modified Files: src/sys/conf: files Log Message: Fix comment - thanks Ryo Shimizu To generate a diff of this commit: cvs rdiff -u -r1.1257 -r1.1258 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1257 src/sys/conf/files:1.1258 --- src/sys/conf/files:1.1257 Wed Mar 4 02:20:56 2020 +++ src/sys/conf/files Thu Mar 5 13:11:30 2020 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1257 2020/03/04 02:20:56 pgoyette Exp $ +# $NetBSD: files,v 1.1258 2020/03/05 13:11:30 pgoyette Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20171118 @@ -165,8 +165,8 @@ defflagCOMPAT_LINUX: COMPAT_NETBSD, defflagCOMPAT_SUNOS: COMPAT_09, COMPAT_43 defflagCOMPAT_ULTRIX: COMPAT_50 -# mips64 has COMPAT_NETBSD64 but cannot have EXEC_AOUT; all other users -# of COMPAT_NETBSD64 need EXEC_AOUT +# mips64 has COMPAT_NETBSD32 but cannot have EXEC_AOUT; all other users +# of COMPAT_NETBSD32 need EXEC_AOUT ifdef mips defflagCOMPAT_NETBSD32 else
CVS commit: src/sys/conf
Module Name:src Committed By: pgoyette Date: Wed Mar 4 02:20:57 UTC 2020 Modified Files: src/sys/conf: files Log Message: mips64 has compat_netbsd32 but cannot have exec_aout; all other users of compat_netbsd32 need exec_aout Addresses PR kern/55037. XXX pullup-9 To generate a diff of this commit: cvs rdiff -u -r1.1256 -r1.1257 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1256 src/sys/conf/files:1.1257 --- src/sys/conf/files:1.1256 Sat Feb 22 00:28:35 2020 +++ src/sys/conf/files Wed Mar 4 02:20:56 2020 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1256 2020/02/22 00:28:35 jmcneill Exp $ +# $NetBSD: files,v 1.1257 2020/03/04 02:20:56 pgoyette Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20171118 @@ -164,7 +164,15 @@ defflagCOMPAT_FREEBSD: COMPAT_09, CO defflagCOMPAT_LINUX: COMPAT_NETBSD, COMPAT_43 defflagCOMPAT_SUNOS: COMPAT_09, COMPAT_43 defflagCOMPAT_ULTRIX: COMPAT_50 + +# mips64 has COMPAT_NETBSD64 but cannot have EXEC_AOUT; all other users +# of COMPAT_NETBSD64 need EXEC_AOUT +ifdef mips defflagCOMPAT_NETBSD32 +else +defflagCOMPAT_NETBSD32 : EXEC_AOUT +endif + defflagCOMPAT_SYSV defflagSYSV_IPC : SYSVSHM, SYSVSEM, SYSVMSG defflagCOMPAT_NETBSD32_SYSVIPC : SYSV_IPC,
CVS commit: src/sys/conf
Module Name:src Committed By: kre Date: Mon Feb 3 13:28:11 UTC 2020 Modified Files: src/sys/conf: majors.usb Log Message: urio has gone. Comment it out (remaining visible to hold the number) To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/conf/majors.usb Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/majors.usb diff -u src/sys/conf/majors.usb:1.1 src/sys/conf/majors.usb:1.2 --- src/sys/conf/majors.usb:1.1 Fri Sep 19 17:32:34 2014 +++ src/sys/conf/majors.usb Mon Feb 3 13:28:11 2020 @@ -1,4 +1,4 @@ -# $NetBSD: majors.usb,v 1.1 2014/09/19 17:32:34 matt Exp $ +# $NetBSD: majors.usb,v 1.2 2020/02/03 13:28:11 kre Exp $ # # MI major assignments for USB devices # @@ -7,5 +7,5 @@ device-major uhid char 221 uhid device-major ulpt char 222 ulpt device-major ugen char 223 ugen device-major ucom char 224 ucom -device-major urio char 225 urio +#device-major urio char 225 urio device-major uscanner char 226 uscanner
CVS commit: src/sys/conf
Module Name:src Committed By: pgoyette Date: Mon Jan 20 22:18:39 UTC 2020 Modified Files: src/sys/conf: files Log Message: COMPAT_43 requires COMPAT_60 To generate a diff of this commit: cvs rdiff -u -r1.1253 -r1.1254 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1253 src/sys/conf/files:1.1254 --- src/sys/conf/files:1.1253 Mon Jan 20 18:38:21 2020 +++ src/sys/conf/files Mon Jan 20 22:18:39 2020 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1253 2020/01/20 18:38:21 thorpej Exp $ +# $NetBSD: files,v 1.1254 2020/01/20 22:18:39 pgoyette Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20171118 @@ -160,7 +160,7 @@ defflag opt_compat_netbsd.h COMPAT_11: C defflag opt_compat_netbsd.h COMPAT_10: COMPAT_11, COMPAT_NETBSD defflag opt_compat_netbsd.h COMPAT_09: COMPAT_10, COMPAT_NETBSD defflagCOMPAT_OSSAUDIO -defflagCOMPAT_43 +defflagCOMPAT_43: COMPAT_60 defflagCOMPAT_FREEBSD: COMPAT_09, COMPAT_43 defflagCOMPAT_LINUX: COMPAT_NETBSD, COMPAT_43 defflagCOMPAT_SUNOS: COMPAT_09, COMPAT_43
CVS commit: src/sys/conf
Module Name:src Committed By: ryoon Date: Sat Jan 18 07:54:26 UTC 2020 Modified Files: src/sys/conf: compat_netbsd80.config compat_netbsd90.config Log Message: Fix version numbers in comments To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/conf/compat_netbsd80.config cvs rdiff -u -r1.1 -r1.2 src/sys/conf/compat_netbsd90.config Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/compat_netbsd80.config diff -u src/sys/conf/compat_netbsd80.config:1.2 src/sys/conf/compat_netbsd80.config:1.3 --- src/sys/conf/compat_netbsd80.config:1.2 Sun Jan 27 02:08:41 2019 +++ src/sys/conf/compat_netbsd80.config Sat Jan 18 07:54:26 2020 @@ -1,6 +1,6 @@ -# $NetBSD: compat_netbsd80.config,v 1.2 2019/01/27 02:08:41 pgoyette Exp $ +# $NetBSD: compat_netbsd80.config,v 1.3 2020/01/18 07:54:26 ryoon Exp $ -# Common fragment for all NetBSD targets wanting NetBSD 7.0 and newer +# Common fragment for all NetBSD targets wanting NetBSD 8.0 and newer # compatibility support. # # Note that COMPAT_80 implies all newer COMPAT_XX options. Index: src/sys/conf/compat_netbsd90.config diff -u src/sys/conf/compat_netbsd90.config:1.1 src/sys/conf/compat_netbsd90.config:1.2 --- src/sys/conf/compat_netbsd90.config:1.1 Sun Sep 22 22:59:38 2019 +++ src/sys/conf/compat_netbsd90.config Sat Jan 18 07:54:26 2020 @@ -1,9 +1,9 @@ -# $NetBSD: compat_netbsd90.config,v 1.1 2019/09/22 22:59:38 christos Exp $ +# $NetBSD: compat_netbsd90.config,v 1.2 2020/01/18 07:54:26 ryoon Exp $ -# Common fragment for all NetBSD targets wanting NetBSD 7.0 and newer +# Common fragment for all NetBSD targets wanting NetBSD 9.0 and newer # compatibility support. # -# Note that COMPAT_80 implies all newer COMPAT_XX options. +# Note that COMPAT_90 implies all newer COMPAT_XX options. include"conf/compat_netbsd.config" options COMPAT_90 # NetBSD 9.0 and beyond.
CVS commit: src/sys/conf
Module Name:src Committed By: mlelstv Date: Wed Jan 1 06:14:29 UTC 2020 Modified Files: src/sys/conf: copyright Log Message: Welcome to 2020. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/conf/copyright Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/copyright diff -u src/sys/conf/copyright:1.17 src/sys/conf/copyright:1.18 --- src/sys/conf/copyright:1.17 Tue Jan 1 01:52:40 2019 +++ src/sys/conf/copyright Wed Jan 1 06:14:29 2020 @@ -1,5 +1,5 @@ Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, -2018, 2019 The NetBSD Foundation, Inc. All rights reserved. +2018, 2019, 2020 The NetBSD Foundation, Inc. All rights reserved. Copyright (c) 1982, 1986, 1989, 1991, 1993 The Regents of the University of California. All rights reserved.
CVS commit: src/sys/conf
Module Name:src Committed By: sevan Date: Mon May 6 11:59:46 UTC 2019 Modified Files: src/sys/conf: filesystems.config Log Message: Oops, disable FILECORE as intended. heads up To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/conf/filesystems.config Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/filesystems.config diff -u src/sys/conf/filesystems.config:1.9 src/sys/conf/filesystems.config:1.10 --- src/sys/conf/filesystems.config:1.9 Mon May 6 01:43:09 2019 +++ src/sys/conf/filesystems.config Mon May 6 11:59:46 2019 @@ -1,4 +1,4 @@ -# $NetBSD: filesystems.config,v 1.9 2019/05/06 01:43:09 sevan Exp $ +# $NetBSD: filesystems.config,v 1.10 2019/05/06 11:59:46 sevan Exp $ #file-system ADOSFS # AmigaDOS-compatible file system #file-system AUTOFS # Automounter Filesystem #pseudo-device autofs # experimental - AUTOFS @@ -9,7 +9,7 @@ file-system EFS # Silicon Graphics Exte file-system EXT2FS # second extended file system (linux) file-system FDESC # /dev/fd file-system FFS # UFS -file-system FILECORE # Acorn filecore file system +#file-system FILECORE # Acorn filecore file system #file-system HFS # experimental - Apple HFS+ (read-only) file-system KERNFS # /kern file-system LFS # log-structured file system
CVS commit: src/sys/conf
Module Name:src Committed By: sevan Date: Mon May 6 01:43:09 UTC 2019 Modified Files: src/sys/conf: filesystems.config Log Message: Add ADOSFS & FILECORE (both disabled) To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/conf/filesystems.config Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/filesystems.config diff -u src/sys/conf/filesystems.config:1.8 src/sys/conf/filesystems.config:1.9 --- src/sys/conf/filesystems.config:1.8 Mon May 6 01:20:42 2019 +++ src/sys/conf/filesystems.config Mon May 6 01:43:09 2019 @@ -1,4 +1,5 @@ -# $NetBSD: filesystems.config,v 1.8 2019/05/06 01:20:42 sevan Exp $ +# $NetBSD: filesystems.config,v 1.9 2019/05/06 01:43:09 sevan Exp $ +#file-system ADOSFS # AmigaDOS-compatible file system #file-system AUTOFS # Automounter Filesystem #pseudo-device autofs # experimental - AUTOFS file-system CD9660 # ISO 9660 + Rock Ridge file system @@ -8,6 +9,7 @@ file-system EFS # Silicon Graphics Exte file-system EXT2FS # second extended file system (linux) file-system FDESC # /dev/fd file-system FFS # UFS +file-system FILECORE # Acorn filecore file system #file-system HFS # experimental - Apple HFS+ (read-only) file-system KERNFS # /kern file-system LFS # log-structured file system
CVS commit: src/sys/conf
Module Name:src Committed By: sevan Date: Mon May 6 01:20:42 UTC 2019 Modified Files: src/sys/conf: filesystems.config Log Message: Add V7FS (disabled) To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/conf/filesystems.config Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/filesystems.config diff -u src/sys/conf/filesystems.config:1.7 src/sys/conf/filesystems.config:1.8 --- src/sys/conf/filesystems.config:1.7 Mon May 6 01:11:42 2019 +++ src/sys/conf/filesystems.config Mon May 6 01:20:42 2019 @@ -1,4 +1,4 @@ -# $NetBSD: filesystems.config,v 1.7 2019/05/06 01:11:42 sevan Exp $ +# $NetBSD: filesystems.config,v 1.8 2019/05/06 01:20:42 sevan Exp $ #file-system AUTOFS # Automounter Filesystem #pseudo-device autofs # experimental - AUTOFS file-system CD9660 # ISO 9660 + Rock Ridge file system @@ -28,3 +28,4 @@ file-system TMPFS # Efficient memory fi #file-system UDF # experimental - OSTA UDF CD/DVD file-system file-system UMAPFS # NULLFS + uid and gid remapping file-system UNION # union file system +#file-system V7FS # 7th Edition(V7) File System
CVS commit: src/sys/conf
Module Name:src Committed By: sevan Date: Mon May 6 01:11:42 UTC 2019 Modified Files: src/sys/conf: filesystems.config Log Message: Add autofs pseudo device (disabled) Add a description for existing pseudo devices To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/conf/filesystems.config Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/filesystems.config diff -u src/sys/conf/filesystems.config:1.6 src/sys/conf/filesystems.config:1.7 --- src/sys/conf/filesystems.config:1.6 Mon May 6 00:33:17 2019 +++ src/sys/conf/filesystems.config Mon May 6 01:11:42 2019 @@ -1,8 +1,9 @@ -# $NetBSD: filesystems.config,v 1.6 2019/05/06 00:33:17 sevan Exp $ +# $NetBSD: filesystems.config,v 1.7 2019/05/06 01:11:42 sevan Exp $ #file-system AUTOFS # Automounter Filesystem +#pseudo-device autofs # experimental - AUTOFS file-system CD9660 # ISO 9660 + Rock Ridge file system file-system CODA # Coda File System; also needs vcoda (below) -pseudo-device vcoda +pseudo-device vcoda # coda minicache <-> venus comm. file-system EFS # Silicon Graphics Extent File System file-system EXT2FS # second extended file system (linux) file-system FDESC # /dev/fd @@ -20,9 +21,9 @@ file-system OVERLAY # overlay file syst file-system PROCFS # /proc file-system PTYFS # /dev/ptm support file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs) -pseudo-device putter +pseudo-device putter # for puffs and pud file-system SMBFS # experimental - CIFS; also needs nsmb (below) -pseudo-device nsmb +pseudo-device nsmb # experimental - SMB requester file-system TMPFS # Efficient memory file-system #file-system UDF # experimental - OSTA UDF CD/DVD file-system file-system UMAPFS # NULLFS + uid and gid remapping
CVS commit: src/sys/conf
Module Name:src Committed By: sevan Date: Mon May 6 00:33:17 UTC 2019 Modified Files: src/sys/conf: filesystems.config Log Message: Include EFS support. Tested on amd64 & macppc To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/conf/filesystems.config Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/filesystems.config diff -u src/sys/conf/filesystems.config:1.5 src/sys/conf/filesystems.config:1.6 --- src/sys/conf/filesystems.config:1.5 Sat Apr 27 00:37:40 2019 +++ src/sys/conf/filesystems.config Mon May 6 00:33:17 2019 @@ -1,8 +1,9 @@ -# $NetBSD: filesystems.config,v 1.5 2019/04/27 00:37:40 sevan Exp $ +# $NetBSD: filesystems.config,v 1.6 2019/05/06 00:33:17 sevan Exp $ #file-system AUTOFS # Automounter Filesystem file-system CD9660 # ISO 9660 + Rock Ridge file system file-system CODA # Coda File System; also needs vcoda (below) pseudo-device vcoda +file-system EFS # Silicon Graphics Extent File System file-system EXT2FS # second extended file system (linux) file-system FDESC # /dev/fd file-system FFS # UFS
CVS commit: src/sys/conf
Module Name:src Committed By: mlelstv Date: Sun May 5 17:24:00 UTC 2019 Modified Files: src/sys/conf: majors Log Message: Now the real number for ipmi To generate a diff of this commit: cvs rdiff -u -r1.85 -r1.86 src/sys/conf/majors Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/majors diff -u src/sys/conf/majors:1.85 src/sys/conf/majors:1.86 --- src/sys/conf/majors:1.85 Sun May 5 17:22:31 2019 +++ src/sys/conf/majors Sun May 5 17:24:00 2019 @@ -1,4 +1,4 @@ -# $NetBSD: majors,v 1.85 2019/05/05 17:22:31 mlelstv Exp $ +# $NetBSD: majors,v 1.86 2019/05/05 17:24:00 mlelstv Exp $ # # Device majors for Machine-Independent drivers. # @@ -85,4 +85,4 @@ device-major spi char 347 spi # Major 351 is reserved for sys/modules/examples # Major 352 is reserved for external/cddl/osnet/dev/fbt/fbt.c # Major 353 is reserved for external/cddl/osnet/dev/sdt/sdt.c -# 348 is reserved for IPMI userland driver +# Major 354 is reserved for IPMI userland driver
CVS commit: src/sys/conf
Module Name:src Committed By: mlelstv Date: Sun May 5 17:22:31 UTC 2019 Modified Files: src/sys/conf: majors Log Message: reservation for IPMI driver To generate a diff of this commit: cvs rdiff -u -r1.84 -r1.85 src/sys/conf/majors Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/majors diff -u src/sys/conf/majors:1.84 src/sys/conf/majors:1.85 --- src/sys/conf/majors:1.84 Sat Mar 9 18:53:52 2019 +++ src/sys/conf/majors Sun May 5 17:22:31 2019 @@ -1,4 +1,4 @@ -# $NetBSD: majors,v 1.84 2019/03/09 18:53:52 kamil Exp $ +# $NetBSD: majors,v 1.85 2019/05/05 17:22:31 mlelstv Exp $ # # Device majors for Machine-Independent drivers. # @@ -85,3 +85,4 @@ device-major spi char 347 spi # Major 351 is reserved for sys/modules/examples # Major 352 is reserved for external/cddl/osnet/dev/fbt/fbt.c # Major 353 is reserved for external/cddl/osnet/dev/sdt/sdt.c +# 348 is reserved for IPMI userland driver
CVS commit: src/sys/conf
Module Name:src Committed By: sevan Date: Sat Apr 27 00:37:40 UTC 2019 Modified Files: src/sys/conf: filesystems.config Log Message: Sort more To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/conf/filesystems.config Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/filesystems.config diff -u src/sys/conf/filesystems.config:1.4 src/sys/conf/filesystems.config:1.5 --- src/sys/conf/filesystems.config:1.4 Sat Apr 27 00:30:37 2019 +++ src/sys/conf/filesystems.config Sat Apr 27 00:37:40 2019 @@ -1,15 +1,17 @@ -# $NetBSD: filesystems.config,v 1.4 2019/04/27 00:30:37 sevan Exp $ +# $NetBSD: filesystems.config,v 1.5 2019/04/27 00:37:40 sevan Exp $ #file-system AUTOFS # Automounter Filesystem file-system CD9660 # ISO 9660 + Rock Ridge file system file-system CODA # Coda File System; also needs vcoda (below) pseudo-device vcoda file-system EXT2FS # second extended file system (linux) file-system FDESC # /dev/fd +file-system FFS # UFS #file-system HFS # experimental - Apple HFS+ (read-only) file-system KERNFS # /kern file-system LFS # log-structured file system file-system MFS # memory file system file-system MSDOSFS # MS-DOS file system +file-system NFS # Network File System client #file-system NILFS # experimental - NTT's NiLFS(2) file-system NTFS # Windows/NT file system (experimental) file-system NULLFS # loopback file system @@ -24,5 +26,3 @@ file-system TMPFS # Efficient memory fi #file-system UDF # experimental - OSTA UDF CD/DVD file-system file-system UMAPFS # NULLFS + uid and gid remapping file-system UNION # union file system -file-system FFS # UFS -file-system NFS # Network File System client
CVS commit: src/sys/conf
Module Name:src Committed By: sevan Date: Sat Apr 27 00:30:37 UTC 2019 Modified Files: src/sys/conf: filesystems.config Log Message: Sort To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/conf/filesystems.config Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/filesystems.config diff -u src/sys/conf/filesystems.config:1.3 src/sys/conf/filesystems.config:1.4 --- src/sys/conf/filesystems.config:1.3 Wed Jan 10 11:32:29 2018 +++ src/sys/conf/filesystems.config Sat Apr 27 00:30:37 2019 @@ -1,28 +1,28 @@ -# $NetBSD: filesystems.config,v 1.3 2018/01/10 11:32:29 jmcneill Exp $ -file-system FFS # UFS -file-system MFS # memory file system -file-system NFS # Network File System client -file-system TMPFS # Efficient memory file-system -file-system EXT2FS # second extended file system (linux) -file-system LFS # log-structured file system -file-system NTFS # Windows/NT file system (experimental) +# $NetBSD: filesystems.config,v 1.4 2019/04/27 00:30:37 sevan Exp $ +#file-system AUTOFS # Automounter Filesystem file-system CD9660 # ISO 9660 + Rock Ridge file system -file-system MSDOSFS # MS-DOS file system +file-system CODA # Coda File System; also needs vcoda (below) +pseudo-device vcoda +file-system EXT2FS # second extended file system (linux) file-system FDESC # /dev/fd +#file-system HFS # experimental - Apple HFS+ (read-only) file-system KERNFS # /kern +file-system LFS # log-structured file system +file-system MFS # memory file system +file-system MSDOSFS # MS-DOS file system +#file-system NILFS # experimental - NTT's NiLFS(2) +file-system NTFS # Windows/NT file system (experimental) file-system NULLFS # loopback file system file-system OVERLAY # overlay file system file-system PROCFS # /proc +file-system PTYFS # /dev/ptm support file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs) pseudo-device putter file-system SMBFS # experimental - CIFS; also needs nsmb (below) pseudo-device nsmb +file-system TMPFS # Efficient memory file-system +#file-system UDF # experimental - OSTA UDF CD/DVD file-system file-system UMAPFS # NULLFS + uid and gid remapping file-system UNION # union file system -file-system CODA # Coda File System; also needs vcoda (below) -pseudo-device vcoda -file-system PTYFS # /dev/ptm support -#file-system UDF # experimental - OSTA UDF CD/DVD file-system -#file-system HFS # experimental - Apple HFS+ (read-only) -#file-system NILFS # experimental - NTT's NiLFS(2) -#file-system AUTOFS # Automounter Filesystem +file-system FFS # UFS +file-system NFS # Network File System client
CVS commit: src/sys/conf
Module Name:src
Committed By: christos
Date: Wed Apr 24 20:53:10 UTC 2019
Modified Files:
src/sys/conf: dts.mk
Log Message:
change -h to -n because it is more "portable"
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/conf/dts.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/dts.mk
diff -u src/sys/conf/dts.mk:1.11 src/sys/conf/dts.mk:1.12
--- src/sys/conf/dts.mk:1.11 Tue Apr 23 09:36:42 2019
+++ src/sys/conf/dts.mk Wed Apr 24 16:53:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: dts.mk,v 1.11 2019/04/23 13:36:42 christos Exp $
+# $NetBSD: dts.mk,v 1.12 2019/04/24 20:53:10 christos Exp $
DTSARCH?=${MACHINE_CPU}
DTSGNUARCH?=${DTSARCH}
@@ -8,7 +8,7 @@ DTSPADDING?=1024
.BEGIN::
-@mkdir -p dts
.for _arch in ${DTSGNUARCH}
- -@ln -shf ${S:S@^../@../../@}/external/gpl2/dts/dist/arch/${_arch}/boot/dts dts/${_arch}
+ -@ln -snf ${S:S@^../@../../@}/external/gpl2/dts/dist/arch/${_arch}/boot/dts dts/${_arch}
.endfor
.endif
CVS commit: src/sys/conf
Module Name:src
Committed By: christos
Date: Tue Apr 23 13:36:42 UTC 2019
Modified Files:
src/sys/conf: dts.mk
Log Message:
Add -h to the link command so that we replace the target file each time; this
should fix:
*** Failed target: .BEGIN
*** Failed command: ln -sf
/usr/src/sys/external/gpl2/dts/dist/arch/arm/boot/dts dts/arm
*** Error code 1 (ignored)
ln: dts/arm/dts: Permission denied
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/conf/dts.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/dts.mk
diff -u src/sys/conf/dts.mk:1.10 src/sys/conf/dts.mk:1.11
--- src/sys/conf/dts.mk:1.10 Sun Dec 16 23:37:15 2018
+++ src/sys/conf/dts.mk Tue Apr 23 09:36:42 2019
@@ -1,4 +1,4 @@
-# $NetBSD: dts.mk,v 1.10 2018/12/17 04:37:15 thorpej Exp $
+# $NetBSD: dts.mk,v 1.11 2019/04/23 13:36:42 christos Exp $
DTSARCH?=${MACHINE_CPU}
DTSGNUARCH?=${DTSARCH}
@@ -8,7 +8,7 @@ DTSPADDING?=1024
.BEGIN::
-@mkdir -p dts
.for _arch in ${DTSGNUARCH}
- -@ln -sf ${S:S@^../@../../@}/external/gpl2/dts/dist/arch/${_arch}/boot/dts dts/${_arch}
+ -@ln -shf ${S:S@^../@../../@}/external/gpl2/dts/dist/arch/${_arch}/boot/dts dts/${_arch}
.endfor
.endif
CVS commit: src/sys/conf
Module Name:src Committed By: tnn Date: Sun Mar 17 01:06:42 UTC 2019 Modified Files: src/sys/conf: files Log Message: config glue for ssdfb To generate a diff of this commit: cvs rdiff -u -r1.1230 -r1.1231 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1230 src/sys/conf/files:1.1231 --- src/sys/conf/files:1.1230 Sat Feb 23 03:10:06 2019 +++ src/sys/conf/files Sun Mar 17 01:06:42 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1230 2019/02/23 03:10:06 kamil Exp $ +# $NetBSD: files,v 1.1231 2019/03/17 01:06:42 tnn Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20171118 @@ -387,6 +387,10 @@ file dev/ic/nslm7x.c lm needs-flag device spdmem file dev/ic/spdmem.c spdmem +# SSD1306 or SH1106 OLED/PLED display (attaches via I2C or SPI) +device ssdfb: wsemuldisplaydev +file dev/ic/ssdfb.c ssdfb + # Generic HID support (used by USB, bluetooth and i2c) include "dev/hid/files.hid"
CVS commit: src/sys/conf
Module Name:src Committed By: kamil Date: Sat Feb 23 12:25:33 UTC 2019 Modified Files: src/sys/conf: majors Log Message: Reserve majors for HAXM and example loadable kernel modules 348-350 are reserved for HAXM 351 is reserved for sys/modules/examples Discussed on tech-kern@ To generate a diff of this commit: cvs rdiff -u -r1.82 -r1.83 src/sys/conf/majors Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/majors diff -u src/sys/conf/majors:1.82 src/sys/conf/majors:1.83 --- src/sys/conf/majors:1.82 Sat Feb 23 07:33:20 2019 +++ src/sys/conf/majors Sat Feb 23 12:25:33 2019 @@ -1,4 +1,4 @@ -# $NetBSD: majors,v 1.82 2019/02/23 07:33:20 mlelstv Exp $ +# $NetBSD: majors,v 1.83 2019/02/23 12:25:33 kamil Exp $ # # Device majors for Machine-Independent drivers. # @@ -81,3 +81,5 @@ device-major gpiopps char 344 device-major nvmm char 345nvmm device-major kcov char 346kcov device-major spi char 347 spi +# Majors 348-350 are reserved for HAXM (pkgsrc/emulators/haxm) +# Major 351 is reserved for sys/modules/examples
CVS commit: src/sys/conf
Module Name:src Committed By: mlelstv Date: Sat Feb 23 07:33:21 UTC 2019 Modified Files: src/sys/conf: majors Log Message: Reserve major number for spi driver To generate a diff of this commit: cvs rdiff -u -r1.81 -r1.82 src/sys/conf/majors Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/majors diff -u src/sys/conf/majors:1.81 src/sys/conf/majors:1.82 --- src/sys/conf/majors:1.81 Sat Feb 23 03:10:06 2019 +++ src/sys/conf/majors Sat Feb 23 07:33:20 2019 @@ -1,4 +1,4 @@ -# $NetBSD: majors,v 1.81 2019/02/23 03:10:06 kamil Exp $ +# $NetBSD: majors,v 1.82 2019/02/23 07:33:20 mlelstv Exp $ # # Device majors for Machine-Independent drivers. # @@ -80,3 +80,4 @@ device-major autofschar 343 auto device-major gpiopps char 344gpiopps device-major nvmm char 345nvmm device-major kcov char 346kcov +device-major spi char 347 spi
CVS commit: src/sys/conf
Module Name:src
Committed By: mrg
Date: Sun Feb 10 05:01:59 UTC 2019
Modified Files:
src/sys/conf: copts.mk
Log Message:
mark pf.c, radeon_cs.c and via_dmablit.c for no fall thru error.
this was already done in the various modules, but not in the main
kernel.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/conf/copts.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/copts.mk
diff -u src/sys/conf/copts.mk:1.2 src/sys/conf/copts.mk:1.3
--- src/sys/conf/copts.mk:1.2 Tue Feb 5 09:29:19 2019
+++ src/sys/conf/copts.mk Sun Feb 10 05:01:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: copts.mk,v 1.2 2019/02/05 09:29:19 mrg Exp $
+# $NetBSD: copts.mk,v 1.3 2019/02/10 05:01:59 mrg Exp $
# MI per-file compiler options required.
@@ -6,7 +6,10 @@
_SYS_CONF_COPTS_MK_=1
.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
-COPTS.zlib.c+= -Wno-error=implicit-fallthrough
+COPTS.zlib.c+= -Wno-error=implicit-fallthrough
+COPTS.pf.c+= -Wno-error=implicit-fallthrough
+COPTS.radeon_cs.c+= -Wno-error=implicit-fallthrough
+COPTS.via_dmablit.c+= -Wno-error=implicit-fallthrough
.endif
.endif
CVS commit: src/sys/conf
Module Name:src
Committed By: mrg
Date: Tue Feb 5 08:33:25 UTC 2019
Modified Files:
src/sys/conf: Makefile.kern.inc
Added Files:
src/sys/conf: copts.mk
Log Message:
pass -Wno-error=implicit-fallthrough for zlib.c.
XXX: consider using copts.mk for various warning/copt flags passed
in kernel builds currently set via 'makeoptions' in files.* files.
this is suboptimal, as those all get embedded into the kernel with
config_file.h.
To generate a diff of this commit:
cvs rdiff -u -r1.267 -r1.268 src/sys/conf/Makefile.kern.inc
cvs rdiff -u -r0 -r1.1 src/sys/conf/copts.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.267 src/sys/conf/Makefile.kern.inc:1.268
--- src/sys/conf/Makefile.kern.inc:1.267 Sun Jan 27 02:08:41 2019
+++ src/sys/conf/Makefile.kern.inc Tue Feb 5 08:33:25 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.267 2019/01/27 02:08:41 pgoyette Exp $
+# $NetBSD: Makefile.kern.inc,v 1.268 2019/02/05 08:33:25 mrg Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -317,6 +317,7 @@ ${_s:T:R}.o: ${_s}
.if "${_SKIP_DTS}" != "yes"
.include "${S}/conf/dts.mk"
.endif
+.include "${S}/conf/copts.mk"
##
## (7) misc targets: install, clean(dir), depend(all), lint, links, tags,
Added files:
Index: src/sys/conf/copts.mk
diff -u /dev/null src/sys/conf/copts.mk:1.1
--- /dev/null Tue Feb 5 08:33:26 2019
+++ src/sys/conf/copts.mk Tue Feb 5 08:33:25 2019
@@ -0,0 +1,10 @@
+# $NetBSD: copts.mk,v 1.1 2019/02/05 08:33:25 mrg Exp $
+
+# MI per-file compiler options required.
+
+.ifndef _SYS_CONF_COPTS_MK_
+_SYS_CONF_COPTS_MK_=1
+
+COPTS.zlib.c+= -Wno-error=implicit-fallthrough
+
+.endif
CVS commit: src/sys/conf
Module Name:src Committed By: pgoyette Date: Mon Jan 28 01:00:23 UTC 2019 Modified Files: src/sys/conf: files Log Message: Move COMPAT_43 to preceed anything that depends on it To generate a diff of this commit: cvs rdiff -u -r1.1226 -r1.1227 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1226 src/sys/conf/files:1.1227 --- src/sys/conf/files:1.1226 Mon Jan 28 00:26:53 2019 +++ src/sys/conf/files Mon Jan 28 01:00:23 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1226 2019/01/28 00:26:53 pgoyette Exp $ +# $NetBSD: files,v 1.1227 2019/01/28 01:00:23 pgoyette Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20171118 @@ -151,6 +151,7 @@ defflag opt_compat_netbsd.h COMPAT_11: C defflag opt_compat_netbsd.h COMPAT_10: COMPAT_11, COMPAT_NETBSD defflag opt_compat_netbsd.h COMPAT_09: COMPAT_10, COMPAT_NETBSD defflagCOMPAT_OSSAUDIO +defflagCOMPAT_43 defflagCOMPAT_FREEBSD: COMPAT_09, COMPAT_43 defflagCOMPAT_LINUX: COMPAT_NETBSD, COMPAT_43 defflagCOMPAT_OSF1 @@ -168,7 +169,6 @@ defflagCOMPAT_LINUX32 : COMPAT_LINUX defflagCOMPAT_AOUT_M68K: COMPAT_40 defflagCOMPAT_M68K4K defflagCOMPAT_VAX1K -defflagCOMPAT_43 defflag opt_compat_netbsd.h COMPAT_NOMID include "compat/common/files.common"
CVS commit: src/sys/conf
Module Name:src Committed By: pgoyette Date: Mon Jan 28 00:26:53 UTC 2019 Modified Files: src/sys/conf: files Log Message: Spell COMPAT_43 correctly - no NETBSD in the middle To generate a diff of this commit: cvs rdiff -u -r1.1225 -r1.1226 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1225 src/sys/conf/files:1.1226 --- src/sys/conf/files:1.1225 Mon Jan 28 00:00:18 2019 +++ src/sys/conf/files Mon Jan 28 00:26:53 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1225 2019/01/28 00:00:18 christos Exp $ +# $NetBSD: files,v 1.1226 2019/01/28 00:26:53 pgoyette Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20171118 @@ -151,8 +151,8 @@ defflag opt_compat_netbsd.h COMPAT_11: C defflag opt_compat_netbsd.h COMPAT_10: COMPAT_11, COMPAT_NETBSD defflag opt_compat_netbsd.h COMPAT_09: COMPAT_10, COMPAT_NETBSD defflagCOMPAT_OSSAUDIO -defflagCOMPAT_FREEBSD: COMPAT_09, COMPAT_NETBSD_43 -defflagCOMPAT_LINUX: COMPAT_NETBSD, COMPAT_NETBSD_43 +defflagCOMPAT_FREEBSD: COMPAT_09, COMPAT_43 +defflagCOMPAT_LINUX: COMPAT_NETBSD, COMPAT_43 defflagCOMPAT_OSF1 defflagCOMPAT_SUNOS: COMPAT_30 defflagCOMPAT_ULTRIX: COMPAT_50
CVS commit: src/sys/conf
Module Name:src Committed By: christos Date: Mon Jan 28 00:00:18 UTC 2019 Modified Files: src/sys/conf: files Log Message: comma police. To generate a diff of this commit: cvs rdiff -u -r1.1224 -r1.1225 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1224 src/sys/conf/files:1.1225 --- src/sys/conf/files:1.1224 Sun Jan 27 17:06:07 2019 +++ src/sys/conf/files Sun Jan 27 19:00:18 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1224 2019/01/27 22:06:07 pgoyette Exp $ +# $NetBSD: files,v 1.1225 2019/01/28 00:00:18 christos Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20171118 @@ -151,8 +151,8 @@ defflag opt_compat_netbsd.h COMPAT_11: C defflag opt_compat_netbsd.h COMPAT_10: COMPAT_11, COMPAT_NETBSD defflag opt_compat_netbsd.h COMPAT_09: COMPAT_10, COMPAT_NETBSD defflagCOMPAT_OSSAUDIO -defflagCOMPAT_FREEBSD: COMPAT_09 COMPAT_NETBSD_43 -defflagCOMPAT_LINUX: COMPAT_NETBSD COMPAT_NETBSD_43 +defflagCOMPAT_FREEBSD: COMPAT_09, COMPAT_NETBSD_43 +defflagCOMPAT_LINUX: COMPAT_NETBSD, COMPAT_NETBSD_43 defflagCOMPAT_OSF1 defflagCOMPAT_SUNOS: COMPAT_30 defflagCOMPAT_ULTRIX: COMPAT_50
CVS commit: src/sys/conf
Module Name:src Committed By: pgoyette Date: Sun Jan 27 22:06:07 UTC 2019 Modified Files: src/sys/conf: files Log Message: COMPAT_FREEBSD also requires COMPAT_43 To generate a diff of this commit: cvs rdiff -u -r1.1223 -r1.1224 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1223 src/sys/conf/files:1.1224 --- src/sys/conf/files:1.1223 Sun Jan 27 22:00:14 2019 +++ src/sys/conf/files Sun Jan 27 22:06:07 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1223 2019/01/27 22:00:14 pgoyette Exp $ +# $NetBSD: files,v 1.1224 2019/01/27 22:06:07 pgoyette Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20171118 @@ -151,7 +151,7 @@ defflag opt_compat_netbsd.h COMPAT_11: C defflag opt_compat_netbsd.h COMPAT_10: COMPAT_11, COMPAT_NETBSD defflag opt_compat_netbsd.h COMPAT_09: COMPAT_10, COMPAT_NETBSD defflagCOMPAT_OSSAUDIO -defflagCOMPAT_FREEBSD: COMPAT_09 +defflagCOMPAT_FREEBSD: COMPAT_09 COMPAT_NETBSD_43 defflagCOMPAT_LINUX: COMPAT_NETBSD COMPAT_NETBSD_43 defflagCOMPAT_OSF1 defflagCOMPAT_SUNOS: COMPAT_30
CVS commit: src/sys/conf
Module Name:src Committed By: pgoyette Date: Sun Jan 27 22:00:14 UTC 2019 Modified Files: src/sys/conf: files Log Message: Adjust dependencies for COMPAT_FREEBSD and COMPAT_LINUX Should address kern/53915 To generate a diff of this commit: cvs rdiff -u -r1.1222 -r1.1223 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1222 src/sys/conf/files:1.1223 --- src/sys/conf/files:1.1222 Sun Jan 27 02:08:41 2019 +++ src/sys/conf/files Sun Jan 27 22:00:14 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1222 2019/01/27 02:08:41 pgoyette Exp $ +# $NetBSD: files,v 1.1223 2019/01/27 22:00:14 pgoyette Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20171118 @@ -151,8 +151,8 @@ defflag opt_compat_netbsd.h COMPAT_11: C defflag opt_compat_netbsd.h COMPAT_10: COMPAT_11, COMPAT_NETBSD defflag opt_compat_netbsd.h COMPAT_09: COMPAT_10, COMPAT_NETBSD defflagCOMPAT_OSSAUDIO -defflagCOMPAT_FREEBSD: COMPAT_30 -defflagCOMPAT_LINUX: COMPAT_NETBSD +defflagCOMPAT_FREEBSD: COMPAT_09 +defflagCOMPAT_LINUX: COMPAT_NETBSD COMPAT_NETBSD_43 defflagCOMPAT_OSF1 defflagCOMPAT_SUNOS: COMPAT_30 defflagCOMPAT_ULTRIX: COMPAT_50
CVS commit: src/sys/conf
Module Name:src Committed By: jnemeth Date: Tue Jan 1 01:52:40 UTC 2019 Modified Files: src/sys/conf: copyright Log Message: Welcome to 2019! To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/conf/copyright Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/copyright diff -u src/sys/conf/copyright:1.16 src/sys/conf/copyright:1.17 --- src/sys/conf/copyright:1.16 Mon Jan 1 01:26:06 2018 +++ src/sys/conf/copyright Tue Jan 1 01:52:40 2019 @@ -1,5 +1,5 @@ Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, -2018 The NetBSD Foundation, Inc. All rights reserved. +2018, 2019 The NetBSD Foundation, Inc. All rights reserved. Copyright (c) 1982, 1986, 1989, 1991, 1993 The Regents of the University of California. All rights reserved.
CVS commit: src/sys/conf
Module Name:src
Committed By: thorpej
Date: Mon Dec 17 04:37:15 UTC 2018
Modified Files:
src/sys/conf: dts.mk
Log Message:
Add support for building overlay DT blobs specified in the kernel
config file like so:
makeoptions DTS_OVERLAYDIR="${THISARM}/conf"
makeoptions DTS_OVERLAYS="
my-cool-overlay.dts
"
The result is my-cool-overlay.dtbo in the kernel compile directory.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/conf/dts.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/dts.mk
diff -u src/sys/conf/dts.mk:1.9 src/sys/conf/dts.mk:1.10
--- src/sys/conf/dts.mk:1.9 Fri May 25 19:48:12 2018
+++ src/sys/conf/dts.mk Mon Dec 17 04:37:15 2018
@@ -1,4 +1,4 @@
-# $NetBSD: dts.mk,v 1.9 2018/05/25 19:48:12 jakllsch Exp $
+# $NetBSD: dts.mk,v 1.10 2018/12/17 04:37:15 thorpej Exp $
DTSARCH?=${MACHINE_CPU}
DTSGNUARCH?=${DTSARCH}
@@ -25,9 +25,9 @@ DTSDIR+=$S/external/gpl2/dts/dist/arch/$
.endfor
.endfor
-DTSPATH=${DTSINC} ${DTSDIR} dts
+DTSPATH=${DTSINC} ${DTSDIR} ${DTS_OVERLAYDIR} dts
-.SUFFIXES: .dtd .dtb .dts
+.SUFFIXES: .dtd .dtdo .dtb .dtbo .dts
.dts.dtd:
(${CPP} -P -xassembler-with-cpp ${DTSPATH:@v@-I ${v}@} \
@@ -41,6 +41,17 @@ DTSPATH=${DTSINC} ${DTSDIR} dts
${TOOL_SED} -e 's@null.o@${.TARGET:.dtd=.dtb}@' \
-e 's@/dev/null@@') > ${.TARGET}
+.dts.dtdo:
+ (${CPP} -P -xassembler-with-cpp ${DTSPATH:@v@-I ${v}@} \
+ -include ${.IMPSRC} /dev/null | \
+ ${TOOL_DTC} ${DTSPATH:@v@-i ${v}@} -I dts -O dtb \
+ -@ -o /dev/null -d /dev/stdout | \
+ ${TOOL_SED} -e 's@/dev/null@${.TARGET:.dtdo=.dtbo}@' \
+ -e 's@@${.IMPSRC}@' && \
+ ${CPP} -P -xassembler-with-cpp ${DTSPATH:@v@-I ${v}@} \
+ -include ${.IMPSRC} -M /dev/null | \
+ ${TOOL_SED} -e 's@null.o@${.TARGET:.dtdo=.dtbo}@' \
+ -e 's@/dev/null@@') > ${.TARGET}
.dts.dtb:
${CPP} -P -xassembler-with-cpp ${DTSPATH:@v@-I ${v}@} \
@@ -48,9 +59,17 @@ DTSPATH=${DTSINC} ${DTSDIR} dts
${TOOL_DTC} ${DTSPATH:@v@-i ${v}@} -I dts -O dtb \
-p ${DTSPADDING} -b 0 -@ -o ${.TARGET}
-.PATH.dts: ${DTSDIR}
+.dts.dtbo:
+ ${CPP} -P -xassembler-with-cpp ${DTSPATH:@v@-I ${v}@} \
+ -include ${.IMPSRC} /dev/null | \
+ ${TOOL_DTC} ${DTSPATH:@v@-i ${v}@} -I dts -O dtb \
+ -@ -o ${.TARGET}
+
+.PATH.dts: ${DTSDIR} ${DTS_OVERLAYDIR}
DEPS+= ${DTS:.dts=.dtd}
-DTB= ${DTS:.dts=.dtb}
+DEPS+= ${DTS_OVERLAYS:.dts=.dtdo}
+DTB= ${DTS:.dts=.dtb}
+DTBO= ${DTS_OVERLAYS:.dts=.dtbo}
-all: ${DTB}
+all: ${DTB} ${DTBO}
CVS commit: src/sys/conf
Module Name:src Committed By: christos Date: Sat Sep 8 14:12:04 UTC 2018 Modified Files: src/sys/conf: files Log Message: Add libnv To generate a diff of this commit: cvs rdiff -u -r1.1206 -r1.1207 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1206 src/sys/conf/files:1.1207 --- src/sys/conf/files:1.1206 Thu Sep 6 02:42:00 2018 +++ src/sys/conf/files Sat Sep 8 10:12:04 2018 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1206 2018/09/06 06:42:00 maxv Exp $ +# $NetBSD: files,v 1.1207 2018/09/08 14:12:04 christos Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20171118 @@ -1628,3 +1628,8 @@ include "dev/clk/files.clk" # include "dev/ofw/files.ofw" include "dev/fdt/files.fdt" + +# +# Name value library +# +include "external/bsd/libnv/conf/files.libnv"
CVS commit: src/sys/conf
Module Name:src
Committed By: riastradh
Date: Mon Aug 27 05:35:22 UTC 2018
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
Add CFLAGS, CPPFLAGS, and CWARNFLAGS from options to .c files.
To generate a diff of this commit:
cvs rdiff -u -r1.264 -r1.265 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.264 src/sys/conf/Makefile.kern.inc:1.265
--- src/sys/conf/Makefile.kern.inc:1.264 Sat Feb 17 22:47:14 2018
+++ src/sys/conf/Makefile.kern.inc Mon Aug 27 05:35:22 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.264 2018/02/17 22:47:14 joerg Exp $
+# $NetBSD: Makefile.kern.inc,v 1.265 2018/08/27 05:35:22 riastradh Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -439,6 +439,12 @@ CFLAGS+= ${COPTS.${.IMPSRC:T}} ${CPUFLAG
CPPFLAGS+= ${CPPFLAGS.${.IMPSRC:T}}
CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}}
+.for _v in CFLAGS CPPFLAGS CWARNFLAGS
+.for _c in ${CSRCS}
+${_v}.${_c:T}+=${OPT.${_c:T}:@.o.@${${_v}.${.o.}}@}
+.endfor
+.endfor
+
.MAIN: all
all: .gdbinit
.for k in ${KERNELS}
CVS commit: src/sys/conf
Module Name:src Committed By: martin Date: Sun Jul 15 07:07:15 UTC 2018 Modified Files: src/sys/conf: files Log Message: More ipkdb removal To generate a diff of this commit: cvs rdiff -u -r1.1201 -r1.1202 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1201 src/sys/conf/files:1.1202 --- src/sys/conf/files:1.1201 Thu Jul 12 10:46:48 2018 +++ src/sys/conf/files Sun Jul 15 07:07:15 2018 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1201 2018/07/12 10:46:48 maxv Exp $ +# $NetBSD: files,v 1.1202 2018/07/15 07:07:15 martin Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20171118 @@ -443,11 +443,6 @@ define arp # include "altq/files.altq" -# -# IPKDB kernel debugger -# -include "ipkdb/files.ipkdb" - # Logical disk # device ld: disk @@ -742,9 +737,8 @@ file dev/ic/dwc_gmac.c awge # 8390-family Ethernet controllers # -defflag opt_ipkdb.h IPKDB_DP8390 define dp8390nic -file dev/ic/dp8390.c dp8390nic | ipkdb_dp8390 +file dev/ic/dp8390.c dp8390nic # National Semiconductor DP83905 AT/LANTIC Ethernet media support # @@ -884,9 +878,8 @@ file dev/ic/tms320av110.c tms320av110 # Novell NE2000-compatible Ethernet cards, based on the # National Semiconductor DS8390. # -defflag opt_ipkdb.h IPKDB_NE : IPKDB_DP8390 device ne: ether, ifnet, arp, dp8390nic, mii -file dev/ic/ne2000.c ne | ipkdb_ne +file dev/ic/ne2000.c ne # 8250/16[45]50-based "com" ports #
CVS commit: src/sys/conf
Module Name:src
Committed By: jakllsch
Date: Fri May 25 19:48:12 UTC 2018
Modified Files:
src/sys/conf: dts.mk
Log Message:
Compile dtbs with -@ so that fdtoverlay(1) et.al. can symbolically
reference phandles.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/conf/dts.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/dts.mk
diff -u src/sys/conf/dts.mk:1.8 src/sys/conf/dts.mk:1.9
--- src/sys/conf/dts.mk:1.8 Sun Dec 10 14:29:47 2017
+++ src/sys/conf/dts.mk Fri May 25 19:48:12 2018
@@ -1,4 +1,4 @@
-# $NetBSD: dts.mk,v 1.8 2017/12/10 14:29:47 christos Exp $
+# $NetBSD: dts.mk,v 1.9 2018/05/25 19:48:12 jakllsch Exp $
DTSARCH?=${MACHINE_CPU}
DTSGNUARCH?=${DTSARCH}
@@ -33,7 +33,7 @@ DTSPATH=${DTSINC} ${DTSDIR} dts
(${CPP} -P -xassembler-with-cpp ${DTSPATH:@v@-I ${v}@} \
-include ${.IMPSRC} /dev/null | \
${TOOL_DTC} ${DTSPATH:@v@-i ${v}@} -I dts -O dtb \
- -p ${DTSPADDING} -b 0 -o /dev/null -d /dev/stdout | \
+ -p ${DTSPADDING} -b 0 -@ -o /dev/null -d /dev/stdout | \
${TOOL_SED} -e 's@/dev/null@${.TARGET:.dtd=.dtb}@' \
-e 's@@${.IMPSRC}@' && \
${CPP} -P -xassembler-with-cpp ${DTSPATH:@v@-I ${v}@} \
@@ -46,7 +46,7 @@ DTSPATH=${DTSINC} ${DTSDIR} dts
${CPP} -P -xassembler-with-cpp ${DTSPATH:@v@-I ${v}@} \
-include ${.IMPSRC} /dev/null | \
${TOOL_DTC} ${DTSPATH:@v@-i ${v}@} -I dts -O dtb \
- -p ${DTSPADDING} -b 0 -o ${.TARGET}
+ -p ${DTSPADDING} -b 0 -@ -o ${.TARGET}
.PATH.dts: ${DTSDIR}
CVS commit: src/sys/conf
Module Name:src
Committed By: joerg
Date: Sat Feb 17 22:47:14 UTC 2018
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
Restrict -fno-delete-null-pointer-checks to GCC.
To generate a diff of this commit:
cvs rdiff -u -r1.263 -r1.264 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.263 src/sys/conf/Makefile.kern.inc:1.264
--- src/sys/conf/Makefile.kern.inc:1.263 Tue Feb 13 09:50:35 2018
+++ src/sys/conf/Makefile.kern.inc Sat Feb 17 22:47:14 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.263 2018/02/13 09:50:35 mrg Exp $
+# $NetBSD: Makefile.kern.inc,v 1.264 2018/02/17 22:47:14 joerg Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -98,7 +98,7 @@ CWARNFLAGS.ah_regdomain.c= ${${ACTIVE_CC
CWARNFLAGS.ioconf.c= ${${ACTIVE_CC} == "clang":? -Wno-unused-const-variable :}
CFLAGS+= -ffreestanding -fno-zero-initialized-in-bss
-CFLAGS+= -fno-delete-null-pointer-checks
+CFLAGS+= ${${ACTIVE_CC} == "gcc":? -fno-delete-null-pointer-checks :}
CFLAGS+= ${DEBUG} ${COPTS}
AFLAGS+= -D_LOCORE -Wa,--fatal-warnings
CVS commit: src/sys/conf
Module Name:src
Committed By: mrg
Date: Tue Feb 13 09:50:36 UTC 2018
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
use -fno-delete-null-pointer-checks for kernels.
To generate a diff of this commit:
cvs rdiff -u -r1.262 -r1.263 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.262 src/sys/conf/Makefile.kern.inc:1.263
--- src/sys/conf/Makefile.kern.inc:1.262 Mon Jan 22 17:38:46 2018
+++ src/sys/conf/Makefile.kern.inc Tue Feb 13 09:50:35 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.262 2018/01/22 17:38:46 christos Exp $
+# $NetBSD: Makefile.kern.inc,v 1.263 2018/02/13 09:50:35 mrg Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -98,6 +98,7 @@ CWARNFLAGS.ah_regdomain.c= ${${ACTIVE_CC
CWARNFLAGS.ioconf.c= ${${ACTIVE_CC} == "clang":? -Wno-unused-const-variable :}
CFLAGS+= -ffreestanding -fno-zero-initialized-in-bss
+CFLAGS+= -fno-delete-null-pointer-checks
CFLAGS+= ${DEBUG} ${COPTS}
AFLAGS+= -D_LOCORE -Wa,--fatal-warnings
CVS commit: src/sys/conf
Module Name:src
Committed By: christos
Date: Mon Jan 22 17:38:46 UTC 2018
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
- Coverity does not like -std=gnu99
- Another lose is that you need to manually edit the compiler XML to add
all the kernel options because cov-configure barfs because it tries to
test the compilation environment thinking that we are userland even
when options like -ffreestanding are present.
To generate a diff of this commit:
cvs rdiff -u -r1.261 -r1.262 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.261 src/sys/conf/Makefile.kern.inc:1.262
--- src/sys/conf/Makefile.kern.inc:1.261 Mon Dec 4 04:44:33 2017
+++ src/sys/conf/Makefile.kern.inc Mon Jan 22 12:38:46 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.261 2017/12/04 09:44:33 martin Exp $
+# $NetBSD: Makefile.kern.inc,v 1.262 2018/01/22 17:38:46 christos Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -63,7 +63,9 @@ S!= cd ../../../.. && pwd
INCLUDES?= -I. ${EXTRA_INCLUDES} -I${S}/../common/include -I$S/arch \
-I$S -nostdinc
CPPFLAGS+= ${INCLUDES} ${IDENT} -D_KERNEL -D_KERNEL_OPT
+.if !defined(COVERITY_TOP_CONFIG)
CPPFLAGS+= -std=gnu99
+.endif
DEFCOPTS?= -O2
COPTS?= ${DEFCOPTS}
DBG= # might contain unwanted -Ofoo
CVS commit: src/sys/conf
Module Name:src Committed By: mrg Date: Mon Jan 15 07:20:10 UTC 2018 Modified Files: src/sys/conf: compat_netbsd09.config compat_netbsd10.config compat_netbsd11.config compat_netbsd12.config compat_netbsd13.config compat_netbsd14.config compat_netbsd15.config compat_netbsd16.config compat_netbsd20.config compat_netbsd30.config compat_netbsd40.config compat_netbsd50.config compat_netbsd60.config compat_netbsd70.config Log Message: note that COMPAT_X implies all COMPAT_X+N. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/conf/compat_netbsd09.config \ src/sys/conf/compat_netbsd10.config src/sys/conf/compat_netbsd11.config \ src/sys/conf/compat_netbsd12.config src/sys/conf/compat_netbsd13.config \ src/sys/conf/compat_netbsd14.config src/sys/conf/compat_netbsd15.config \ src/sys/conf/compat_netbsd16.config src/sys/conf/compat_netbsd20.config \ src/sys/conf/compat_netbsd30.config src/sys/conf/compat_netbsd40.config \ src/sys/conf/compat_netbsd50.config src/sys/conf/compat_netbsd60.config \ src/sys/conf/compat_netbsd70.config Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/compat_netbsd09.config diff -u src/sys/conf/compat_netbsd09.config:1.1 src/sys/conf/compat_netbsd09.config:1.2 --- src/sys/conf/compat_netbsd09.config:1.1 Thu Sep 14 07:58:44 2017 +++ src/sys/conf/compat_netbsd09.config Mon Jan 15 07:20:10 2018 @@ -1,7 +1,9 @@ -# $NetBSD: compat_netbsd09.config,v 1.1 2017/09/14 07:58:44 mrg Exp $ +# $NetBSD: compat_netbsd09.config,v 1.2 2018/01/15 07:20:10 mrg Exp $ # Common fragment for all NetBSD targets wanting NetBSD 0.9 and newer # compatibility support. +# +# Note that COMPAT_09 implies all newer COMPAT_XX options. include"conf/compat_netbsd.config" options COMPAT_09 # NetBSD 0.9 and beyond. Index: src/sys/conf/compat_netbsd10.config diff -u src/sys/conf/compat_netbsd10.config:1.1 src/sys/conf/compat_netbsd10.config:1.2 --- src/sys/conf/compat_netbsd10.config:1.1 Thu Sep 14 07:58:44 2017 +++ src/sys/conf/compat_netbsd10.config Mon Jan 15 07:20:10 2018 @@ -1,7 +1,9 @@ -# $NetBSD: compat_netbsd10.config,v 1.1 2017/09/14 07:58:44 mrg Exp $ +# $NetBSD: compat_netbsd10.config,v 1.2 2018/01/15 07:20:10 mrg Exp $ # Common fragment for all NetBSD targets wanting NetBSD 1.0 and newer # compatibility support. +# +# Note that COMPAT_10 implies all newer COMPAT_XX options. include"conf/compat_netbsd.config" options COMPAT_10 # NetBSD 1.0 and beyond. Index: src/sys/conf/compat_netbsd11.config diff -u src/sys/conf/compat_netbsd11.config:1.1 src/sys/conf/compat_netbsd11.config:1.2 --- src/sys/conf/compat_netbsd11.config:1.1 Thu Sep 14 07:58:44 2017 +++ src/sys/conf/compat_netbsd11.config Mon Jan 15 07:20:10 2018 @@ -1,7 +1,9 @@ -# $NetBSD: compat_netbsd11.config,v 1.1 2017/09/14 07:58:44 mrg Exp $ +# $NetBSD: compat_netbsd11.config,v 1.2 2018/01/15 07:20:10 mrg Exp $ # Common fragment for all NetBSD targets wanting NetBSD 1.1 and newer # compatibility support. +# +# Note that COMPAT_11 implies all newer COMPAT_XX options. include"conf/compat_netbsd.config" options COMPAT_11 # NetBSD 1.1 and beyond. Index: src/sys/conf/compat_netbsd12.config diff -u src/sys/conf/compat_netbsd12.config:1.1 src/sys/conf/compat_netbsd12.config:1.2 --- src/sys/conf/compat_netbsd12.config:1.1 Thu Sep 14 07:58:44 2017 +++ src/sys/conf/compat_netbsd12.config Mon Jan 15 07:20:10 2018 @@ -1,7 +1,9 @@ -# $NetBSD: compat_netbsd12.config,v 1.1 2017/09/14 07:58:44 mrg Exp $ +# $NetBSD: compat_netbsd12.config,v 1.2 2018/01/15 07:20:10 mrg Exp $ # Common fragment for all NetBSD targets wanting NetBSD 1.2 and newer # compatibility support. +# +# Note that COMPAT_12 implies all newer COMPAT_XX options. include"conf/compat_netbsd.config" options COMPAT_12 # NetBSD 1.2 and beyond. Index: src/sys/conf/compat_netbsd13.config diff -u src/sys/conf/compat_netbsd13.config:1.1 src/sys/conf/compat_netbsd13.config:1.2 --- src/sys/conf/compat_netbsd13.config:1.1 Thu Sep 14 07:58:44 2017 +++ src/sys/conf/compat_netbsd13.config Mon Jan 15 07:20:10 2018 @@ -1,7 +1,9 @@ -# $NetBSD: compat_netbsd13.config,v 1.1 2017/09/14 07:58:44 mrg Exp $ +# $NetBSD: compat_netbsd13.config,v 1.2 2018/01/15 07:20:10 mrg Exp $ # Common fragment for all NetBSD targets wanting NetBSD 1.3 and newer # compatibility support. +# +# Note that COMPAT_13 implies all newer COMPAT_XX options. include"conf/compat_netbsd.config" options COMPAT_13 # NetBSD 1.3 and beyond. Index: src/sys/conf/compat_netbsd14.config diff -u src/sys/conf/compat_netbsd14.config:1.1 src/sys/conf/compat_netbsd14.config:1.2 --- src/sys/conf/compat_netbsd14.config:1.1 Thu Sep 14 07:58:44 2017 +++ src/sys/conf/compat_netbsd14.config Mon Jan 15 07:20:10 2018 @@ -1,7 +1,9 @@ -# $NetBSD:
CVS commit: src/sys/conf
Module Name:src Committed By: jmcneill Date: Wed Jan 10 11:32:29 UTC 2018 Modified Files: src/sys/conf: filesystems.config Log Message: Comment out AUTOFS until it compiles To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/conf/filesystems.config Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/filesystems.config diff -u src/sys/conf/filesystems.config:1.2 src/sys/conf/filesystems.config:1.3 --- src/sys/conf/filesystems.config:1.2 Tue Jan 9 03:31:12 2018 +++ src/sys/conf/filesystems.config Wed Jan 10 11:32:29 2018 @@ -1,4 +1,4 @@ -# $NetBSD: filesystems.config,v 1.2 2018/01/09 03:31:12 christos Exp $ +# $NetBSD: filesystems.config,v 1.3 2018/01/10 11:32:29 jmcneill Exp $ file-system FFS # UFS file-system MFS # memory file system file-system NFS # Network File System client @@ -25,4 +25,4 @@ file-system PTYFS # /dev/ptm support #file-system UDF # experimental - OSTA UDF CD/DVD file-system #file-system HFS # experimental - Apple HFS+ (read-only) #file-system NILFS # experimental - NTT's NiLFS(2) -file-system AUTOFS # Automounter Filesystem +#file-system AUTOFS # Automounter Filesystem
CVS commit: src/sys/conf
Module Name:src Committed By: maxv Date: Sat Dec 16 09:34:18 UTC 2017 Modified Files: src/sys/conf: files Log Message: Fix the linux dependency. It does not depend on COMPAT_16, it just wants the compat functions (not really controlled by COMPAT_NETBSD, but for the principle). Makes it possible to load compat_linux.kmod from the filesystem without any COMPAT_* option compiled (but COMPAT_NETBSD). To generate a diff of this commit: cvs rdiff -u -r1.1187 -r1.1188 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1187 src/sys/conf/files:1.1188 --- src/sys/conf/files:1.1187 Sun Dec 10 17:12:54 2017 +++ src/sys/conf/files Sat Dec 16 09:34:18 2017 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1187 2017/12/10 17:12:54 bouyer Exp $ +# $NetBSD: files,v 1.1188 2017/12/16 09:34:18 maxv Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20171118 @@ -149,7 +149,7 @@ defflag opt_compat_netbsd.h COMPAT_09: C defflagCOMPAT_OSSAUDIO defflagCOMPAT_FREEBSD: COMPAT_30 defflagCOMPAT_IBCS2 -defflagCOMPAT_LINUX: COMPAT_16 +defflagCOMPAT_LINUX: COMPAT_NETBSD defflagCOMPAT_OSF1 defflagCOMPAT_SUNOS: COMPAT_30 defflag opt_compat_svr4.h COMPAT_SVR4 COMPAT_SVR4_32 SVR4_COMPAT_SOLARIS2
CVS commit: src/sys/conf
Module Name:src
Committed By: christos
Date: Wed Dec 6 02:08:03 UTC 2017
Modified Files:
src/sys/conf: dts.mk
Log Message:
use -@ like bsd.klinks.mk
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/conf/dts.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/dts.mk
diff -u src/sys/conf/dts.mk:1.6 src/sys/conf/dts.mk:1.7
--- src/sys/conf/dts.mk:1.6 Mon Dec 4 21:57:37 2017
+++ src/sys/conf/dts.mk Tue Dec 5 21:08:03 2017
@@ -1,4 +1,4 @@
-# $NetBSD: dts.mk,v 1.6 2017/12/05 02:57:37 christos Exp $
+# $NetBSD: dts.mk,v 1.7 2017/12/06 02:08:03 christos Exp $
DTSARCH?=${MACHINE_CPU}
DTSGNUARCH?=${DTSARCH}
@@ -6,9 +6,9 @@ DTSPADDING?=1024
.if !make(obj) && !make(clean) && !make(cleandir)
.BEGIN:
- @mkdir -p dts
+ -@mkdir -p dts
.for _arch in ${DTSGNUARCH}
- @ln -sf ${S:S@^../@../../@}/external/gpl2/dts/dist/arch/${_arch}/boot/dts dts/${_arch}
+ -@ln -sf ${S:S@^../@../../@}/external/gpl2/dts/dist/arch/${_arch}/boot/dts dts/${_arch}
.endfor
.endif
CVS commit: src/sys/conf
Module Name:src
Committed By: christos
Date: Tue Dec 5 02:57:37 UTC 2017
Modified Files:
src/sys/conf: dts.mk
Log Message:
Use similar restrictions to bsd.klinks.mk for .BEGIN rules.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/conf/dts.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/dts.mk
diff -u src/sys/conf/dts.mk:1.5 src/sys/conf/dts.mk:1.6
--- src/sys/conf/dts.mk:1.5 Sun Dec 3 12:07:18 2017
+++ src/sys/conf/dts.mk Mon Dec 4 21:57:37 2017
@@ -1,14 +1,16 @@
-# $NetBSD: dts.mk,v 1.5 2017/12/03 17:07:18 christos Exp $
+# $NetBSD: dts.mk,v 1.6 2017/12/05 02:57:37 christos Exp $
DTSARCH?=${MACHINE_CPU}
DTSGNUARCH?=${DTSARCH}
DTSPADDING?=1024
+.if !make(obj) && !make(clean) && !make(cleandir)
.BEGIN:
@mkdir -p dts
.for _arch in ${DTSGNUARCH}
@ln -sf ${S:S@^../@../../@}/external/gpl2/dts/dist/arch/${_arch}/boot/dts dts/${_arch}
.endfor
+.endif
DTSINC?=$S/external/gpl2/dts/dist/include
.for _arch in ${DTSARCH}
CVS commit: src/sys/conf
Module Name:src
Committed By: christos
Date: Sun Dec 3 17:07:18 UTC 2017
Modified Files:
src/sys/conf: dts.mk
Log Message:
handle absolute $S paths; we want to add ../ if they are relative only.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/conf/dts.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/dts.mk
diff -u src/sys/conf/dts.mk:1.4 src/sys/conf/dts.mk:1.5
--- src/sys/conf/dts.mk:1.4 Sun Dec 3 11:36:05 2017
+++ src/sys/conf/dts.mk Sun Dec 3 12:07:18 2017
@@ -1,4 +1,4 @@
-# $NetBSD: dts.mk,v 1.4 2017/12/03 16:36:05 christos Exp $
+# $NetBSD: dts.mk,v 1.5 2017/12/03 17:07:18 christos Exp $
DTSARCH?=${MACHINE_CPU}
DTSGNUARCH?=${DTSARCH}
@@ -7,7 +7,7 @@ DTSPADDING?=1024
.BEGIN:
@mkdir -p dts
.for _arch in ${DTSGNUARCH}
- @ln -sf ../$S/external/gpl2/dts/dist/arch/${_arch}/boot/dts dts/${_arch}
+ @ln -sf ${S:S@^../@../../@}/external/gpl2/dts/dist/arch/${_arch}/boot/dts dts/${_arch}
.endfor
DTSINC?=$S/external/gpl2/dts/dist/include
CVS commit: src/sys/conf
Module Name:src
Committed By: christos
Date: Sun Dec 3 16:36:05 UTC 2017
Modified Files:
src/sys/conf: dts.mk
Log Message:
Add more complexity because of the path mess in the dts files. Requested
by jmcneill@
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/conf/dts.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/dts.mk
diff -u src/sys/conf/dts.mk:1.3 src/sys/conf/dts.mk:1.4
--- src/sys/conf/dts.mk:1.3 Thu Sep 7 17:22:19 2017
+++ src/sys/conf/dts.mk Sun Dec 3 11:36:05 2017
@@ -1,9 +1,15 @@
-# $NetBSD: dts.mk,v 1.3 2017/09/07 21:22:19 jmcneill Exp $
+# $NetBSD: dts.mk,v 1.4 2017/12/03 16:36:05 christos Exp $
DTSARCH?=${MACHINE_CPU}
DTSGNUARCH?=${DTSARCH}
DTSPADDING?=1024
+.BEGIN:
+ @mkdir -p dts
+.for _arch in ${DTSGNUARCH}
+ @ln -sf ../$S/external/gpl2/dts/dist/arch/${_arch}/boot/dts dts/${_arch}
+.endfor
+
DTSINC?=$S/external/gpl2/dts/dist/include
.for _arch in ${DTSARCH}
DTSDIR+=$S/arch/${_arch}/dts
@@ -17,7 +23,7 @@ DTSDIR+=$S/external/gpl2/dts/dist/arch/$
.endfor
.endfor
-DTSPATH=${DTSINC} ${DTSDIR}
+DTSPATH=${DTSINC} ${DTSDIR} dts
.SUFFIXES: .dtd .dtb .dts
CVS commit: src/sys/conf
Module Name:src Committed By: christos Date: Sat Nov 18 18:44:55 UTC 2017 Modified Files: src/sys/conf: files Log Message: Catch up with the new config version. To generate a diff of this commit: cvs rdiff -u -r1.1183 -r1.1184 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1183 src/sys/conf/files:1.1184 --- src/sys/conf/files:1.1183 Thu Oct 19 19:58:41 2017 +++ src/sys/conf/files Sat Nov 18 13:44:55 2017 @@ -1,7 +1,7 @@ -# $NetBSD: files,v 1.1183 2017/10/19 23:58:41 jmcneill Exp $ +# $NetBSD: files,v 1.1184 2017/11/18 18:44:55 christos Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 -version 20170615 +version 20171118 # # device classes
CVS commit: src/sys/conf
Module Name:src Committed By: kre Date: Mon Oct 9 10:28:33 UTC 2017 Modified Files: src/sys/conf: files Log Message: (untested) attempt to fix b5 evbarm-earmv7hf build - please revert if this is incorrect, or harms anything else... To generate a diff of this commit: cvs rdiff -u -r1.1181 -r1.1182 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1181 src/sys/conf/files:1.1182 --- src/sys/conf/files:1.1181 Wed Sep 13 22:24:46 2017 +++ src/sys/conf/files Mon Oct 9 10:28:33 2017 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1181 2017/09/13 22:24:46 sevan Exp $ +# $NetBSD: files,v 1.1182 2017/10/09 10:28:33 kre Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20170615 @@ -1037,7 +1037,7 @@ device siisata: ata, ata_dma, ata_udma, # Marvell Serial-ATA Host Controller define mvsata file dev/ic/mvsata.c mvsata -device mvsata: ata, ata_dma, ata_udma, wdc_common, sata, sata_pmp, mvsata +device mvsata: ata, ata_dma, ata_udma, wdc_common, sata, sata_fis, sata_pmp, mvsata defflag opt_mvsata.h MVSATA_WITHOUTDMA # DECchip 21x4x Ethernet controller family, and assorted clones.
CVS commit: src/sys/conf
Module Name:src
Committed By: jmcneill
Date: Thu Sep 7 21:22:19 UTC 2017
Modified Files:
src/sys/conf: dts.mk
Log Message:
Add support for building dts files from multiple paths, idea from christos
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/conf/dts.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/dts.mk
diff -u src/sys/conf/dts.mk:1.2 src/sys/conf/dts.mk:1.3
--- src/sys/conf/dts.mk:1.2 Sat Jul 15 15:53:48 2017
+++ src/sys/conf/dts.mk Thu Sep 7 21:22:19 2017
@@ -1,32 +1,46 @@
-# $NetBSD: dts.mk,v 1.2 2017/07/15 15:53:48 christos Exp $
+# $NetBSD: dts.mk,v 1.3 2017/09/07 21:22:19 jmcneill Exp $
-DTSINC?=$S/external/gpl2/dts/dist/include
-DTSGNUPATH?=$S/external/gpl2/dts/dist/arch/${MACHINE_CPU}/boot/dts
-DTSPATH?=$S/arch/${MACHINE_CPU}/dts
+DTSARCH?=${MACHINE_CPU}
+DTSGNUARCH?=${DTSARCH}
DTSPADDING?=1024
+DTSINC?=$S/external/gpl2/dts/dist/include
+.for _arch in ${DTSARCH}
+DTSDIR+=$S/arch/${_arch}/dts
+.endfor
+.for _arch in ${DTSGNUARCH}
+DTSDIR+=$S/external/gpl2/dts/dist/arch/${_arch}/boot/dts
+.for _dir in ${DTSSUBDIR}
+.if exists($S/external/gpl2/dts/dist/arch/${_arch}/boot/dts/${_dir})
+DTSDIR+=$S/external/gpl2/dts/dist/arch/${_arch}/boot/dts/${_dir}
+.endif
+.endfor
+.endfor
+
+DTSPATH=${DTSINC} ${DTSDIR}
+
.SUFFIXES: .dtd .dtb .dts
.dts.dtd:
- (${CPP} -P -xassembler-with-cpp -I ${DTSINC} -I ${DTSPATH} \
- -I ${DTSGNUPATH} -include ${.IMPSRC} /dev/null | \
- ${TOOL_DTC} -i ${DTSINC} -i ${DTSPATH} -i ${DTSGNUPATH} -I dts -O dtb \
+ (${CPP} -P -xassembler-with-cpp ${DTSPATH:@v@-I ${v}@} \
+ -include ${.IMPSRC} /dev/null | \
+ ${TOOL_DTC} ${DTSPATH:@v@-i ${v}@} -I dts -O dtb \
-p ${DTSPADDING} -b 0 -o /dev/null -d /dev/stdout | \
${TOOL_SED} -e 's@/dev/null@${.TARGET:.dtd=.dtb}@' \
-e 's@@${.IMPSRC}@' && \
- ${CPP} -P -xassembler-with-cpp -I ${DTSINC} -I ${DTSPATH} \
- -I ${DTSGNUPATH} -include ${.IMPSRC} -M /dev/null | \
+ ${CPP} -P -xassembler-with-cpp ${DTSPATH:@v@-I ${v}@} \
+ -include ${.IMPSRC} -M /dev/null | \
${TOOL_SED} -e 's@null.o@${.TARGET:.dtd=.dtb}@' \
-e 's@/dev/null@@') > ${.TARGET}
.dts.dtb:
- ${CPP} -P -xassembler-with-cpp -I ${DTSINC} -I ${DTSPATH} \
- -I ${DTSGNUPATH} -include ${.IMPSRC} /dev/null | \
- ${TOOL_DTC} -i ${DTSINC} -i ${DTSPATH} -i ${DTSGNUPATH} -I dts -O dtb \
+ ${CPP} -P -xassembler-with-cpp ${DTSPATH:@v@-I ${v}@} \
+ -include ${.IMPSRC} /dev/null | \
+ ${TOOL_DTC} ${DTSPATH:@v@-i ${v}@} -I dts -O dtb \
-p ${DTSPADDING} -b 0 -o ${.TARGET}
-.PATH.dts: ${DTSPATH} ${DTSGNUPATH}
+.PATH.dts: ${DTSDIR}
DEPS+= ${DTS:.dts=.dtd}
DTB= ${DTS:.dts=.dtb}
CVS commit: src/sys/conf
Module Name:src
Committed By: christos
Date: Sat Jul 15 15:53:48 UTC 2017
Modified Files:
src/sys/conf: dts.mk
Log Message:
do dts depend processing in two passes, one for /include/ and one for #include
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/conf/dts.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/dts.mk
diff -u src/sys/conf/dts.mk:1.1 src/sys/conf/dts.mk:1.2
--- src/sys/conf/dts.mk:1.1 Sat Jul 15 11:20:52 2017
+++ src/sys/conf/dts.mk Sat Jul 15 11:53:48 2017
@@ -1,4 +1,4 @@
-# $NetBSD: dts.mk,v 1.1 2017/07/15 15:20:52 christos Exp $
+# $NetBSD: dts.mk,v 1.2 2017/07/15 15:53:48 christos Exp $
DTSINC?=$S/external/gpl2/dts/dist/include
DTSGNUPATH?=$S/external/gpl2/dts/dist/arch/${MACHINE_CPU}/boot/dts
@@ -8,9 +8,17 @@ DTSPADDING?=1024
.SUFFIXES: .dtd .dtb .dts
.dts.dtd:
+ (${CPP} -P -xassembler-with-cpp -I ${DTSINC} -I ${DTSPATH} \
+ -I ${DTSGNUPATH} -include ${.IMPSRC} /dev/null | \
${TOOL_DTC} -i ${DTSINC} -i ${DTSPATH} -i ${DTSGNUPATH} -I dts -O dtb \
- -p ${DTSPADDING} -b 0 -o /dev/null -d /dev/stdout ${.IMPSRC} | \
- ${TOOL_SED} -e 's@/dev/null@${.TARGET:.dtd=.dtb}@' > ${.TARGET}
+ -p ${DTSPADDING} -b 0 -o /dev/null -d /dev/stdout | \
+ ${TOOL_SED} -e 's@/dev/null@${.TARGET:.dtd=.dtb}@' \
+ -e 's@@${.IMPSRC}@' && \
+ ${CPP} -P -xassembler-with-cpp -I ${DTSINC} -I ${DTSPATH} \
+ -I ${DTSGNUPATH} -include ${.IMPSRC} -M /dev/null | \
+ ${TOOL_SED} -e 's@null.o@${.TARGET:.dtd=.dtb}@' \
+ -e 's@/dev/null@@') > ${.TARGET}
+
.dts.dtb:
${CPP} -P -xassembler-with-cpp -I ${DTSINC} -I ${DTSPATH} \
CVS commit: src/sys/conf
Module Name:src
Committed By: christos
Date: Sat Jul 15 15:20:52 UTC 2017
Modified Files:
src/sys/conf: Makefile.kern.inc
Added Files:
src/sys/conf: dts.mk
Log Message:
Move the dts rule to a separate file and add dependencies handling.
To generate a diff of this commit:
cvs rdiff -u -r1.259 -r1.260 src/sys/conf/Makefile.kern.inc
cvs rdiff -u -r0 -r1.1 src/sys/conf/dts.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.259 src/sys/conf/Makefile.kern.inc:1.260
--- src/sys/conf/Makefile.kern.inc:1.259 Wed Jul 12 21:17:03 2017
+++ src/sys/conf/Makefile.kern.inc Sat Jul 15 11:20:52 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.259 2017/07/13 01:17:03 jmcneill Exp $
+# $NetBSD: Makefile.kern.inc,v 1.260 2017/07/15 15:20:52 christos Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -321,6 +321,7 @@ ${_s:T:R}.o: ${_s}
.include "${S}/conf/cscope.mk"
.include "${S}/conf/gdbinit.mk"
.include "${S}/conf/ssp.mk"
+.include "${S}/conf/dts.mk"
##
## (7) misc targets: install, clean(dir), depend(all), lint, links, tags,
@@ -534,27 +535,6 @@ build_kernel: .USE
@${KCOMPILE.s} -pg
.endif # ___USE_SUFFIX_RULES___
-# Begin DTS handling
-
-DTSINC?=$S/external/gpl2/dts/dist/include
-DTSGNUPATH?=$S/external/gpl2/dts/dist/arch/${MACHINE_CPU}/boot/dts
-DTSPATH?=$S/arch/${MACHINE_CPU}/dts
-DTSPADDING?=1024
-
-.SUFFIXES: .dtb .dts
-.dts.dtb:
- ${CPP} -P -xassembler-with-cpp -I ${DTSINC} -I ${DTSPATH} -I ${DTSGNUPATH} \
- -include ${.IMPSRC} /dev/null | \
- ${TOOL_DTC} -i ${DTSINC} -i ${DTSPATH} -i ${DTSGNUPATH} -I dts -O dtb \
- -p ${DTSPADDING} -b 0 -o ${.TARGET}
-
-.PATH.dts: ${DTSPATH} ${DTSGNUPATH}
-
-DTB= ${DTS:.dts=.dtb}
-all: ${DTB}
-
-# End DTS handling
-
##
## the end
##
Added files:
Index: src/sys/conf/dts.mk
diff -u /dev/null src/sys/conf/dts.mk:1.1
--- /dev/null Sat Jul 15 11:20:52 2017
+++ src/sys/conf/dts.mk Sat Jul 15 11:20:52 2017
@@ -0,0 +1,26 @@
+# $NetBSD: dts.mk,v 1.1 2017/07/15 15:20:52 christos Exp $
+
+DTSINC?=$S/external/gpl2/dts/dist/include
+DTSGNUPATH?=$S/external/gpl2/dts/dist/arch/${MACHINE_CPU}/boot/dts
+DTSPATH?=$S/arch/${MACHINE_CPU}/dts
+DTSPADDING?=1024
+
+.SUFFIXES: .dtd .dtb .dts
+
+.dts.dtd:
+ ${TOOL_DTC} -i ${DTSINC} -i ${DTSPATH} -i ${DTSGNUPATH} -I dts -O dtb \
+ -p ${DTSPADDING} -b 0 -o /dev/null -d /dev/stdout ${.IMPSRC} | \
+ ${TOOL_SED} -e 's@/dev/null@${.TARGET:.dtd=.dtb}@' > ${.TARGET}
+
+.dts.dtb:
+ ${CPP} -P -xassembler-with-cpp -I ${DTSINC} -I ${DTSPATH} \
+ -I ${DTSGNUPATH} -include ${.IMPSRC} /dev/null | \
+ ${TOOL_DTC} -i ${DTSINC} -i ${DTSPATH} -i ${DTSGNUPATH} -I dts -O dtb \
+ -p ${DTSPADDING} -b 0 -o ${.TARGET}
+
+.PATH.dts: ${DTSPATH} ${DTSGNUPATH}
+
+DEPS+= ${DTS:.dts=.dtd}
+DTB= ${DTS:.dts=.dtb}
+
+all: ${DTB}
CVS commit: src/sys/conf
Module Name:src
Committed By: jmcneill
Date: Thu Jul 13 01:17:03 UTC 2017
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
Add support for dts files outside of external/gpl2.
To generate a diff of this commit:
cvs rdiff -u -r1.258 -r1.259 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.258 src/sys/conf/Makefile.kern.inc:1.259
--- src/sys/conf/Makefile.kern.inc:1.258 Sat Jun 17 17:08:49 2017
+++ src/sys/conf/Makefile.kern.inc Thu Jul 13 01:17:03 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.258 2017/06/17 17:08:49 christos Exp $
+# $NetBSD: Makefile.kern.inc,v 1.259 2017/07/13 01:17:03 jmcneill Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -537,17 +537,18 @@ build_kernel: .USE
# Begin DTS handling
DTSINC?=$S/external/gpl2/dts/dist/include
-DTSPATH?=$S/external/gpl2/dts/dist/arch/${MACHINE_CPU}/boot/dts
+DTSGNUPATH?=$S/external/gpl2/dts/dist/arch/${MACHINE_CPU}/boot/dts
+DTSPATH?=$S/arch/${MACHINE_CPU}/dts
DTSPADDING?=1024
.SUFFIXES: .dtb .dts
.dts.dtb:
- ${CPP} -P -xassembler-with-cpp -I ${DTSINC} -I ${DTSPATH} \
+ ${CPP} -P -xassembler-with-cpp -I ${DTSINC} -I ${DTSPATH} -I ${DTSGNUPATH} \
-include ${.IMPSRC} /dev/null | \
- ${TOOL_DTC} -i ${DTSINC} -i ${DTSPATH} -I dts -O dtb \
+ ${TOOL_DTC} -i ${DTSINC} -i ${DTSPATH} -i ${DTSGNUPATH} -I dts -O dtb \
-p ${DTSPADDING} -b 0 -o ${.TARGET}
-.PATH.dts: ${DTSPATH}
+.PATH.dts: ${DTSPATH} ${DTSGNUPATH}
DTB= ${DTS:.dts=.dtb}
all: ${DTB}
CVS commit: src/sys/conf
Module Name:src
Committed By: christos
Date: Sat Jun 17 17:08:49 UTC 2017
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
Assign DTB files to a variable so we can make -V DTB
To generate a diff of this commit:
cvs rdiff -u -r1.257 -r1.258 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.257 src/sys/conf/Makefile.kern.inc:1.258
--- src/sys/conf/Makefile.kern.inc:1.257 Thu Jun 15 17:41:01 2017
+++ src/sys/conf/Makefile.kern.inc Sat Jun 17 13:08:49 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.257 2017/06/15 21:41:01 jmcneill Exp $
+# $NetBSD: Makefile.kern.inc,v 1.258 2017/06/17 17:08:49 christos Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -549,7 +549,8 @@ DTSPADDING?=1024
.PATH.dts: ${DTSPATH}
-all: ${DTS:.dts=.dtb}
+DTB= ${DTS:.dts=.dtb}
+all: ${DTB}
# End DTS handling
CVS commit: src/sys/conf
Module Name:src Committed By: jmcneill Date: Fri Jun 16 21:36:35 UTC 2017 Modified Files: src/sys/conf: files Log Message: bump required config version for multiline makeoptions feature To generate a diff of this commit: cvs rdiff -u -r1.1177 -r1.1178 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1177 src/sys/conf/files:1.1178 --- src/sys/conf/files:1.1177 Sun Jun 11 21:45:28 2017 +++ src/sys/conf/files Fri Jun 16 21:36:35 2017 @@ -1,7 +1,7 @@ -# $NetBSD: files,v 1.1177 2017/06/11 21:45:28 pgoyette Exp $ +# $NetBSD: files,v 1.1178 2017/06/16 21:36:35 jmcneill Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 -version 20150846 +version 20170615 # # device classes
CVS commit: src/sys/conf
Module Name:src
Committed By: jmcneill
Date: Thu Jun 15 21:41:01 UTC 2017
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
Add support for building DTB files during kernel build, from christos.
To generate a diff of this commit:
cvs rdiff -u -r1.256 -r1.257 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.256 src/sys/conf/Makefile.kern.inc:1.257
--- src/sys/conf/Makefile.kern.inc:1.256 Wed Jan 11 12:19:43 2017
+++ src/sys/conf/Makefile.kern.inc Thu Jun 15 21:41:01 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.256 2017/01/11 12:19:43 joerg Exp $
+# $NetBSD: Makefile.kern.inc,v 1.257 2017/06/15 21:41:01 jmcneill Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -534,6 +534,25 @@ build_kernel: .USE
@${KCOMPILE.s} -pg
.endif # ___USE_SUFFIX_RULES___
+# Begin DTS handling
+
+DTSINC?=$S/external/gpl2/dts/dist/include
+DTSPATH?=$S/external/gpl2/dts/dist/arch/${MACHINE_CPU}/boot/dts
+DTSPADDING?=1024
+
+.SUFFIXES: .dtb .dts
+.dts.dtb:
+ ${CPP} -P -xassembler-with-cpp -I ${DTSINC} -I ${DTSPATH} \
+ -include ${.IMPSRC} /dev/null | \
+ ${TOOL_DTC} -i ${DTSINC} -i ${DTSPATH} -I dts -O dtb \
+ -p ${DTSPADDING} -b 0 -o ${.TARGET}
+
+.PATH.dts: ${DTSPATH}
+
+all: ${DTS:.dts=.dtb}
+
+# End DTS handling
+
##
## the end
##
CVS commit: src/sys/conf
Module Name:src Committed By: pgoyette Date: Sun Jun 11 21:45:28 UTC 2017 Modified Files: src/sys/conf: files Log Message: Remove the 'needs-flag' from spkr.c - it's not needed by anything. To generate a diff of this commit: cvs rdiff -u -r1.1176 -r1.1177 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1176 src/sys/conf/files:1.1177 --- src/sys/conf/files:1.1176 Sun Jun 11 03:55:56 2017 +++ src/sys/conf/files Sun Jun 11 21:45:28 2017 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1176 2017/06/11 03:55:56 nat Exp $ +# $NetBSD: files,v 1.1177 2017/06/11 21:45:28 pgoyette Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20150846 @@ -345,7 +345,7 @@ define firmload # speaker devices, attaches to audio or pcppi drivers device spkr: wsbelldev -file dev/spkr.c spkr needs-flag +file dev/spkr.c spkr include "dev/files.audio"
CVS commit: src/sys/conf
Module Name:src
Committed By: christos
Date: Sun Apr 9 14:52:14 UTC 2017
Modified Files:
src/sys/conf: newvers_stand.mk
Log Message:
Fix typo
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/conf/newvers_stand.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/newvers_stand.mk
diff -u src/sys/conf/newvers_stand.mk:1.1 src/sys/conf/newvers_stand.mk:1.2
--- src/sys/conf/newvers_stand.mk:1.1 Sat Apr 8 15:53:54 2017
+++ src/sys/conf/newvers_stand.mk Sun Apr 9 10:52:14 2017
@@ -1,4 +1,4 @@
-# $NetBSD: newvers_stand.mk,v 1.1 2017/04/08 19:53:54 christos Exp $
+# $NetBSD: newvers_stand.mk,v 1.2 2017/04/09 14:52:14 christos Exp $
VERSIONFILE?=version
VERSIONMACHINE?=${MACHINE}
@@ -10,7 +10,7 @@ SRCS+= vers.c
CLEANFILES+= vers.c
.if ${MKREPRO:Uno} == "yes"
-. if ${MKREPRO_TIMESTAMP:U0} != 0}
+. if ${MKREPRO_TIMESTAMP:U0} != 0
VERSIONFLAGS+=-D ${MKREPRO_TIMESTAMP}
. else
VERSIONFLAGS+=-d
CVS commit: src/sys/conf
Module Name:src
Committed By: christos
Date: Sat Apr 8 19:53:54 UTC 2017
Modified Files:
src/sys/conf: newvers_stand.sh
Added Files:
src/sys/conf: newvers_stand.mk
Log Message:
Add makefile snippet for vers.c building.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/conf/newvers_stand.mk
cvs rdiff -u -r1.8 -r1.9 src/sys/conf/newvers_stand.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/newvers_stand.sh
diff -u src/sys/conf/newvers_stand.sh:1.8 src/sys/conf/newvers_stand.sh:1.9
--- src/sys/conf/newvers_stand.sh:1.8 Sat Jan 22 14:19:25 2011
+++ src/sys/conf/newvers_stand.sh Sat Apr 8 15:53:54 2017
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: newvers_stand.sh,v 1.8 2011/01/22 19:19:25 joerg Exp $
+# $NetBSD: newvers_stand.sh,v 1.9 2017/04/08 19:53:54 christos Exp $
#
# Copyright (c) 2000 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -33,44 +33,48 @@
# bootblock build on various architectures.
#
# Called as:
-# sh ${S}/conf/newvers_stand.sh [-N] VERSION_FILE ARCH [EXTRA_MSG]
+# sh ${S}/conf/newvers_stand.sh [-dkn] [-D ] [-m ] VERSION_TEMPLATE [EXTRA_MSG]
-cwd=$(dirname $0)
+cwd=$(dirname "$0")
-add_name=yes
-add_date=no
-add_kernrev=yes
+add_name=true
+add_date=true
+add_kernrev=true
+machine="unknown"
+dateargs=
# parse command args
-while getopts "DKN?" OPT; do
+while getopts "m:D:dknm:" OPT; do
case $OPT in
- D) add_date=yes;;
- K) add_kernrev=no;;
- N) add_name=no;;
- ?) echo "Syntax: newvers_stand.sh [-NDMK] VERSION_TEMPLATE ARCH EXTRA_COMMENT" >&2
+ D) dateargs="-r $OPTARG";;
+ d) add_date=false;;
+ k) add_kernrev=false;;
+ m) machine=${OPTARG};;
+ n) add_name=false;;
+ *) echo "Usage: newvers_stand.sh [-dkn] [-D ] [-m ] VERSION_TEMPLATE EXTRA_COMMENT" >&2
exit 1;;
esac
done
-shift `expr $OPTIND - 1`
+shift $(expr $OPTIND - 1)
-r=`awk -F: '$1 ~ /^[0-9.]*$/ { it = $1; } END { print it }' $1`
-t=`LC_ALL=C date`
+r=$(awk -F: '$1 ~ /^[0-9.]*$/ { it = $1; } END { print it }' "$1")
+shift
+t=$(LC_ALL=C TZ=UTC date $dateargs)
-if [ $add_date = yes ]; then
+if $add_date; then
echo "const char bootprog_rev[] = \"${r} (${t})\";" > vers.c
else
echo "const char bootprog_rev[] = \"${r}\";" > vers.c
fi
-if [ $add_name = yes ]; then
- a="$2" # architecture name
- extra=${3:+" $3"}
+if $add_name; then
+ extra=${1:+" $1"}
- echo "const char bootprog_name[] = \"NetBSD/${a}${extra}\";" >> vers.c
+ echo "const char bootprog_name[] = \"NetBSD/${machine}${extra}\";" >> vers.c
fi
-if [ $add_kernrev = yes ]; then
- osr=$(sh ${cwd}/osrelease.sh)
+if $add_kernrev; then
+ osr=$(sh "${cwd}/osrelease.sh")
echo "const char bootprog_kernrev[] = \"${osr}\";" >> vers.c
fi
Added files:
Index: src/sys/conf/newvers_stand.mk
diff -u /dev/null src/sys/conf/newvers_stand.mk:1.1
--- /dev/null Sat Apr 8 15:53:54 2017
+++ src/sys/conf/newvers_stand.mk Sat Apr 8 15:53:54 2017
@@ -0,0 +1,25 @@
+# $NetBSD: newvers_stand.mk,v 1.1 2017/04/08 19:53:54 christos Exp $
+
+VERSIONFILE?=version
+VERSIONMACHINE?=${MACHINE}
+.if exists(${VERSIONFILE})
+
+.if !make(depend)
+SRCS+= vers.c
+.endif
+CLEANFILES+= vers.c
+
+.if ${MKREPRO:Uno} == "yes"
+. if ${MKREPRO_TIMESTAMP:U0} != 0}
+VERSIONFLAGS+=-D ${MKREPRO_TIMESTAMP}
+. else
+VERSIONFLAGS+=-d
+. endif
+.endif
+
+vers.c: ${VERSIONFILE}
+ ${_MKTARGET_CREATE}
+ ${HOST_SH} ${S}/conf/newvers_stand.sh \
+ -m ${VERSIONMACHINE} ${VERSIONFLAGS} ${.ALLSRC} ${NEWVERSWHAT}
+
+.endif
CVS commit: src/sys/conf
Module Name:src
Committed By: christos
Date: Sat Apr 8 18:24:09 UTC 2017
Modified Files:
src/sys/conf: newvers.mk newvers.sh
Log Message:
- modernize: use getopts/usage/true/false variables
- if ${MKREPRO_TIMESTAMP} is used, synthesize all the information, instead
of eliding it.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/conf/newvers.mk
cvs rdiff -u -r1.61 -r1.62 src/sys/conf/newvers.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/newvers.mk
diff -u src/sys/conf/newvers.mk:1.1 src/sys/conf/newvers.mk:1.2
--- src/sys/conf/newvers.mk:1.1 Sun Sep 6 02:13:16 2015
+++ src/sys/conf/newvers.mk Sat Apr 8 14:24:09 2017
@@ -1,9 +1,13 @@
-# $NetBSD: newvers.mk,v 1.1 2015/09/06 06:13:16 uebayasi Exp $
+# $NetBSD: newvers.mk,v 1.2 2017/04/08 18:24:09 christos Exp $
MKREPRO?=no
.if ${MKREPRO} == "yes"
-_NVFLAGS=${NVFLAGS} -r
+. if ${MKREPRO_TIMESTAMP:U0} != 0
+_NVFLAGS=${NVFLAGS} -r ${MKREPRO_TIMESTAMP} -i ${KERNEL_BUILD:T} -m ${MACHINE}
+. else
+_NVFLAGS=${NVFLAGS} -R
+. endif
.else
_NVFLAGS=${NVFLAGS}
.endif
Index: src/sys/conf/newvers.sh
diff -u src/sys/conf/newvers.sh:1.61 src/sys/conf/newvers.sh:1.62
--- src/sys/conf/newvers.sh:1.61 Sun Aug 3 09:14:59 2014
+++ src/sys/conf/newvers.sh Sat Apr 8 14:24:09 2017
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: newvers.sh,v 1.61 2014/08/03 13:14:59 justin Exp $
+# $NetBSD: newvers.sh,v 1.62 2017/04/08 18:24:09 christos Exp $
#
# Copyright (c) 1984, 1986, 1990, 1993
# The Regents of the University of California. All rights reserved.
@@ -41,13 +41,22 @@
#
# Command line options:
#
-# -rReproducible build: Do not embed directory
+# -RReproducible build: Do not embed directory
# names, user names, time stamps, or other dynamic
# information into the output file. This intended
# to allow two builds done at different times and
# even by different people on different hosts to
# produce identical output.
#
+# -r Reproducible build: Embed fixed information to
+# the output file.
+# This intended to allow two builds done at different
+# times and even by different people on different
+# hosts to produce identical output.
+#
+# -m Use the specified string as the value of the
+# machine variable
+#
# -iUse the specified string as the value of the
# kernel_ident variable
#
@@ -144,40 +153,44 @@ if [ ! -e version ]; then
echo 0 > version
fi
-v=$(cat version)
-t=$(LC_ALL=C date)
-u=${USER-root}
-h=$(hostname)
-d=$(pwd)
-cwd=$(dirname $0)
-copyright="$(cat "${cwd}/copyright")"
-
-while [ $# -gt 0 ]; do
- case "$1" in
- -r)
- # -r: Reproducible build
- rflag=true
+Rflag=false
+nflag=false
+timestamp=
+pwd=$(pwd)
+
+while getopts "Rr:m:i:n" OPT; do
+ case $OPT in
+ R)
+ # -R: Reproducible build
+ Rflag=true
;;
- -i)
+ r)
+ # -r : timestamp
+ timestamp="$OPTARG"
+ ;;
+ m)
+ # -m : machine
+ machine="$OPTARG"
+ ;;
+ i)
# -i : Use the secified string as the
# value of the kernel_ident variable
- id="$2"
- shift
+ id="$OPTARG"
;;
- -n)
- # -n: Do not include a ELF note section
- # in the output file.
+ n)
+ # -n: Do not include a ELF note section in the output file.
nflag=true
;;
+ *) echo "Usage: newvers.sh [-Rn] [-r ] [-m ] [-i ]" >&2
+ exit 1;;
esac
- shift
done
if [ -z "${id}" ]; then
if [ -f ident ]; then
id="$(cat ident)"
else
- id=$(basename ${d})
+ id=$(basename "${pwd}")
fi
# Append ".${BUILDID}" to the default value of .
# If the "-i " command line option was used then this
@@ -188,16 +201,35 @@ if [ -z "${id}" ]; then
fi
fi
+if ${Rflag}; then
+ reproversion=
+else
+ if [ -z "${timestamp}" ]; then
+ v=$(cat version)
+ t=$(LC_ALL=C date)
+ u=${USER-root}
+ h=$(hostname)
+ d=$(pwd)
+ # Increment the serial number in the version file
+ echo $(expr ${v} + 1) > version
+ else
+ v=0
+ t=$(LC_ALL=C TZ=UTC date -r "${timestamp}")
+ u=mkrepro
+ h=mkrepro.NetBSD.org
+ d="/usr/src/sys/arch/${machine}/compile/${id}"
+ fi
+ reproversion=" #${v}: ${t}\n\t${u}@${h}:${d}"
+fi
+
+cwd=$(dirname "$0")
+copyright="$(cat "${cwd}/copyright")"
osrelcmd=${cwd}/osrelease.sh
ost="NetBSD"
osr=$(sh $osrelcmd)
-if [ ! -z "${rflag}" ]; then
- fullversion="${ost} ${osr} (${id})\n"
-else
- fullversion="${ost} ${osr} (${id}) #${v}: ${t}\n\t${u}@${h}:${d}\n"
-fi
+fullversion="${ost} ${osr} (${id})${reproversion}\n"
# Convert multi-line strings to C source code.
# Also add an extra blank line to copyright.
@@ -206,9 +238,6 @@ copyright_source="$(printf "%s\n\n" "${c
fullversion_source="$(printf "%b" "${fullversion}" | source_lines)"
buildinfo_source="$(printf "%b" "${BUILDINFO}" | source_lines)"
-# Increment
CVS commit: src/sys/conf
Module Name:src Committed By: macallan Date: Thu Feb 2 19:50:35 UTC 2017 Modified Files: src/sys/conf: files Log Message: chipsfb needs glyphcache now To generate a diff of this commit: cvs rdiff -u -r1.1168 -r1.1169 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1168 src/sys/conf/files:1.1169 --- src/sys/conf/files:1.1168 Mon Dec 26 23:12:33 2016 +++ src/sys/conf/files Thu Feb 2 19:50:35 2017 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1168 2016/12/26 23:12:33 pgoyette Exp $ +# $NetBSD: files,v 1.1169 2017/02/02 19:50:35 macallan Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20150846 @@ -1213,7 +1213,7 @@ device igsfb: wsemuldisplaydev, rasops8, file dev/ic/igsfb.c igsfb needs-flag file dev/ic/igsfb_subr.c igsfb -device chipsfb: wsemuldisplaydev, rasops8, vcons, videomode +device chipsfb: wsemuldisplaydev, rasops8, vcons, videomode, glyphcache file dev/ic/ct65550.c chipsfb defflag opt_chipsfb.h CHIPSFB_DEBUG defflag opt_chipsfb.h CHIPSFB_WAIT
CVS commit: src/sys/conf
Module Name:src
Committed By: christos
Date: Sun Jan 8 17:10:35 UTC 2017
Modified Files:
src/sys/conf: Makefile.kern.inc ssp.mk
Log Message:
Move to ssp.c suggested by uebayasi@
To generate a diff of this commit:
cvs rdiff -u -r1.254 -r1.255 src/sys/conf/Makefile.kern.inc
cvs rdiff -u -r1.1 -r1.2 src/sys/conf/ssp.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.254 src/sys/conf/Makefile.kern.inc:1.255
--- src/sys/conf/Makefile.kern.inc:1.254 Sun Jan 8 00:02:08 2017
+++ src/sys/conf/Makefile.kern.inc Sun Jan 8 12:10:35 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.254 2017/01/08 05:02:08 christos Exp $
+# $NetBSD: Makefile.kern.inc,v 1.255 2017/01/08 17:10:35 christos Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -118,9 +118,6 @@ COPTS.${j}+=-g
#
COPTS.debugsyms.c+= -g
-# XXX: Gcc bug?
-COPTS.xhci.c+= -Wno-stack-protector
-
# Add CTF sections for DTrace
.if defined(CTFCONVERT)
COMPILE_CTFCONVERT= ${_MKSHECHO}\
Index: src/sys/conf/ssp.mk
diff -u src/sys/conf/ssp.mk:1.1 src/sys/conf/ssp.mk:1.2
--- src/sys/conf/ssp.mk:1.1 Sun Sep 6 00:42:06 2015
+++ src/sys/conf/ssp.mk Sun Jan 8 12:10:35 2017
@@ -1,4 +1,4 @@
-# $NetBSD: ssp.mk,v 1.1 2015/09/06 04:42:06 uebayasi Exp $
+# $NetBSD: ssp.mk,v 1.2 2017/01/08 17:10:35 christos Exp $
.if ${USE_SSP:Uno} == "yes"
COPTS.kern_ssp.c+= -fno-stack-protector -D__SSP__
@@ -16,6 +16,7 @@ VARSTACK= \
arch/xen/i386/gdt.c \
dev/ic/aic79xx.c \
dev/ic/aic7xxx.c \
+ dev/usb/xhci.c \
dev/ofw/ofw_subr.c \
kern/uipc_socket.c \
miscfs/genfs/genfs_vnops.c \
CVS commit: src/sys/conf
Module Name:src
Committed By: christos
Date: Sun Jan 8 05:02:08 UTC 2017
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
Add COPTS for xhci.c, since the do_command_locked causes a spurious stack
proector warning.
To generate a diff of this commit:
cvs rdiff -u -r1.253 -r1.254 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.253 src/sys/conf/Makefile.kern.inc:1.254
--- src/sys/conf/Makefile.kern.inc:1.253 Wed Jan 4 16:37:46 2017
+++ src/sys/conf/Makefile.kern.inc Sun Jan 8 00:02:08 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.253 2017/01/04 21:37:46 christos Exp $
+# $NetBSD: Makefile.kern.inc,v 1.254 2017/01/08 05:02:08 christos Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -118,6 +118,9 @@ COPTS.${j}+=-g
#
COPTS.debugsyms.c+= -g
+# XXX: Gcc bug?
+COPTS.xhci.c+= -Wno-stack-protector
+
# Add CTF sections for DTrace
.if defined(CTFCONVERT)
COMPILE_CTFCONVERT= ${_MKSHECHO}\
CVS commit: src/sys/conf
Module Name:src
Committed By: christos
Date: Wed Jan 4 21:37:46 UTC 2017
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
Collect a list of kernel swap files to be removed (Yorick Hardy)
To generate a diff of this commit:
cvs rdiff -u -r1.252 -r1.253 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.252 src/sys/conf/Makefile.kern.inc:1.253
--- src/sys/conf/Makefile.kern.inc:1.252 Wed Jan 4 14:55:06 2017
+++ src/sys/conf/Makefile.kern.inc Wed Jan 4 16:37:46 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.252 2017/01/04 19:55:06 christos Exp $
+# $NetBSD: Makefile.kern.inc,v 1.253 2017/01/04 21:37:46 christos Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -209,14 +209,20 @@ SYSTEM_CTFMERGE= ${CTFMERGE} ${CTFMFLAGS
.else
SYSTEM_CTFMERGE= ${_MKSHECHO}
.endif
+
+REMOVE_SWAP= [@]
+.for k in ${KERNELS}
+REMOVE_SWAP:= ${REMOVE_SWAP}:Nswap${k}.o
+.endfor
+
SYSTEM_LD_HEAD?=@rm -f $@
SYSTEM_LD?= ${_MKSHMSG} " link ${.CURDIR:T}/${.TARGET}"; \
${_MKSHECHO}\
${LD} -Map ${.TARGET}.map --cref ${LINKFLAGS} -o ${.TARGET} \
- '$${SYSTEM_OBJ:N*swap${.TARGET}.o}' '$${EXTRA_OBJ}' vers.o \
+ '$${SYSTEM_OBJ:${REMOVE_SWAP}}' '$${EXTRA_OBJ}' vers.o \
${OBJS:M*swap${.TARGET}.o}; \
${LD} -Map ${.TARGET}.map --cref ${LINKFLAGS} -o ${.TARGET} \
- ${SYSTEM_OBJ:N*swap${.TARGET}.o} ${EXTRA_OBJ} vers.o \
+ ${SYSTEM_OBJ:${REMOVE_SWAP}} ${EXTRA_OBJ} vers.o \
${OBJS:M*swap${.TARGET}.o}
TEXTADDR?= ${LOADADDRESS} # backwards compatibility
CVS commit: src/sys/conf
Module Name:src
Committed By: christos
Date: Wed Jan 4 19:55:06 UTC 2017
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
match the M* and N* targets.
To generate a diff of this commit:
cvs rdiff -u -r1.251 -r1.252 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.251 src/sys/conf/Makefile.kern.inc:1.252
--- src/sys/conf/Makefile.kern.inc:1.251 Wed Jan 4 10:43:04 2017
+++ src/sys/conf/Makefile.kern.inc Wed Jan 4 14:55:06 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.251 2017/01/04 15:43:04 christos Exp $
+# $NetBSD: Makefile.kern.inc,v 1.252 2017/01/04 19:55:06 christos Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -213,10 +213,10 @@ SYSTEM_LD_HEAD?=@rm -f $@
SYSTEM_LD?= ${_MKSHMSG} " link ${.CURDIR:T}/${.TARGET}"; \
${_MKSHECHO}\
${LD} -Map ${.TARGET}.map --cref ${LINKFLAGS} -o ${.TARGET} \
- '$${SYSTEM_OBJ:N*swap*${.TARGET}*}' '$${EXTRA_OBJ}' vers.o \
+ '$${SYSTEM_OBJ:N*swap${.TARGET}.o}' '$${EXTRA_OBJ}' vers.o \
${OBJS:M*swap${.TARGET}.o}; \
${LD} -Map ${.TARGET}.map --cref ${LINKFLAGS} -o ${.TARGET} \
- ${SYSTEM_OBJ:N*swap*${.TARGET}*} ${EXTRA_OBJ} vers.o \
+ ${SYSTEM_OBJ:N*swap${.TARGET}.o} ${EXTRA_OBJ} vers.o \
${OBJS:M*swap${.TARGET}.o}
TEXTADDR?= ${LOADADDRESS} # backwards compatibility
CVS commit: src/sys/conf
Module Name:src
Committed By: christos
Date: Wed Jan 4 15:43:04 UTC 2017
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
PR/51772: Yorick Hardy: Don't hard-code "netbsd", use ${.TARGET} consistently.
To generate a diff of this commit:
cvs rdiff -u -r1.250 -r1.251 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.250 src/sys/conf/Makefile.kern.inc:1.251
--- src/sys/conf/Makefile.kern.inc:1.250 Sat Apr 9 14:51:44 2016
+++ src/sys/conf/Makefile.kern.inc Wed Jan 4 10:43:04 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.250 2016/04/09 18:51:44 riastradh Exp $
+# $NetBSD: Makefile.kern.inc,v 1.251 2017/01/04 15:43:04 christos Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -213,10 +213,10 @@ SYSTEM_LD_HEAD?=@rm -f $@
SYSTEM_LD?= ${_MKSHMSG} " link ${.CURDIR:T}/${.TARGET}"; \
${_MKSHECHO}\
${LD} -Map ${.TARGET}.map --cref ${LINKFLAGS} -o ${.TARGET} \
- '$${SYSTEM_OBJ:N*swap*netbsd*}' '$${EXTRA_OBJ}' vers.o \
+ '$${SYSTEM_OBJ:N*swap*${.TARGET}*}' '$${EXTRA_OBJ}' vers.o \
${OBJS:M*swap${.TARGET}.o}; \
${LD} -Map ${.TARGET}.map --cref ${LINKFLAGS} -o ${.TARGET} \
- ${SYSTEM_OBJ:N*swap*netbsd*} ${EXTRA_OBJ} vers.o \
+ ${SYSTEM_OBJ:N*swap*${.TARGET}*} ${EXTRA_OBJ} vers.o \
${OBJS:M*swap${.TARGET}.o}
TEXTADDR?= ${LOADADDRESS} # backwards compatibility
CVS commit: src/sys/conf
Module Name:src Committed By: snj Date: Sun Jan 1 06:56:59 UTC 2017 Modified Files: src/sys/conf: copyright Log Message: goodbye 2016, hello 2017! To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/conf/copyright Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/copyright diff -u src/sys/conf/copyright:1.14 src/sys/conf/copyright:1.15 --- src/sys/conf/copyright:1.14 Thu Dec 31 15:23:07 2015 +++ src/sys/conf/copyright Sun Jan 1 06:56:59 2017 @@ -1,5 +1,5 @@ Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 +2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017 The NetBSD Foundation, Inc. All rights reserved. Copyright (c) 1982, 1986, 1989, 1991, 1993 The Regents of the University of California. All rights reserved.
CVS commit: src/sys/conf
Module Name:src Committed By: pgoyette Date: Tue Nov 1 22:54:33 UTC 2016 Modified Files: src/sys/conf: files Log Message: Update dependencies for COMPAT_LINUX32 to include COMPAT_NETBSD32 Without this, an attempt to build a kernel with COMPAT_LINUX32 but without COMPAT_NETBSD32 will fail during the execution of genassym, and the error messages are not very helpful. With this change, config(1) will automatically (and silently) select/add COMPAT_NETBSD32 to the configuration. It might be better if config(1) were to issue an appropriate diagnostic, but that is a change for some future day. To generate a diff of this commit: cvs rdiff -u -r1.1164 -r1.1165 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1164 src/sys/conf/files:1.1165 --- src/sys/conf/files:1.1164 Fri Sep 9 21:10:01 2016 +++ src/sys/conf/files Tue Nov 1 22:54:33 2016 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1164 2016/09/09 21:10:01 christos Exp $ +# $NetBSD: files,v 1.1165 2016/11/01 22:54:33 pgoyette Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20150846 @@ -149,12 +149,12 @@ defflagCOMPAT_OSSAUDIO defflagCOMPAT_FREEBSD: COMPAT_30 defflagCOMPAT_IBCS2 defflagCOMPAT_LINUX: COMPAT_16 -defflagCOMPAT_LINUX32 : COMPAT_LINUX defflagCOMPAT_OSF1 defflagCOMPAT_SUNOS: COMPAT_30 defflag opt_compat_svr4.h COMPAT_SVR4 COMPAT_SVR4_32 SVR4_COMPAT_SOLARIS2 defflagCOMPAT_ULTRIX: COMPAT_50 defflagCOMPAT_NETBSD32 +defflagCOMPAT_LINUX32 : COMPAT_LINUX, COMPAT_NETBSD32 defflagCOMPAT_AOUT_M68K: COMPAT_40 defflagCOMPAT_M68K4K defflagCOMPAT_VAX1K
CVS commit: src/sys/conf
Module Name:src Committed By: christos Date: Fri Sep 9 21:10:01 UTC 2016 Modified Files: src/sys/conf: files Log Message: sppp is not a pseudo-device To generate a diff of this commit: cvs rdiff -u -r1.1163 -r1.1164 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1163 src/sys/conf/files:1.1164 --- src/sys/conf/files:1.1163 Fri Aug 19 14:08:50 2016 +++ src/sys/conf/files Fri Sep 9 17:10:01 2016 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1163 2016/08/19 18:08:50 maxv Exp $ +# $NetBSD: files,v 1.1164 2016/09/09 21:10:01 christos Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20150846 @@ -1409,7 +1409,6 @@ defpseudo loop: ifnet defpseudo sl: ifnet defpseudo ppp: ifnet, bpf_filter defpseudo pppoe: ifnet, ether, sppp -defpseudo sppp: ifnet defpseudo tun: ifnet defpseudo vlan: ifnet, ether defpseudo bridge: ifnet, ether
CVS commit: src/sys/conf
Module Name:src Committed By: christos Date: Thu Aug 11 15:16:54 UTC 2016 Modified Files: src/sys/conf: files Log Message: defopt PPPOE_DEBUG kill unknown sessions To generate a diff of this commit: cvs rdiff -u -r1.1161 -r1.1162 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1161 src/sys/conf/files:1.1162 --- src/sys/conf/files:1.1161 Sun Aug 7 06:44:04 2016 +++ src/sys/conf/files Thu Aug 11 11:16:54 2016 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1161 2016/08/07 10:44:04 christos Exp $ +# $NetBSD: files,v 1.1162 2016/08/11 15:16:54 christos Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20150846 @@ -246,7 +246,7 @@ defflag opt_ppp.h PPP_DEFLATE PPP_BSDCO # Include deflate or bsd # compression, enable pppd # packet filtering support -defflag opt_pppoe.h PPPOE_SERVER PPPOE_TERM_UNKNOWN_SESSIONS +defflag opt_pppoe.h PPPOE_SERVER PPPOE_DEBUG # networking options #
CVS commit: src/sys/conf
Module Name:src Committed By: skrll Date: Fri May 13 07:41:47 UTC 2016 Modified Files: src/sys/conf: majors Log Message: Clarify the intention here after discussing it with soda@ To generate a diff of this commit: cvs rdiff -u -r1.72 -r1.73 src/sys/conf/majors Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/majors diff -u src/sys/conf/majors:1.72 src/sys/conf/majors:1.73 --- src/sys/conf/majors:1.72 Fri May 13 02:00:36 2016 +++ src/sys/conf/majors Fri May 13 07:41:47 2016 @@ -1,4 +1,4 @@ -# $NetBSD: majors,v 1.72 2016/05/13 02:00:36 soda Exp $ +# $NetBSD: majors,v 1.73 2016/05/13 07:41:47 skrll Exp $ # # Device majors for Machine-Independent drivers. # @@ -56,11 +56,19 @@ device-major dtracechar 207 dtra device-major spiflash char 208 block 208 spiflash device-major lua char 209lua +# NOTE: +# The following ranges are reserved for devices that have historical MD +# definition, but are for "partially" MI use. +# +# Any new port should use these "previously not" MI definitions instead of +# separate MD values. +# +# New MI devices should go to this file instead of majors.* +# # 210-219 reserved for previously not MI ws devices # 220-239 reserved for previously not MI usb devices # 240-259 reserved for previously not MI "std" devices # 260-269 reserved for previously not MI tty devices # 310-339 reserved for previously not MI storage devices -# NOTE: new MI devices should go to this file instead of above device-major hdmicec char 340hdmicec
CVS commit: src/sys/conf
Module Name:src
Committed By: soda
Date: Fri May 13 02:00:36 UTC 2016
Modified Files:
src/sys/conf: majors
Log Message:
- change major number limit for MI devices from 255 to 511,
because twe is already using 332
- clarify that new MI devices should go to this file
instead of majors.{ws,usb,std,tty,storage}
- fix major number conflict about hdmicec vs tty
OKed by matt@
the expression "previously not MI" is suggested by matt@ too.
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/sys/conf/majors
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/majors
diff -u src/sys/conf/majors:1.71 src/sys/conf/majors:1.72
--- src/sys/conf/majors:1.71 Wed May 11 06:42:06 2016
+++ src/sys/conf/majors Fri May 13 02:00:36 2016
@@ -1,4 +1,4 @@
-# $NetBSD: majors,v 1.71 2016/05/11 06:42:06 skrll Exp $
+# $NetBSD: majors,v 1.72 2016/05/13 02:00:36 soda Exp $
#
# Device majors for Machine-Independent drivers.
#
@@ -7,7 +7,7 @@
#
# Majors 144-159 are reserved for local/vendor use.
#
-# Majors 160-255 are used for the MI drivers.
+# Majors 160-511 are used for the MI drivers.
device-major cryptochar 160 crypto single
device-major pfchar 161 pf single
@@ -56,11 +56,11 @@ device-major dtracechar 207 dtra
device-major spiflash char 208 block 208 spiflash
device-major lua char 209lua
-# 210-219 reserved for MI ws devices
-# 220-239 reserved for MI usb devices
-# 240-259 reserved for MI "std" devices
-# 260-269 reserved for MI tty devices
-# 310-339 reserved for MI storage devices
+# 210-219 reserved for previously not MI ws devices
+# 220-239 reserved for previously not MI usb devices
+# 240-259 reserved for previously not MI "std" devices
+# 260-269 reserved for previously not MI tty devices
+# 310-339 reserved for previously not MI storage devices
+# NOTE: new MI devices should go to this file instead of above
-# XXX conflicts with tty
-device-major hdmicec char 260hdmicec
+device-major hdmicec char 340hdmicec
CVS commit: src/sys/conf
Module Name:src Committed By: skrll Date: Wed May 11 06:42:06 UTC 2016 Modified Files: src/sys/conf: majors Log Message: Update with info about tty/storage reservations To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/sys/conf/majors Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/majors diff -u src/sys/conf/majors:1.70 src/sys/conf/majors:1.71 --- src/sys/conf/majors:1.70 Sat Aug 1 21:19:24 2015 +++ src/sys/conf/majors Wed May 11 06:42:06 2016 @@ -1,4 +1,4 @@ -# $NetBSD: majors,v 1.70 2015/08/01 21:19:24 jmcneill Exp $ +# $NetBSD: majors,v 1.71 2016/05/11 06:42:06 skrll Exp $ # # Device majors for Machine-Independent drivers. # @@ -59,5 +59,8 @@ device-major lua char 209 # 210-219 reserved for MI ws devices # 220-239 reserved for MI usb devices # 240-259 reserved for MI "std" devices +# 260-269 reserved for MI tty devices +# 310-339 reserved for MI storage devices +# XXX conflicts with tty device-major hdmicec char 260hdmicec
CVS commit: src/sys/conf
Module Name:src Committed By: christos Date: Wed Apr 27 19:46:11 UTC 2016 Modified Files: src/sys/conf: files Log Message: Add rt2860 now that it compiles. To generate a diff of this commit: cvs rdiff -u -r1.1156 -r1.1157 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1156 src/sys/conf/files:1.1157 --- src/sys/conf/files:1.1156 Tue Apr 26 06:38:42 2016 +++ src/sys/conf/files Wed Apr 27 15:46:11 2016 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1156 2016/04/26 10:38:42 skrll Exp $ +# $NetBSD: files,v 1.1157 2016/04/27 19:46:11 christos Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20150846 @@ -661,10 +661,11 @@ file dev/ic/rtw.c rtw file dev/ic/rtwphy.c rtw file dev/ic/rtwphyio.c rtw -# Ralink RT2500/RT2600 802.11 +# Ralink RT2500/RT2600/RT2860 802.11 device ral: arp, ether, ifnet, wlan, firmload file dev/ic/rt2560.c ral file dev/ic/rt2661.c ral +file dev/ic/rt2860.c ral # Marvell Libertas Open device malo: arp, ether, ifnet, wlan, firmload
CVS commit: src/sys/conf
Module Name:src
Committed By: skrll
Date: Sat Apr 23 12:50:35 UTC 2016
Modified Files:
src/sys/conf: files
Log Message:
Merge nick-nhusb (missed commit)
To generate a diff of this commit:
cvs rdiff -u -r1.1154 -r1.1155 src/sys/conf/files
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1154 src/sys/conf/files:1.1155
--- src/sys/conf/files:1.1154 Tue Apr 12 11:51:08 2016
+++ src/sys/conf/files Sat Apr 23 12:50:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1154 2016/04/12 11:51:08 christos Exp $
+# $NetBSD: files,v 1.1155 2016/04/23 12:50:35 skrll Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20150846
@@ -1230,10 +1230,8 @@ define sdmmcbus { } # SD/MMC attachmen
# use them in an 'attach-with'.
#
-defparam USB_MEM_RESERVE
-
define usbroothub
-file dev/usb/usbroothub_subr.c usbroothub
+file dev/usb/usbroothub.c usbroothub
define usb_dma
@@ -1259,7 +1257,7 @@ file dev/usb/xhci.c xhci needs-flag
# Mentor graphics OTG IP
defflag opt_motg.h MOTG_ALLWINNER
-device motg: usbus, usbroothub, usb_dma
+device motg: usbus, usbroothub
file dev/usb/motg.c motg needs-flag
# SL811HS/T USB controller
