CVS commit: src/external/bsd/openresolv/dist
Module Name:src
Committed By: ryoon
Date: Tue Sep 25 05:57:46 UTC 2018
Modified Files:
src/external/bsd/openresolv/dist: resolvconf.in
Log Message:
Close double quotation mark
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/openresolv/dist/resolvconf.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/openresolv/dist/resolvconf.in
diff -u src/external/bsd/openresolv/dist/resolvconf.in:1.2 src/external/bsd/openresolv/dist/resolvconf.in:1.3
--- src/external/bsd/openresolv/dist/resolvconf.in:1.2 Mon Sep 24 21:58:11 2018
+++ src/external/bsd/openresolv/dist/resolvconf.in Tue Sep 25 05:57:46 2018
@@ -603,7 +603,7 @@ make_vars()
list_resolv -i "$@" >/dev/null || IF_EXCLUSIVE=0
eval "$(list_resolv -l "$@" | replace | parse_resolv)"
fi
- if [ -n "${name_servers_append}${search_domains_append} ]; then
+ if [ -n "${name_servers_append}${search_domains_append}" ]; then
eval "$(echo_append | parse_resolv)"
fi
CVS commit: src/doc
Module Name:src Committed By: joerg Date: Tue Sep 25 05:43:43 UTC 2018 Modified Files: src/doc: 3RDPARTY Log Message: Update xz entry for 5.2.4. To generate a diff of this commit: cvs rdiff -u -r1.1564 -r1.1565 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1564 src/doc/3RDPARTY:1.1565 --- src/doc/3RDPARTY:1.1564 Sat Sep 8 13:26:12 2018 +++ src/doc/3RDPARTY Tue Sep 25 05:43:43 2018 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1564 2018/09/08 13:26:12 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1565 2018/09/25 05:43:43 joerg Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1494,7 +1494,7 @@ Location: external/zlib/pigz/dist Notes: Package: xz -Version: 5.2.1 +Version: 5.2.4 Current Vers: 5.2.4 Maintainer: Lasse Collin Archive Site: http://tukaani.org/xz/ @@ -1504,8 +1504,9 @@ License: public-domain Location: external/public-domain/xz/dist Notes: 1. See prepare-import script for stripping down the distribution. -2. Update configure.ac and use it to generate include/config.h. -3. Carefully check for GPL components leaked into the dist area. +2. Use run-configure and double check that the stripped down configure works + for tools. +3. Carefully check for non-autoconf GPL components leaked into the dist area. Package: mpc Version: 1.1.0
CVS commit: src
Module Name:src
Committed By: joerg
Date: Tue Sep 25 05:42:08 UTC 2018
Modified Files:
src/external/public-domain/xz: Makefile Makefile.inc
src/external/public-domain/xz/bin/xz: Makefile
src/external/public-domain/xz/include: config.h
src/external/public-domain/xz/lib: Makefile
src/tools: Makefile
Added Files:
src/tools/xz-bin: Makefile
src/tools/xz-include: Makefile
src/tools/xz-lib: Makefile
Log Message:
Update build glue for xz-5.2.4. Hook up tools version.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/public-domain/xz/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/public-domain/xz/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/external/public-domain/xz/bin/xz/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/public-domain/xz/include/config.h
cvs rdiff -u -r1.9 -r1.10 src/external/public-domain/xz/lib/Makefile
cvs rdiff -u -r1.195 -r1.196 src/tools/Makefile
cvs rdiff -u -r0 -r1.1 src/tools/xz-bin/Makefile
cvs rdiff -u -r0 -r1.1 src/tools/xz-include/Makefile
cvs rdiff -u -r0 -r1.1 src/tools/xz-lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/xz/Makefile
diff -u src/external/public-domain/xz/Makefile:1.1 src/external/public-domain/xz/Makefile:1.2
--- src/external/public-domain/xz/Makefile:1.1 Tue Nov 2 16:34:36 2010
+++ src/external/public-domain/xz/Makefile Tue Sep 25 05:42:08 2018
@@ -1,5 +1,17 @@
-# $NetBSD: Makefile,v 1.1 2010/11/02 16:34:36 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2018/09/25 05:42:08 joerg Exp $
SUBDIR+= lib .WAIT bin
+run-configure:
+ [ ! -d tmp ] || rm -r tmp
+ mkdir -p tmp
+ cd tmp && CONFIG_SITE= ${XZSRCDIR:Q}/configure --enable-external-sha256 \
+ CC=${CC:Q} CFLAGS=${CFLAGS:N-Werror:Q} \
+ CPPFLAGS=${CPPFLAGS:N-std=c++11:Q} LDFLAGS=${LDFLAGS:Q} LD=${LD:Q} \
+ --target=${MACHINE_GNU_PLATFORM} --host=${MACHINE_GNU_PLATFORM}
+ mv tmp/config.h ${XZINCDIR:Q}
+ printf '#include \n#if BYTE_ORDER == BIG_ENDIAN\n# define WORDS_BIGENDIAN 1\n#endif\n' >> ${XZINCDIR:Q}/config.h
+
+.include "Makefile.inc"
+
.include
Index: src/external/public-domain/xz/Makefile.inc
diff -u src/external/public-domain/xz/Makefile.inc:1.3 src/external/public-domain/xz/Makefile.inc:1.4
--- src/external/public-domain/xz/Makefile.inc:1.3 Sun Oct 16 17:24:32 2011
+++ src/external/public-domain/xz/Makefile.inc Tue Sep 25 05:42:08 2018
@@ -1,10 +1,16 @@
-# $NetBSD: Makefile.inc,v 1.3 2011/10/16 17:24:32 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.4 2018/09/25 05:42:08 joerg Exp $
+
+.include
XZHOMEPAGE= http://tukaani.org/xz/
-XZVERSION= 5.0.0
+XZVERSION= 5.2.4
XZSRCDIR:= ${.PARSEDIR}/dist
+.if defined(HOSTLIB) || defined(HOSTPROG)
+XZINCDIR!= cd ${NETBSDSRCDIR}/tools/xz-include && ${PRINTOBJDIR}
+.else
XZINCDIR:= ${.PARSEDIR}/include
+.endif
CPPFLAGS+= -I${XZINCDIR}
CPPFLAGS+= -I${XZSRCDIR}/src/common
Index: src/external/public-domain/xz/bin/xz/Makefile
diff -u src/external/public-domain/xz/bin/xz/Makefile:1.3 src/external/public-domain/xz/bin/xz/Makefile:1.4
--- src/external/public-domain/xz/bin/xz/Makefile:1.3 Tue Apr 21 10:12:04 2015
+++ src/external/public-domain/xz/bin/xz/Makefile Tue Sep 25 05:42:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/04/21 10:12:04 christos Exp $
+# $NetBSD: Makefile,v 1.4 2018/09/25 05:42:08 joerg Exp $
PROG= xz
BINDIR= /usr/bin
@@ -13,16 +13,17 @@ USETBL= yes
.include
CPPFLAGS+= -DPACKAGE=\"xz\"
+.if !defined(HOST_PROG)
CPPFLAGS+= -DENABLE_NLS -DLOCALEDIR=\"/usr/share/locale\"
+.endif
-DPADD+= ${LIBLZMA} ${LIBINTL}
-LDADD+= -llzma -lintl
-
+.if !defined(HOSTPROG)
LINKS+= ${BINDIR}/xz ${BINDIR}/lzcat
LINKS+= ${BINDIR}/xz ${BINDIR}/lzma
LINKS+= ${BINDIR}/xz ${BINDIR}/unlzma
LINKS+= ${BINDIR}/xz ${BINDIR}/unxz
LINKS+= ${BINDIR}/xz ${BINDIR}/xzcat
+.endif
MLINKS+= xz.1 lzcat.1
MLINKS+= xz.1 lzma.1
@@ -40,7 +41,13 @@ FILESNAME_${XZSRCDIR}/po/${lang}.gmo= xz
.endfor
.endif
-LDADD+= -lpthread
-DPADD+= ${LIBPTHREAD}
-
+.if defined(HOSTPROG)
+HOST_CPPFLAGS+= ${CPPFLAGS:N-Wp,-iremap,*}
+XZLIBDIR!= cd ${NETBSDSRCDIR}/tools/xz-lib && ${PRINTOBJDIR}
+LDADD+= -L${XZLIBDIR} -llzma
+DPADD+= ${XZLIBDIR}/liblzma.a
+.else
+DPADD+= ${LIBLZMA} ${LIBINTL} ${LIBPTHREAD}
+LDADD+= -llzma -lintl -lpthread
.include
+.endif
Index: src/external/public-domain/xz/include/config.h
diff -u src/external/public-domain/xz/include/config.h:1.8 src/external/public-domain/xz/include/config.h:1.9
--- src/external/public-domain/xz/include/config.h:1.8 Sat Feb 6 20:23:39 2016
+++ src/external/public-domain/xz/include/config.h Tue Sep 25 05:42:08 2018
@@ -23,17 +23,20 @@
/* Define to 1 if you have the header file. */
/* #undef HAVE_BYTESWAP_H */
+/* Define to 1 if Capsicum is available. */
+/* #undef HAVE_CAPSICUM */
+
/* Define to 1 if the system has the type `CC_SHA256_CTX'. */
/* #undef HAVE_CC_SHA256_CTX */
/* Define
CVS commit: src/external/public-domain/xz/dist/src/xz
Module Name:src Committed By: joerg Date: Tue Sep 25 05:41:20 UTC 2018 Modified Files: src/external/public-domain/xz/dist/src/xz: list.c Log Message: Revert last change, side effect of old config.h. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/public-domain/xz/dist/src/xz/list.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/xz/dist/src/xz/list.c diff -u src/external/public-domain/xz/dist/src/xz/list.c:1.2 src/external/public-domain/xz/dist/src/xz/list.c:1.3 --- src/external/public-domain/xz/dist/src/xz/list.c:1.2 Tue Sep 25 03:50:58 2018 +++ src/external/public-domain/xz/dist/src/xz/list.c Tue Sep 25 05:41:20 2018 @@ -11,7 +11,6 @@ /// #include "private.h" -#include "list.h" #include "tuklib_integer.h"
CVS commit: src/external/public-domain/xz/dist
Module Name:src Committed By: joerg Date: Tue Sep 25 05:39:19 UTC 2018 Modified Files: src/external/public-domain/xz/dist: configure.ac src/external/public-domain/xz/dist/src/liblzma/check: check.h src/external/public-domain/xz/dist/src/xz: args.c Log Message: Revert to vendor state. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/public-domain/xz/dist/configure.ac cvs rdiff -u -r1.3 -r1.4 \ src/external/public-domain/xz/dist/src/liblzma/check/check.h cvs rdiff -u -r1.2 -r1.3 src/external/public-domain/xz/dist/src/xz/args.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/xz/dist/configure.ac diff -u src/external/public-domain/xz/dist/configure.ac:1.4 src/external/public-domain/xz/dist/configure.ac:1.5 --- src/external/public-domain/xz/dist/configure.ac:1.4 Fri Apr 17 18:49:23 2015 +++ src/external/public-domain/xz/dist/configure.ac Tue Sep 25 05:39:19 2018 @@ -15,20 +15,27 @@ # of malloc(), stat(), or lstat(), since we don't use those functions in # a way that would cause the problems the autoconf macros check. -AC_PREREQ([2.52]) +AC_PREREQ([2.64]) -AC_INIT([XZ Utils], 5.0.0, [jo...@netbsd.org], [xz], [http://tukaani.org/xz/]) +AC_INIT([XZ Utils], m4_esyscmd([/bin/sh build-aux/version.sh]), + [lasse.col...@tukaani.org], [xz], [https://tukaani.org/xz/]) +AC_CONFIG_SRCDIR([src/liblzma/common/common.h]) +AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADER([config.h]) -AC_CONFIG_AUX_DIR([../../gnu/dist/autoconf/config]) +echo +echo "$PACKAGE_STRING" + +echo +echo "System type:" +# This is needed to know if assembler optimizations can be used. AC_CANONICAL_HOST -AC_USE_SYSTEM_EXTENSIONS # We do some special things on Windows (32-bit or 64-bit) builds. case $host_os in - mingw* | cygwin*) is_w32=yes ;; - *)is_w32=no ;; + mingw* | cygwin | msys) is_w32=yes ;; + *) is_w32=no ;; esac AM_CONDITIONAL([COND_W32], [test "$is_w32" = yes]) @@ -36,9 +43,15 @@ AM_CONDITIONAL([COND_W32], [test "$is_w3 # executables. Cygwin is an exception to this, since it is recommended # that symlinks don't have the .exe suffix. To make this work, we # define LN_EXEEXT. +# +# MSYS2 is treated the same way as Cygwin. It uses plain "msys" like +# the original MSYS when building MSYS/MSYS2-binaries. Hopefully this +# doesn't break things for the original MSYS developers. Note that this +# doesn't affect normal MSYS/MSYS2 users building non-MSYS/MSYS2 binaries +# since in that case the $host_os is usually mingw32. case $host_os in - cygwin) LN_EXEEXT= ;; - *) LN_EXEEXT='$(EXEEXT)' ;; + cygwin | msys) LN_EXEEXT= ;; + *) LN_EXEEXT='$(EXEEXT)' ;; esac AC_SUBST([LN_EXEEXT]) @@ -84,6 +97,7 @@ AC_ARG_ENABLE([encoders], AS_HELP_STRING [], [enable_encoders=SUPPORTED_FILTERS]) enable_encoders=`echo "$enable_encoders" | sed 's/,/ /g'` if test "x$enable_encoders" = xno || test "x$enable_encoders" = x; then + enable_encoders=no AC_MSG_RESULT([(none)]) else for arg in $enable_encoders @@ -101,6 +115,8 @@ else ;; esac done + AC_DEFINE([HAVE_ENCODERS], [1], + [Define to 1 if any of HAVE_ENCODER_foo have been defined.]) AC_MSG_RESULT([$enable_encoders]) fi @@ -111,6 +127,7 @@ AC_ARG_ENABLE([decoders], AS_HELP_STRING [], [enable_decoders=SUPPORTED_FILTERS]) enable_decoders=`echo "$enable_decoders" | sed 's/,/ /g'` if test "x$enable_decoders" = xno || test "x$enable_decoders" = x; then + enable_decoders=no AC_MSG_RESULT([(none)]) else for arg in $enable_decoders @@ -128,11 +145,8 @@ else ;; esac done - - # LZMA2 requires that LZMA1 is enabled. - test "x$enable_encoder_lzma2" = xyes && enable_encoder_lzma1=yes - test "x$enable_decoder_lzma2" = xyes && enable_decoder_lzma1=yes - + AC_DEFINE([HAVE_DECODERS], [1], + [Define to 1 if any of HAVE_DECODER_foo have been defined.]) AC_MSG_RESULT([$enable_decoders]) fi @@ -141,8 +155,8 @@ if test "x$enable_encoder_lzma2$enable_e AC_MSG_ERROR([LZMA2 requires that LZMA1 is also enabled.]) fi -AM_CONDITIONAL(COND_MAIN_ENCODER, test "x$enable_encoders" != xno && test "x$enable_encoders" != x) -AM_CONDITIONAL(COND_MAIN_DECODER, test "x$enable_decoders" != xno && test "x$enable_decoders" != x) +AM_CONDITIONAL(COND_MAIN_ENCODER, test "x$enable_encoders" != xno) +AM_CONDITIONAL(COND_MAIN_DECODER, test "x$enable_decoders" != xno) m4_foreach([NAME], [SUPPORTED_FILTERS], [AM_CONDITIONAL(COND_FILTER_[]m4_toupper(NAME), test "x$enable_filter_[]NAME" = xyes) @@ -176,12 +190,6 @@ AM_CONDITIONAL(COND_FILTER_LZ, test "x$e AM_CONDITIONAL(COND_ENCODER_LZ, test "x$enable_encoder_lz" = xyes) AM_CONDITIONAL(COND_DECODER_LZ, test "x$enable_decoder_lz" = xyes) -m4_foreach([NAME], [SUPPORTED_FILTERS], [ - AC_DEFINE(HAVE_ENCODER_[]m4_toupper(NAME), [1], - [Define to 1 if] NAME [encoder is
CVS commit: src/external/public-domain/xz/dist
Module Name:src Committed By: joerg Date: Tue Sep 25 05:39:45 UTC 2018 Modified Files: src/external/public-domain/xz/dist: configure Log Message: Don't try to generate files we are not interested in. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/public-domain/xz/dist/configure Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/xz/dist/configure diff -u src/external/public-domain/xz/dist/configure:1.1.1.1 src/external/public-domain/xz/dist/configure:1.2 --- src/external/public-domain/xz/dist/configure:1.1.1.1 Mon Sep 24 22:36:01 2018 +++ src/external/public-domain/xz/dist/configure Tue Sep 25 05:39:45 2018 @@ -19545,15 +19545,10 @@ fi xz=`echo xz | sed "$program_transform_name"` -ac_config_files="$ac_config_files Doxyfile Makefile po/Makefile.in lib/Makefile src/Makefile src/liblzma/Makefile src/liblzma/api/Makefile src/xz/Makefile src/xzdec/Makefile src/lzmainfo/Makefile src/scripts/Makefile tests/Makefile debug/Makefile" -ac_config_files="$ac_config_files src/scripts/xzdiff" -ac_config_files="$ac_config_files src/scripts/xzgrep" -ac_config_files="$ac_config_files src/scripts/xzmore" -ac_config_files="$ac_config_files src/scripts/xzless" cat >confcache <<\_ACEOF
CVS commit: src/external/public-domain/xz
Module Name:src Committed By: joerg Date: Tue Sep 25 05:38:10 UTC 2018 Modified Files: src/external/public-domain/xz: prepare-import.sh Log Message: Update xz import script to reflect inclusion of configure. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/public-domain/xz/prepare-import.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/xz/prepare-import.sh diff -u src/external/public-domain/xz/prepare-import.sh:1.4 src/external/public-domain/xz/prepare-import.sh:1.5 --- src/external/public-domain/xz/prepare-import.sh:1.4 Fri Apr 17 18:49:23 2015 +++ src/external/public-domain/xz/prepare-import.sh Tue Sep 25 05:38:10 2018 @@ -1,25 +1,27 @@ #!/bin/sh -# $NetBSD: prepare-import.sh,v 1.4 2015/04/17 18:49:23 christos Exp $ +# $NetBSD: prepare-import.sh,v 1.5 2018/09/25 05:38:10 joerg Exp $ set -e rm -rf dist tmp -tar xzf xz-5.2.1.tar.gz -mv xz-5.2.1 dist +tar xf xz-5.2.4.tar.xz +mv xz-5.2.4 dist cd dist # Binary files derived from distribution files rm -rf doc/man # Files under GPL -rm -rf build-aux extra lib m4/[a-s]* m4/[u-z]* src/scripts/xz* Doxyfile.in +rm -rf extra lib m4/[a-s]* m4/[u-z]* src/scripts/xz* Doxyfile.in # Files not of relevance -rm -rf ABOUT-NLS aclocal.m4 autogen.sh configure COPYING.*GPL* INSTALL.generic +rm -rf ABOUT-NLS aclocal.m4 autogen.sh COPYING.*GPL* INSTALL.generic mkdir po.tmp mv po/*.po po/*.gmo po.tmp/ rm -rf po mv po.tmp po rm -rf debug dos windows rm -rf Makefile* */Makefile* */*/Makefile* */*/*/Makefile* +# Files under GPL/LGPL kept: +# build-aux/* from autoconf # Binary files to be encoded for f in tests/compress_prepared_bcj_sparc tests/compress_prepared_bcj_x86 \ tests/files/*.xz; do @@ -27,16 +29,5 @@ for f in tests/compress_prepared_bcj_spa rm $f done -# Files under GPL/LGPL kept: -# build-aux/* from autoconf -# lib/* -# m4/* - -# Changes to config.h -echo Add build-time endian test to include/config.h: -cat << EOE -#include -#if BYTE_ORDER == BIG_ENDIAN -# define WORDS_BIGENDIAN 1 -#endif -EOE +grep -v '^ac_config_files=' configure > configure.new +mv configure.new ../configure
CVS commit: src/external/public-domain/xz/dist/src/xz
Module Name:src Committed By: kre Date: Tue Sep 25 03:50:58 UTC 2018 Modified Files: src/external/public-domain/xz/dist/src/xz: list.c Log Message: Include list.h so prototypes for funcs exist (appease gcc) To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r1.2 src/external/public-domain/xz/dist/src/xz/list.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/xz/dist/src/xz/list.c diff -u src/external/public-domain/xz/dist/src/xz/list.c:1.1.1.3 src/external/public-domain/xz/dist/src/xz/list.c:1.2 --- src/external/public-domain/xz/dist/src/xz/list.c:1.1.1.3 Mon Sep 24 22:36:02 2018 +++ src/external/public-domain/xz/dist/src/xz/list.c Tue Sep 25 03:50:58 2018 @@ -11,6 +11,7 @@ /// #include "private.h" +#include "list.h" #include "tuklib_integer.h"
CVS commit: [pgoyette-compat] src/sys/arch/amd64/amd64
Module Name:src
Committed By: pgoyette
Date: Tue Sep 25 01:26:58 UTC 2018
Modified Files:
src/sys/arch/amd64/amd64 [pgoyette-compat]: netbsd32_machdep_16.c
Log Message:
In the xxx_fini() routine we need to _un_set the hook!
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.6 -r1.1.2.7 \
src/sys/arch/amd64/amd64/netbsd32_machdep_16.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/amd64/netbsd32_machdep_16.c
diff -u src/sys/arch/amd64/amd64/netbsd32_machdep_16.c:1.1.2.6 src/sys/arch/amd64/amd64/netbsd32_machdep_16.c:1.1.2.7
--- src/sys/arch/amd64/amd64/netbsd32_machdep_16.c:1.1.2.6 Tue Sep 25 01:15:27 2018
+++ src/sys/arch/amd64/amd64/netbsd32_machdep_16.c Tue Sep 25 01:26:58 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.6 2018/09/25 01:15:27 pgoyette Exp $ */
+/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.7 2018/09/25 01:26:58 pgoyette Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.1.2.6 2018/09/25 01:15:27 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.1.2.7 2018/09/25 01:26:58 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -259,5 +259,5 @@ void
netbsd32_machdep_md_16_fini(void)
{
- netbsd32_sendsig_hook_set();
+ netbsd32_sendsig_hook_unset();
}
CVS commit: [pgoyette-compat] src/sys/arch/amd64/amd64
Module Name:src
Committed By: pgoyette
Date: Tue Sep 25 01:15:27 UTC 2018
Modified Files:
src/sys/arch/amd64/amd64 [pgoyette-compat]: netbsd32_machdep_16.c
Log Message:
Make the replacement/hook function return an int, to match the
expectations of the MP-safe HOOK mechanism.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 \
src/sys/arch/amd64/amd64/netbsd32_machdep_16.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/amd64/netbsd32_machdep_16.c
diff -u src/sys/arch/amd64/amd64/netbsd32_machdep_16.c:1.1.2.5 src/sys/arch/amd64/amd64/netbsd32_machdep_16.c:1.1.2.6
--- src/sys/arch/amd64/amd64/netbsd32_machdep_16.c:1.1.2.5 Tue Sep 25 00:53:59 2018
+++ src/sys/arch/amd64/amd64/netbsd32_machdep_16.c Tue Sep 25 01:15:27 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.5 2018/09/25 00:53:59 pgoyette Exp $ */
+/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.6 2018/09/25 01:15:27 pgoyette Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.1.2.5 2018/09/25 00:53:59 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.1.2.6 2018/09/25 01:15:27 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -84,7 +84,7 @@ void netbsd32_sendsig_siginfo(const ksig
int check_sigcontext32(struct lwp *, const struct netbsd32_sigcontext *);
-void netbsd32_sendsig_16(const ksiginfo_t *, const sigset_t *);
+int netbsd32_sendsig_16(const ksiginfo_t *, const sigset_t *);
struct netbsd32_sendsig_hook_t netbsd32_sendsig_hook;
@@ -175,13 +175,15 @@ netbsd32_sendsig_sigcontext(const ksigin
netbsd32_buildcontext(l, tf, fp, catcher, onstack);
}
-void
+int
netbsd32_sendsig_16(const ksiginfo_t *ksi, const sigset_t *mask)
{
if (curproc->p_sigacts->sa_sigdesc[ksi->ksi_signo].sd_vers < 2)
netbsd32_sendsig_sigcontext(ksi, mask);
else
netbsd32_sendsig_siginfo(ksi, mask);
+
+ return 0;
}
int
CVS commit: [pgoyette-compat] src/sys/arch/amd64/amd64
Module Name:src Committed By: pgoyette Date: Tue Sep 25 00:53:59 UTC 2018 Modified Files: src/sys/arch/amd64/amd64 [pgoyette-compat]: netbsd32_machdep_16.c Log Message: And use proper macro names To generate a diff of this commit: cvs rdiff -u -r1.1.2.4 -r1.1.2.5 \ src/sys/arch/amd64/amd64/netbsd32_machdep_16.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/amd64/netbsd32_machdep_16.c diff -u src/sys/arch/amd64/amd64/netbsd32_machdep_16.c:1.1.2.4 src/sys/arch/amd64/amd64/netbsd32_machdep_16.c:1.1.2.5 --- src/sys/arch/amd64/amd64/netbsd32_machdep_16.c:1.1.2.4 Tue Sep 25 00:00:05 2018 +++ src/sys/arch/amd64/amd64/netbsd32_machdep_16.c Tue Sep 25 00:53:59 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.4 2018/09/25 00:00:05 pgoyette Exp $ */ +/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.5 2018/09/25 00:53:59 pgoyette Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -36,7 +36,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.1.2.4 2018/09/25 00:00:05 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.1.2.5 2018/09/25 00:53:59 pgoyette Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -243,8 +243,8 @@ compat_16_netbsd32___sigreturn14(struct return (EJUSTRETURN); } -MODULE_HOOK_SET(netbsd32_sendsig_hook, "nb32_16", netbsd32_sendsig_16); -MODULE_HOOK_UNSET(netbsd32_sendsig_hook); +MODULE_SET_HOOK(netbsd32_sendsig_hook, "nb32_16", netbsd32_sendsig_16); +MODULE_UNSET_HOOK(netbsd32_sendsig_hook); void netbsd32_machdep_md_16_init(void)
CVS commit: [pgoyette-compat] src/sys/arch/amd64/amd64
Module Name:src Committed By: pgoyette Date: Tue Sep 25 00:00:05 UTC 2018 Modified Files: src/sys/arch/amd64/amd64 [pgoyette-compat]: netbsd32_machdep_16.c Log Message: If we're going to use the MP-safe HOOK macros, it helps to define them by including the proper header! To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 \ src/sys/arch/amd64/amd64/netbsd32_machdep_16.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/amd64/netbsd32_machdep_16.c diff -u src/sys/arch/amd64/amd64/netbsd32_machdep_16.c:1.1.2.3 src/sys/arch/amd64/amd64/netbsd32_machdep_16.c:1.1.2.4 --- src/sys/arch/amd64/amd64/netbsd32_machdep_16.c:1.1.2.3 Mon Sep 24 22:56:45 2018 +++ src/sys/arch/amd64/amd64/netbsd32_machdep_16.c Tue Sep 25 00:00:05 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.3 2018/09/24 22:56:45 pgoyette Exp $ */ +/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.4 2018/09/25 00:00:05 pgoyette Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -36,7 +36,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.1.2.3 2018/09/24 22:56:45 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.1.2.4 2018/09/25 00:00:05 pgoyette Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -59,6 +59,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_mac #include #include #include +#include #include #include
CVS commit: [pgoyette-compat] src/sys/arch/amd64/amd64
Module Name:src
Committed By: pgoyette
Date: Mon Sep 24 23:47:07 UTC 2018
Modified Files:
src/sys/arch/amd64/amd64 [pgoyette-compat]: netbsd32_machdep.c
Log Message:
Adjust declaration of netbsd32_sendsig_siginfo() too.
Remove the attempted initialization of the former function pointer; this
is now handled by the "default" argument in MODULE_HOOK_CALL() macro.
To generate a diff of this commit:
cvs rdiff -u -r1.115.2.6 -r1.115.2.7 \
src/sys/arch/amd64/amd64/netbsd32_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/amd64/netbsd32_machdep.c
diff -u src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.115.2.6 src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.115.2.7
--- src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.115.2.6 Mon Sep 24 23:37:59 2018
+++ src/sys/arch/amd64/amd64/netbsd32_machdep.c Mon Sep 24 23:47:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.115.2.6 2018/09/24 23:37:59 pgoyette Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.115.2.7 2018/09/24 23:47:07 pgoyette Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.115.2.6 2018/09/24 23:37:59 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.115.2.7 2018/09/24 23:47:07 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -106,7 +106,7 @@ int check_sigcontext32(struct lwp *, con
void netbsd32_buildcontext(struct lwp *l, struct trapframe *tf, void *fp,
sig_t catcher, int onstack);
-void netbsd32_sendsig_siginfo(const ksiginfo_t *, const sigset_t *);
+int netbsd32_sendsig_siginfo(const ksiginfo_t *, const sigset_t *);
#ifdef EXEC_AOUT
/*
@@ -979,10 +979,12 @@ void
netbsd32_machdep_md_init(void)
{
- vec_netbsd32_sendsig = netbsd32_sendsig_siginfo;
+ /* nothing to do */
}
void
netbsd32_machdep_md_fini(void)
{
+
+ /* nothing to do */
}
CVS commit: [pgoyette-compat] src/sys/arch/amd64/amd64
Module Name:src
Committed By: pgoyette
Date: Mon Sep 24 23:38:00 UTC 2018
Modified Files:
src/sys/arch/amd64/amd64 [pgoyette-compat]: netbsd32_machdep.c
Log Message:
Make the netbsd32_sendsig_siginfo() routine return an int, to conform
to the MP-safe HOOKs mechanism.
To generate a diff of this commit:
cvs rdiff -u -r1.115.2.5 -r1.115.2.6 \
src/sys/arch/amd64/amd64/netbsd32_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/amd64/netbsd32_machdep.c
diff -u src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.115.2.5 src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.115.2.6
--- src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.115.2.5 Mon Sep 24 23:25:24 2018
+++ src/sys/arch/amd64/amd64/netbsd32_machdep.c Mon Sep 24 23:37:59 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.115.2.5 2018/09/24 23:25:24 pgoyette Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.115.2.6 2018/09/24 23:37:59 pgoyette Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.115.2.5 2018/09/24 23:25:24 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.115.2.6 2018/09/24 23:37:59 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -202,7 +202,7 @@ netbsd32_buildcontext(struct lwp *l, str
}
}
-void
+int
netbsd32_sendsig_siginfo(const ksiginfo_t *ksi, const sigset_t *mask)
{
struct lwp *l = curlwp;
@@ -268,6 +268,8 @@ netbsd32_sendsig_siginfo(const ksiginfo_
}
netbsd32_buildcontext(l, tf, fp, catcher, onstack);
+
+ return 0;
}
MODULE_CALL_HOOK_DECL(netbsd32_sendsig_hook, f,
CVS commit: [pgoyette-compat] src/doc
Module Name:src Committed By: pgoyette Date: Mon Sep 24 23:28:55 UTC 2018 Modified Files: src/doc [pgoyette-compat]: TODO.compat-module Log Message: Put the NTP issue in the "required before merge" section. Note that the compat library is completely gone now, both .o and .a variants. To generate a diff of this commit: cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/doc/TODO.compat-module Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/TODO.compat-module diff -u src/doc/TODO.compat-module:1.1.2.10 src/doc/TODO.compat-module:1.1.2.11 --- src/doc/TODO.compat-module:1.1.2.10 Mon Sep 24 23:23:26 2018 +++ src/doc/TODO.compat-module Mon Sep 24 23:28:55 2018 @@ -1,13 +1,8 @@ -/* $NetBSD: TODO.compat-module,v 1.1.2.10 2018/09/24 23:23:26 pgoyette Exp $ */ +/* $NetBSD: TODO.compat-module,v 1.1.2.11 2018/09/24 23:28:55 pgoyette Exp $ */ DONE -1. Returned the build to use a .a compat library rather than a .o -library. The original method used was .a but that was changed -(fairly recently) as a work-around to address some support -routines that were not being included when needed. These support -modules are now included in their own module, and the work-around -is therefore no longer needed. +1. Removed the building of the compat library - it is no longer needed. 2. Reverted some intentional auto-load breakage for loading the sysv_ipc module; the breakage was introduced as the fix for the above-mentioned @@ -72,14 +67,19 @@ TODO - Required for branch merge netbsd32_compat_80.[ch] amd64's machdep.c and machdep_16.c +18. We need a mechanism to determine, at run-time, whether or not the +NTP option was selected. Even though the NTP code is not modular, +other modules (such as clockctl) need to know whether NTP routines +are available. + TODO - Not required for branch merge -18. Audit the entire code base for any remaining embedded #ifdef's for +19. Audit the entire code base for any remaining embedded #ifdef's for COMPAT_xx. When found, move the actual compat code into the compat hierarchy and replace originals with indirect (vectored) calls. -19. The rtsock compat code is a disaster, with rtsock_50.c #include-ing +20. The rtsock compat code is a disaster, with rtsock_50.c #include-ing the main rtsock.c code with various manipulations of the COMPAT_50 macro. Once rtsock is separated, compat_14 references to rtsock_50 routines needs to be verified. @@ -89,7 +89,7 @@ TODO - Not required for branch merge the compat code can be executed, neither on the branch nor on HEAD. -20. The compat_60 module still needs some work for XEN systems. We +21. The compat_60 module still needs some work for XEN systems. We probably need some build infrastructure changes to ensure that XEN (and, for i386, XEN-PAE) modules are build with the correct macros defined and with -I directories specified in the same order @@ -97,7 +97,7 @@ TODO - Not required for branch merge prevents loading of micro-code updates for amd64 processors running XEN kernels. This limitation also exists on HEAD. -21. There seems to be quite a bit of MD compat_xx code, in the various +22. There seems to be quite a bit of MD compat_xx code, in the various sys/arch/ directories. I haven't yet looked at any of this. But it seems to me that the MI compat build infrastructure should have some mechanism to "reach over" to the MD code, #include a Makefile.inc file, @@ -115,17 +115,8 @@ TODO - Not required for branch merge into the monolithic COMPAT module on HEAD. Thus, its absence from any of the version-specific modules is not a regression. -22. For compat_50, in addition to rtsock there are some things in dev/gpio +23. For compat_50, in addition to rtsock there are some things in dev/gpio and dev/wscons/wsmux that I haven't been able to cleanly separate. These items are not currently included in the monolithic COMPAT module on HEAD, so lack of integration on the branch is not a regression. - -23. Even though the build mechanism has been switched back to using a -.a compat library, it might be useful to make it work with the .o -library. - -24. We need a mechanism to determine, at run-time, whether or not the -NTP option was selected. Even though the NTP code is not modular, -other modules (such as clockctl) need to know whether NTP routines -are available.
CVS commit: [pgoyette-compat] src/sys/arch/amd64/amd64
Module Name:src Committed By: pgoyette Date: Mon Sep 24 23:25:24 UTC 2018 Modified Files: src/sys/arch/amd64/amd64 [pgoyette-compat]: netbsd32_machdep.c Log Message: Provide required args when calling the default (un-hooked) routine. To generate a diff of this commit: cvs rdiff -u -r1.115.2.4 -r1.115.2.5 \ src/sys/arch/amd64/amd64/netbsd32_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/amd64/netbsd32_machdep.c diff -u src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.115.2.4 src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.115.2.5 --- src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.115.2.4 Mon Sep 24 22:56:45 2018 +++ src/sys/arch/amd64/amd64/netbsd32_machdep.c Mon Sep 24 23:25:24 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_machdep.c,v 1.115.2.4 2018/09/24 22:56:45 pgoyette Exp $ */ +/* $NetBSD: netbsd32_machdep.c,v 1.115.2.5 2018/09/24 23:25:24 pgoyette Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -36,7 +36,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.115.2.4 2018/09/24 22:56:45 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.115.2.5 2018/09/24 23:25:24 pgoyette Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -272,10 +272,10 @@ netbsd32_sendsig_siginfo(const ksiginfo_ MODULE_CALL_HOOK_DECL(netbsd32_sendsig_hook, f, (const ksiginfo_t *ksi, const sigset_t *mask), (ksi, mask), -netbsd32_sendsig_siginfo()); +netbsd32_sendsig_siginfo(ksi, mask)); MODULE_CALL_HOOK(netbsd32_sendsig_hook, f, (const ksiginfo_t *ksi, const sigset_t *mask), (ksi, mask), -netbsd32_sendsig_siginfo()); +netbsd32_sendsig_siginfo(ksi, mask)); void netbsd32_sendsig(const ksiginfo_t *ksi, const sigset_t *mask)
CVS commit: [pgoyette-compat] src/doc
Module Name:src Committed By: pgoyette Date: Mon Sep 24 23:23:26 UTC 2018 Modified Files: src/doc [pgoyette-compat]: TODO.compat-module Log Message: Update note on NTP To generate a diff of this commit: cvs rdiff -u -r1.1.2.9 -r1.1.2.10 src/doc/TODO.compat-module Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/TODO.compat-module diff -u src/doc/TODO.compat-module:1.1.2.9 src/doc/TODO.compat-module:1.1.2.10 --- src/doc/TODO.compat-module:1.1.2.9 Mon Sep 24 00:03:53 2018 +++ src/doc/TODO.compat-module Mon Sep 24 23:23:26 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: TODO.compat-module,v 1.1.2.9 2018/09/24 00:03:53 pgoyette Exp $ */ +/* $NetBSD: TODO.compat-module,v 1.1.2.10 2018/09/24 23:23:26 pgoyette Exp $ */ DONE @@ -124,5 +124,8 @@ TODO - Not required for branch merge .a compat library, it might be useful to make it work with the .o library. -24. The clockctl module currently assumes that NTP exists. We need to -introduce some hook(s) for this. +24. We need a mechanism to determine, at run-time, whether or not the +NTP option was selected. Even though the NTP code is not modular, +other modules (such as clockctl) need to know whether NTP routines +are available. +
CVS commit: [pgoyette-compat] src/sys
Module Name:src
Committed By: pgoyette
Date: Mon Sep 24 23:18:15 UTC 2018
Modified Files:
src/sys/dev [pgoyette-compat]: clockctl.c
src/sys/modules/clockctl [pgoyette-compat]: Makefile
Log Message:
Revert previous. We need a MP-safe way to determine _at_runtime_ if
the NTP option was included or not.
To generate a diff of this commit:
cvs rdiff -u -r1.35.14.5 -r1.35.14.6 src/sys/dev/clockctl.c
cvs rdiff -u -r1.1.20.2 -r1.1.20.3 src/sys/modules/clockctl/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/clockctl.c
diff -u src/sys/dev/clockctl.c:1.35.14.5 src/sys/dev/clockctl.c:1.35.14.6
--- src/sys/dev/clockctl.c:1.35.14.5 Mon Sep 24 00:01:13 2018
+++ src/sys/dev/clockctl.c Mon Sep 24 23:18:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: clockctl.c,v 1.35.14.5 2018/09/24 00:01:13 pgoyette Exp $ */
+/* $NetBSD: clockctl.c,v 1.35.14.6 2018/09/24 23:18:15 pgoyette Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: clockctl.c,v 1.35.14.5 2018/09/24 00:01:13 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clockctl.c,v 1.35.14.6 2018/09/24 23:18:15 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_ntp.h"
@@ -251,7 +251,6 @@ clockctlioctl(
error = clock_settime1(l->l_proc, args->clock_id, , false);
break;
}
-#ifdef NTP
case CLOCKCTL_NTP_ADJTIME: {
struct clockctl_ntp_adjtime *args = data;
struct timex ntv;
@@ -271,7 +270,6 @@ clockctlioctl(
args->retval = ntp_timestatus();
break;
}
-#endif
default:
error = clockctl_ioctl_50_hook_f_call(dev, cmd, data, flags, l);
if (error == ENOSYS)
Index: src/sys/modules/clockctl/Makefile
diff -u src/sys/modules/clockctl/Makefile:1.1.20.2 src/sys/modules/clockctl/Makefile:1.1.20.3
--- src/sys/modules/clockctl/Makefile:1.1.20.2 Mon Sep 24 00:02:50 2018
+++ src/sys/modules/clockctl/Makefile Mon Sep 24 23:18:15 2018
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.1.20.2 2018/09/24 00:02:50 pgoyette Exp $
+# $NetBSD: Makefile,v 1.1.20.3 2018/09/24 23:18:15 pgoyette Exp $
.include "../Makefile.inc"
.PATH: ${S}/dev
-CPPFLAGS+= -DNTP
-
KMOD= clockctl
IOCONF= clockctl.ioconf
SRCS= clockctl.c
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Mon Sep 24 23:06:02 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32.h Log Message: syntax: add missing ) To generate a diff of this commit: cvs rdiff -u -r1.116.2.13 -r1.116.2.14 src/sys/compat/netbsd32/netbsd32.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/netbsd32/netbsd32.h diff -u src/sys/compat/netbsd32/netbsd32.h:1.116.2.13 src/sys/compat/netbsd32/netbsd32.h:1.116.2.14 --- src/sys/compat/netbsd32/netbsd32.h:1.116.2.13 Mon Sep 24 22:56:45 2018 +++ src/sys/compat/netbsd32/netbsd32.h Mon Sep 24 23:06:02 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32.h,v 1.116.2.13 2018/09/24 22:56:45 pgoyette Exp $ */ +/* $NetBSD: netbsd32.h,v 1.116.2.14 2018/09/24 23:06:02 pgoyette Exp $ */ /* * Copyright (c) 1998, 2001, 2008, 2015 Matthew R. Green @@ -1167,7 +1167,7 @@ struct iovec *netbsd32_get_iov(struct ne SYSCTL_SETUP_PROTO(netbsd32_sysctl_emul_setup); #endif /* SYSCTL_SETUP_PROTO */ -MODULE_HOOK(netbsd32_sendsig_hook, (const ksiginfo_t *, const sigset_t *); +MODULE_HOOK(netbsd32_sendsig_hook, (const ksiginfo_t *, const sigset_t *)); extern struct sysent netbsd32_sysent[]; extern const uint32_t netbsd32_sysent_nomodbits[];
CVS commit: [pgoyette-compat] src/sys
Module Name:src
Committed By: pgoyette
Date: Mon Sep 24 22:56:45 UTC 2018
Modified Files:
src/sys/arch/amd64/amd64 [pgoyette-compat]: netbsd32_machdep.c
netbsd32_machdep_16.c
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32.h
Log Message:
Convert yet another function pointer to the MP-safe mechanism
To generate a diff of this commit:
cvs rdiff -u -r1.115.2.3 -r1.115.2.4 \
src/sys/arch/amd64/amd64/netbsd32_machdep.c
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 \
src/sys/arch/amd64/amd64/netbsd32_machdep_16.c
cvs rdiff -u -r1.116.2.12 -r1.116.2.13 src/sys/compat/netbsd32/netbsd32.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/amd64/netbsd32_machdep.c
diff -u src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.115.2.3 src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.115.2.4
--- src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.115.2.3 Fri Sep 14 08:38:37 2018
+++ src/sys/arch/amd64/amd64/netbsd32_machdep.c Mon Sep 24 22:56:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.115.2.3 2018/09/14 08:38:37 pgoyette Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.115.2.4 2018/09/24 22:56:45 pgoyette Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.115.2.3 2018/09/14 08:38:37 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.115.2.4 2018/09/24 22:56:45 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -270,13 +270,18 @@ netbsd32_sendsig_siginfo(const ksiginfo_
netbsd32_buildcontext(l, tf, fp, catcher, onstack);
}
-void (*vec_netbsd32_sendsig)(const ksiginfo_t *, const sigset_t *);
+MODULE_CALL_HOOK_DECL(netbsd32_sendsig_hook, f,
+(const ksiginfo_t *ksi, const sigset_t *mask), (ksi, mask),
+netbsd32_sendsig_siginfo());
+MODULE_CALL_HOOK(netbsd32_sendsig_hook, f,
+(const ksiginfo_t *ksi, const sigset_t *mask), (ksi, mask),
+netbsd32_sendsig_siginfo());
void
netbsd32_sendsig(const ksiginfo_t *ksi, const sigset_t *mask)
{
- (*vec_netbsd32_sendsig)(ksi, mask);
+ netbsd32_sendsig_hook_f_call(ksi, mask);
}
#ifdef COREDUMP
Index: src/sys/arch/amd64/amd64/netbsd32_machdep_16.c
diff -u src/sys/arch/amd64/amd64/netbsd32_machdep_16.c:1.1.2.2 src/sys/arch/amd64/amd64/netbsd32_machdep_16.c:1.1.2.3
--- src/sys/arch/amd64/amd64/netbsd32_machdep_16.c:1.1.2.2 Fri Sep 14 08:38:37 2018
+++ src/sys/arch/amd64/amd64/netbsd32_machdep_16.c Mon Sep 24 22:56:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.2 2018/09/14 08:38:37 pgoyette Exp $ */
+/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.3 2018/09/24 22:56:45 pgoyette Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.1.2.2 2018/09/14 08:38:37 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.1.2.3 2018/09/24 22:56:45 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -85,6 +85,8 @@ int check_sigcontext32(struct lwp *, con
void netbsd32_sendsig_16(const ksiginfo_t *, const sigset_t *);
+struct netbsd32_sendsig_hook_t netbsd32_sendsig_hook;
+
static void
netbsd32_sendsig_sigcontext(const ksiginfo_t *ksi, const sigset_t *mask)
{
@@ -240,18 +242,19 @@ compat_16_netbsd32___sigreturn14(struct
return (EJUSTRETURN);
}
-extern void (*vec_netbsd32_sendsig)(const ksiginfo_t *, const sigset_t *);
+MODULE_HOOK_SET(netbsd32_sendsig_hook, "nb32_16", netbsd32_sendsig_16);
+MODULE_HOOK_UNSET(netbsd32_sendsig_hook);
void
netbsd32_machdep_md_16_init(void)
{
- vec_netbsd32_sendsig = netbsd32_sendsig_16;
+ netbsd32_sendsig_hook_set();
}
void
netbsd32_machdep_md_16_fini(void)
{
- vec_netbsd32_sendsig = netbsd32_sendsig_siginfo;
+ netbsd32_sendsig_hook_set();
}
Index: src/sys/compat/netbsd32/netbsd32.h
diff -u src/sys/compat/netbsd32/netbsd32.h:1.116.2.12 src/sys/compat/netbsd32/netbsd32.h:1.116.2.13
--- src/sys/compat/netbsd32/netbsd32.h:1.116.2.12 Sun Sep 23 11:57:09 2018
+++ src/sys/compat/netbsd32/netbsd32.h Mon Sep 24 22:56:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32.h,v 1.116.2.12 2018/09/23 11:57:09 pgoyette Exp $ */
+/* $NetBSD: netbsd32.h,v 1.116.2.13 2018/09/24 22:56:45 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001, 2008, 2015 Matthew R. Green
@@ -1167,7 +1167,7 @@ struct iovec *netbsd32_get_iov(struct ne
SYSCTL_SETUP_PROTO(netbsd32_sysctl_emul_setup);
#endif /* SYSCTL_SETUP_PROTO */
-extern void (*vec_netbsd32_sendsig)(const ksiginfo_t *, const sigset_t *);
+MODULE_HOOK(netbsd32_sendsig_hook, (const ksiginfo_t *, const sigset_t *);
extern struct sysent netbsd32_sysent[];
extern const uint32_t netbsd32_sysent_nomodbits[];
CVS import: src/external/public-domain/xz/dist
Module Name:src Committed By: joerg Date: Mon Sep 24 22:36:05 UTC 2018 Update of /cvsroot/src/external/public-domain/xz/dist In directory ivanova.netbsd.org:/tmp/cvs-serv25415 Log Message: Import xz 5.2.4. Status: Vendor Tag: XZ Release Tags: xz-5-2-4 U src/external/public-domain/xz/dist/ChangeLog U src/external/public-domain/xz/dist/TODO U src/external/public-domain/xz/dist/THANKS C src/external/public-domain/xz/dist/configure.ac U src/external/public-domain/xz/dist/INSTALL U src/external/public-domain/xz/dist/COPYING N src/external/public-domain/xz/dist/configure U src/external/public-domain/xz/dist/NEWS U src/external/public-domain/xz/dist/AUTHORS U src/external/public-domain/xz/dist/config.h.in U src/external/public-domain/xz/dist/README U src/external/public-domain/xz/dist/PACKAGERS U src/external/public-domain/xz/dist/src/xzdec/xzdec_w32res.rc U src/external/public-domain/xz/dist/src/xzdec/xzdec.c U src/external/public-domain/xz/dist/src/xzdec/lzmadec_w32res.rc U src/external/public-domain/xz/dist/src/xzdec/xzdec.1 U src/external/public-domain/xz/dist/src/common/sysdefs.h U src/external/public-domain/xz/dist/src/common/tuklib_open_stdxxx.h U src/external/public-domain/xz/dist/src/common/tuklib_exit.h U src/external/public-domain/xz/dist/src/common/tuklib_cpucores.c U src/external/public-domain/xz/dist/src/common/tuklib_physmem.c U src/external/public-domain/xz/dist/src/common/tuklib_progname.h U src/external/public-domain/xz/dist/src/common/tuklib_gettext.h U src/external/public-domain/xz/dist/src/common/tuklib_cpucores.h U src/external/public-domain/xz/dist/src/common/tuklib_common.h U src/external/public-domain/xz/dist/src/common/tuklib_physmem.h U src/external/public-domain/xz/dist/src/common/tuklib_mbstr_width.c U src/external/public-domain/xz/dist/src/common/tuklib_mbstr.h U src/external/public-domain/xz/dist/src/common/common_w32res.rc U src/external/public-domain/xz/dist/src/common/tuklib_progname.c U src/external/public-domain/xz/dist/src/common/tuklib_config.h U src/external/public-domain/xz/dist/src/common/tuklib_exit.c U src/external/public-domain/xz/dist/src/common/tuklib_integer.h U src/external/public-domain/xz/dist/src/common/tuklib_mbstr_fw.c U src/external/public-domain/xz/dist/src/common/mythread.h U src/external/public-domain/xz/dist/src/common/tuklib_open_stdxxx.c U src/external/public-domain/xz/dist/src/xz/xz.1 U src/external/public-domain/xz/dist/src/xz/mytime.c U src/external/public-domain/xz/dist/src/xz/args.h U src/external/public-domain/xz/dist/src/xz/hardware.h U src/external/public-domain/xz/dist/src/xz/mytime.h U src/external/public-domain/xz/dist/src/xz/coder.c U src/external/public-domain/xz/dist/src/xz/signals.h U src/external/public-domain/xz/dist/src/xz/util.c U src/external/public-domain/xz/dist/src/xz/file_io.h U src/external/public-domain/xz/dist/src/xz/suffix.h U src/external/public-domain/xz/dist/src/xz/list.c U src/external/public-domain/xz/dist/src/xz/list.h U src/external/public-domain/xz/dist/src/xz/message.c U src/external/public-domain/xz/dist/src/xz/util.h U src/external/public-domain/xz/dist/src/xz/private.h U src/external/public-domain/xz/dist/src/xz/xz_w32res.rc U src/external/public-domain/xz/dist/src/xz/message.h C src/external/public-domain/xz/dist/src/xz/args.c U src/external/public-domain/xz/dist/src/xz/suffix.c U src/external/public-domain/xz/dist/src/xz/coder.h U src/external/public-domain/xz/dist/src/xz/hardware.c U src/external/public-domain/xz/dist/src/xz/options.c U src/external/public-domain/xz/dist/src/xz/main.h U src/external/public-domain/xz/dist/src/xz/options.h U src/external/public-domain/xz/dist/src/xz/signals.c U src/external/public-domain/xz/dist/src/xz/main.c U src/external/public-domain/xz/dist/src/xz/file_io.c U src/external/public-domain/xz/dist/src/lzmainfo/lzmainfo.c U src/external/public-domain/xz/dist/src/lzmainfo/lzmainfo.1 U src/external/public-domain/xz/dist/src/lzmainfo/lzmainfo_w32res.rc U src/external/public-domain/xz/dist/src/liblzma/validate_map.sh U src/external/public-domain/xz/dist/src/liblzma/liblzma.pc.in U src/external/public-domain/xz/dist/src/liblzma/liblzma_w32res.rc U src/external/public-domain/xz/dist/src/liblzma/liblzma.map U src/external/public-domain/xz/dist/src/liblzma/check/crc32_table.c U src/external/public-domain/xz/dist/src/liblzma/check/crc64_table.c U src/external/public-domain/xz/dist/src/liblzma/check/crc64_x86.S U src/external/public-domain/xz/dist/src/liblzma/check/crc64_tablegen.c U src/external/public-domain/xz/dist/src/liblzma/check/crc32_x86.S C src/external/public-domain/xz/dist/src/liblzma/check/check.h U src/external/public-domain/xz/dist/src/liblzma/check/crc_macros.h U src/external/public-domain/xz/dist/src/liblzma/check/check.c U src/external/public-domain/xz/dist/src/liblzma/check/crc32_small.c U src/external/public-domain/xz/dist/src/liblzma/check/crc64_fast.c U src/external/public-domain/xz/dist/src/liblzma/check/crc64_table_le.h U
CVS commit: src/sys/arch/arm/nvidia
Module Name:src
Committed By: jmcneill
Date: Mon Sep 24 22:22:16 UTC 2018
Modified Files:
src/sys/arch/arm/nvidia: tegra_soc.c
Log Message:
Remove two unused bs handles
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/nvidia/tegra_soc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/nvidia/tegra_soc.c
diff -u src/sys/arch/arm/nvidia/tegra_soc.c:1.15 src/sys/arch/arm/nvidia/tegra_soc.c:1.16
--- src/sys/arch/arm/nvidia/tegra_soc.c:1.15 Sun Apr 1 04:35:04 2018
+++ src/sys/arch/arm/nvidia/tegra_soc.c Mon Sep 24 22:22:16 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_soc.c,v 1.15 2018/04/01 04:35:04 ryo Exp $ */
+/* $NetBSD: tegra_soc.c,v 1.16 2018/09/24 22:22:16 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -30,7 +30,7 @@
#include "opt_multiprocessor.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: tegra_soc.c,v 1.15 2018/04/01 04:35:04 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_soc.c,v 1.16 2018/09/24 22:22:16 jmcneill Exp $");
#include
#include
@@ -47,10 +47,8 @@ __KERNEL_RCSID(0, "$NetBSD: tegra_soc.c,
#include
#include
-bus_space_handle_t tegra_host1x_bsh;
bus_space_handle_t tegra_ppsb_bsh;
bus_space_handle_t tegra_apb_bsh;
-bus_space_handle_t tegra_ahb_a2_bsh;
void
tegra_bootstrap(void)
@@ -58,16 +56,10 @@ tegra_bootstrap(void)
extern struct bus_space arm_generic_bs_tag;
bus_space_tag_t bst = _generic_bs_tag;
- if (bus_space_map(bst, TEGRA_HOST1X_BASE, TEGRA_HOST1X_SIZE, 0,
- _host1x_bsh) != 0)
- panic("couldn't map HOST1X");
if (bus_space_map(bst, TEGRA_PPSB_BASE, TEGRA_PPSB_SIZE, 0,
_ppsb_bsh) != 0)
panic("couldn't map PPSB");
if (bus_space_map(bst, TEGRA_APB_BASE, TEGRA_APB_SIZE, 0,
_apb_bsh) != 0)
panic("couldn't map APB");
- if (bus_space_map(bst, TEGRA_AHB_A2_BASE, TEGRA_AHB_A2_SIZE, 0,
- _ahb_a2_bsh) != 0)
- panic("couldn't map AHB A2");
}
CVS commit: src/external/bsd/openresolv/dist
Module Name:src
Committed By: kre
Date: Mon Sep 24 21:58:11 UTC 2018
Modified Files:
src/external/bsd/openresolv/dist: dnsmasq.in libc.in named.in pdnsd.in
resolvconf.in
Log Message:
Resolvconf is (can be) used as part of network config during
system installation, so also must confine itself to POSIX specified
test ('[') usage. Pointed out by roy@ - thanks.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.11 -r1.2 src/external/bsd/openresolv/dist/dnsmasq.in \
src/external/bsd/openresolv/dist/libc.in
cvs rdiff -u -r1.1.1.7 -r1.2 src/external/bsd/openresolv/dist/named.in
cvs rdiff -u -r1.1.1.4 -r1.2 src/external/bsd/openresolv/dist/pdnsd.in
cvs rdiff -u -r1.1.1.14 -r1.2 src/external/bsd/openresolv/dist/resolvconf.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/openresolv/dist/dnsmasq.in
diff -u src/external/bsd/openresolv/dist/dnsmasq.in:1.1.1.11 src/external/bsd/openresolv/dist/dnsmasq.in:1.2
--- src/external/bsd/openresolv/dist/dnsmasq.in:1.1.1.11 Mon Apr 11 10:40:22 2016
+++ src/external/bsd/openresolv/dist/dnsmasq.in Mon Sep 24 21:58:11 2018
@@ -28,7 +28,7 @@
[ -f "@SYSCONFDIR@"/resolvconf.conf ] || exit 0
. "@SYSCONFDIR@/resolvconf.conf" || exit 1
-[ -z "$dnsmasq_conf" -a -z "$dnsmasq_resolv" ] && exit 0
+[ -z "${dnsmasq_conf}${dnsmasq_resolv}" ] && exit 0
[ -z "$RESOLVCONF" ] && eval "$(@SBINDIR@/resolvconf -v)"
NL="
"
@@ -98,7 +98,7 @@ for d in $DOMAINS; do
empty=false i=0
IFS=:
set -- $n
-while [ -n "$1" -o -n "$2" ]; do
+while [ -n "$1" ] || [ -n "$2" ]; do
addr="$1"
shift
if [ -z "$addr" ]; then
Index: src/external/bsd/openresolv/dist/libc.in
diff -u src/external/bsd/openresolv/dist/libc.in:1.1.1.11 src/external/bsd/openresolv/dist/libc.in:1.2
--- src/external/bsd/openresolv/dist/libc.in:1.1.1.11 Fri Dec 30 19:42:05 2016
+++ src/external/bsd/openresolv/dist/libc.in Mon Sep 24 21:58:11 2018
@@ -98,10 +98,12 @@ fi
: ${resolv_conf:=/etc/resolv.conf}
: ${libc_service:=nscd}
: ${list_resolv:=@SBINDIR@/resolvconf -l}
-if [ "${resolv_conf_head-x}" = x -a -f "$SYSCONFDIR"/resolv.conf.head ]; then
+if [ "${resolv_conf_head-x}" = x ] && [ -f "$SYSCONFDIR"/resolv.conf.head ]
+then
resolv_conf_head="$(cat "${SYSCONFDIR}"/resolv.conf.head)"
fi
-if [ "${resolv_conf_tail-x}" = x -a -f "$SYSCONFDIR"/resolv.conf.tail ]; then
+if [ "${resolv_conf_tail-x}" = x ] && [ -f "$SYSCONFDIR"/resolv.conf.tail ]
+then
resolv_conf_tail="$(cat "$SYSCONFDIR"/resolv.conf.tail)"
fi
@@ -126,7 +128,7 @@ case "${resolv_conf_passthrough:-NO}" in
backup=false
newest=
for conf in "$IFACEDIR"/*; do
- if [ -z "$newest" -o "$conf" -nt "$newest" ]; then
+ if [ -z "$newest" ] || [ "$conf" -nt "$newest" ]; then
newest="$conf"
fi
done
@@ -178,7 +180,7 @@ case "${resolv_conf_passthrough:-NO}" in
fi
[ -n "$domain" ] && newconf="${newconf}domain $domain$NL"
- if [ -n "$newsearch" -a "$newsearch" != "$domain" ]; then
+ if [ -n "$newsearch" ] && [ "$newsearch" != "$domain" ]; then
newconf="${newconf}search $newsearch$NL"
fi
for n in $newns; do
Index: src/external/bsd/openresolv/dist/named.in
diff -u src/external/bsd/openresolv/dist/named.in:1.1.1.7 src/external/bsd/openresolv/dist/named.in:1.2
--- src/external/bsd/openresolv/dist/named.in:1.1.1.7 Mon Apr 11 10:40:22 2016
+++ src/external/bsd/openresolv/dist/named.in Mon Sep 24 21:58:11 2018
@@ -28,14 +28,14 @@
[ -f "@SYSCONFDIR@"/resolvconf.conf ] || exit 0
. "@SYSCONFDIR@/resolvconf.conf" || exit 1
-[ -z "$named_zones" -a -z "$named_options" ] && exit 0
+[ -z "${named_zones}${named_options}" ] && exit 0
[ -z "$RESOLVCONF" ] && eval "$(@SBINDIR@/resolvconf -v)"
NL="
"
# Platform specific kludges
-if [ -z "$named_service" -a -z "$named_restart" -a \
- -d "$RCDIR" -a ! -x "$RCDIR"/named ]
+if [ -z "${named_service}${named_restart}" ] &&
+ [ -d "$RCDIR" ] && ! [ -x "$RCDIR"/named ]
then
if [ -x "$RCDIR"/bind9 ]; then
# Debian and derivatives
Index: src/external/bsd/openresolv/dist/pdnsd.in
diff -u src/external/bsd/openresolv/dist/pdnsd.in:1.1.1.4 src/external/bsd/openresolv/dist/pdnsd.in:1.2
--- src/external/bsd/openresolv/dist/pdnsd.in:1.1.1.4 Fri Jul 12 16:50:27 2013
+++ src/external/bsd/openresolv/dist/pdnsd.in Mon Sep 24 21:58:11 2018
@@ -28,7 +28,7 @@
[ -f "@SYSCONFDIR@"/resolvconf.conf ] || exit 0
. "@SYSCONFDIR@/resolvconf.conf" || exit 1
-[ -z "$pdnsd_conf" -a -z "$pdnsd_resolv" ] && exit 0
+[ -z "${pdnsd_conf}${pdnsd_resolv}" ] && exit 0
[ -z "$RESOLVCONF" ] && eval "$(@SBINDIR@/resolvconf -v)"
NL="
"
Index: src/external/bsd/openresolv/dist/resolvconf.in
diff -u src/external/bsd/openresolv/dist/resolvconf.in:1.1.1.14 src/external/bsd/openresolv/dist/resolvconf.in:1.2
--- src/external/bsd/openresolv/dist/resolvconf.in:1.1.1.14 Fri Dec 30 19:42:05 2016
+++ src/external/bsd/openresolv/dist/resolvconf.in Mon Sep 24
CVS commit: [jdolecek-ncqfixes] src/sys/dev
Module Name:src Committed By: jdolecek Date: Mon Sep 24 21:19:50 UTC 2018 Modified Files: src/sys/dev/isa [jdolecek-ncqfixes]: files.isa src/sys/dev/isapnp [jdolecek-ncqfixes]: files.isapnp src/sys/dev/pci [jdolecek-ncqfixes]: files.pci src/sys/dev/pcmcia [jdolecek-ncqfixes]: files.pcmcia Log Message: partial HEAD sync - ISDN device removal To generate a diff of this commit: cvs rdiff -u -r1.169 -r1.169.6.1 src/sys/dev/isa/files.isa cvs rdiff -u -r1.38 -r1.38.166.1 src/sys/dev/isapnp/files.isapnp cvs rdiff -u -r1.400 -r1.400.2.1 src/sys/dev/pci/files.pci cvs rdiff -u -r1.58 -r1.58.42.1 src/sys/dev/pcmcia/files.pcmcia Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/isa/files.isa diff -u src/sys/dev/isa/files.isa:1.169 src/sys/dev/isa/files.isa:1.169.6.1 --- src/sys/dev/isa/files.isa:1.169 Tue Jan 2 00:25:35 2018 +++ src/sys/dev/isa/files.isa Mon Sep 24 21:19:50 2018 @@ -1,4 +1,4 @@ -# $NetBSD: files.isa,v 1.169 2018/01/02 00:25:35 christos Exp $ +# $NetBSD: files.isa,v 1.169.6.1 2018/09/24 21:19:50 jdolecek Exp $ # # Config file and device description for machine-independent ISA code. # Included by ports that need it. Requires that the SCSI files be @@ -484,22 +484,6 @@ device aps: sysmon_envsys attach aps at isa with aps file dev/isa/aps.c aps -# ISDN devices -attach isic at isa with isic_isa -file dev/isa/isic_isa.c isic_isa -#attach daic at isa with daic_isa -#file dev/isa/daic_isa.c daic_isa - -defflag opt_isicisa.h ISICISA_TEL_S0_8 ISICISA_TEL_S0_16 ISICISA_TEL_S0_16_3 - ISICISA_AVM_A1 ISICISA_USR_STI ISICISA_ITKIX1 - -file dev/isa/isic_isa_tel_s08.c isic_isa -file dev/isa/isic_isa_tel_s016.c isic_isa -file dev/isa/isic_isa_tel_s0163.c isic_isa -file dev/isa/isic_isa_avm_a1.c isic_isa -file dev/isa/isic_isa_usr_sti.c isic_isa -file dev/isa/isic_isa_itk_ix1.c isic_isa - # Game adapter (joystick) attach joy at isa with joy_isa file dev/isa/joy_isa.c joy_isa Index: src/sys/dev/isapnp/files.isapnp diff -u src/sys/dev/isapnp/files.isapnp:1.38 src/sys/dev/isapnp/files.isapnp:1.38.166.1 --- src/sys/dev/isapnp/files.isapnp:1.38 Sun Dec 11 12:22:16 2005 +++ src/sys/dev/isapnp/files.isapnp Mon Sep 24 21:19:50 2018 @@ -1,4 +1,4 @@ -# $NetBSD: files.isapnp,v 1.38 2005/12/11 12:22:16 christos Exp $ +# $NetBSD: files.isapnp,v 1.38.166.1 2018/09/24 21:19:50 jdolecek Exp $ # # Config file and device description for machine-independent ISAPnP code. # Included by ports that need it. @@ -91,24 +91,6 @@ file dev/isapnp/aha_isapnp.c aha_isapn attach aic at isapnp with aic_isapnp file dev/isapnp/aic_isapnp.c aic_isapnp -# ISDN devices -attach isic at isapnp with isic_isapnp -file dev/isapnp/isic_isapnp.c isic_isapnp - -defflag opt_isicpnp.h ISICPNP_TEL_S0_16_3_P ISICPNP_CRTX_S0_P ISICPNP_DRN_NGO - ISICPNP_ELSA_QS1ISA ISICPNP_ELSA_PCC16 - ISICPNP_SEDLBAUER ISICPNP_DYNALINK - ISICPNP_SIEMENS_ISURF2 ISICPNP_ITKIX - -file dev/isapnp/isic_isapnp_tel_s0P.c isic_isapnp -file dev/isapnp/isic_isapnp_ctx_s0P.c isic_isapnp -file dev/isapnp/isic_isapnp_drn_ngo.c isic_isapnp -file dev/isapnp/isic_isapnp_elsa_qs1i.c isic_isapnp -file dev/isapnp/isic_isapnp_sws.c isic_isapnp -file dev/isapnp/isic_isapnp_dynalink.c isic_isapnp -file dev/isapnp/isic_isapnp_siemens_isurf.c isic_isapnp -file dev/isapnp/isic_isapnp_itkix.c isic_isapnp - # Game adapter (joystick) attach joy at isapnp with joy_isapnp file dev/isapnp/joy_isapnp.c joy_isapnp Index: src/sys/dev/pci/files.pci diff -u src/sys/dev/pci/files.pci:1.400 src/sys/dev/pci/files.pci:1.400.2.1 --- src/sys/dev/pci/files.pci:1.400 Sat Aug 25 07:48:57 2018 +++ src/sys/dev/pci/files.pci Mon Sep 24 21:19:50 2018 @@ -1,4 +1,4 @@ -# $NetBSD: files.pci,v 1.400 2018/08/25 07:48:57 maxv Exp $ +# $NetBSD: files.pci,v 1.400.2.1 2018/09/24 21:19:50 jdolecek Exp $ # # Config file and device description for machine-independent PCI code. # Included by ports that need it. Requires that the SCSI files be @@ -167,11 +167,6 @@ device de: ether, ifnet, arp attach de at pci file dev/pci/if_de.c de -# Efficient Networks, Inc. ATM interface -# device declaration in sys/conf/files -attach en at pci with en_pci -file dev/pci/if_en_pci.c en_pci - # 3Com 3c590 and 3c595 Ethernet controllers # device declaration in sys/conf/files attach ep at pci with ep_pci @@ -812,24 +807,6 @@ filedev/pci/if_malo_pci.c malo attach wi at pci with wi_pci file dev/pci/if_wi_pci.c wi_pci -# ISDN devices -attach isic at pci with isic_pci -file dev/pci/isic_pci.c isic_pci - -file dev/pci/isic_pci_elsa_qs1p.c isic_pci - -# AVM T1/B1 -attach iavc at pci with iavc_pci -file dev/pci/iavc_pci.c iavc_pci - -device ifpci: isdndev, passive_isdn, nisac -attach ifpci at pci -file dev/pci/ifpci.c ifpci - -device ifritz: isdndev, passive_isdn, nisacsx -attach ifritz at pci -file dev/pci/ifpci2.c ifritz - # Winbond
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: jdolecek
Date: Mon Sep 24 21:15:39 UTC 2018
Modified Files:
src/sys/compat/netbsd32: netbsd32_ioctl.c netbsd32_ioctl.h
Log Message:
fix DIOCLWEDGES to at least not fail with ENOTTY due to struct size difference,
but probably more needs to be done to work if any actual wedges are configured
To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/sys/compat/netbsd32/netbsd32_ioctl.c
cvs rdiff -u -r1.62 -r1.63 src/sys/compat/netbsd32/netbsd32_ioctl.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32_ioctl.c
diff -u src/sys/compat/netbsd32/netbsd32_ioctl.c:1.94 src/sys/compat/netbsd32/netbsd32_ioctl.c:1.95
--- src/sys/compat/netbsd32/netbsd32_ioctl.c:1.94 Mon Sep 24 21:08:08 2018
+++ src/sys/compat/netbsd32/netbsd32_ioctl.c Mon Sep 24 21:15:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_ioctl.c,v 1.94 2018/09/24 21:08:08 jdolecek Exp $ */
+/* $NetBSD: netbsd32_ioctl.c,v 1.95 2018/09/24 21:15:39 jdolecek Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.94 2018/09/24 21:08:08 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.95 2018/09/24 21:15:39 jdolecek Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ntp.h"
@@ -552,7 +552,7 @@ netbsd32_to_dkwedge_list(
struct dkwedge_list *p,
u_long cmd)
{
- p->dkwl_buf = s32p->dkwl_buf;
+ p->dkwl_buf = NETBSD32PTR64(s32p->dkwl_buf);
p->dkwl_bufsize = s32p->dkwl_bufsize;
p->dkwl_nwedges = s32p->dkwl_nwedges;
p->dkwl_ncopied = s32p->dkwl_ncopied;
@@ -1017,7 +1017,7 @@ netbsd32_from_dkwedge_list(
struct netbsd32_dkwedge_list *s32p,
u_long cmd)
{
- s32p->dkwl_buf = p->dkwl_buf;
+ NETBSD32PTR32(s32p->dkwl_buf, p->dkwl_buf);
s32p->dkwl_bufsize = p->dkwl_bufsize;
s32p->dkwl_nwedges = p->dkwl_nwedges;
s32p->dkwl_ncopied = p->dkwl_ncopied;
Index: src/sys/compat/netbsd32/netbsd32_ioctl.h
diff -u src/sys/compat/netbsd32/netbsd32_ioctl.h:1.62 src/sys/compat/netbsd32/netbsd32_ioctl.h:1.63
--- src/sys/compat/netbsd32/netbsd32_ioctl.h:1.62 Mon Sep 24 21:08:08 2018
+++ src/sys/compat/netbsd32/netbsd32_ioctl.h Mon Sep 24 21:15:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_ioctl.h,v 1.62 2018/09/24 21:08:08 jdolecek Exp $ */
+/* $NetBSD: netbsd32_ioctl.h,v 1.63 2018/09/24 21:15:39 jdolecek Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -604,11 +604,11 @@ struct netbsd32_devrescanargs {
/* From sys/disk.h, sys/dkio.h */
struct netbsd32_dkwedge_list {
- void *dkwl_buf; /* storage for dkwedge_info array */
+ netbsd32_voidp dkwl_buf; /* storage for dkwedge_info array */
netbsd32_size_t dkwl_bufsize; /* size of that buffer */
u_int dkwl_nwedges; /* total number of wedges */
u_int dkwl_ncopied; /* number actually copied */
-};
+} __packed;
#define DIOCLWEDGES32 _IOWR('d', 124, struct netbsd32_dkwedge_list)
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: jdolecek
Date: Mon Sep 24 21:08:08 UTC 2018
Modified Files:
src/sys/compat/netbsd32: netbsd32_ioctl.c netbsd32_ioctl.h
Log Message:
add support for DIOCGSTRATEGY and DIOCSSTRATEGY
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/sys/compat/netbsd32/netbsd32_ioctl.c
cvs rdiff -u -r1.61 -r1.62 src/sys/compat/netbsd32/netbsd32_ioctl.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32_ioctl.c
diff -u src/sys/compat/netbsd32/netbsd32_ioctl.c:1.93 src/sys/compat/netbsd32/netbsd32_ioctl.c:1.94
--- src/sys/compat/netbsd32/netbsd32_ioctl.c:1.93 Mon Sep 3 16:29:29 2018
+++ src/sys/compat/netbsd32/netbsd32_ioctl.c Mon Sep 24 21:08:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_ioctl.c,v 1.93 2018/09/03 16:29:29 riastradh Exp $ */
+/* $NetBSD: netbsd32_ioctl.c,v 1.94 2018/09/24 21:08:08 jdolecek Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.93 2018/09/03 16:29:29 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.94 2018/09/24 21:08:08 jdolecek Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ntp.h"
@@ -536,6 +536,17 @@ netbsd32_to_devrescanargs(
}
static inline void
+netbsd32_to_disk_strategy(
+const struct netbsd32_disk_strategy *s32p,
+struct disk_strategy *p,
+u_long cmd)
+{
+ memcpy(p->dks_name, s32p->dks_name, sizeof(p->dks_name));
+ p->dks_param = NETBSD32PTR64(s32p->dks_param);
+ p->dks_paramlen = s32p->dks_paramlen;
+}
+
+static inline void
netbsd32_to_dkwedge_list(
const struct netbsd32_dkwedge_list *s32p,
struct dkwedge_list *p,
@@ -990,6 +1001,17 @@ netbsd32_from_devrescanargs(
}
static inline void
+netbsd32_from_disk_strategy(
+const struct disk_strategy *p,
+struct netbsd32_disk_strategy *s32p,
+u_long cmd)
+{
+ memcpy(s32p->dks_name, p->dks_name, sizeof(p->dks_name));
+ NETBSD32PTR32(s32p->dks_param, p->dks_param);
+ s32p->dks_paramlen = p->dks_paramlen;
+}
+
+static inline void
netbsd32_from_dkwedge_list(
const struct dkwedge_list *p,
struct netbsd32_dkwedge_list *s32p,
@@ -1457,6 +1479,10 @@ netbsd32_ioctl(struct lwp *l, const stru
case DRVGETEVENT32:
IOCTL_STRUCT_CONV_TO(DRVGETEVENT, plistref);
+ case DIOCGSTRATEGY32:
+ IOCTL_STRUCT_CONV_TO(DIOCGSTRATEGY, disk_strategy);
+ case DIOCSSTRATEGY32:
+ IOCTL_STRUCT_CONV_TO(DIOCSSTRATEGY, disk_strategy);
case DIOCLWEDGES32:
IOCTL_STRUCT_CONV_TO(DIOCLWEDGES, dkwedge_list);
Index: src/sys/compat/netbsd32/netbsd32_ioctl.h
diff -u src/sys/compat/netbsd32/netbsd32_ioctl.h:1.61 src/sys/compat/netbsd32/netbsd32_ioctl.h:1.62
--- src/sys/compat/netbsd32/netbsd32_ioctl.h:1.61 Thu Sep 6 06:41:59 2018
+++ src/sys/compat/netbsd32/netbsd32_ioctl.h Mon Sep 24 21:08:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_ioctl.h,v 1.61 2018/09/06 06:41:59 maxv Exp $ */
+/* $NetBSD: netbsd32_ioctl.h,v 1.62 2018/09/24 21:08:08 jdolecek Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -612,3 +612,11 @@ struct netbsd32_dkwedge_list {
#define DIOCLWEDGES32 _IOWR('d', 124, struct netbsd32_dkwedge_list)
+struct netbsd32_disk_strategy {
+ char dks_name[DK_STRATEGYNAMELEN]; /* name of strategy */
+ netbsd32_charp dks_param; /* notyet; should be NULL */
+ netbsd32_size_t dks_paramlen; /* notyet; should be 0 */
+} __packed;
+
+#define DIOCGSTRATEGY32 _IOR('d', 125, struct netbsd32_disk_strategy)
+#define DIOCSSTRATEGY32 _IOW('d', 126, struct netbsd32_disk_strategy)
CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc
Module Name:src
Committed By: christos
Date: Mon Sep 24 20:36:51 UTC 2018
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc: crypto.inc
Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc: sparccap.c
Log Message:
put back sparccap.c; too hard to iron out the bn_mont stuff.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc
cvs rdiff -u -r0 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/sparccap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc:1.10 src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc:1.11
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc:1.10 Mon Sep 24 16:15:38 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc Mon Sep 24 16:36:51 2018
@@ -1,7 +1,7 @@
.PATH.S: ${.PARSEDIR}
.PATH.c: ${.PARSEDIR}
CPUID = yes
-CPUID_SRCS += sparccpuid.S sparcv9cap.c
+CPUID_SRCS += sparccpuid.S sparccap.c
CRYPTOCPPFLAGS += -DOPENSSL_CPUID_OBJ
.if ${MACHINE} == "sparc64"
Added files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/sparccap.c
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/sparccap.c:1.3
--- /dev/null Mon Sep 24 16:36:51 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/sparccap.c Mon Sep 24 16:36:51 2018
@@ -0,0 +1,11 @@
+#include "e_os.h"
+#include "internal/cryptlib_int.h"
+
+uint32_t OPENSSL_rdtsc(void)
+{
+return 0;
+}
+
+void OPENSSL_cpuid_setup(void)
+{
+}
CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc
Module Name:src
Committed By: christos
Date: Mon Sep 24 20:15:38 UTC 2018
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc: crypto.inc
Log Message:
sparcv9cap is a c file.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc:1.9 src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc:1.10
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc:1.9 Mon Sep 24 15:50:51 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc Mon Sep 24 16:15:38 2018
@@ -1,7 +1,7 @@
.PATH.S: ${.PARSEDIR}
.PATH.c: ${.PARSEDIR}
CPUID = yes
-CPUID_SRCS += sparccpuid.S sparcv9cap.S
+CPUID_SRCS += sparccpuid.S sparcv9cap.c
CRYPTOCPPFLAGS += -DOPENSSL_CPUID_OBJ
.if ${MACHINE} == "sparc64"
@@ -12,7 +12,6 @@ AFLAGS.sparcv9-mont.S+= -Wa,-Av9
AFLAGS.sparcv9a-mont.S+= -Wa,-Av9a
AFLAGS.sparct4-mont.S+= -Wa,-Av9a
AFLAGS.vis3-mont.S+= -Wa,-Av9a
-AFLAGS.sparcv9cap.S+= -Wa,-Av9
.endif
.include "../../crypto.inc"
CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc
Module Name:src
Committed By: christos
Date: Mon Sep 24 19:50:51 UTC 2018
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc: crypto.inc
Removed Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc: sparccap.c
Log Message:
use sparcv9cap.S
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc
cvs rdiff -u -r1.1 -r0 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/sparccap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc:1.8 src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc:1.9
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc:1.8 Sun Sep 23 20:45:12 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc Mon Sep 24 15:50:51 2018
@@ -1,7 +1,7 @@
.PATH.S: ${.PARSEDIR}
.PATH.c: ${.PARSEDIR}
CPUID = yes
-CPUID_SRCS += sparccpuid.S sparccap.c
+CPUID_SRCS += sparccpuid.S sparcv9cap.S
CRYPTOCPPFLAGS += -DOPENSSL_CPUID_OBJ
.if ${MACHINE} == "sparc64"
@@ -12,6 +12,7 @@ AFLAGS.sparcv9-mont.S+= -Wa,-Av9
AFLAGS.sparcv9a-mont.S+= -Wa,-Av9a
AFLAGS.sparct4-mont.S+= -Wa,-Av9a
AFLAGS.vis3-mont.S+= -Wa,-Av9a
+AFLAGS.sparcv9cap.S+= -Wa,-Av9
.endif
.include "../../crypto.inc"
CVS commit: [jdolecek-ncqfixes] src/sys/dev/ata
Module Name:src
Committed By: jdolecek
Date: Mon Sep 24 19:48:02 UTC 2018
Modified Files:
src/sys/dev/ata [jdolecek-ncqfixes]: TODO.ncq ata.c
Log Message:
replace KASSERT() for READ LOG EXT returning without error indication
with just log to avoid triggering panic under QEMU - it doesn't implement
the command for AHCI emulation
To generate a diff of this commit:
cvs rdiff -u -r1.4.2.8 -r1.4.2.9 src/sys/dev/ata/TODO.ncq
cvs rdiff -u -r1.141.6.9 -r1.141.6.10 src/sys/dev/ata/ata.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ata/TODO.ncq
diff -u src/sys/dev/ata/TODO.ncq:1.4.2.8 src/sys/dev/ata/TODO.ncq:1.4.2.9
--- src/sys/dev/ata/TODO.ncq:1.4.2.8 Sat Sep 22 17:52:24 2018
+++ src/sys/dev/ata/TODO.ncq Mon Sep 24 19:48:02 2018
@@ -1,9 +1,9 @@
jdolecek-ncqfixes goals:
-- re-fix QEMU ahci(4) bug workaround (no READ LOG EXT support) - now it
- triggers KASSERT()
- fix ahci(4) error handling under paralles - invalid bio via WD_CHAOS_MONKEY
ends up being handled as NOERROR, triggering KASSERT() in wd(4)
- remove controller-specific slot bitmaps (ic/siisata.c, ic/ahcisata_core.c)
+- revert rev 1.431 of wd.c (AT_POOL removal) - ensure still works
+ for the reset-via-thread case
Bugs
Index: src/sys/dev/ata/ata.c
diff -u src/sys/dev/ata/ata.c:1.141.6.9 src/sys/dev/ata/ata.c:1.141.6.10
--- src/sys/dev/ata/ata.c:1.141.6.9 Sat Sep 22 16:14:25 2018
+++ src/sys/dev/ata/ata.c Mon Sep 24 19:48:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ata.c,v 1.141.6.9 2018/09/22 16:14:25 jdolecek Exp $ */
+/* $NetBSD: ata.c,v 1.141.6.10 2018/09/24 19:48:02 jdolecek Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.141.6.9 2018/09/22 16:14:25 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.141.6.10 2018/09/24 19:48:02 jdolecek Exp $");
#include "opt_ata.h"
@@ -972,7 +972,7 @@ ata_read_log_ext_ncq(struct ata_drive_da
for (int i = 0; i < sizeof(drvp->recovery_blk); i++)
cksum += tb[i];
if (cksum != 0) {
- aprint_error_dev(drvp->drv_softc,
+ device_printf(drvp->drv_softc,
"invalid checksum %x for READ LOG EXT page %x\n",
cksum, page);
rv = EINVAL;
@@ -989,10 +989,20 @@ ata_read_log_ext_ncq(struct ata_drive_da
*status = tb[2];
*err = tb[3];
- KASSERTMSG((*status & WDCS_ERR),
- "%s: non-error command slot %d reported by READ LOG EXT page %x: "
- "err %x status %x\n",
- device_xname(drvp->drv_softc), *slot, page, *err, *status);
+ if ((*status & WDCS_ERR) == 0) {
+ /*
+ * We expect error here. Normal physical drives always
+ * do, it's part of ATA standard. However, QEMU AHCI emulation
+ * misehandles READ LOG EXT in a way that the command itself
+ * returns without error, but no data is transferred.
+ */
+ device_printf(drvp->drv_softc,
+ "READ LOG EXT page %x failed to report error: "
+ "slot %d err %x status %x\n",
+ page, *slot, *err, *status);
+ rv = EOPNOTSUPP;
+ goto out;
+ }
rv = 0;
@@ -1460,7 +1470,7 @@ ata_timo_xfer_check(struct ata_xfer *xfe
xfer->c_flags &= ~C_FREE;
ata_channel_unlock(chp);
- aprint_normal_dev(drvp->drv_softc,
+ device_printf(drvp->drv_softc,
"xfer %p freed while invoking timeout\n", xfer);
ata_free_xfer(chp, xfer);
@@ -1470,7 +1480,7 @@ ata_timo_xfer_check(struct ata_xfer *xfe
/* Race vs. callout_stop() in ata_deactivate_xfer() */
ata_channel_unlock(chp);
- aprint_normal_dev(drvp->drv_softc,
+ device_printf(drvp->drv_softc,
"xfer %p deactivated while invoking timeout\n", xfer);
return true;
}
CVS commit: src/tests/crypto/libcrypto
Module Name:src
Committed By: christos
Date: Mon Sep 24 16:25:24 UTC 2018
Modified Files:
src/tests/crypto/libcrypto: t_hashes.sh t_libcrypto.sh
Log Message:
Remove tests that don't exist anymore in OpenSSL-1.1.1 (We should add the
one ones it adds though :-)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/crypto/libcrypto/t_hashes.sh
cvs rdiff -u -r1.5 -r1.6 src/tests/crypto/libcrypto/t_libcrypto.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/crypto/libcrypto/t_hashes.sh
diff -u src/tests/crypto/libcrypto/t_hashes.sh:1.3 src/tests/crypto/libcrypto/t_hashes.sh:1.4
--- src/tests/crypto/libcrypto/t_hashes.sh:1.3 Thu Feb 22 09:24:03 2018
+++ src/tests/crypto/libcrypto/t_hashes.sh Mon Sep 24 12:25:24 2018
@@ -1,4 +1,4 @@
-# $NetBSD: t_hashes.sh,v 1.3 2018/02/22 14:24:03 martin Exp $
+# $NetBSD: t_hashes.sh,v 1.4 2018/09/24 16:25:24 christos Exp $
#
# Copyright (c) 2008, 2009, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -45,47 +45,6 @@ md2_body()
atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_md2test"
}
-atf_test_case md4
-md4_head()
-{
- atf_set "descr" "Checks MD4 digest"
-}
-md4_body()
-{
- atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_md4test"
-}
-
-atf_test_case md5
-md5_head()
-{
- atf_set "descr" "Checks MD5 digest"
-}
-md5_body()
-{
- atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_md5test"
-}
-
-atf_test_case ripemd
-ripemd_head()
-{
- atf_set "descr" "Checks RMD-160 digest"
-}
-ripemd_body()
-{
- atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_ripemdtest"
-}
-
-atf_test_case sha
-sha_head()
-{
- atf_set "descr" "Checks SHA-1 digest"
-}
-sha_body()
-{
- atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_shatest"
-}
-
-
atf_test_case mdc2
mdc2_head()
{
@@ -100,9 +59,5 @@ atf_init_test_cases()
{
atf_add_test_case hmac
atf_add_test_case md2
- atf_add_test_case md4
- atf_add_test_case md5
- atf_add_test_case ripemd
- openssl version | fgrep -q "OpenSSL 1.0" && atf_add_test_case sha
atf_add_test_case mdc2
}
Index: src/tests/crypto/libcrypto/t_libcrypto.sh
diff -u src/tests/crypto/libcrypto/t_libcrypto.sh:1.5 src/tests/crypto/libcrypto/t_libcrypto.sh:1.6
--- src/tests/crypto/libcrypto/t_libcrypto.sh:1.5 Thu Feb 22 09:24:03 2018
+++ src/tests/crypto/libcrypto/t_libcrypto.sh Mon Sep 24 12:25:24 2018
@@ -1,4 +1,4 @@
-# $NetBSD: t_libcrypto.sh,v 1.5 2018/02/22 14:24:03 martin Exp $
+# $NetBSD: t_libcrypto.sh,v 1.6 2018/09/24 16:25:24 christos Exp $
#
# Copyright (c) 2008, 2009, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -35,16 +35,6 @@ engine_body()
atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_enginetest"
}
-atf_test_case rand
-rand_head()
-{
- atf_set "descr" "Checks peudo-random number generator"
-}
-rand_body()
-{
- atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_randtest"
-}
-
atf_test_case bn
bn_head()
{
@@ -71,17 +61,6 @@ conf_body()
$(atf_get_srcdir)/h_conftest
}
-atf_test_case lhash
-lhash_head()
-{
- atf_set "descr" "Checks lhash - dynamic hash tables"
-}
-lhash_body()
-{
- atf_check -o ignore -e ignore -x \
- "echo hoge | $(atf_get_srcdir)/h_lhashtest"
-}
-
atf_test_case threads
threads_head()
{
@@ -99,9 +78,7 @@ threads_body()
atf_init_test_cases()
{
atf_add_test_case engine
- atf_add_test_case rand
atf_add_test_case bn
atf_add_test_case conf
- openssl version | fgrep -q "OpenSSL 1.0" && atf_add_test_case lhash
atf_add_test_case threads
}
CVS commit: src
Module Name:src Committed By: martin Date: Mon Sep 24 13:18:35 UTC 2018 Modified Files: src: UPDATING Log Message: Note that we need to clean objdir for the OpenSSL update. To generate a diff of this commit: cvs rdiff -u -r1.297 -r1.298 src/UPDATING Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/UPDATING diff -u src/UPDATING:1.297 src/UPDATING:1.298 --- src/UPDATING:1.297 Tue Jul 17 19:13:53 2018 +++ src/UPDATING Mon Sep 24 13:18:35 2018 @@ -1,4 +1,4 @@ -$NetBSD: UPDATING,v 1.297 2018/07/17 19:13:53 joerg Exp $ +$NetBSD: UPDATING,v 1.298 2018/09/24 13:18:35 martin Exp $ This file (UPDATING) is intended to be a brief reference to recent changes that might cause problems in the build process, and a guide for @@ -19,6 +19,11 @@ See also: BUILDING, build.sh, Makefile. Recent changes: ^^^ +20180924: + A newer OpenSSL version has been imported. If you are doing + update builds, make sure to remove all old obj dirs, like: + cd /usr/obj && find . -type d -name openssl | xargs rm -rf + 20180717: On aarch64 int64_t and related types have changed from long long to long. This requires recompiling all C++ binaries.
CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch
Module Name:src
Committed By: christos
Date: Mon Sep 24 11:03:40 UTC 2018
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64: crypto.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/alpha: crypto.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/hppa: crypto.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k: crypto.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips: crypto.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc: crypto.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64:
crypto.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sh3: crypto.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax: crypto.inc
Log Message:
Don't include the libc CRYPTO_memcmp file (it has a different prototype
now) and it is provided by openssl in C, or use the assembly versions.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/crypto.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/alpha/crypto.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/hppa/crypto.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/crypto.inc
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/crypto.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/crypto.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sh3/crypto.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/crypto.inc:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/crypto.inc:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/crypto.inc:1.3 Sun Jul 15 20:08:12 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/crypto.inc Mon Sep 24 07:03:39 2018
@@ -1,5 +1,6 @@
.PATH.S: ${.PARSEDIR}
CPUID_SRCS += arm64cpuid.S armcap.c
+CRYPTOCPPFLAGS += -DOPENSSL_CPUID_OBJ
CPUID = yes
ARM_MAX_ARCH=8
CPPFLAGS += -D__ARM_MAX_ARCH__=${ARM_MAX_ARCH}
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/alpha/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/alpha/crypto.inc:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/alpha/crypto.inc:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/alpha/crypto.inc:1.1 Sat Mar 3 23:00:45 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/alpha/crypto.inc Mon Sep 24 07:03:39 2018
@@ -5,6 +5,7 @@ ASMDIR:=${.PARSEDIR}
CPUID_SRCS += alpha-mont.S alphacpuid.S
CPUID = yes
CPPFLAGS += -DOPENSSL_BN_ASM_MONT -I${ASMDIR}
+CRYPTOCPPFLAGS += -DOPENSSL_CPUID_OBJ
.include "../../crypto.inc"
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/hppa/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/hppa/crypto.inc:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/hppa/crypto.inc:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/hppa/crypto.inc:1.1 Tue Mar 6 14:30:56 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/hppa/crypto.inc Mon Sep 24 07:03:39 2018
@@ -1,3 +1,3 @@
-CRYPTO_SRCS += libc-memequal.c
+#CRYPTO_SRCS += libc-memequal.c
.include "../../crypto.inc"
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/crypto.inc:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/crypto.inc:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/crypto.inc:1.1 Sun Mar 4 20:00:12 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/crypto.inc Mon Sep 24 07:03:39 2018
@@ -1,5 +1,5 @@
.PATH.S: ${.PARSEDIR}
-CRYPTO_SRCS += libc-memequal.c
+#CRYPTO_SRCS += libc-memequal.c
.include "../../crypto.inc"
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc:1.6 src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc:1.7
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc:1.6 Fri Mar 9 16:49:55 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc Mon Sep 24 07:03:40 2018
@@ -3,6 +3,5 @@
CRYPTO_SRCS += mips-mont${"${COPTS:M*-mabi=64*}" == "":?:64}.S
.endif
-CRYPTO_SRCS += libc-memequal.c
.include "../../crypto.inc"
Index:
CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto
Module Name:src
Committed By: christos
Date: Mon Sep 24 11:02:12 UTC 2018
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: man.inc
Log Message:
don't override the sha man page provided by libc.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/crypto/external/bsd/openssl/lib/libcrypto/man.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/man.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/man.inc:1.11 src/crypto/external/bsd/openssl/lib/libcrypto/man.inc:1.12
--- src/crypto/external/bsd/openssl/lib/libcrypto/man.inc:1.11 Sun Sep 23 09:33:04 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/man.inc Mon Sep 24 07:02:12 2018
@@ -1,4 +1,4 @@
-# $NetBSD: man.inc,v 1.11 2018/09/23 13:33:04 christos Exp $
+# $NetBSD: man.inc,v 1.12 2018/09/24 11:02:12 christos Exp $
.PATH: ${.CURDIR}/man
@@ -277,7 +277,6 @@ RSA_size.3 \
SCT_new.3 \
SCT_print.3 \
SCT_validate.3 \
-SHA256_Init.3 \
SM2.7 \
SMIME_read_CMS.3 \
SMIME_read_PKCS7.3 \
CVS commit: [pgoyette-compat] src/sys
Module Name:src
Committed By: pgoyette
Date: Mon Sep 24 10:21:00 UTC 2018
Modified Files:
src/sys/arch/acorn32/conf [pgoyette-compat]: files.acorn32
src/sys/modules/compat_netbsd32 [pgoyette-compat]: Makefile
Added Files:
src/sys/arch/acorn32/acorn32 [pgoyette-compat]: netbsd32_machdep.c
src/sys/arch/algor/algor [pgoyette-compat]: netbsd32_machdep.c
netbsd32_machdep_16.c
Log Message:
Work in progress
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1.2.1 src/sys/arch/acorn32/acorn32/netbsd32_machdep.c
cvs rdiff -u -r1.29 -r1.29.64.1 src/sys/arch/acorn32/conf/files.acorn32
cvs rdiff -u -r0 -r1.1.2.1 src/sys/arch/algor/algor/netbsd32_machdep.c \
src/sys/arch/algor/algor/netbsd32_machdep_16.c
cvs rdiff -u -r1.20.12.12 -r1.20.12.13 \
src/sys/modules/compat_netbsd32/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/acorn32/conf/files.acorn32
diff -u src/sys/arch/acorn32/conf/files.acorn32:1.29 src/sys/arch/acorn32/conf/files.acorn32:1.29.64.1
--- src/sys/arch/acorn32/conf/files.acorn32:1.29 Sat Jan 17 22:56:34 2009
+++ src/sys/arch/acorn32/conf/files.acorn32 Mon Sep 24 10:21:00 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.acorn32,v 1.29 2009/01/17 22:56:34 bjh21 Exp $
+# $NetBSD: files.acorn32,v 1.29.64.1 2018/09/24 10:21:00 pgoyette Exp $
#
# First try for arm-specific configuration info
#
@@ -187,4 +187,11 @@ include "dev/pckbport/files.pckbport"
# Include USB stuff
#include "dev/usb/files.usb"
+#
+# Files for compat_netbsd32
+#
+file arch/acorn32/acorn32/netbsd32_machdep.c compat_netbsd32
+file arch/acorn32/acorn32/netbsd32_machdep_16.c compat_netbsd32 &
+compat_16
+
include "arch/acorn32/conf/majors.acorn32"
Index: src/sys/modules/compat_netbsd32/Makefile
diff -u src/sys/modules/compat_netbsd32/Makefile:1.20.12.12 src/sys/modules/compat_netbsd32/Makefile:1.20.12.13
--- src/sys/modules/compat_netbsd32/Makefile:1.20.12.12 Fri Sep 14 08:38:37 2018
+++ src/sys/modules/compat_netbsd32/Makefile Mon Sep 24 10:21:00 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20.12.12 2018/09/14 08:38:37 pgoyette Exp $
+# $NetBSD: Makefile,v 1.20.12.13 2018/09/24 10:21:00 pgoyette Exp $
.include "../Makefile.inc"
.include "../Makefile.assym"
@@ -52,7 +52,7 @@ SRCS+= netbsd32_syscall.c
SRCS+= netbsd32_sigcode.S
.endif
-.PATH: ${S}/arch/${MACHINE_CPU}/${MACHINE_CPU}
+.PATH: ${S}/arch/${MACHINE}/${MACHINE}
SRCS+= netbsd32_machdep.c
.include
Added files:
Index: src/sys/arch/acorn32/acorn32/netbsd32_machdep.c
diff -u /dev/null src/sys/arch/acorn32/acorn32/netbsd32_machdep.c:1.1.2.1
--- /dev/null Mon Sep 24 10:21:00 2018
+++ src/sys/arch/acorn32/acorn32/netbsd32_machdep.c Mon Sep 24 10:20:59 2018
@@ -0,0 +1,59 @@
+/* $NetBSD: netbsd32_machdep.c,v 1.1.2.1 2018/09/24 10:20:59 pgoyette Exp $ */
+
+/*
+ * Copyright (c) 2001 Wasabi Systems, Inc.
+ * All rights reserved.
+ *
+ * Written by Frank van der Linden for Wasabi Systems, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *must display the following acknowledgement:
+ * This product includes software developed for the NetBSD Project by
+ * Wasabi Systems, Inc.
+ * 4. The name of Wasabi Systems, Inc. may not be used to endorse
+ *or promote products derived from this software without specific prior
+ *written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL WASABI SYSTEMS, INC
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.1.2.1 2018/09/24 10:20:59 pgoyette Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_compat_netbsd.h"
+#endif
+
+#include
+
+void
+netbsd32_machdep_md_init(void)
+{
+
CVS commit: src/sys/arch/arm/nvidia
Module Name:src
Committed By: skrll
Date: Mon Sep 24 09:25:14 UTC 2018
Modified Files:
src/sys/arch/arm/nvidia: tegra_drm_fb.c
Log Message:
Call drm_fb_helper_prepare in tegra_drm_fb_init as required.
I can boot a kernel with this
jetsontk1# dmesg | grep fb
[ 1.580] tegrafb0 at tegradrm0
[ 1.580] tegrafb0: framebuffer at 0x9bc0, size 1024x768, depth 32,
stride 4096
[ 1.580] wsdisplay0 at tegrafb0 kbdmux 1
jetsontk1#
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/nvidia/tegra_drm_fb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/nvidia/tegra_drm_fb.c
diff -u src/sys/arch/arm/nvidia/tegra_drm_fb.c:1.6 src/sys/arch/arm/nvidia/tegra_drm_fb.c:1.7
--- src/sys/arch/arm/nvidia/tegra_drm_fb.c:1.6 Tue Dec 26 14:54:52 2017
+++ src/sys/arch/arm/nvidia/tegra_drm_fb.c Mon Sep 24 09:25:14 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_drm_fb.c,v 1.6 2017/12/26 14:54:52 jmcneill Exp $ */
+/* $NetBSD: tegra_drm_fb.c,v 1.7 2018/09/24 09:25:14 skrll Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tegra_drm_fb.c,v 1.6 2017/12/26 14:54:52 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_drm_fb.c,v 1.7 2018/09/24 09:25:14 skrll Exp $");
#include
#include
@@ -53,7 +53,8 @@ tegra_drm_fb_init(struct drm_device *dde
int error;
fbdev = kmem_zalloc(sizeof(*fbdev), KM_SLEEP);
- fbdev->helper.funcs = _fb_helper_funcs;
+
+ drm_fb_helper_prepare(ddev, >helper, _fb_helper_funcs);
error = drm_fb_helper_init(ddev, >helper, 2, 1);
if (error) {
