CVS commit: src/sys
Module Name:src
Committed By: uebayasi
Date: Tue Sep 15 02:22:43 UTC 2015
Modified Files:
src/sys/conf: Makefile.kern.inc
src/sys/dev/splash: splash.mk
Removed Files:
src/sys/conf: splash.mk
Log Message:
Clean up splash image build. Print messages when creating files.
To generate a diff of this commit:
cvs rdiff -u -r1.246 -r1.247 src/sys/conf/Makefile.kern.inc
cvs rdiff -u -r1.4 -r0 src/sys/conf/splash.mk
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/splash/splash.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.246 src/sys/conf/Makefile.kern.inc:1.247
--- src/sys/conf/Makefile.kern.inc:1.246 Fri Sep 11 01:40:52 2015
+++ src/sys/conf/Makefile.kern.inc Tue Sep 15 02:22:43 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.246 2015/09/11 01:40:52 uebayasi Exp $
+# $NetBSD: Makefile.kern.inc,v 1.247 2015/09/15 02:22:43 uebayasi Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -410,7 +410,7 @@ install-kernel-${MACHINE_NAME}:
.include "${S}/conf/ldscript.mk"
.include "${S}/conf/assym.mk"
.include "${S}/conf/newvers.mk"
-.include "${S}/conf/splash.mk"
+.include "${S}/dev/splash/splash.mk"
.include "${S}/conf/mdroot.mk"
.include "${S}/conf/lint.mk"
.include "${S}/conf/cscope.mk"
Index: src/sys/dev/splash/splash.mk
diff -u src/sys/dev/splash/splash.mk:1.5 src/sys/dev/splash/splash.mk:1.6
--- src/sys/dev/splash/splash.mk:1.5 Tue Sep 15 00:16:42 2015
+++ src/sys/dev/splash/splash.mk Tue Sep 15 02:22:43 2015
@@ -1,4 +1,6 @@
-# $NetBSD: splash.mk,v 1.5 2015/09/15 00:16:42 uebayasi Exp $
+# $NetBSD: splash.mk,v 1.6 2015/09/15 02:22:43 uebayasi Exp $
+
+.if defined(SPLASHSCREEN_IMAGE)
# Makefile for embedding splash image into kernel.
.include
@@ -18,13 +20,17 @@ BFD_TARGET=${BFD_ELFTARGET}-${BFD_ENDIAN
BFD_TARGET=${BFD_ELFTARGET}-${BFD_CPU}
.endif
-.if defined(SPLASHSCREEN_IMAGE)
splash_image.o: ${SPLASHSCREEN_IMAGE}
+ ${_MKTARGET_CREATE}
cp ${SPLASHSCREEN_IMAGE} splash.image
${OBJCOPY} -I binary -B ${MACHINE_CPU:C/x86_64/i386/} \
-O ${BFD_TARGET} splash.image splash_image.o
rm splash.image
.else
+
+# SPLASHSCREEN_IMAGE is not defined; build empty splash_image.o.
splash_image.c:
+ ${_MKTARGET_CREATE}
echo > $@
+
.endif
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: riz Date: Tue Sep 15 00:03:24 UTC 2015 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.3 Log Message: Fix file list for ticket 1865; add a missing "/" To generate a diff of this commit: cvs rdiff -u -r1.1.2.53 -r1.1.2.54 src/doc/CHANGES-5.1.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1.3 diff -u src/doc/CHANGES-5.1.3:1.1.2.53 src/doc/CHANGES-5.1.3:1.1.2.54 --- src/doc/CHANGES-5.1.3:1.1.2.53 Sun Sep 22 22:12:05 2013 +++ src/doc/CHANGES-5.1.3 Tue Sep 15 00:03:24 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.3,v 1.1.2.53 2013/09/22 22:12:05 riz Exp $ +# $NetBSD: CHANGES-5.1.3,v 1.1.2.54 2015/09/15 00:03:24 riz Exp $ A complete list of changes from the NetBSD 5.1.2 release to the NetBSD 5.1.3 release: @@ -2393,54 +2393,54 @@ distrib/utils/sysinst/menus.mi 1.35, 1. public servers. [msaitoh, ticket #1846] -xsrc/external/mitMesaLib/dist/src/glx/x11/XF86dri.c patch -xsrc/external/mitlibFS/dist/src/FSOpenServ.c patch -xsrc/external/mitlibX11/dist/modules/im/ximcp/imLcPrs.c patch -xsrc/external/mitlibX11/dist/modules/im/ximcp/imTrX.c patch -xsrc/external/mitlibX11/dist/src/AllCells.c patch -xsrc/external/mitlibX11/dist/src/Font.c patch -xsrc/external/mitlibX11/dist/src/FontInfo.c patch -xsrc/external/mitlibX11/dist/src/FontNames.c patch -xsrc/external/mitlibX11/dist/src/GetFPath.c patch -xsrc/external/mitlibX11/dist/src/GetImage.c patch -xsrc/external/mitlibX11/dist/src/GetMoEv.c patch -xsrc/external/mitlibX11/dist/src/GetPntMap.c patch -xsrc/external/mitlibX11/dist/src/GetProp.c patch -xsrc/external/mitlibX11/dist/src/LiHosts.c patch -xsrc/external/mitlibX11/dist/src/ListExt.c patch -xsrc/external/mitlibX11/dist/src/ModMap.c patch -xsrc/external/mitlibX11/dist/src/Xrm.c patch -xsrc/external/mitlibX11/dist/src/xcms/cmsColNm.c patch -xsrc/external/mitlibX11/dist/src/xkb/XKBExtDev.c patch -xsrc/external/mitlibX11/dist/src/xkb/XKBGeom.c patch -xsrc/external/mitlibX11/dist/src/xkb/XKBGetMap.c patch -xsrc/external/mitlibX11/dist/src/xkb/XKBNames.c patch -xsrc/external/mitlibXcursor/dist/src/file.c patch -xsrc/external/mitlibXext/dist/src/XEVI.c patch -xsrc/external/mitlibXext/dist/src/XShape.c patch -xsrc/external/mitlibXext/dist/src/XSync.c patch -xsrc/external/mitlibXext/dist/src/Xcup.c patch -xsrc/external/mitlibXext/dist/src/Xdbe.c patch -xsrc/external/mitlibXfixes/dist/src/Cursor.c patch -xsrc/external/mitlibXi/dist/src/XGMotion.c patch -xsrc/external/mitlibXi/dist/src/XGetBMap.c patch -xsrc/external/mitlibXi/dist/src/XGetDCtl.c patch -xsrc/external/mitlibXi/dist/src/XGetDProp.c patch -xsrc/external/mitlibXi/dist/src/XGetFCtl.c patch -xsrc/external/mitlibXi/dist/src/XGetProp.c patch -xsrc/external/mitlibXi/dist/src/XListDev.c patch -xsrc/external/mitlibXi/dist/src/XQueryDv.c patch -xsrc/external/mitlibXinerama/dist/src/Xinerama.c patch -xsrc/external/mitlibXrandr/dist/src/XrrProperty.c patch -xsrc/external/mitlibXrender/dist/src/Filter.c patch -xsrc/external/mitlibXrender/dist/src/Xrender.c patch -xsrc/external/mitlibXres/dist/src/XRes.c patch -xsrc/external/mitlibXt/dist/src/ResConfig.c patch -xsrc/external/mitlibXt/dist/src/Selection.c patch -xsrc/external/mitlibXv/dist/src/Xv.c patch -xsrc/external/mitlibXvMC/dist/src/XvMC.c patch -xsrc/external/mitlibXxf86dga/dist/src/XF86DGA2.c patch -xsrc/external/mitlibXxf86vm/dist/src/XF86VMode.c patch +xsrc/external/mit/MesaLib/dist/src/glx/x11/XF86dri.c patch +xsrc/external/mit/libFS/dist/src/FSOpenServ.c patch +xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcPrs.c patch +xsrc/external/mit/libX11/dist/modules/im/ximcp/imTrX.c patch +xsrc/external/mit/libX11/dist/src/AllCells.c patch +xsrc/external/mit/libX11/dist/src/Font.c patch +xsrc/external/mit/libX11/dist/src/FontInfo.c patch +xsrc/external/mit/libX11/dist/src/FontNames.c patch +xsrc/external/mit/libX11/dist/src/GetFPath.c patch +xsrc/external/mit/libX11/dist/src/GetImage.c patch +xsrc/external/mit/libX11/dist/src/GetMoEv.c patch +xsrc/external/mit/libX11/dist/src/GetPntMap.c patch +xsrc/external/mit/libX11/dist/src/GetProp.c patch +xsrc/external/mit/libX11/dist/src/LiHosts.c patch +xsrc/external/mit/libX11/dist/src/ListExt.c patch +xsrc/external/mit/libX11/dist/src/ModMap.c patch +xsrc/external/mit/libX11/dist/src/Xrm.c patch +xsrc/external/mit/libX11/dist/src/xcms/cmsColNm.c patch +xsrc/external/mit/libX11/dist/src/xkb/XKBExtDev.c patch +xsrc/external/mit/libX11/dist/src/xkb/XKBGeom.c patch +xsrc/external/mit/libX11/dist/src/xkb/XKBGetMap.c patch +xsrc/external/mit/libX11/dist/src/xkb/XKBNames.c patch +xsrc/external/mit/libXcursor/dist/src/file.c patch +xsrc/external/mit/libXext/dist/src/XEVI.c patch +xsrc/external/mit/libXext/dist/src/XShape.c patch +xsrc/external/mit/libXext/dist/src/XSync.c patch +xsrc/external/mit/libXext/dist/src/Xcup.c patch +xsrc/external/mit/libXe
CVS commit: [netbsd-5-2] src/doc
Module Name:src Committed By: riz Date: Tue Sep 15 00:03:37 UTC 2015 Modified Files: src/doc [netbsd-5-2]: CHANGES-5.2.1 Log Message: Fix file list for ticket 1865; add a missing "/" To generate a diff of this commit: cvs rdiff -u -r1.1.2.22 -r1.1.2.23 src/doc/CHANGES-5.2.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.2.1 diff -u src/doc/CHANGES-5.2.1:1.1.2.22 src/doc/CHANGES-5.2.1:1.1.2.23 --- src/doc/CHANGES-5.2.1:1.1.2.22 Sun Sep 22 22:43:10 2013 +++ src/doc/CHANGES-5.2.1 Tue Sep 15 00:03:37 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2.1,v 1.1.2.22 2013/09/22 22:43:10 riz Exp $ +# $NetBSD: CHANGES-5.2.1,v 1.1.2.23 2015/09/15 00:03:37 riz Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.2.1 release: @@ -107,54 +107,54 @@ distrib/utils/sysinst/menus.mi 1.35, 1. public servers. [msaitoh, ticket #1846] -xsrc/external/mitMesaLib/dist/src/glx/x11/XF86dri.c patch -xsrc/external/mitlibFS/dist/src/FSOpenServ.c patch -xsrc/external/mitlibX11/dist/modules/im/ximcp/imLcPrs.c patch -xsrc/external/mitlibX11/dist/modules/im/ximcp/imTrX.c patch -xsrc/external/mitlibX11/dist/src/AllCells.c patch -xsrc/external/mitlibX11/dist/src/Font.c patch -xsrc/external/mitlibX11/dist/src/FontInfo.c patch -xsrc/external/mitlibX11/dist/src/FontNames.c patch -xsrc/external/mitlibX11/dist/src/GetFPath.c patch -xsrc/external/mitlibX11/dist/src/GetImage.c patch -xsrc/external/mitlibX11/dist/src/GetMoEv.c patch -xsrc/external/mitlibX11/dist/src/GetPntMap.c patch -xsrc/external/mitlibX11/dist/src/GetProp.c patch -xsrc/external/mitlibX11/dist/src/LiHosts.c patch -xsrc/external/mitlibX11/dist/src/ListExt.c patch -xsrc/external/mitlibX11/dist/src/ModMap.c patch -xsrc/external/mitlibX11/dist/src/Xrm.c patch -xsrc/external/mitlibX11/dist/src/xcms/cmsColNm.c patch -xsrc/external/mitlibX11/dist/src/xkb/XKBExtDev.c patch -xsrc/external/mitlibX11/dist/src/xkb/XKBGeom.c patch -xsrc/external/mitlibX11/dist/src/xkb/XKBGetMap.c patch -xsrc/external/mitlibX11/dist/src/xkb/XKBNames.c patch -xsrc/external/mitlibXcursor/dist/src/file.c patch -xsrc/external/mitlibXext/dist/src/XEVI.c patch -xsrc/external/mitlibXext/dist/src/XShape.c patch -xsrc/external/mitlibXext/dist/src/XSync.c patch -xsrc/external/mitlibXext/dist/src/Xcup.c patch -xsrc/external/mitlibXext/dist/src/Xdbe.c patch -xsrc/external/mitlibXfixes/dist/src/Cursor.c patch -xsrc/external/mitlibXi/dist/src/XGMotion.c patch -xsrc/external/mitlibXi/dist/src/XGetBMap.c patch -xsrc/external/mitlibXi/dist/src/XGetDCtl.c patch -xsrc/external/mitlibXi/dist/src/XGetDProp.c patch -xsrc/external/mitlibXi/dist/src/XGetFCtl.c patch -xsrc/external/mitlibXi/dist/src/XGetProp.c patch -xsrc/external/mitlibXi/dist/src/XListDev.c patch -xsrc/external/mitlibXi/dist/src/XQueryDv.c patch -xsrc/external/mitlibXinerama/dist/src/Xinerama.c patch -xsrc/external/mitlibXrandr/dist/src/XrrProperty.c patch -xsrc/external/mitlibXrender/dist/src/Filter.c patch -xsrc/external/mitlibXrender/dist/src/Xrender.c patch -xsrc/external/mitlibXres/dist/src/XRes.c patch -xsrc/external/mitlibXt/dist/src/ResConfig.c patch -xsrc/external/mitlibXt/dist/src/Selection.c patch -xsrc/external/mitlibXv/dist/src/Xv.c patch -xsrc/external/mitlibXvMC/dist/src/XvMC.c patch -xsrc/external/mitlibXxf86dga/dist/src/XF86DGA2.c patch -xsrc/external/mitlibXxf86vm/dist/src/XF86VMode.c patch +xsrc/external/mit/MesaLib/dist/src/glx/x11/XF86dri.c patch +xsrc/external/mit/libFS/dist/src/FSOpenServ.c patch +xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcPrs.c patch +xsrc/external/mit/libX11/dist/modules/im/ximcp/imTrX.c patch +xsrc/external/mit/libX11/dist/src/AllCells.c patch +xsrc/external/mit/libX11/dist/src/Font.c patch +xsrc/external/mit/libX11/dist/src/FontInfo.c patch +xsrc/external/mit/libX11/dist/src/FontNames.c patch +xsrc/external/mit/libX11/dist/src/GetFPath.c patch +xsrc/external/mit/libX11/dist/src/GetImage.c patch +xsrc/external/mit/libX11/dist/src/GetMoEv.c patch +xsrc/external/mit/libX11/dist/src/GetPntMap.c patch +xsrc/external/mit/libX11/dist/src/GetProp.c patch +xsrc/external/mit/libX11/dist/src/LiHosts.c patch +xsrc/external/mit/libX11/dist/src/ListExt.c patch +xsrc/external/mit/libX11/dist/src/ModMap.c patch +xsrc/external/mit/libX11/dist/src/Xrm.c patch +xsrc/external/mit/libX11/dist/src/xcms/cmsColNm.c patch +xsrc/external/mit/libX11/dist/src/xkb/XKBExtDev.c patch +xsrc/external/mit/libX11/dist/src/xkb/XKBGeom.c patch +xsrc/external/mit/libX11/dist/src/xkb/XKBGetMap.c patch +xsrc/external/mit/libX11/dist/src/xkb/XKBNames.c patch +xsrc/external/mit/libXcursor/dist/src/file.c patch +xsrc/external/mit/libXext/dist/src/XEVI.c patch +xsrc/external/mit/libXext/dist/src/XShape.c patch +xsrc/external/mit/libXext/dist/src/XSync.c patch +xsrc/external/mit/libXext/dist/src/Xcup.c patch +xsrc/external/mit/libXext/d
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Tue Sep 15 00:04:12 UTC 2015 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Fix file list for ticket 900; add a missing "/" To generate a diff of this commit: cvs rdiff -u -r1.1.2.224 -r1.1.2.225 src/doc/CHANGES-6.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.224 src/doc/CHANGES-6.2:1.1.2.225 --- src/doc/CHANGES-6.2:1.1.2.224 Sun Aug 2 12:51:34 2015 +++ src/doc/CHANGES-6.2 Tue Sep 15 00:04:12 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.224 2015/08/02 12:51:34 martin Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.225 2015/09/15 00:04:12 riz Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -122,60 +122,60 @@ sys/arch/amiga/dev/if_ne_zbus.c 1.15 Fix kernel panic on Amigas with Deneb cards. [rkujawa, ticket #892] -xsrc/external/mitMesaLib/dist/src/glx/XF86dri.c patch -xsrc/external/mitlibFS/dist/src/FSOpenServ.c patch -xsrc/external/mitlibX11/dist/modules/im/ximcp/Makefile.am patch -xsrc/external/mitlibX11/dist/modules/im/ximcp/imLcPrs.c patch -xsrc/external/mitlibX11/dist/modules/im/ximcp/imTrX.c patch -xsrc/external/mitlibX11/dist/src/AllCells.c patch -xsrc/external/mitlibX11/dist/src/Font.c patch -xsrc/external/mitlibX11/dist/src/FontInfo.c patch -xsrc/external/mitlibX11/dist/src/FontNames.c patch -xsrc/external/mitlibX11/dist/src/GetFPath.c patch -xsrc/external/mitlibX11/dist/src/GetImage.c patch -xsrc/external/mitlibX11/dist/src/GetMoEv.c patch -xsrc/external/mitlibX11/dist/src/GetPntMap.c patch -xsrc/external/mitlibX11/dist/src/GetProp.c patch -xsrc/external/mitlibX11/dist/src/LiHosts.c patch -xsrc/external/mitlibX11/dist/src/ListExt.c patch -xsrc/external/mitlibX11/dist/src/ModMap.c patch -xsrc/external/mitlibX11/dist/src/Xrm.c patch -xsrc/external/mitlibX11/dist/src/xcms/cmsColNm.c patch -xsrc/external/mitlibX11/dist/src/xkb/XKBExtDev.c patch -xsrc/external/mitlibX11/dist/src/xkb/XKBGeom.c patch -xsrc/external/mitlibX11/dist/src/xkb/XKBGetMap.c patch -xsrc/external/mitlibX11/dist/src/xkb/XKBNames.c patch -xsrc/external/mitlibXcursor/dist/src/file.c patch -xsrc/external/mitlibXext/dist/src/XEVI.c patch -xsrc/external/mitlibXext/dist/src/XShape.c patch -xsrc/external/mitlibXext/dist/src/XSync.c patch -xsrc/external/mitlibXext/dist/src/Xcup.c patch -xsrc/external/mitlibXext/dist/src/Xdbe.c patch -xsrc/external/mitlibXfixes/dist/src/Cursor.c patch -xsrc/external/mitlibXi/dist/src/XGMotion.c patch -xsrc/external/mitlibXi/dist/src/XGetBMap.c patch -xsrc/external/mitlibXi/dist/src/XGetDCtl.c patch -xsrc/external/mitlibXi/dist/src/XGetDProp.c patch -xsrc/external/mitlibXi/dist/src/XGetFCtl.c patch -xsrc/external/mitlibXi/dist/src/XGetProp.c patch -xsrc/external/mitlibXi/dist/src/XIPassiveGrab.c patch -xsrc/external/mitlibXi/dist/src/XIProperties.c patch -xsrc/external/mitlibXi/dist/src/XISelEv.c patch -xsrc/external/mitlibXi/dist/src/XListDev.c patch -xsrc/external/mitlibXi/dist/src/XQueryDv.c patch -xsrc/external/mitlibXinerama/dist/src/Xinerama.c patch -xsrc/external/mitlibXrandr/dist/src/XrrProperty.c patch -xsrc/external/mitlibXrender/dist/src/Filter.c patch -xsrc/external/mitlibXrender/dist/src/Xrender.c patch -xsrc/external/mitlibXres/dist/src/XRes.c patch -xsrc/external/mitlibXt/dist/src/ResConfig.c patch -xsrc/external/mitlibXt/dist/src/Selection.c patch -xsrc/external/mitlibXv/dist/src/Xv.c patch -xsrc/external/mitlibXvMC/dist/src/XvMC.c patch -xsrc/external/mitlibXxf86dga/dist/src/XF86DGA2.c patch -xsrc/external/mitlibXxf86vm/dist/src/XF86VMode.c patch -xsrc/external/mitlibxcb/dist/src/xcb_in.c patch -xsrc/external/mitxf86-video-openchrome/dist/libxvmc/xf86dri.c patch +xsrc/external/mit/MesaLib/dist/src/glx/XF86dri.c patch +xsrc/external/mit/libFS/dist/src/FSOpenServ.c patch +xsrc/external/mit/libX11/dist/modules/im/ximcp/Makefile.am patch +xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcPrs.c patch +xsrc/external/mit/libX11/dist/modules/im/ximcp/imTrX.c patch +xsrc/external/mit/libX11/dist/src/AllCells.c patch +xsrc/external/mit/libX11/dist/src/Font.c patch +xsrc/external/mit/libX11/dist/src/FontInfo.c patch +xsrc/external/mit/libX11/dist/src/FontNames.c patch +xsrc/external/mit/libX11/dist/src/GetFPath.c patch +xsrc/external/mit/libX11/dist/src/GetImage.c patch +xsrc/external/mit/libX11/dist/src/GetMoEv.c patch +xsrc/external/mit/libX11/dist/src/GetPntMap.c patch +xsrc/external/mit/libX11/dist/src/GetProp.c patch +xsrc/external/mit/libX11/dist/src/LiHosts.c patch +xsrc/external/mit/libX11/dist/src/ListExt.c patch +xsrc/external/mit/libX11/dist/src/ModMap.c patch +xsrc/external/mit/libX11/dist/src/Xrm.c patch +xsrc/external/mit/libX11/dist/src/xcms/cmsColNm.c patch +xsrc/external/mit/libX11/dist/src/xkb/XKBExtDev.c patch +xsrc/external/mit/libX11/dist/src/xkb/XKBGeom
CVS commit: src/sys
Module Name:src
Committed By: uebayasi
Date: Tue Sep 15 00:16:42 UTC 2015
Modified Files:
src/sys/conf: splash.mk
src/sys/dev/splash: splash.mk
Log Message:
Fix build of SPLASHSCREEN without SPLASHSCREEN_IMAGE. Since there is no way
to change ALLFILES by makeoptions, build an empty splash_image.o.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/conf/splash.mk
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/splash/splash.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/splash.mk
diff -u src/sys/conf/splash.mk:1.3 src/sys/conf/splash.mk:1.4
--- src/sys/conf/splash.mk:1.3 Mon Sep 14 01:40:03 2015
+++ src/sys/conf/splash.mk Tue Sep 15 00:16:42 2015
@@ -1,6 +1,4 @@
-# $NetBSD: splash.mk,v 1.3 2015/09/14 01:40:03 uebayasi Exp $
+# $NetBSD: splash.mk,v 1.4 2015/09/15 00:16:42 uebayasi Exp $
# Option for embedding a splashscreen image.
-.if defined(SPLASHSCREEN_IMAGE)
.include "${S}/dev/splash/splash.mk"
-.endif
Index: src/sys/dev/splash/splash.mk
diff -u src/sys/dev/splash/splash.mk:1.4 src/sys/dev/splash/splash.mk:1.5
--- src/sys/dev/splash/splash.mk:1.4 Mon Sep 14 01:40:03 2015
+++ src/sys/dev/splash/splash.mk Tue Sep 15 00:16:42 2015
@@ -1,4 +1,4 @@
-# $NetBSD: splash.mk,v 1.4 2015/09/14 01:40:03 uebayasi Exp $
+# $NetBSD: splash.mk,v 1.5 2015/09/15 00:16:42 uebayasi Exp $
# Makefile for embedding splash image into kernel.
.include
@@ -18,8 +18,13 @@ BFD_TARGET=${BFD_ELFTARGET}-${BFD_ENDIAN
BFD_TARGET=${BFD_ELFTARGET}-${BFD_CPU}
.endif
+.if defined(SPLASHSCREEN_IMAGE)
splash_image.o: ${SPLASHSCREEN_IMAGE}
cp ${SPLASHSCREEN_IMAGE} splash.image
${OBJCOPY} -I binary -B ${MACHINE_CPU:C/x86_64/i386/} \
-O ${BFD_TARGET} splash.image splash_image.o
rm splash.image
+.else
+splash_image.c:
+ echo > $@
+.endif
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: riz Date: Tue Sep 15 00:04:27 UTC 2015 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.1 Log Message: Fix file list for ticket 900; add a missing "/" To generate a diff of this commit: cvs rdiff -u -r1.1.2.19 -r1.1.2.20 src/doc/CHANGES-6.1.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.1.1 diff -u src/doc/CHANGES-6.1.1:1.1.2.19 src/doc/CHANGES-6.1.1:1.1.2.20 --- src/doc/CHANGES-6.1.1:1.1.2.19 Thu Aug 15 03:27:37 2013 +++ src/doc/CHANGES-6.1.1 Tue Sep 15 00:04:26 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.1,v 1.1.2.19 2013/08/15 03:27:37 snj Exp $ +# $NetBSD: CHANGES-6.1.1,v 1.1.2.20 2015/09/15 00:04:26 riz Exp $ A complete list of changes from the NetBSD 6.1 release to the NetBSD 6.1.1 release: @@ -15,60 +15,60 @@ sys/arch/amiga/dev/if_ne_zbus.c 1.15 Fix kernel panic on Amigas with Deneb cards. [rkujawa, ticket #892] -xsrc/external/mitMesaLib/dist/src/glx/XF86dri.c patch -xsrc/external/mitlibFS/dist/src/FSOpenServ.c patch -xsrc/external/mitlibX11/dist/modules/im/ximcp/Makefile.am patch -xsrc/external/mitlibX11/dist/modules/im/ximcp/imLcPrs.c patch -xsrc/external/mitlibX11/dist/modules/im/ximcp/imTrX.c patch -xsrc/external/mitlibX11/dist/src/AllCells.c patch -xsrc/external/mitlibX11/dist/src/Font.c patch -xsrc/external/mitlibX11/dist/src/FontInfo.c patch -xsrc/external/mitlibX11/dist/src/FontNames.c patch -xsrc/external/mitlibX11/dist/src/GetFPath.c patch -xsrc/external/mitlibX11/dist/src/GetImage.c patch -xsrc/external/mitlibX11/dist/src/GetMoEv.c patch -xsrc/external/mitlibX11/dist/src/GetPntMap.c patch -xsrc/external/mitlibX11/dist/src/GetProp.c patch -xsrc/external/mitlibX11/dist/src/LiHosts.c patch -xsrc/external/mitlibX11/dist/src/ListExt.c patch -xsrc/external/mitlibX11/dist/src/ModMap.c patch -xsrc/external/mitlibX11/dist/src/Xrm.c patch -xsrc/external/mitlibX11/dist/src/xcms/cmsColNm.c patch -xsrc/external/mitlibX11/dist/src/xkb/XKBExtDev.c patch -xsrc/external/mitlibX11/dist/src/xkb/XKBGeom.c patch -xsrc/external/mitlibX11/dist/src/xkb/XKBGetMap.c patch -xsrc/external/mitlibX11/dist/src/xkb/XKBNames.c patch -xsrc/external/mitlibXcursor/dist/src/file.c patch -xsrc/external/mitlibXext/dist/src/XEVI.c patch -xsrc/external/mitlibXext/dist/src/XShape.c patch -xsrc/external/mitlibXext/dist/src/XSync.c patch -xsrc/external/mitlibXext/dist/src/Xcup.c patch -xsrc/external/mitlibXext/dist/src/Xdbe.c patch -xsrc/external/mitlibXfixes/dist/src/Cursor.c patch -xsrc/external/mitlibXi/dist/src/XGMotion.c patch -xsrc/external/mitlibXi/dist/src/XGetBMap.c patch -xsrc/external/mitlibXi/dist/src/XGetDCtl.c patch -xsrc/external/mitlibXi/dist/src/XGetDProp.c patch -xsrc/external/mitlibXi/dist/src/XGetFCtl.c patch -xsrc/external/mitlibXi/dist/src/XGetProp.c patch -xsrc/external/mitlibXi/dist/src/XIPassiveGrab.c patch -xsrc/external/mitlibXi/dist/src/XIProperties.c patch -xsrc/external/mitlibXi/dist/src/XISelEv.c patch -xsrc/external/mitlibXi/dist/src/XListDev.c patch -xsrc/external/mitlibXi/dist/src/XQueryDv.c patch -xsrc/external/mitlibXinerama/dist/src/Xinerama.c patch -xsrc/external/mitlibXrandr/dist/src/XrrProperty.c patch -xsrc/external/mitlibXrender/dist/src/Filter.c patch -xsrc/external/mitlibXrender/dist/src/Xrender.c patch -xsrc/external/mitlibXres/dist/src/XRes.c patch -xsrc/external/mitlibXt/dist/src/ResConfig.c patch -xsrc/external/mitlibXt/dist/src/Selection.c patch -xsrc/external/mitlibXv/dist/src/Xv.c patch -xsrc/external/mitlibXvMC/dist/src/XvMC.c patch -xsrc/external/mitlibXxf86dga/dist/src/XF86DGA2.c patch -xsrc/external/mitlibXxf86vm/dist/src/XF86VMode.c patch -xsrc/external/mitlibxcb/dist/src/xcb_in.c patch -xsrc/external/mitxf86-video-openchrome/dist/libxvmc/xf86dri.c patch +xsrc/external/mit/MesaLib/dist/src/glx/XF86dri.c patch +xsrc/external/mit/libFS/dist/src/FSOpenServ.c patch +xsrc/external/mit/libX11/dist/modules/im/ximcp/Makefile.am patch +xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcPrs.c patch +xsrc/external/mit/libX11/dist/modules/im/ximcp/imTrX.c patch +xsrc/external/mit/libX11/dist/src/AllCells.c patch +xsrc/external/mit/libX11/dist/src/Font.c patch +xsrc/external/mit/libX11/dist/src/FontInfo.c patch +xsrc/external/mit/libX11/dist/src/FontNames.c patch +xsrc/external/mit/libX11/dist/src/GetFPath.c patch +xsrc/external/mit/libX11/dist/src/GetImage.c patch +xsrc/external/mit/libX11/dist/src/GetMoEv.c patch +xsrc/external/mit/libX11/dist/src/GetPntMap.c patch +xsrc/external/mit/libX11/dist/src/GetProp.c patch +xsrc/external/mit/libX11/dist/src/LiHosts.c patch +xsrc/external/mit/libX11/dist/src/ListExt.c patch +xsrc/external/mit/libX11/dist/src/ModMap.c patch +xsrc/external/mit/libX11/dist/src/Xrm.c patch +xsrc/external/mit/libX11/dist/src/xcms/cmsColNm.c patch +xsrc/external/mit/libX11/dist/src/xkb/XKBExtDev.c patch +xsrc/external/mit/libX11/
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Tue Sep 15 00:03:00 UTC 2015 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: Fix file list for ticket 1865; add a missing "/" To generate a diff of this commit: cvs rdiff -u -r1.1.2.124 -r1.1.2.125 src/doc/CHANGES-5.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.3 diff -u src/doc/CHANGES-5.3:1.1.2.124 src/doc/CHANGES-5.3:1.1.2.125 --- src/doc/CHANGES-5.3:1.1.2.124 Fri Aug 14 06:00:19 2015 +++ src/doc/CHANGES-5.3 Tue Sep 15 00:03:00 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.3,v 1.1.2.124 2015/08/14 06:00:19 msaitoh Exp $ +# $NetBSD: CHANGES-5.3,v 1.1.2.125 2015/09/15 00:03:00 riz Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3 release: @@ -221,54 +221,54 @@ distrib/utils/sysinst/menus.mi 1.35, 1. public servers. [msaitoh, ticket #1846] -xsrc/external/mitMesaLib/dist/src/glx/x11/XF86dri.c patch -xsrc/external/mitlibFS/dist/src/FSOpenServ.c patch -xsrc/external/mitlibX11/dist/modules/im/ximcp/imLcPrs.c patch -xsrc/external/mitlibX11/dist/modules/im/ximcp/imTrX.c patch -xsrc/external/mitlibX11/dist/src/AllCells.c patch -xsrc/external/mitlibX11/dist/src/Font.c patch -xsrc/external/mitlibX11/dist/src/FontInfo.c patch -xsrc/external/mitlibX11/dist/src/FontNames.c patch -xsrc/external/mitlibX11/dist/src/GetFPath.c patch -xsrc/external/mitlibX11/dist/src/GetImage.c patch -xsrc/external/mitlibX11/dist/src/GetMoEv.c patch -xsrc/external/mitlibX11/dist/src/GetPntMap.c patch -xsrc/external/mitlibX11/dist/src/GetProp.c patch -xsrc/external/mitlibX11/dist/src/LiHosts.c patch -xsrc/external/mitlibX11/dist/src/ListExt.c patch -xsrc/external/mitlibX11/dist/src/ModMap.c patch -xsrc/external/mitlibX11/dist/src/Xrm.c patch -xsrc/external/mitlibX11/dist/src/xcms/cmsColNm.c patch -xsrc/external/mitlibX11/dist/src/xkb/XKBExtDev.c patch -xsrc/external/mitlibX11/dist/src/xkb/XKBGeom.c patch -xsrc/external/mitlibX11/dist/src/xkb/XKBGetMap.c patch -xsrc/external/mitlibX11/dist/src/xkb/XKBNames.c patch -xsrc/external/mitlibXcursor/dist/src/file.c patch -xsrc/external/mitlibXext/dist/src/XEVI.c patch -xsrc/external/mitlibXext/dist/src/XShape.c patch -xsrc/external/mitlibXext/dist/src/XSync.c patch -xsrc/external/mitlibXext/dist/src/Xcup.c patch -xsrc/external/mitlibXext/dist/src/Xdbe.c patch -xsrc/external/mitlibXfixes/dist/src/Cursor.c patch -xsrc/external/mitlibXi/dist/src/XGMotion.c patch -xsrc/external/mitlibXi/dist/src/XGetBMap.c patch -xsrc/external/mitlibXi/dist/src/XGetDCtl.c patch -xsrc/external/mitlibXi/dist/src/XGetDProp.c patch -xsrc/external/mitlibXi/dist/src/XGetFCtl.c patch -xsrc/external/mitlibXi/dist/src/XGetProp.c patch -xsrc/external/mitlibXi/dist/src/XListDev.c patch -xsrc/external/mitlibXi/dist/src/XQueryDv.c patch -xsrc/external/mitlibXinerama/dist/src/Xinerama.c patch -xsrc/external/mitlibXrandr/dist/src/XrrProperty.c patch -xsrc/external/mitlibXrender/dist/src/Filter.c patch -xsrc/external/mitlibXrender/dist/src/Xrender.c patch -xsrc/external/mitlibXres/dist/src/XRes.c patch -xsrc/external/mitlibXt/dist/src/ResConfig.c patch -xsrc/external/mitlibXt/dist/src/Selection.c patch -xsrc/external/mitlibXv/dist/src/Xv.c patch -xsrc/external/mitlibXvMC/dist/src/XvMC.c patch -xsrc/external/mitlibXxf86dga/dist/src/XF86DGA2.c patch -xsrc/external/mitlibXxf86vm/dist/src/XF86VMode.c patch +xsrc/external/mit/MesaLib/dist/src/glx/x11/XF86dri.c patch +xsrc/external/mit/libFS/dist/src/FSOpenServ.c patch +xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcPrs.c patch +xsrc/external/mit/libX11/dist/modules/im/ximcp/imTrX.c patch +xsrc/external/mit/libX11/dist/src/AllCells.c patch +xsrc/external/mit/libX11/dist/src/Font.c patch +xsrc/external/mit/libX11/dist/src/FontInfo.c patch +xsrc/external/mit/libX11/dist/src/FontNames.c patch +xsrc/external/mit/libX11/dist/src/GetFPath.c patch +xsrc/external/mit/libX11/dist/src/GetImage.c patch +xsrc/external/mit/libX11/dist/src/GetMoEv.c patch +xsrc/external/mit/libX11/dist/src/GetPntMap.c patch +xsrc/external/mit/libX11/dist/src/GetProp.c patch +xsrc/external/mit/libX11/dist/src/LiHosts.c patch +xsrc/external/mit/libX11/dist/src/ListExt.c patch +xsrc/external/mit/libX11/dist/src/ModMap.c patch +xsrc/external/mit/libX11/dist/src/Xrm.c patch +xsrc/external/mit/libX11/dist/src/xcms/cmsColNm.c patch +xsrc/external/mit/libX11/dist/src/xkb/XKBExtDev.c patch +xsrc/external/mit/libX11/dist/src/xkb/XKBGeom.c patch +xsrc/external/mit/libX11/dist/src/xkb/XKBGetMap.c patch +xsrc/external/mit/libX11/dist/src/xkb/XKBNames.c patch +xsrc/external/mit/libXcursor/dist/src/file.c patch +xsrc/external/mit/libXext/dist/src/XEVI.c patch +xsrc/external/mit/libXext/dist/src/XShape.c patch +xsrc/external/mit/libXext/dist/src/XSync.c patch +xsrc/external/mit/libXext/dist/src/Xcup.c patch +xsrc/external/mit/libXext/dist/src/Xdb
CVS commit: src/sys/dev/usb
Module Name:src Committed By: nonaka Date: Mon Sep 14 15:51:07 UTC 2015 Modified Files: src/sys/dev/usb: usbdevs Log Message: COREGA RTL8192SU is actually CG-WLUSBNM. To generate a diff of this commit: cvs rdiff -u -r1.700 -r1.701 src/sys/dev/usb/usbdevs 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/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.700 src/sys/dev/usb/usbdevs:1.701 --- src/sys/dev/usb/usbdevs:1.700 Wed Sep 9 20:03:48 2015 +++ src/sys/dev/usb/usbdevs Mon Sep 14 15:51:07 2015 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.700 2015/09/09 20:03:48 rjs Exp $ +$NetBSD: usbdevs,v 1.701 2015/09/14 15:51:07 nonaka Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -1216,7 +1216,7 @@ product COREGA RT2870_1 0x002f RT2870 product COREGA RT2870_2 0x003c RT2870 product COREGA RT2870_3 0x003f RT2870 product COREGA RT3070 0x0041 RT3070 -product COREGA RTL8192SU 0x0047 RTL8192SU +product COREGA CGWLUSBNM 0x0047 CG-WLUSBNM product COREGA RTL8192CU 0x0056 RTL8192CU product COREGA CGWLUSB300GNM 0x0042 CG-WLUSB300GNM product COREGA WLUSB_11_STICK 0x7613 WLAN USB Stick 11
CVS commit: src/sys/rump/dev/lib/libugenhc
Module Name:src
Committed By: pooka
Date: Mon Sep 14 15:09:35 UTC 2015
Modified Files:
src/sys/rump/dev/lib/libugenhc: Makefile
Log Message:
Fully build ugenhc only on archs where libusb is built.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/dev/lib/libugenhc/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/rump/dev/lib/libugenhc/Makefile
diff -u src/sys/rump/dev/lib/libugenhc/Makefile:1.8 src/sys/rump/dev/lib/libugenhc/Makefile:1.9
--- src/sys/rump/dev/lib/libugenhc/Makefile:1.8 Thu Mar 13 01:38:11 2014
+++ src/sys/rump/dev/lib/libugenhc/Makefile Mon Sep 14 15:09:35 2015
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2014/03/13 01:38:11 pooka Exp $
+# $NetBSD: Makefile,v 1.9 2015/09/14 15:09:35 pooka Exp $
#
LIB= rumpdev_ugenhc
+
+.if ${MACHINE} == "i386" || ${MACHINE} == "amd64"
IOCONF= UGENHC.ioconf
SRCS= ugenhc.c ugenhc_at_mainbus.c ugenhc_dma.c
@@ -9,6 +11,10 @@ SRCS= ugenhc.c ugenhc_at_mainbus.c ugenh
CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern
RUMPCOMP_USER_SRCS= ugenhc_user.c
+.else
+.PATH: ${.CURDIR}/../libusb
+SRCS= dummy.c
+.endif
.include
.include
CVS commit: src/sys/rump/dev/lib/libugenhc
Module Name:src
Committed By: pooka
Date: Mon Sep 14 15:08:50 UTC 2015
Modified Files:
src/sys/rump/dev/lib/libugenhc: ugenhc_dma.c
Log Message:
Note in comment why this "d"ma implementation is not in libusb.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libugenhc/ugenhc_dma.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/rump/dev/lib/libugenhc/ugenhc_dma.c
diff -u src/sys/rump/dev/lib/libugenhc/ugenhc_dma.c:1.1 src/sys/rump/dev/lib/libugenhc/ugenhc_dma.c:1.2
--- src/sys/rump/dev/lib/libugenhc/ugenhc_dma.c:1.1 Thu Sep 19 17:55:22 2013
+++ src/sys/rump/dev/lib/libugenhc/ugenhc_dma.c Mon Sep 14 15:08:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ugenhc_dma.c,v 1.1 2013/09/19 17:55:22 pooka Exp $ */
+/* $NetBSD: ugenhc_dma.c,v 1.2 2015/09/14 15:08:50 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -34,7 +34,16 @@
#include
/*
- * bus_dma(9) that works for USB drivers
+ * bus_dma(9) that works for USB drivers.
+ *
+ * So why is it here instead of in libusb? Well, first of all, it's
+ * actually a bus_dma implementation which works with ugenhc. Of course,
+ * ugenhc doesn't make any bus_dma calls itself, all of those calls come
+ * from the usb code. However, the USB component can be paired with other
+ * USB host controllers, such as {e,o,u}hci. Therefore, we keep the "D"MA
+ * code here.
+ *
+ * Note: this implementation requires a __HAVE_NEW_STYLE_BUS_H arch
*/
int
