CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src Committed By: skrll Date: Fri Dec 19 09:52:35 UTC 2014 Modified Files: src/sys/dev/usb [nick-nhusb]: usbdivar.h Log Message: Update a comment To generate a diff of this commit: cvs rdiff -u -r1.109.2.9 -r1.109.2.10 src/sys/dev/usb/usbdivar.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/dev/usb/usbdivar.h diff -u src/sys/dev/usb/usbdivar.h:1.109.2.9 src/sys/dev/usb/usbdivar.h:1.109.2.10 --- src/sys/dev/usb/usbdivar.h:1.109.2.9 Sun Dec 14 11:16:29 2014 +++ src/sys/dev/usb/usbdivar.h Fri Dec 19 09:52:35 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: usbdivar.h,v 1.109.2.9 2014/12/14 11:16:29 skrll Exp $ */ +/* $NetBSD: usbdivar.h,v 1.109.2.10 2014/12/19 09:52:35 skrll Exp $ */ /* * Copyright (c) 1998, 2012 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ * List of hardware interface methods, and whether the lock is held * when each is called by this module: * - * BUS METHOD LOCK NOTES + * BUS METHOD LOCK NOTES * --- --- - * ubm_open - might want to take lock? * ubm_softint x @@ -49,14 +49,14 @@ * ubm_newdev - Will take lock ubm_rhctrl * - * PIPE METHOD LOCK NOTES + * PIPE METHOD LOCK NOTES * --- --- - - * transfer - - * start - might want to take lock? - * abort x - * close x - * cleartoggle - - * done x + * upm_transfer - + * upm_start - might want to take lock? + * upm_abort x + * upm_close x + * upm_cleartoggle - + * upm_done x * * The above semantics are likely to change. Little performance * evaluation has been done on this code and the locking strategy.
CVS import: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Fri Dec 19 10:53:12 UTC 2014 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv11051 Log Message: Import dhcpcd-6.6.7 with the following changes: * INET6 only builds again * test mode no longer turns off kernel rtadv handling Status: Vendor Tag: roy Release Tags: dhcpcd-6-6-7 U src/external/bsd/dhcpcd/dist/common.c U src/external/bsd/dhcpcd/dist/control.c C src/external/bsd/dhcpcd/dist/dhcpcd.c U src/external/bsd/dhcpcd/dist/duid.c U src/external/bsd/dhcpcd/dist/eloop.c U src/external/bsd/dhcpcd/dist/if.c U src/external/bsd/dhcpcd/dist/if-options.c U src/external/bsd/dhcpcd/dist/script.c U src/external/bsd/dhcpcd/dist/dhcp-common.c U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c U src/external/bsd/dhcpcd/dist/if-bsd.c U src/external/bsd/dhcpcd/dist/arp.c U src/external/bsd/dhcpcd/dist/dhcp.c U src/external/bsd/dhcpcd/dist/ipv4.c U src/external/bsd/dhcpcd/dist/ipv4ll.c U src/external/bsd/dhcpcd/dist/ipv6.c U src/external/bsd/dhcpcd/dist/ipv6nd.c U src/external/bsd/dhcpcd/dist/dhcp6.c U src/external/bsd/dhcpcd/dist/auth.c U src/external/bsd/dhcpcd/dist/dhcpcd.conf U src/external/bsd/dhcpcd/dist/dhcpcd-definitions.conf U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c.in U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h.in U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in U src/external/bsd/dhcpcd/dist/dhcpcd.8.in U src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in C src/external/bsd/dhcpcd/dist/arp.h U src/external/bsd/dhcpcd/dist/auth.h U src/external/bsd/dhcpcd/dist/bpf-filter.h U src/external/bsd/dhcpcd/dist/common.h U src/external/bsd/dhcpcd/dist/config.h U src/external/bsd/dhcpcd/dist/control.h C src/external/bsd/dhcpcd/dist/defs.h U src/external/bsd/dhcpcd/dist/dev.h U src/external/bsd/dhcpcd/dist/dhcp-common.h U src/external/bsd/dhcpcd/dist/dhcp.h U src/external/bsd/dhcpcd/dist/dhcp6.h U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h U src/external/bsd/dhcpcd/dist/dhcpcd.h U src/external/bsd/dhcpcd/dist/duid.h U src/external/bsd/dhcpcd/dist/eloop.h U src/external/bsd/dhcpcd/dist/if-options.h U src/external/bsd/dhcpcd/dist/if.h U src/external/bsd/dhcpcd/dist/ipv4.h U src/external/bsd/dhcpcd/dist/ipv4ll.h U src/external/bsd/dhcpcd/dist/ipv6.h U src/external/bsd/dhcpcd/dist/ipv6nd.h U src/external/bsd/dhcpcd/dist/script.h U src/external/bsd/dhcpcd/dist/crypt/hmac_md5.c U src/external/bsd/dhcpcd/dist/crypt/crypt.h U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/02-dump U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-mtu U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-wpa_supplicant U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/15-timezone U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ntp.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ypbind 3 conflicts created by this import. Use the following command to help the merge: cvs checkout -jroy:yesterday -jroy src/external/bsd/dhcpcd/dist
CVS commit: src/external/bsd/dhcpcd/dist
Module Name:src
Committed By: roy
Date: Fri Dec 19 10:54:08 UTC 2014
Modified Files:
src/external/bsd/dhcpcd/dist: arp.h defs.h dhcpcd.c
Log Message:
Sync
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/dhcpcd/dist/arp.h
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/dhcpcd/dist/defs.h
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/dhcpcd/dist/dhcpcd.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/bsd/dhcpcd/dist/arp.h
diff -u src/external/bsd/dhcpcd/dist/arp.h:1.6 src/external/bsd/dhcpcd/dist/arp.h:1.7
--- src/external/bsd/dhcpcd/dist/arp.h:1.6 Fri Nov 7 20:51:02 2014
+++ src/external/bsd/dhcpcd/dist/arp.h Fri Dec 19 10:54:08 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: arp.h,v 1.6 2014/11/07 20:51:02 roy Exp $ */
+/* $NetBSD: arp.h,v 1.7 2014/12/19 10:54:08 roy Exp $ */
/*
* dhcpcd - DHCP client daemon
@@ -67,6 +67,7 @@ struct arp_state {
};
TAILQ_HEAD(arp_statehead, arp_state);
+#ifdef INET
void arp_report_conflicted(const struct arp_state *, const struct arp_msg *);
void arp_announce(struct arp_state *);
void arp_probe(struct arp_state *);
@@ -75,4 +76,7 @@ void arp_cancel(struct arp_state *);
void arp_free(struct arp_state *);
void arp_free_but(struct arp_state *);
void arp_close(struct interface *);
+#else
+#define arp_close(a)
+#endif
#endif
Index: src/external/bsd/dhcpcd/dist/defs.h
diff -u src/external/bsd/dhcpcd/dist/defs.h:1.11 src/external/bsd/dhcpcd/dist/defs.h:1.12
--- src/external/bsd/dhcpcd/dist/defs.h:1.11 Wed Dec 17 20:50:08 2014
+++ src/external/bsd/dhcpcd/dist/defs.h Fri Dec 19 10:54:08 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.11 2014/12/17 20:50:08 roy Exp $ */
+/* $NetBSD: defs.h,v 1.12 2014/12/19 10:54:08 roy Exp $ */
/*
* dhcpcd - DHCP client daemon
@@ -30,7 +30,7 @@
#define CONFIG_H
#define PACKAGE dhcpcd
-#define VERSION 6.6.6
+#define VERSION 6.6.7
#ifndef CONFIG
# define CONFIG SYSCONFDIR / PACKAGE .conf
Index: src/external/bsd/dhcpcd/dist/dhcpcd.c
diff -u src/external/bsd/dhcpcd/dist/dhcpcd.c:1.19 src/external/bsd/dhcpcd/dist/dhcpcd.c:1.20
--- src/external/bsd/dhcpcd/dist/dhcpcd.c:1.19 Tue Dec 9 20:21:05 2014
+++ src/external/bsd/dhcpcd/dist/dhcpcd.c Fri Dec 19 10:54:08 2014
@@ -1,5 +1,5 @@
#include sys/cdefs.h
- __RCSID($NetBSD: dhcpcd.c,v 1.19 2014/12/09 20:21:05 roy Exp $);
+ __RCSID($NetBSD: dhcpcd.c,v 1.20 2014/12/19 10:54:08 roy Exp $);
/*
* dhcpcd - DHCP client daemon
@@ -373,7 +373,8 @@ configure_interface1(struct interface *i
if (!(ifo-options DHCPCD_IPV6))
ifo-options = ~(DHCPCD_IPV6RS | DHCPCD_DHCP6);
- if (ifo-options DHCPCD_SLAACPRIVATE)
+ if (ifo-options DHCPCD_SLAACPRIVATE
+ !(ifp-ctx-options DHCPCD_TEST))
ifo-options |= DHCPCD_IPV6RA_OWN;
/* We want to disable kernel interface RA as early as possible. */
CVS commit: src/doc
Module Name:src Committed By: roy Date: Fri Dec 19 10:55:13 UTC 2014 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note import of dhcpcd-6.6.7 To generate a diff of this commit: cvs rdiff -u -r1.1183 -r1.1184 src/doc/3RDPARTY cvs rdiff -u -r1.2027 -r1.2028 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1183 src/doc/3RDPARTY:1.1184 --- src/doc/3RDPARTY:1.1183 Wed Dec 17 20:53:08 2014 +++ src/doc/3RDPARTY Fri Dec 19 10:55:13 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1183 2014/12/17 20:53:08 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.1184 2014/12/19 10:55:13 roy Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -305,8 +305,8 @@ Notes: Use the dhcp2netbsd script. Package: dhcpcd -Version: 6.6.6 -Current Vers: 6.6.6 +Version: 6.6.7 +Current Vers: 6.6.7 Maintainer: roy Archive Site: ftp://roy.marples.name/pub/dhcpcd/ Home Page: http://roy.marples.name/projects/dhcpcd/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2027 src/doc/CHANGES:1.2028 --- src/doc/CHANGES:1.2027 Thu Dec 18 02:30:01 2014 +++ src/doc/CHANGES Fri Dec 19 10:55:13 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2027 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2028 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -113,3 +113,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: bind: Import version 9.10.1-P1. [christos 20141209] dhcpcd(8): Import dhcpcd-6.6.6. [roy 20141217] powerpc: Switch to GCC 4.8. [matt 20141218] + dhcpcd(8): Import dhcpcd-6.6.7. [roy 20141219]
CVS commit: src/sys/ufs/ufs
Module Name:src Committed By: manu Date: Fri Dec 19 10:59:21 UTC 2014 Modified Files: src/sys/ufs/ufs: extattr.h Log Message: Bump UFS1 extended attribute max name length to 256 For extended attribute name max length, kernel filesystem-independant code use either EXTATTR_MAXNAMELEN (BSD API) or XATTR_NAME_MAX (Linux API), which are both defined as KERNEL_NAME_MAX and fits Linux limit of 255 without training \0. UFS1 code had a lower limit that broke Linux compatibility. We can bump the limit without sacrifying backward compatibility, because: 1) There is no API exposing this limit outside the kernel. Upper kernel layers have a larger limit handle the increase without a hitch 2) Each attribute has its own backing store in the fileystem, the name of the backing store matching the attribute name. A newer kernel can create/read/write backing store for longer attribute names and will have no problem with existing shorter names. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/ufs/ufs/extattr.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/ufs/ufs/extattr.h diff -u src/sys/ufs/ufs/extattr.h:1.10 src/sys/ufs/ufs/extattr.h:1.11 --- src/sys/ufs/ufs/extattr.h:1.10 Sun Oct 9 21:15:34 2011 +++ src/sys/ufs/ufs/extattr.h Fri Dec 19 10:59:21 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: extattr.h,v 1.10 2011/10/09 21:15:34 chs Exp $ */ +/* $NetBSD: extattr.h,v 1.11 2014/12/19 10:59:21 manu Exp $ */ /*- * Copyright (c) 1999-2001 Robert N. M. Watson @@ -43,7 +43,7 @@ #define UFS_EXTATTR_FSROOTSUBDIR .attribute #define UFS_EXTATTR_SUBDIR_SYSTEM system #define UFS_EXTATTR_SUBDIR_USER user -#define UFS_EXTATTR_MAXEXTATTRNAME 65 /* including null */ +#define UFS_EXTATTR_MAXEXTATTRNAME 256 /* including null */ #define UFS_EXTATTR_ATTR_FLAG_INUSE 0x0001 /* attr has been set */ #define UFS_EXTATTR_PERM_KERNEL 0x
CVS commit: src/external/bsd/dhcpcd/sbin/dhcpcd
Module Name:src
Committed By: roy
Date: Fri Dec 19 10:59:06 UTC 2014
Modified Files:
src/external/bsd/dhcpcd/sbin/dhcpcd: Makefile
Log Message:
Make the building of INET optional.
As both INET and INET6 are now options, it's possible to build dhcpcd
without both. When built this way it will just report carrier events.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/dhcpcd/sbin/dhcpcd/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/bsd/dhcpcd/sbin/dhcpcd/Makefile
diff -u src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.22 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.23
--- src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.22 Sat Jun 14 21:00:22 2014
+++ src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile Fri Dec 19 10:59:06 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2014/06/14 21:00:22 roy Exp $
+# $NetBSD: Makefile,v 1.23 2014/12/19 10:59:06 roy Exp $
#
PROG= dhcpcd
@@ -14,8 +14,11 @@ USE_FORT?= yes # network client (local s
SRCS+= auth.c hmac_md5.c
+USE_INET?= yes
+.if (${USE_INET} != no)
CPPFLAGS+= -DINET
SRCS+= arp.c dhcp.c ipv4.c ipv4ll.c
+.endif
.if (${USE_INET6} != no)
CPPFLAGS+= -DINET6
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: bouyer
Date: Fri Dec 19 11:54:02 UTC 2014
Modified Files:
src/sys/dev/pci: if_wpi.c
Log Message:
Consistently take the interface down when the radio swicth is off.
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/dev/pci/if_wpi.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/pci/if_wpi.c
diff -u src/sys/dev/pci/if_wpi.c:1.68 src/sys/dev/pci/if_wpi.c:1.69
--- src/sys/dev/pci/if_wpi.c:1.68 Fri Aug 8 10:17:07 2014
+++ src/sys/dev/pci/if_wpi.c Fri Dec 19 11:54:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wpi.c,v 1.68 2014/08/08 10:17:07 jmcneill Exp $ */
+/* $NetBSD: if_wpi.c,v 1.69 2014/12/19 11:54:02 bouyer Exp $ */
/*-
* Copyright (c) 2006, 2007
@@ -18,7 +18,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wpi.c,v 1.68 2014/08/08 10:17:07 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wpi.c,v 1.69 2014/12/19 11:54:02 bouyer Exp $);
/*
* Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters.
@@ -3170,6 +3170,7 @@ wpi_init(struct ifnet *ifp)
if (wpi_getrfkill(sc)) {
aprint_error_dev(sc-sc_dev,
radio is disabled by hardware switch\n);
+ ifp-if_flags = ~IFF_UP;
error = EBUSY;
goto fail1;
}
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Fri Dec 19 15:33:11 UTC 2014 Modified Files: src/doc: 3RDPARTY Log Message: gcc-4.8.4/4.9.2 out. To generate a diff of this commit: cvs rdiff -u -r1.1184 -r1.1185 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.1184 src/doc/3RDPARTY:1.1185 --- src/doc/3RDPARTY:1.1184 Fri Dec 19 10:55:13 2014 +++ src/doc/3RDPARTY Fri Dec 19 15:33:11 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1184 2014/12/19 10:55:13 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.1185 2014/12/19 15:33:11 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -396,7 +396,7 @@ There is a flex2netbsd script to help ne Package: gcc Version: 4.1.3-20080831/4.5.4/4.8.3 -Current Vers: 4.8.3 +Current Vers: 4.8.4/4.9.2 Maintainer: FSF Archive Site: ftp://ftp.gnu.org/gnu/gcc/ Home Page: http://www.gnu.org/software/gcc/
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: msaitoh Date: Fri Dec 19 17:06:31 UTC 2014 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: Sync gpio related lines with i386/conf/GENERIC. To generate a diff of this commit: cvs rdiff -u -r1.405 -r1.406 src/sys/arch/amd64/conf/GENERIC 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/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.405 src/sys/arch/amd64/conf/GENERIC:1.406 --- src/sys/arch/amd64/conf/GENERIC:1.405 Fri Dec 12 01:13:40 2014 +++ src/sys/arch/amd64/conf/GENERIC Fri Dec 19 17:06:31 2014 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.405 2014/12/12 01:13:40 christos Exp $ +# $NetBSD: GENERIC,v 1.406 2014/12/19 17:06:31 msaitoh Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include arch/amd64/conf/std.amd64 options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.405 $ +#ident GENERIC-$Revision: 1.406 $ maxusers 64 # estimated number of users @@ -537,14 +537,12 @@ ld* at iop? tid ? # block devices #dpti* at iop? tid 0 # DPT/Adaptec control interface # GPIO devices -#gpio* at gpiobus? -#gpioow* at gpio? -#onewire* at gpioow? +gpio* at gpiobus? # 1- Wire support #gpioow* at gpio? offset ? mask ? # 1-wire bitbanging via gpio -#gpioow* at gpio? -#onewire* at gpioow? +gpioow* at gpio? +onewire* at gpioow? # I2C support #gpioiic* at gpio?
CVS commit: xsrc/external/mit/fontconfig/dist/src
Module Name:xsrc
Committed By: christos
Date: Fri Dec 19 18:10:18 UTC 2014
Modified Files:
xsrc/external/mit/fontconfig/dist/src: fccache.c
Log Message:
on vax mutexes are volatile.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/fontconfig/dist/src/fccache.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/fontconfig/dist/src/fccache.c
diff -u xsrc/external/mit/fontconfig/dist/src/fccache.c:1.6 xsrc/external/mit/fontconfig/dist/src/fccache.c:1.7
--- xsrc/external/mit/fontconfig/dist/src/fccache.c:1.6 Sat Jul 12 00:11:34 2014
+++ xsrc/external/mit/fontconfig/dist/src/fccache.c Fri Dec 19 13:10:18 2014
@@ -297,7 +297,7 @@ free_lock (void)
lock = fc_atomic_ptr_get (cache_lock);
if (lock fc_atomic_ptr_cmpexch (cache_lock, lock, NULL)) {
FcMutexFinish (lock);
-free (lock);
+free (__UNVOLATILE(lock));
}
}
CVS commit: xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/util
Module Name:xsrc Committed By: christos Date: Fri Dec 19 18:33:02 UTC 2014 Modified Files: xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/util: u_math.h Log Message: Use FLT_MAX if possible (fix VAX) To generate a diff of this commit: cvs rdiff -u -r1.1.1.4 -r1.2 \ xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/util/u_math.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/util/u_math.h diff -u xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/util/u_math.h:1.1.1.4 xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/util/u_math.h:1.2 --- xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/util/u_math.h:1.1.1.4 Thu Dec 18 01:02:06 2014 +++ xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/util/u_math.h Fri Dec 19 13:33:02 2014 @@ -263,8 +263,11 @@ util_fast_exp2(float x) float fpart, mpart; union fi epart; - if(x 129.0f) - return 3.402823466e+38f; +#ifndef FLT_MAX +#define FLT_MAX ((float)3.40282346638528860e+38) +#endif + if (x 129.0f) + return FLT_MAX; if (x -126.9f) return 0.0f;
CVS commit: xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/util
Module Name:xsrc
Committed By: christos
Date: Fri Dec 19 18:39:58 UTC 2014
Modified Files:
xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/util:
u_format_tests.c
Log Message:
Only test NAN's if we have them.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/util/u_format_tests.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/util/u_format_tests.c
diff -u xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/util/u_format_tests.c:1.1.1.2 xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/util/u_format_tests.c:1.2
--- xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/util/u_format_tests.c:1.1.1.2 Thu Dec 18 01:02:06 2014
+++ xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/util/u_format_tests.c Fri Dec 19 13:39:58 2014
@@ -900,7 +900,7 @@ util_format_test_cases[] =
/* Max representable value */
{PIPE_FORMAT_R16_FLOAT, PACKED_1x16(0x), PACKED_1x16(0x7bff), UNPACKED_1x1(65504.0, 0.0, 0.0, 1.0)},
-#if !defined(PIPE_CC_MSVC)
+#if !defined(PIPE_CC_MSVC) defined(NAN)
/* NaNs */
{PIPE_FORMAT_R16_FLOAT, PACKED_1x16(0x), PACKED_1x16(0x7c01), UNPACKED_1x1(NAN, 0.0, 0.0, 1.0)},
CVS commit: xsrc/external/mit/glu/dist/include/GL
Module Name:xsrc Committed By: christos Date: Fri Dec 19 19:07:46 UTC 2014 Modified Files: xsrc/external/mit/glu/dist/include/GL: glu.h Log Message: use DBL_MAX instead of 1.0e150... To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/glu/dist/include/GL/glu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/glu/dist/include/GL/glu.h diff -u xsrc/external/mit/glu/dist/include/GL/glu.h:1.1.1.1 xsrc/external/mit/glu/dist/include/GL/glu.h:1.2 --- xsrc/external/mit/glu/dist/include/GL/glu.h:1.1.1.1 Tue Dec 16 01:01:15 2014 +++ xsrc/external/mit/glu/dist/include/GL/glu.h Fri Dec 19 14:07:46 2014 @@ -281,7 +281,13 @@ typedef GLUquadric GLUquadricObj; typedef GLUtesselator GLUtesselatorObj; typedef GLUtesselator GLUtriangulatorObj; +/* GLdouble is double in gl.h so we are DBL_MAX */ +#include limits.h /* Not a good place to do that, but... */ +#ifndef DBL_MAX #define GLU_TESS_MAX_COORD 1.0e150 +#else +#define GLU_TESS_MAX_COORD DBL_MAX +#endif /* Internal convenience typedefs */ typedef void (GLAPIENTRYP _GLUfuncptr)(void);
CVS commit: src/external/bsd/ntp/include
Module Name:src Committed By: christos Date: Fri Dec 19 20:46:47 UTC 2014 Modified Files: src/external/bsd/ntp/include: config.h Log Message: No, bash is not the posix shell. Why do you need the shell anyway? To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/external/bsd/ntp/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/ntp/include/config.h diff -u src/external/bsd/ntp/include/config.h:1.9 src/external/bsd/ntp/include/config.h:1.10 --- src/external/bsd/ntp/include/config.h:1.9 Fri Dec 19 15:43:20 2014 +++ src/external/bsd/ntp/include/config.h Fri Dec 19 15:46:47 2014 @@ -1443,7 +1443,7 @@ #define PERLLIBDIR /usr/local/share/ntp/lib /* define to a working POSIX compliant shell */ -#define POSIX_SHELL /usr/pkg/bin/bash +#define POSIX_SHELL /bin/sh /* PARSE kernel PLL PPS support */ /* #undef PPS_SYNC */
CVS commit: src/doc
Module Name:src Committed By: christos Date: Fri Dec 19 20:50:36 UTC 2014 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new ntp import to handle security issues. To generate a diff of this commit: cvs rdiff -u -r1.1185 -r1.1186 src/doc/3RDPARTY cvs rdiff -u -r1.2028 -r1.2029 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1185 src/doc/3RDPARTY:1.1186 --- src/doc/3RDPARTY:1.1185 Fri Dec 19 10:33:11 2014 +++ src/doc/3RDPARTY Fri Dec 19 15:50:35 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1185 2014/12/19 15:33:11 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.1186 2014/12/19 20:50:35 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -896,8 +896,8 @@ and ndbootd-raw.c. Restore saved config HAVE_STRICT_ALIGNMENT. Fix RCS IDs, import. Package: ntp -Version: 4.2.7p404 -Current Vers: 4.2.6p5/4.2.7p404 +Version: 4.2.8 +Current Vers: 4.2.8 Maintainer: David L. Mills mi...@udel.edu Archive Site: http://www.ntp.org/ Home Page: http://www.ntp.org/, http://support.ntp.org/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2028 src/doc/CHANGES:1.2029 --- src/doc/CHANGES:1.2028 Fri Dec 19 05:55:13 2014 +++ src/doc/CHANGES Fri Dec 19 15:50:35 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2028 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2029 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -114,3 +114,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: dhcpcd(8): Import dhcpcd-6.6.6. [roy 20141217] powerpc: Switch to GCC 4.8. [matt 20141218] dhcpcd(8): Import dhcpcd-6.6.7. [roy 20141219] + ntp: Import ntp 4.2.8. [christos 20141219]
CVS commit: src/external/bsd/ntp/dist/sntp/libopts
Module Name:src Committed By: christos Date: Fri Dec 19 20:48:55 UTC 2014 Modified Files: src/external/bsd/ntp/dist/sntp/libopts: autoopts.h Log Message: I will let others decide if we should grow this wart... To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/dist/sntp/libopts/autoopts.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/ntp/dist/sntp/libopts/autoopts.h diff -u src/external/bsd/ntp/dist/sntp/libopts/autoopts.h:1.6 src/external/bsd/ntp/dist/sntp/libopts/autoopts.h:1.7 --- src/external/bsd/ntp/dist/sntp/libopts/autoopts.h:1.6 Fri Dec 19 15:43:19 2014 +++ src/external/bsd/ntp/dist/sntp/libopts/autoopts.h Fri Dec 19 15:48:55 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: autoopts.h,v 1.6 2014/12/19 20:43:19 christos Exp $ */ +/* $NetBSD: autoopts.h,v 1.7 2014/12/19 20:48:55 christos Exp $ */ /* @@ -34,7 +34,11 @@ #ifndef AUTOGEN_AUTOOPTS_H #define AUTOGEN_AUTOOPTS_H +#if 0 #include stdnoreturn.h +#else +#define noreturn __dead +#endif #define AO_NAME_LIMIT 127 #define AO_NAME_SIZE((size_t)(AO_NAME_LIMIT + 1))
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Fri Dec 19 21:43:11 UTC 2014
Modified Files:
src/share/mk: bsd.man.mk
Log Message:
Explain why used to fold case when deciding if we are going to install manual
page links, and change the behavior not to do this anymore.
To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 src/share/mk/bsd.man.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.man.mk
diff -u src/share/mk/bsd.man.mk:1.115 src/share/mk/bsd.man.mk:1.116
--- src/share/mk/bsd.man.mk:1.115 Tue Aug 5 11:40:59 2014
+++ src/share/mk/bsd.man.mk Fri Dec 19 16:43:11 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.man.mk,v 1.115 2014/08/05 15:40:59 apb Exp $
+# $NetBSD: bsd.man.mk,v 1.116 2014/12/19 21:43:11 christos Exp $
# @(#)bsd.man.mk 8.1 (Berkeley) 6/8/93
.include bsd.init.mk
@@ -9,6 +9,17 @@
.PHONY: lintmanpages
realinstall: ${MANINSTALL}
+# If our install destination is case-preserving, but case-insensitive
+# then we do filesystem comparisons in lower case to make sure that
+# we always refresh the target when needed. In general we don't
+# want to do this, otherwise things like _exit.2 - _Exit.2 get
+# installed on each build even when they don't need to. Note that
+# the CASE_INSENSITIVE_DEST macro is currently not defined anywhere.
+
+.if defined(CASE_INSENSITIVE_DEST)
+FLATTEN?= :tl
+.endif
+
# Default values
.if ${USETOOLS} == yes
TMACDEPDIR?= ${TOOLDIR}/share/groff/tmac
@@ -109,7 +120,7 @@ _t:=${DESTDIR}${MANDIR}/man${_dst:T:E}${
# Handle case conflicts carefully, when _dst occurs
# more than once after case flattening
-.if ${MKUPDATE} == no || ${MLINKS:tl:M${_dst:tl:Q}:[\#]} 1
+.if ${MKUPDATE} == no || ${MLINKS:${FLATTEN}M${_dst:${FLATTEN}Q}:[\#]} 1
${_t}! ${_l} __linkinstallpage
.else
${_t}: ${_l} __linkinstallpage
@@ -177,7 +188,7 @@ _t:=${DESTDIR}${MANDIR}/cat${_dst:T:E}${
# Handle case conflicts carefully, when _dst occurs
# more than once after case flattening
-.if ${MKUPDATE} == no || ${MLINKS:tl:M${_dst:tl:Q}:[\#]} 1
+.if ${MKUPDATE} == no || ${MLINKS:${FLATTEN}M${_dst:${FLATTEN}Q}:[\#]} 1
${_t}! ${_l} __linkinstallpage
.else
${_t}: ${_l} __linkinstallpage
@@ -249,7 +260,7 @@ _t:=${HTMLDIR}/html${_dst:T:E}${MANSUBDI
# Handle case conflicts carefully, when _dst occurs
# more than once after case flattening
-.if ${MKUPDATE} == no || ${MLINKS:tl:M${_dst:tl:Q}:[\#]} 1
+.if ${MKUPDATE} == no || ${MLINKS:${FLATTEN}M${_dst:${FLATTEN}Q}:[\#]} 1
${_t}! ${_l} __linkinstallpage
.else
${_t}: ${_l} __linkinstallpage
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Fri Dec 19 22:25:39 UTC 2014
Modified Files:
src/share/mk: bsd.man.mk
Log Message:
protect the variable name, and explain why setting it does not work.
To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 src/share/mk/bsd.man.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.man.mk
diff -u src/share/mk/bsd.man.mk:1.116 src/share/mk/bsd.man.mk:1.117
--- src/share/mk/bsd.man.mk:1.116 Fri Dec 19 16:43:11 2014
+++ src/share/mk/bsd.man.mk Fri Dec 19 17:25:39 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.man.mk,v 1.116 2014/12/19 21:43:11 christos Exp $
+# $NetBSD: bsd.man.mk,v 1.117 2014/12/19 22:25:39 christos Exp $
# @(#)bsd.man.mk 8.1 (Berkeley) 6/8/93
.include bsd.init.mk
@@ -14,10 +14,10 @@ realinstall: ${MANINSTALL}
# we always refresh the target when needed. In general we don't
# want to do this, otherwise things like _exit.2 - _Exit.2 get
# installed on each build even when they don't need to. Note that
-# the CASE_INSENSITIVE_DEST macro is currently not defined anywhere.
-
+# the CASE_INSENSITIVE_DEST macro is currently not defined anywhere,
+# and the expansion does not really work because of make(1).
.if defined(CASE_INSENSITIVE_DEST)
-FLATTEN?= :tl
+_FLATTEN?=tl:
.endif
# Default values
@@ -120,7 +120,7 @@ _t:=${DESTDIR}${MANDIR}/man${_dst:T:E}${
# Handle case conflicts carefully, when _dst occurs
# more than once after case flattening
-.if ${MKUPDATE} == no || ${MLINKS:${FLATTEN}M${_dst:${FLATTEN}Q}:[\#]} 1
+.if ${MKUPDATE} == no || ${MLINKS:${_FLATTEN}M${_dst:${_FLATTEN}Q}:[\#]} 1
${_t}! ${_l} __linkinstallpage
.else
${_t}: ${_l} __linkinstallpage
@@ -188,7 +188,7 @@ _t:=${DESTDIR}${MANDIR}/cat${_dst:T:E}${
# Handle case conflicts carefully, when _dst occurs
# more than once after case flattening
-.if ${MKUPDATE} == no || ${MLINKS:${FLATTEN}M${_dst:${FLATTEN}Q}:[\#]} 1
+.if ${MKUPDATE} == no || ${MLINKS:${_FLATTEN}M${_dst:${_FLATTEN}Q}:[\#]} 1
${_t}! ${_l} __linkinstallpage
.else
${_t}: ${_l} __linkinstallpage
@@ -260,7 +260,7 @@ _t:=${HTMLDIR}/html${_dst:T:E}${MANSUBDI
# Handle case conflicts carefully, when _dst occurs
# more than once after case flattening
-.if ${MKUPDATE} == no || ${MLINKS:${FLATTEN}M${_dst:${FLATTEN}Q}:[\#]} 1
+.if ${MKUPDATE} == no || ${MLINKS:${_FLATTEN}M${_dst:${_FLATTEN}Q}:[\#]} 1
${_t}! ${_l} __linkinstallpage
.else
${_t}: ${_l} __linkinstallpage
CVS commit: src/sys/ufs/ufs
Module Name:src
Committed By: christos
Date: Sat Dec 20 00:28:05 UTC 2014
Modified Files:
src/sys/ufs/ufs: ufs_dirhash.c
Log Message:
clear i_dirhash sooner, but what lock protects it?
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/ufs/ufs/ufs_dirhash.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/ufs/ufs/ufs_dirhash.c
diff -u src/sys/ufs/ufs/ufs_dirhash.c:1.36 src/sys/ufs/ufs/ufs_dirhash.c:1.37
--- src/sys/ufs/ufs/ufs_dirhash.c:1.36 Tue Feb 25 13:30:13 2014
+++ src/sys/ufs/ufs/ufs_dirhash.c Fri Dec 19 19:28:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_dirhash.c,v 1.36 2014/02/25 18:30:13 pooka Exp $ */
+/* $NetBSD: ufs_dirhash.c,v 1.37 2014/12/20 00:28:05 christos Exp $ */
/*
* Copyright (c) 2001, 2002 Ian Dowse. All rights reserved.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ufs_dirhash.c,v 1.36 2014/02/25 18:30:13 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: ufs_dirhash.c,v 1.37 2014/12/20 00:28:05 christos Exp $);
/*
* This implements a hash-based lookup scheme for UFS directories.
@@ -255,6 +255,7 @@ ufsdirhash_build(struct inode *ip)
return (0);
fail:
+ ip-i_dirhash = NULL;
DIRHASH_UNLOCK(dh);
if (dh-dh_hash != NULL) {
for (i = 0; i narrays; i++)
@@ -266,7 +267,6 @@ fail:
kmem_free(dh-dh_blkfree, dh-dh_blkfreesz);
mutex_destroy(dh-dh_lock);
pool_cache_put(ufsdirhash_cache, dh);
- ip-i_dirhash = NULL;
atomic_add_int(ufs_dirhashmem, -memreqd);
return (-1);
}
@@ -283,6 +283,8 @@ ufsdirhash_free(struct inode *ip)
if ((dh = ip-i_dirhash) == NULL)
return;
+ ip-i_dirhash = NULL;
+
if (dh-dh_onlist) {
DIRHASHLIST_LOCK();
if (dh-dh_onlist)
@@ -303,7 +305,6 @@ ufsdirhash_free(struct inode *ip)
}
mutex_destroy(dh-dh_lock);
pool_cache_put(ufsdirhash_cache, dh);
- ip-i_dirhash = NULL;
atomic_add_int(ufs_dirhashmem, -mem);
}
CVS commit: xsrc/external/mit/MesaLib/dist/src/mesa/main
Module Name:xsrc
Committed By: mrg
Date: Sat Dec 20 02:05:35 UTC 2014
Modified Files:
xsrc/external/mit/MesaLib/dist/src/mesa/main: dlist.c
Log Message:
fix my prior hack here to only apply on platforms that need it.
namely, any current netbsd 64 bit platform besides x86. (i meant
to do this before merging.)
the problem here is the Node type is only 4 bytes, an allocation
is assigned to a Node *node, and then node + 1 is returned.
this returns a 4-byte aligned pointer, and some callers expect to
be able to store 64-bit (pointer, at least) values there and demand
that the structure be properly aligned. this change forces Node to
be 8-byte aligned on all-but-x86 64 bit netbsd platforms.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/MesaLib/dist/src/mesa/main/dlist.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/MesaLib/dist/src/mesa/main/dlist.c
diff -u xsrc/external/mit/MesaLib/dist/src/mesa/main/dlist.c:1.2 xsrc/external/mit/MesaLib/dist/src/mesa/main/dlist.c:1.3
--- xsrc/external/mit/MesaLib/dist/src/mesa/main/dlist.c:1.2 Thu Dec 18 06:20:51 2014
+++ xsrc/external/mit/MesaLib/dist/src/mesa/main/dlist.c Sat Dec 20 02:05:35 2014
@@ -505,6 +505,16 @@ typedef enum
* sake of compact display lists. We store 8-byte pointers in a pair of
* these nodes using the save/get_pointer() functions below.
*/
+#if defined(__NetBSD__) defined(_LP64) !defined(__x86_64__)
+/*
+ * This pointer typ is returned with node + 1, which ends up at an
+ * illegal offset for 64 bit values, such as pointers, which may be
+ * stored in the returned space. As such, we have to force this
+ * structure to be 64-bit type aligned. x86-64 is the only known
+ * platform that allows this.
+ */
+#define STRICT_DLIST_ALIGNMENT
+#endif
union gl_dlist_node
{
OpCode opcode;
@@ -518,7 +528,7 @@ union gl_dlist_node
GLenum e;
GLfloat f;
GLsizei si;
-#ifdef __NetBSD__
+#ifdef STRICT_DLIST_ALIGNMENT
unsigned long long _dummy;
#endif
};
@@ -551,8 +561,12 @@ save_pointer(union gl_dlist_node *dest,
unsigned i;
STATIC_ASSERT(POINTER_DWORDS == 1 || POINTER_DWORDS == 2);
+#ifdef STRICT_DLIST_ALIGNMENT
STATIC_ASSERT(sizeof(union gl_dlist_node) == 4 ||
sizeof(union gl_dlist_node) == 8);
+#else
+ STATIC_ASSERT(sizeof(union gl_dlist_node) == 4);
+#endif
p.ptr = src;
CVS commit: src/external/bsd/ntp
Module Name:src
Committed By: christos
Date: Sat Dec 20 02:59:24 UTC 2014
Modified Files:
src/external/bsd/ntp: importdate
src/external/bsd/ntp/scripts: mkver
Log Message:
finish import
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ntp/importdate
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/scripts/mkver
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/ntp/importdate
diff -u src/external/bsd/ntp/importdate:1.3 src/external/bsd/ntp/importdate:1.4
--- src/external/bsd/ntp/importdate:1.3 Fri Dec 27 22:19:43 2013
+++ src/external/bsd/ntp/importdate Fri Dec 19 21:59:24 2014
@@ -1 +1 @@
-Fri Dec 27 19:28:17 EST 2013 (import)
+Fri Dec 19 21:49:44 EST 2014 (import)
Index: src/external/bsd/ntp/scripts/mkver
diff -u src/external/bsd/ntp/scripts/mkver:1.4 src/external/bsd/ntp/scripts/mkver:1.5
--- src/external/bsd/ntp/scripts/mkver:1.4 Wed Jan 15 07:58:23 2014
+++ src/external/bsd/ntp/scripts/mkver Fri Dec 19 21:59:24 2014
@@ -3,7 +3,7 @@ PROG=${1-UNKNOWN}
ConfStr=$PROG
-ConfStr=$ConfStr 4.2.7p404
+ConfStr=$ConfStr 4.2.8
case $CSET in
'') ;;
CVS commit: src
Module Name:src
Committed By: uebayasi
Date: Sat Dec 20 07:02:25 UTC 2014
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/usr.bin/config/support/conf: Makefile
Added Files:
src/tests/usr.bin/config/support/conf: Makefile.kern.inc
Log Message:
config(1): Fix test breakage
Now config(1) checks the content of $S/conf/Makefile.kern.inc. Install it
into config(1) test directory to fix test. Noticed by Martin Husemann.
To generate a diff of this commit:
cvs rdiff -u -r1.603 -r1.604 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/config/support/conf/Makefile
cvs rdiff -u -r0 -r1.1 \
src/tests/usr.bin/config/support/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.603 src/distrib/sets/lists/tests/mi:1.604
--- src/distrib/sets/lists/tests/mi:1.603 Mon Dec 8 04:23:03 2014
+++ src/distrib/sets/lists/tests/mi Sat Dec 20 07:02:25 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.603 2014/12/08 04:23:03 ozaki-r Exp $
+# $NetBSD: mi,v 1.604 2014/12/20 07:02:25 uebayasi Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -3410,6 +3410,7 @@
./usr/tests/usr.bin/config/support/arch/regress/conf/files.regress tests-usr.bin-tests atf
./usr/tests/usr.bin/config/support/arch/regress/conf/std.regress tests-usr.bin-tests atf
./usr/tests/usr.bin/config/support/conf tests-usr.bin-tests
+./usr/tests/usr.bin/config/support/conf/Makefile.kern.inc tests-usr.bin-tests atf
./usr/tests/usr.bin/config/support/conf/files tests-usr.bin-tests atf
./usr/tests/usr.bin/config/t_config tests-usr.bin-tests atf
./usr/tests/usr.bin/cuttests-usr.bin-tests
Index: src/tests/usr.bin/config/support/conf/Makefile
diff -u src/tests/usr.bin/config/support/conf/Makefile:1.1 src/tests/usr.bin/config/support/conf/Makefile:1.2
--- src/tests/usr.bin/config/support/conf/Makefile:1.1 Sat Mar 17 16:33:12 2012
+++ src/tests/usr.bin/config/support/conf/Makefile Sat Dec 20 07:02:25 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2012/03/17 16:33:12 jruoho Exp $
+# $NetBSD: Makefile,v 1.2 2014/12/20 07:02:25 uebayasi Exp $
.include bsd.own.mk
@@ -6,7 +6,8 @@ TESTSDIR= ${TESTSBASE}/usr.bin/config
ATFFILE= no
FILESDIR= ${TESTSDIR}/support/conf
-FILES= files
+FILES= Makefile.kern.inc \
+ files
.include bsd.test.mk
.include bsd.files.mk
Added files:
Index: src/tests/usr.bin/config/support/conf/Makefile.kern.inc
diff -u /dev/null src/tests/usr.bin/config/support/conf/Makefile.kern.inc:1.1
--- /dev/null Sat Dec 20 07:02:25 2014
+++ src/tests/usr.bin/config/support/conf/Makefile.kern.inc Sat Dec 20 07:02:25 2014
@@ -0,0 +1,4 @@
+# $NetBSD: Makefile.kern.inc,v 1.1 2014/12/20 07:02:25 uebayasi Exp $
+
+build_kernel: .USE
+ XXX
