CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Mon Aug 4 06:17:05 UTC 2014 Modified Files: src/sys/dev/usb: ehci.c Log Message: Fix duplicate assignment to NULL of sqtdstart in ehci_device_isoc_start and initialise sqtdend is NULL instead. >From OpenBSD. To generate a diff of this commit: cvs rdiff -u -r1.225 -r1.226 src/sys/dev/usb/ehci.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/usb/ehci.c diff -u src/sys/dev/usb/ehci.c:1.225 src/sys/dev/usb/ehci.c:1.226 --- src/sys/dev/usb/ehci.c:1.225 Mon Feb 17 07:34:21 2014 +++ src/sys/dev/usb/ehci.c Mon Aug 4 06:17:04 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ehci.c,v 1.225 2014/02/17 07:34:21 skrll Exp $ */ +/* $NetBSD: ehci.c,v 1.226 2014/08/04 06:17:04 skrll Exp $ */ /* * Copyright (c) 2004-2012 The NetBSD Foundation, Inc. @@ -53,7 +53,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.225 2014/02/17 07:34:21 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.226 2014/08/04 06:17:04 skrll Exp $"); #include "ohci.h" #include "uhci.h" @@ -4195,7 +4195,7 @@ ehci_device_isoc_start(usbd_xfer_handle exfer->itdstart = start; exfer->itdend = stop; exfer->sqtdstart = NULL; - exfer->sqtdstart = NULL; + exfer->sqtdend = NULL; ehci_add_intr_list(sc, exfer); xfer->status = USBD_IN_PROGRESS;
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: mrg Date: Mon Aug 4 04:20:01 UTC 2014 Modified Files: src/usr.sbin/sysinst: disks.c Log Message: for the !tmpfs case, ensure that pm_with_swap is initialised. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/disks.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/sysinst/disks.c diff -u src/usr.sbin/sysinst/disks.c:1.2 src/usr.sbin/sysinst/disks.c:1.3 --- src/usr.sbin/sysinst/disks.c:1.2 Sun Aug 3 16:09:38 2014 +++ src/usr.sbin/sysinst/disks.c Mon Aug 4 04:20:01 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: disks.c,v 1.2 2014/08/03 16:09:38 martin Exp $ */ +/* $NetBSD: disks.c,v 1.3 2014/08/04 04:20:01 mrg Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -823,7 +823,7 @@ make_fstab(void) char *dev = NULL; pm_devs_t *pm_i; #ifndef HAVE_TMPFS - pm_devs_t *pm_with_swap; + pm_devs_t *pm_with_swap = NULL; #endif /* Create the fstab. */
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-radeon
Module Name:src
Committed By: rjs
Date: Mon Aug 4 01:25:23 UTC 2014
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-radeon: Makefile
Log Message:
Link against radeon_libdrm.
Re-enable building kms bits, ok mrg@.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/external/mit/xorg/server/drivers/xf86-video-radeon/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/mit/xorg/server/drivers/xf86-video-radeon/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.16 src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.17
--- src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.16 Sun Jul 27 23:24:19 2014
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile Mon Aug 4 01:25:23 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2014/07/27 23:24:19 mrg Exp $
+# $NetBSD: Makefile,v 1.17 2014/08/04 01:25:23 rjs Exp $
.include
@@ -18,10 +18,9 @@ CPPFLAGS+= ${X11FLAGS.DRI}
# XXX
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-.if 0
SRCS.KMS= radeon_dri2.c radeon_kms.c drmmode_display.c radeon_vbo.c
CPPFLAGS+= -DXF86DRM_MODE
-.endif
+LIBDPLIBS+= drm_radeon ${.CURDIR}/../../../lib/libdrm_radeon
.endif
SRCS.EXA= radeon_exa.c r600_exa.c r6xx_accel.c \
CVS commit: src/sys/netinet6
Module Name:src
Committed By: rmind
Date: Sun Aug 3 22:55:24 UTC 2014
Modified Files:
src/sys/netinet6: in6_pcb.c
Log Message:
in6_pcbdetach: now that IGMP and multicast groups are MP-safe, we can move
the ip6_freemoptions() call outside the softnet_lock. Should fix PR/49065.
To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 src/sys/netinet6/in6_pcb.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/netinet6/in6_pcb.c
diff -u src/sys/netinet6/in6_pcb.c:1.126 src/sys/netinet6/in6_pcb.c:1.127
--- src/sys/netinet6/in6_pcb.c:1.126 Thu Jul 24 15:12:03 2014
+++ src/sys/netinet6/in6_pcb.c Sun Aug 3 22:55:24 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_pcb.c,v 1.126 2014/07/24 15:12:03 rtr Exp $ */
+/* $NetBSD: in6_pcb.c,v 1.127 2014/08/03 22:55:24 rmind Exp $ */
/* $KAME: in6_pcb.c,v 1.84 2001/02/08 18:02:08 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.126 2014/07/24 15:12:03 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.127 2014/08/03 22:55:24 rmind Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -599,24 +599,28 @@ in6_pcbdetach(struct in6pcb *in6p)
#if defined(IPSEC)
if (ipsec_enabled)
ipsec6_delete_pcbpolicy(in6p);
-#endif /* IPSEC */
- so->so_pcb = 0;
- if (in6p->in6p_options)
+#endif
+ so->so_pcb = NULL;
+
+ s = splnet();
+ in6_pcbstate(in6p, IN6P_ATTACHED);
+ LIST_REMOVE(&in6p->in6p_head, inph_lhash);
+ TAILQ_REMOVE(&in6p->in6p_table->inpt_queue, &in6p->in6p_head,
+ inph_queue);
+ splx(s);
+
+ if (in6p->in6p_options) {
m_freem(in6p->in6p_options);
+ }
if (in6p->in6p_outputopts != NULL) {
ip6_clearpktopts(in6p->in6p_outputopts, -1);
free(in6p->in6p_outputopts, M_IP6OPT);
}
rtcache_free(&in6p->in6p_route);
+ sofree(so);/* drops the socket's lock */
+
ip6_freemoptions(in6p->in6p_moptions);
- s = splnet();
- in6_pcbstate(in6p, IN6P_ATTACHED);
- LIST_REMOVE(&in6p->in6p_head, inph_lhash);
- TAILQ_REMOVE(&in6p->in6p_table->inpt_queue, &in6p->in6p_head,
- inph_queue);
pool_put(&in6pcb_pool, in6p);
- splx(s);
- sofree(so);/* drops the socket's lock */
mutex_enter(softnet_lock); /* reacquire it */
}
CVS commit: src/sys/netinet
Module Name:src
Committed By: rmind
Date: Sun Aug 3 22:11:50 UTC 2014
Modified Files:
src/sys/netinet: in_pcb.c
Log Message:
in_pcbdetach: not that IGMP and multicast groups are MP-safe, we can move
the ip_freemoptions() call outside the softnet_lock. Should fix PR/49065.
To generate a diff of this commit:
cvs rdiff -u -r1.149 -r1.150 src/sys/netinet/in_pcb.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/netinet/in_pcb.c
diff -u src/sys/netinet/in_pcb.c:1.149 src/sys/netinet/in_pcb.c:1.150
--- src/sys/netinet/in_pcb.c:1.149 Thu Jul 24 15:12:03 2014
+++ src/sys/netinet/in_pcb.c Sun Aug 3 22:11:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: in_pcb.c,v 1.149 2014/07/24 15:12:03 rtr Exp $ */
+/* $NetBSD: in_pcb.c,v 1.150 2014/08/03 22:11:50 rmind Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -93,7 +93,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: in_pcb.c,v 1.149 2014/07/24 15:12:03 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_pcb.c,v 1.150 2014/08/03 22:11:50 rmind Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -593,19 +593,23 @@ in_pcbdetach(void *v)
#if defined(IPSEC)
if (ipsec_enabled)
ipsec4_delete_pcbpolicy(inp);
-#endif /* IPSEC */
- so->so_pcb = 0;
- if (inp->inp_options)
- (void)m_free(inp->inp_options);
- rtcache_free(&inp->inp_route);
- ip_freemoptions(inp->inp_moptions);
+#endif
+ so->so_pcb = NULL;
+
s = splnet();
in_pcbstate(inp, INP_ATTACHED);
LIST_REMOVE(&inp->inp_head, inph_lhash);
TAILQ_REMOVE(&inp->inp_table->inpt_queue, &inp->inp_head, inph_queue);
- pool_put(&inpcb_pool, inp);
splx(s);
+
+ if (inp->inp_options) {
+ m_free(inp->inp_options);
+ }
+ rtcache_free(&inp->inp_route);
sofree(so); /* drops the socket's lock */
+
+ ip_freemoptions(inp->inp_moptions);
+ pool_put(&inpcb_pool, inp);
mutex_enter(softnet_lock); /* reacquire the softnet_lock */
}
CVS commit: src
Module Name:src
Committed By: wiz
Date: Sun Aug 3 19:14:24 UTC 2014
Modified Files:
src/lib/libc/arch/alpha/gen: flt_rounds.c
src/lib/libc/include/isc: dst.h
src/share/zoneinfo: leap-seconds.list
src/sys/arch/arm/allwinner: awin_reg.h
src/sys/arch/arm/samsung: exynos_reg.h
src/sys/arch/xen/include/xen-public/xsm: acm.h
src/sys/dev/ic: athioctl.h
src/sys/dev/pci/n8/include_private: n8_sks.h
src/sys/external/bsd/drm2/dist/drm/radeon: atombios.h
src/sys/external/isc/atheros_hal/dist/ar5210: ar5210reg.h
src/sys/kern: kern_runq.c
src/sys/sys: mman.h
Log Message:
defintion -> definition
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/lib/libc/arch/alpha/gen/flt_rounds.c
cvs rdiff -u -r1.1.1.4 -r1.2 src/lib/libc/include/isc/dst.h
cvs rdiff -u -r1.1.1.1 -r1.2 src/share/zoneinfo/leap-seconds.list
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/allwinner/awin_reg.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/samsung/exynos_reg.h
cvs rdiff -u -r1.1.1.2 -r1.2 src/sys/arch/xen/include/xen-public/xsm/acm.h
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/ic/athioctl.h
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/n8/include_private/n8_sks.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/drm2/dist/drm/radeon/atombios.h
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/isc/atheros_hal/dist/ar5210/ar5210reg.h
cvs rdiff -u -r1.42 -r1.43 src/sys/kern/kern_runq.c
cvs rdiff -u -r1.47 -r1.48 src/sys/sys/mman.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/alpha/gen/flt_rounds.c
diff -u src/lib/libc/arch/alpha/gen/flt_rounds.c:1.9 src/lib/libc/arch/alpha/gen/flt_rounds.c:1.10
--- src/lib/libc/arch/alpha/gen/flt_rounds.c:1.9 Sun Jun 12 05:44:36 2011
+++ src/lib/libc/arch/alpha/gen/flt_rounds.c Sun Aug 3 19:14:24 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: flt_rounds.c,v 1.9 2011/06/12 05:44:36 matt Exp $ */
+/* $NetBSD: flt_rounds.c,v 1.10 2014/08/03 19:14:24 wiz Exp $ */
/*
* Copyright (c) 1995 Christopher G. Demetriou
@@ -36,7 +36,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: flt_rounds.c,v 1.9 2011/06/12 05:44:36 matt Exp $");
+__RCSID("$NetBSD: flt_rounds.c,v 1.10 2014/08/03 19:14:24 wiz Exp $");
#endif /* LIBC_SCCS and not lint */
#include
@@ -44,7 +44,7 @@ __RCSID("$NetBSD: flt_rounds.c,v 1.9 201
#include
/*
- * These come from defintion
+ * These come from definition
*/
#define FLT_ROUND_MAP \
( (0 << (FP_RZ*2)) /* round to zero */ \
Index: src/lib/libc/include/isc/dst.h
diff -u src/lib/libc/include/isc/dst.h:1.1.1.4 src/lib/libc/include/isc/dst.h:1.2
--- src/lib/libc/include/isc/dst.h:1.1.1.4 Sun Apr 12 16:35:44 2009
+++ src/lib/libc/include/isc/dst.h Sun Aug 3 19:14:24 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dst.h,v 1.1.1.4 2009/04/12 16:35:44 christos Exp $ */
+/* $NetBSD: dst.h,v 1.2 2014/08/03 19:14:24 wiz Exp $ */
#ifndef DST_H
#define DST_H
@@ -55,7 +55,7 @@ typedef struct dst_key {
#define dst_write_key __dst_write_key
/*
- * DST Crypto API defintions
+ * DST Crypto API definitions
*/
void dst_init(void);
int dst_check_algorithm(const int);
Index: src/share/zoneinfo/leap-seconds.list
diff -u src/share/zoneinfo/leap-seconds.list:1.1.1.1 src/share/zoneinfo/leap-seconds.list:1.2
--- src/share/zoneinfo/leap-seconds.list:1.1.1.1 Thu Dec 26 16:41:00 2013
+++ src/share/zoneinfo/leap-seconds.list Sun Aug 3 19:14:24 2014
@@ -44,7 +44,7 @@
# by the International Bureau of Weights and Measures
# (BIPM). See www.bipm.fr for more information.
#
-# 3. The current defintion of the relationship between UTC
+# 3. The current definition of the relationship between UTC
# and TAI dates from 1 January 1972. A number of different
# time scales were in use before than epoch, and it can be
# quite difficult to compute precise timestamps and time
Index: src/sys/arch/arm/allwinner/awin_reg.h
diff -u src/sys/arch/arm/allwinner/awin_reg.h:1.13 src/sys/arch/arm/allwinner/awin_reg.h:1.14
--- src/sys/arch/arm/allwinner/awin_reg.h:1.13 Thu Mar 13 23:44:31 2014
+++ src/sys/arch/arm/allwinner/awin_reg.h Sun Aug 3 19:14:24 2014
@@ -231,7 +231,7 @@
#define AWIN_DRAM_HPCR_PRIORITY_LEVEL __BIT(2)
#define AWIN_DRAM_HPCR_ACCESS_EN __BIT(0)
-/* DMA controller defintions */
+/* DMA controller definitions */
#define AWIN_DMA_IRQ_EN_REG 0x
#define AWIN_DMA_IRQ_PEND_STA_REG 0x0004
#define AWIN_NDMA_AUTO_GATE_REG 0x0008
Index: src/sys/arch/arm/samsung/exynos_reg.h
diff -u src/sys/arch/arm/samsung/exynos_reg.h:1.6 src/sys/arch/arm/samsung/exynos_reg.h:1.7
--- src/sys/arch/arm/samsung/exynos_reg.h:1.6 Tue Jun 3 15:56:14 2014
+++ src/sys/arch/arm/samsung/exynos_reg.h Sun Aug 3 19:14:24 2014
@@ -142,7 +142,7 @@
#define EXYNOS_GPIO_FUNC_INPUT 0x0
#define EXYNOS_GPIO_FUNC_OUTPUT 0x1
-/* intermediate values are devices, defintions depende
CVS commit: src
Module Name:src Committed By: riz Date: Sun Aug 3 17:11:44 UTC 2014 Modified Files: src: build.sh Log Message: hpcarm wants earmv4 because some models only have v4 CPUs. To generate a diff of this commit: cvs rdiff -u -r1.287 -r1.288 src/build.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/build.sh diff -u src/build.sh:1.287 src/build.sh:1.288 --- src/build.sh:1.287 Sun Aug 3 09:22:29 2014 +++ src/build.sh Sun Aug 3 17:11:44 2014 @@ -1,5 +1,5 @@ #! /usr/bin/env sh -# $NetBSD: build.sh,v 1.287 2014/08/03 09:22:29 apb Exp $ +# $NetBSD: build.sh,v 1.288 2014/08/03 17:11:44 riz Exp $ # # Copyright (c) 2001-2011 The NetBSD Foundation, Inc. # All rights reserved. @@ -643,8 +643,7 @@ MACHINE=ews4800mips MACHINE_ARCH=mipseb MACHINE=hp300 MACHINE_ARCH=m68k MACHINE=hppa MACHINE_ARCH=hppa MACHINE=hpcarm MACHINE_ARCH=arm ALIAS=hpcoarm -MACHINE=hpcarm MACHINE_ARCH=earm ALIAS=hpcearm -MACHINE=hpcarm MACHINE_ARCH=earmv4 ALIAS=hpcearmv4 DEFAULT +MACHINE=hpcarm MACHINE_ARCH=earmv4 ALIAS=hpcearm DEFAULT MACHINE=hpcmips MACHINE_ARCH=mipsel MACHINE=hpcsh MACHINE_ARCH=sh3el MACHINE=i386 MACHINE_ARCH=i386 @@ -1775,7 +1774,7 @@ createmakewrapper() eval cat <
CVS commit: src/sys/arch
Module Name:src Committed By: martin Date: Sun Aug 3 16:16:27 UTC 2014 Added Files: src/sys/arch/acorn32/include: netbsd32_machdep.h src/sys/arch/cats/include: netbsd32_machdep.h src/sys/arch/epoc32/include: netbsd32_machdep.h src/sys/arch/iyonix/include: netbsd32_machdep.h src/sys/arch/netwinder/include: netbsd32_machdep.h src/sys/arch/zaurus/include: netbsd32_machdep.h Log Message: Add a few missing netbsd32_machdep.h files To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/acorn32/include/netbsd32_machdep.h cvs rdiff -u -r0 -r1.1 src/sys/arch/cats/include/netbsd32_machdep.h cvs rdiff -u -r0 -r1.1 src/sys/arch/epoc32/include/netbsd32_machdep.h cvs rdiff -u -r0 -r1.1 src/sys/arch/iyonix/include/netbsd32_machdep.h cvs rdiff -u -r0 -r1.1 src/sys/arch/netwinder/include/netbsd32_machdep.h cvs rdiff -u -r0 -r1.1 src/sys/arch/zaurus/include/netbsd32_machdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/acorn32/include/netbsd32_machdep.h diff -u /dev/null src/sys/arch/acorn32/include/netbsd32_machdep.h:1.1 --- /dev/null Sun Aug 3 16:16:27 2014 +++ src/sys/arch/acorn32/include/netbsd32_machdep.h Sun Aug 3 16:16:27 2014 @@ -0,0 +1,3 @@ +/* $NetBSD: netbsd32_machdep.h,v 1.1 2014/08/03 16:16:27 martin Exp $ */ + +#include Index: src/sys/arch/cats/include/netbsd32_machdep.h diff -u /dev/null src/sys/arch/cats/include/netbsd32_machdep.h:1.1 --- /dev/null Sun Aug 3 16:16:27 2014 +++ src/sys/arch/cats/include/netbsd32_machdep.h Sun Aug 3 16:16:27 2014 @@ -0,0 +1,3 @@ +/* $NetBSD: netbsd32_machdep.h,v 1.1 2014/08/03 16:16:27 martin Exp $ */ + +#include Index: src/sys/arch/epoc32/include/netbsd32_machdep.h diff -u /dev/null src/sys/arch/epoc32/include/netbsd32_machdep.h:1.1 --- /dev/null Sun Aug 3 16:16:27 2014 +++ src/sys/arch/epoc32/include/netbsd32_machdep.h Sun Aug 3 16:16:27 2014 @@ -0,0 +1,3 @@ +/* $NetBSD: netbsd32_machdep.h,v 1.1 2014/08/03 16:16:27 martin Exp $ */ + +#include Index: src/sys/arch/iyonix/include/netbsd32_machdep.h diff -u /dev/null src/sys/arch/iyonix/include/netbsd32_machdep.h:1.1 --- /dev/null Sun Aug 3 16:16:27 2014 +++ src/sys/arch/iyonix/include/netbsd32_machdep.h Sun Aug 3 16:16:27 2014 @@ -0,0 +1,3 @@ +/* $NetBSD: netbsd32_machdep.h,v 1.1 2014/08/03 16:16:27 martin Exp $ */ + +#include Index: src/sys/arch/netwinder/include/netbsd32_machdep.h diff -u /dev/null src/sys/arch/netwinder/include/netbsd32_machdep.h:1.1 --- /dev/null Sun Aug 3 16:16:27 2014 +++ src/sys/arch/netwinder/include/netbsd32_machdep.h Sun Aug 3 16:16:27 2014 @@ -0,0 +1,3 @@ +/* $NetBSD: netbsd32_machdep.h,v 1.1 2014/08/03 16:16:27 martin Exp $ */ + +#include Index: src/sys/arch/zaurus/include/netbsd32_machdep.h diff -u /dev/null src/sys/arch/zaurus/include/netbsd32_machdep.h:1.1 --- /dev/null Sun Aug 3 16:16:27 2014 +++ src/sys/arch/zaurus/include/netbsd32_machdep.h Sun Aug 3 16:16:27 2014 @@ -0,0 +1,3 @@ +/* $NetBSD: netbsd32_machdep.h,v 1.1 2014/08/03 16:16:27 martin Exp $ */ + +#include
CVS commit: src/sys/arch/acorn26/conf
Module Name:src Committed By: martin Date: Sun Aug 3 16:15:46 UTC 2014 Modified Files: src/sys/arch/acorn26/conf: GENERIC Log Message: backout previous, there was no eabi switch for arcon26 To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 src/sys/arch/acorn26/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/acorn26/conf/GENERIC diff -u src/sys/arch/acorn26/conf/GENERIC:1.77 src/sys/arch/acorn26/conf/GENERIC:1.78 --- src/sys/arch/acorn26/conf/GENERIC:1.77 Sun Aug 3 08:53:56 2014 +++ src/sys/arch/acorn26/conf/GENERIC Sun Aug 3 16:15:46 2014 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.77 2014/08/03 08:53:56 martin Exp $ +# $NetBSD: GENERIC,v 1.78 2014/08/03 16:15:46 martin Exp $ # # GENERIC machine description file # @@ -76,7 +76,6 @@ options WAPBL # File system journaling # Executable format options options EXEC_ELF32 options EXEC_SCRIPT -options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries # Networking options options GATEWAY # packet forwarding
CVS commit: src/sys/conf
Module Name:src
Committed By: justin
Date: Sun Aug 3 13:14:59 UTC 2014
Modified Files:
src/sys/conf: newvers.sh
Log Message:
Work around escaping issues with quotes in substitutions, to fix cross builds
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/conf/newvers.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/newvers.sh
diff -u src/sys/conf/newvers.sh:1.60 src/sys/conf/newvers.sh:1.61
--- src/sys/conf/newvers.sh:1.60 Sun Aug 3 09:13:11 2014
+++ src/sys/conf/newvers.sh Sun Aug 3 13:14:59 2014
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: newvers.sh,v 1.60 2014/08/03 09:13:11 apb Exp $
+# $NetBSD: newvers.sh,v 1.61 2014/08/03 13:14:59 justin Exp $
#
# Copyright (c) 1984, 1986, 1990, 1993
# The Regents of the University of California. All rights reserved.
@@ -209,6 +209,9 @@ buildinfo_source="$(printf "%b" "${BUILD
# Increment the serial number in the version file
echo $(expr ${v} + 1) > version
+# work around escaping issues with different shells
+emptyq='""'
+
cat << _EOF > vers.c
/*
* Automatically generated file from $0
@@ -224,7 +227,7 @@ const char ostype[] = "${ost}";
const char osrelease[] = "${osr}";
const char sccs[] = "@(#)" ${fullversion_source};
const char version[] = ${fullversion_source};
-const char buildinfo[] = ${buildinfo_source:-\"\"};
+const char buildinfo[] = ${buildinfo_source:-${emptyq}};
const char kernel_ident[] = "${id}";
const char copyright[] = ${copyright_source};
_EOF
CVS commit: src/sys/sys
Module Name:src Committed By: wiz Date: Sun Aug 3 12:49:32 UTC 2014 Modified Files: src/sys/sys: systm.h Log Message: Fix typo in comment. To generate a diff of this commit: cvs rdiff -u -r1.265 -r1.266 src/sys/sys/systm.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/sys/systm.h diff -u src/sys/sys/systm.h:1.265 src/sys/sys/systm.h:1.266 --- src/sys/sys/systm.h:1.265 Sun Aug 3 09:15:21 2014 +++ src/sys/sys/systm.h Sun Aug 3 12:49:32 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: systm.h,v 1.265 2014/08/03 09:15:21 apb Exp $ */ +/* $NetBSD: systm.h,v 1.266 2014/08/03 12:49:32 wiz Exp $ */ /*- * Copyright (c) 1982, 1988, 1991, 1993 @@ -73,7 +73,7 @@ extern const char osrelease[]; /* short extern const char ostype[]; /* system type */ extern const char kernel_ident[];/* kernel configuration ID */ extern const char version[]; /* system version */ -extern const char buildinfo[]; /* infomation from build environment */ +extern const char buildinfo[]; /* information from build environment */ extern int autonicetime;/* time (in seconds) before autoniceval */ extern int autoniceval; /* proc priority after autonicetime */
CVS commit: src/sys/netinet
Module Name:src
Committed By: rtr
Date: Sun Aug 3 11:44:52 UTC 2014
Modified Files:
src/sys/netinet: raw_ip.c
Log Message:
req cannot be PRU_SENDOOB here as per KASSERT() earlier in the
rip_usrreq() function.
- KASSERT(!control || (req == PRU_SEND || req == PRU_SENDOOB));
+ KASSERT(!control || (req == PRU_SEND));
To generate a diff of this commit:
cvs rdiff -u -r1.140 -r1.141 src/sys/netinet/raw_ip.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/netinet/raw_ip.c
diff -u src/sys/netinet/raw_ip.c:1.140 src/sys/netinet/raw_ip.c:1.141
--- src/sys/netinet/raw_ip.c:1.140 Sat Aug 2 03:55:26 2014
+++ src/sys/netinet/raw_ip.c Sun Aug 3 11:44:52 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: raw_ip.c,v 1.140 2014/08/02 03:55:26 rtr Exp $ */
+/* $NetBSD: raw_ip.c,v 1.141 2014/08/03 11:44:52 rtr Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -65,7 +65,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.140 2014/08/02 03:55:26 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.141 2014/08/03 11:44:52 rtr Exp $");
#include "opt_inet.h"
#include "opt_compat_netbsd.h"
@@ -770,7 +770,7 @@ rip_usrreq(struct socket *so, int req, s
KASSERT(solocked(so));
inp = sotoinpcb(so);
- KASSERT(!control || (req == PRU_SEND || req == PRU_SENDOOB));
+ KASSERT(!control || (req == PRU_SEND));
if (inp == NULL) {
splx(s);
return EINVAL;
CVS commit: src/doc
Module Name:src Committed By: apb Date: Sun Aug 3 09:33:48 UTC 2014 Modified Files: src/doc: CHANGES Log Message: Mention BUILDINFO in doc/CHANGES file To generate a diff of this commit: cvs rdiff -u -r1.1956 -r1.1957 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1956 src/doc/CHANGES:1.1957 --- src/doc/CHANGES:1.1956 Fri Aug 1 14:05:35 2014 +++ src/doc/CHANGES Sun Aug 3 09:33:48 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1956 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1957 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -458,3 +458,6 @@ Changes from NetBSD 6.0 to NetBSD 7.0: arm: Add support for the Kobo touch (i.MX50). [hkenken 20140725] dhcpcd(8): Import dhcpcd-6.4.3 [roy 20140730] timeout(1): Import from FreeBSD [christos 20140801] + build: New BUILDINFO variable may be passed to build.sh, and exposed + in /etc/release, as well as in sysctl kern.buildinfo. + [apb 20140803]
CVS commit: src
Module Name:src Committed By: apb Date: Sun Aug 3 09:28:43 UTC 2014 Modified Files: src: BUILDING Log Message: BUILDINFO part6: regen BUILDING from doc/BUILDING.mdoc To generate a diff of this commit: cvs rdiff -u -r1.107 -r1.108 src/BUILDING Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/BUILDING diff -u src/BUILDING:1.107 src/BUILDING:1.108 --- src/BUILDING:1.107 Sat Jun 14 12:21:41 2014 +++ src/BUILDING Sun Aug 3 09:28:43 2014 @@ -162,6 +162,17 @@ CONFIGURATION Default: Unset. + BUILDINFO This may be a multi-line string containing information about + the build. This will appear in DESTDIR/etc/release, and it + will be stored in the buildinfo variable in any kernels that + are built. When such kernels are booted, the sysctl(7) + kern.buildinfo variable will report this value. The string + may contain backslash escape sequences, such as ``\\'' + (representing a backslash character) and ``\n'' (representing + a newline). + + Default: Unset. + BUILDSEED GCC uses random numbers when compiling C++ code. This variable seeds the gcc random number generator using the -frandom-seed flag with this value. By default, it is set to @@ -1053,4 +1064,4 @@ HISTORY The build.sh based build scheme was introduced for NetBSD 1.6 as USE_NEW_TOOLCHAIN, and re-worked to TOOLCHAIN_MISSING after that. -NetBSD June 14, 2014 NetBSD +NetBSD August 3, 2014 NetBSD
CVS commit: src/doc
Module Name:src Committed By: apb Date: Sun Aug 3 09:25:02 UTC 2014 Modified Files: src/doc: BUILDING.mdoc Log Message: Bump date for previous To generate a diff of this commit: cvs rdiff -u -r1.101 -r1.102 src/doc/BUILDING.mdoc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/BUILDING.mdoc diff -u src/doc/BUILDING.mdoc:1.101 src/doc/BUILDING.mdoc:1.102 --- src/doc/BUILDING.mdoc:1.101 Sun Aug 3 09:24:08 2014 +++ src/doc/BUILDING.mdoc Sun Aug 3 09:25:02 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: BUILDING.mdoc,v 1.101 2014/08/03 09:24:08 apb Exp $ +.\" $NetBSD: BUILDING.mdoc,v 1.102 2014/08/03 09:25:02 apb Exp $ .\" .\" Copyright (c) 2001-2011 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -33,7 +33,7 @@ .\" Toolchain prefix for commands .ds toolprefix nb . -.Dd June 14, 2014 +.Dd August 3, 2014 .Dt BUILDING 8 .Os NetBSD .
CVS commit: src/doc
Module Name:src Committed By: apb Date: Sun Aug 3 09:24:08 UTC 2014 Modified Files: src/doc: BUILDING.mdoc Log Message: BUILDINFO part 5: Document BUILDINFO in doc/BUILDING.mdoc. To generate a diff of this commit: cvs rdiff -u -r1.100 -r1.101 src/doc/BUILDING.mdoc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/BUILDING.mdoc diff -u src/doc/BUILDING.mdoc:1.100 src/doc/BUILDING.mdoc:1.101 --- src/doc/BUILDING.mdoc:1.100 Sat Jun 14 12:20:17 2014 +++ src/doc/BUILDING.mdoc Sun Aug 3 09:24:08 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: BUILDING.mdoc,v 1.100 2014/06/14 12:20:17 apb Exp $ +.\" $NetBSD: BUILDING.mdoc,v 1.101 2014/08/03 09:24:08 apb Exp $ .\" .\" Copyright (c) 2001-2011 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -351,6 +351,25 @@ which can be printed by .Dq Li uname \-v . .DFLTu . +.It Sy BUILDINFO +This may be a multi-line string containing information about the build. +This will appear in +.Sy DESTDIR Ns Pa /etc/release , +and it will be stored in the +.Va buildinfo +variable in any kernels that are built. +When such kernels are booted, the +.Xr sysctl 7 +.Va kern.buildinfo +variable will report this value. +The string may contain backslash escape sequences, such as +.Dq "\e\e" +(representing a backslash character) +and +.Dq "\en" +(representing a newline). +.DFLTu +. .It Sy BUILDSEED GCC uses random numbers when compiling C++ code. This variable seeds the gcc random number generator using
CVS commit: src
Module Name:src
Committed By: apb
Date: Sun Aug 3 09:22:29 UTC 2014
Modified Files:
src: build.sh
Log Message:
BUILDINFO part 4: build.sh
Add BUILDINFO to the list of variables saved in the makewrapper script,
and print any non-blank BUILDINFO lines near the beginning of the output
from build.sh.
Index: build.sh
===
RCS file: /cvsroot/src/build.sh,v
retrieving revision 1.286
diff -d -p -u -r1.286 build.sh
--- build.sh3 Aug 2014 01:03:41 - 1.286
+++ build.sh3 Aug 2014 09:20:46 -
@@ -1299,6 +1299,7 @@ parseoptions()
#
makeenv="${makeenv} TOOLDIR MACHINE MACHINE_ARCH MAKEFLAGS"
[ -z "${BUILDID}" ] || makeenv="${makeenv} BUILDID"
+ [ -z "${BUILDINFO}" ] || makeenv="${makeenv} BUILDINFO"
MAKEFLAGS="-de -m ${TOP}/share/mk ${MAKEFLAGS}"
MAKEFLAGS="${MAKEFLAGS} MKOBJDIRS=${MKOBJDIRS-yes}"
export MAKEFLAGS MACHINE MACHINE_ARCH
@@ -2078,6 +2079,13 @@ main()
if [ -n "${BUILDID}" ]; then
statusmsg2 "BUILDID:" "${BUILDID}"
fi
+ if [ -n "${BUILDINFO}" ]; then
+ printf "%b\n" "${BUILDINFO}" | \
+ while read -r line ; do
+ [ -s "${line}" ] && continue
+ statusmsg2 "BUILDINFO:" "${line}"
+ done
+ fi
rebuildmake
validatemakeparams
To generate a diff of this commit:
cvs rdiff -u -r1.286 -r1.287 src/build.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/build.sh
diff -u src/build.sh:1.286 src/build.sh:1.287
--- src/build.sh:1.286 Sun Aug 3 01:03:41 2014
+++ src/build.sh Sun Aug 3 09:22:29 2014
@@ -1,5 +1,5 @@
#! /usr/bin/env sh
-# $NetBSD: build.sh,v 1.286 2014/08/03 01:03:41 riz Exp $
+# $NetBSD: build.sh,v 1.287 2014/08/03 09:22:29 apb Exp $
#
# Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1299,6 +1299,7 @@ parseoptions()
#
makeenv="${makeenv} TOOLDIR MACHINE MACHINE_ARCH MAKEFLAGS"
[ -z "${BUILDID}" ] || makeenv="${makeenv} BUILDID"
+ [ -z "${BUILDINFO}" ] || makeenv="${makeenv} BUILDINFO"
MAKEFLAGS="-de -m ${TOP}/share/mk ${MAKEFLAGS}"
MAKEFLAGS="${MAKEFLAGS} MKOBJDIRS=${MKOBJDIRS-yes}"
export MAKEFLAGS MACHINE MACHINE_ARCH
@@ -1774,7 +1775,7 @@ createmakewrapper()
eval cat <
CVS commit: src/etc
Module Name:src
Committed By: apb
Date: Sun Aug 3 09:19:34 UTC 2014
Modified Files:
src/etc: Makefile Makefile.params
Log Message:
BUILDINFO part 3: Add BUILDINFO to RELEASEVARS and /etc/release
The BUILDINFO string will appear nearthe top of /etc/release,
indented by 8 spaces and with a blank line above and below it,
but without a heading. The BUILDINFO string is expected to
be self-explanatory.
Also change some other headings near the top of /etc/release.
To generate a diff of this commit:
cvs rdiff -u -r1.415 -r1.416 src/etc/Makefile
cvs rdiff -u -r1.11 -r1.12 src/etc/Makefile.params
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.415 src/etc/Makefile:1.416
--- src/etc/Makefile:1.415 Mon Jun 30 15:34:57 2014
+++ src/etc/Makefile Sun Aug 3 09:19:34 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.415 2014/06/30 15:34:57 martin Exp $
+# $NetBSD: Makefile,v 1.416 2014/08/03 09:19:34 apb Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -193,13 +193,21 @@ etc-release: .EXEC .MAKE
echo ; \
cat ${NETBSDSRCDIR}/sys/conf/copyright; \
echo ; \
- echo "Build settings:"; \
+ echo "Build information:"; \
printf "%20s %s\n" "Build date" "$$(date -u)"; \
printf "%20s %s\n" "Built by" "$${USER-root}@$$(hostname)"; \
if [ -n "${BUILDID}" ]; then \
- printf "%20s %s\n" "Build ID:" "${BUILDID}" ; \
+ printf "%20s %s\n" "Build ID" "${BUILDID}" ; \
+ fi ; \
+ if [ -n "${BUILDINFO}" ]; then \
+ echo ; \
+ info="$$(printf "%b" ${BUILDINFO:Q})" ; \
+ printf "%s\n" "$${info}" \
+ | ${TOOL_SED} -e 's/^//' ; \
fi ; \
echo ; \
+ echo "Build settings:"; \
+ echo ; \
${PRINT_PARAMS} ; \
) >${.OBJDIR}/${.TARGET}
Index: src/etc/Makefile.params
diff -u src/etc/Makefile.params:1.11 src/etc/Makefile.params:1.12
--- src/etc/Makefile.params:1.11 Tue Mar 25 09:52:55 2014
+++ src/etc/Makefile.params Sun Aug 3 09:19:34 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.params,v 1.11 2014/03/25 09:52:55 ozaki-r Exp $
+# $NetBSD: Makefile.params,v 1.12 2014/08/03 09:19:34 apb Exp $
#
# Makefile fragment for printing build parameters.
#
@@ -37,7 +37,7 @@
.include # for some variables
-RELEASEVARS= BSDOBJDIR BSDSRCDIR BUILDID BUILDSEED \
+RELEASEVARS= BSDOBJDIR BSDSRCDIR BUILDID BUILDINFO BUILDSEED \
DESTDIR DISTRIBVER EXTERNAL_TOOLCHAIN HAVE_GCC HAVE_GDB \
HAVE_LLVM HAVE_PCC INSTALLWORLDDIR \
KERNARCHDIR KERNCONFDIR KERNOBJDIR KERNSRCDIR \
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: martin Date: Sun Aug 3 09:18:16 UTC 2014 Modified Files: src/sys/arch/evbarm/conf: HAWK HDL_G HPT5325 IGEPV2 IMX23_OLINUXINO IMX31LITE INTEGRATOR INTEGRATOR_CP IQ31244 IQ80310 IQ80321 IXDP425 IXM1200 KOBO LUBBOCK MARVELL_NAS MINI2440 MMNET_GENERIC MPCSA_GENERIC MV2120 N900 NAPPI NETWALKER NSLU2 ODROID ODROID-U OMAP5EVM OPENBLOCKS_A6 OPENBLOCKS_AX3 OSK5912 OVERO PANDABOARD RPI SHEEVAPLUG SMDK2410 SMDK2800 TEAMASA_NPWR TEAMASA_NPWR_FC TISDP2420 TISDP2430 TS7200 TWINTAIL VIPER ZAO425 Log Message: Add COMPAT_NETBSD32 to more kernels (we have too many) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/HAWK \ src/sys/arch/evbarm/conf/KOBO cvs rdiff -u -r1.39 -r1.40 src/sys/arch/evbarm/conf/HDL_G cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbarm/conf/HPT5325 \ src/sys/arch/evbarm/conf/MARVELL_NAS \ src/sys/arch/evbarm/conf/OPENBLOCKS_A6 cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbarm/conf/IGEPV2 cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/IMX23_OLINUXINO \ src/sys/arch/evbarm/conf/ODROID cvs rdiff -u -r1.25 -r1.26 src/sys/arch/evbarm/conf/IMX31LITE cvs rdiff -u -r1.75 -r1.76 src/sys/arch/evbarm/conf/INTEGRATOR cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/INTEGRATOR_CP cvs rdiff -u -r1.65 -r1.66 src/sys/arch/evbarm/conf/IQ31244 cvs rdiff -u -r1.83 -r1.84 src/sys/arch/evbarm/conf/IQ80310 \ src/sys/arch/evbarm/conf/TEAMASA_NPWR cvs rdiff -u -r1.80 -r1.81 src/sys/arch/evbarm/conf/IQ80321 cvs rdiff -u -r1.45 -r1.46 src/sys/arch/evbarm/conf/IXDP425 \ src/sys/arch/evbarm/conf/RPI cvs rdiff -u -r1.56 -r1.57 src/sys/arch/evbarm/conf/IXM1200 cvs rdiff -u -r1.49 -r1.50 src/sys/arch/evbarm/conf/LUBBOCK cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/conf/MINI2440 \ src/sys/arch/evbarm/conf/PANDABOARD cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/conf/MMNET_GENERIC cvs rdiff -u -r1.40 -r1.41 src/sys/arch/evbarm/conf/MPCSA_GENERIC cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/conf/MV2120 cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/conf/N900 cvs rdiff -u -r1.52 -r1.53 src/sys/arch/evbarm/conf/NAPPI cvs rdiff -u -r1.28 -r1.29 src/sys/arch/evbarm/conf/NETWALKER \ src/sys/arch/evbarm/conf/TISDP2420 src/sys/arch/evbarm/conf/TISDP2430 cvs rdiff -u -r1.34 -r1.35 src/sys/arch/evbarm/conf/NSLU2 cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/conf/ODROID-U \ src/sys/arch/evbarm/conf/OPENBLOCKS_AX3 cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/OMAP5EVM cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbarm/conf/OSK5912 cvs rdiff -u -r1.36 -r1.37 src/sys/arch/evbarm/conf/OVERO cvs rdiff -u -r1.38 -r1.39 src/sys/arch/evbarm/conf/SHEEVAPLUG cvs rdiff -u -r1.54 -r1.55 src/sys/arch/evbarm/conf/SMDK2410 cvs rdiff -u -r1.53 -r1.54 src/sys/arch/evbarm/conf/SMDK2800 \ src/sys/arch/evbarm/conf/ZAO425 cvs rdiff -u -r1.44 -r1.45 src/sys/arch/evbarm/conf/TEAMASA_NPWR_FC cvs rdiff -u -r1.58 -r1.59 src/sys/arch/evbarm/conf/TS7200 cvs rdiff -u -r1.60 -r1.61 src/sys/arch/evbarm/conf/TWINTAIL cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbarm/conf/VIPER 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/evbarm/conf/HAWK diff -u src/sys/arch/evbarm/conf/HAWK:1.2 src/sys/arch/evbarm/conf/HAWK:1.3 --- src/sys/arch/evbarm/conf/HAWK:1.2 Sun Jul 27 03:34:41 2014 +++ src/sys/arch/evbarm/conf/HAWK Sun Aug 3 09:18:16 2014 @@ -1,4 +1,4 @@ -# $NetBSD: HAWK,v 1.2 2014/07/27 03:34:41 dholland Exp $ +# $NetBSD: HAWK,v 1.3 2014/08/03 09:18:16 martin Exp $ # # HAWK -- TI OMAPL138 based Board Kernel # @@ -65,6 +65,7 @@ options NFS_BOOT_RWSIZE=1024 # Compatibility options +options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries #options COMPAT_43 # 4.3BSD compatibility. options COMPAT_40 # NetBSD 4.0 compatibility. options COMPAT_30 # NetBSD 3.0 compatibility. Index: src/sys/arch/evbarm/conf/KOBO diff -u src/sys/arch/evbarm/conf/KOBO:1.2 src/sys/arch/evbarm/conf/KOBO:1.3 --- src/sys/arch/evbarm/conf/KOBO:1.2 Sun Jul 27 03:34:41 2014 +++ src/sys/arch/evbarm/conf/KOBO Sun Aug 3 09:18:16 2014 @@ -1,4 +1,4 @@ -# $NetBSD: KOBO,v 1.2 2014/07/27 03:34:41 dholland Exp $ +# $NetBSD: KOBO,v 1.3 2014/08/03 09:18:16 martin Exp $ # # KOBO -- http://kobo.com # @@ -79,6 +79,7 @@ options INET6 # IPV6 # Compatibility options +options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries #options COMPAT_43 # 4.3BSD compatibility. options COMPAT_60 # NetBSD 6.0 compatibility. #options COMPAT_50 # NetBSD 5.0 compatibility. Index: src/sys/arch/evbarm/conf/HDL_G diff -u src/sys/arch/evbarm/conf/HDL_G:1.39 src/sys/arch/evbarm/conf/HDL_G:1.40 --- src/sys/arch/evbarm/conf/HDL_G:1.39 Sun Jul 27 03:34:41 2014 +++ src/sys/arch/evbarm/conf/HDL_G Sun Aug 3 09:18:16 2014 @@ -1,4 +1,4 @@ -# $NetBSD: HDL_G,v 1.39 2014/07/27 03:34:41 dholland Exp $ +#
CVS commit: src
Module Name:src
Committed By: apb
Date: Sun Aug 3 09:15:21 UTC 2014
Modified Files:
src/share/man/man7: sysctl.7
src/sys/kern: init_sysctl.c
src/sys/sys: systm.h
Log Message:
BUILDINFO part 2: expose sysctl kern.buildinfo
To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/share/man/man7/sysctl.7
cvs rdiff -u -r1.203 -r1.204 src/sys/kern/init_sysctl.c
cvs rdiff -u -r1.264 -r1.265 src/sys/sys/systm.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man7/sysctl.7
diff -u src/share/man/man7/sysctl.7:1.84 src/share/man/man7/sysctl.7:1.85
--- src/share/man/man7/sysctl.7:1.84 Thu Jul 17 13:42:02 2014
+++ src/share/man/man7/sysctl.7 Sun Aug 3 09:15:21 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: sysctl.7,v 1.84 2014/07/17 13:42:02 njoly Exp $
+.\" $NetBSD: sysctl.7,v 1.85 2014/08/03 09:15:21 apb Exp $
.\"
.\" Copyright (c) 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" @(#)sysctl.3 8.4 (Berkeley) 5/9/95
.\"
-.Dd July 17, 2014
+.Dd August 3, 2014
.Dt SYSCTL 7
.Os
.Sh NAME
@@ -280,6 +280,7 @@ privilege may change the value.
.It kern.argmax integer no
.It kern.boothowto integer no
.It kern.boottime struct timeval no
+.It kern.buildinfo string no
.\".It kern.bufq node not applicable
.It kern.ccpu integer no
.It kern.clockrate struct clockinfo no
@@ -398,6 +399,9 @@ A
.Vt struct timeval
structure is returned.
This structure contains the time that the system was booted.
+.It Li kern.buildinfo
+When the kernel is built, the build environment may optionally provide
+arbitrary information to be stored in this variable.
.\" .It Li kern.bufq
.\" XXX: Undocumented.
.It Li kern.ccpu ( KERN_CCPU )
Index: src/sys/kern/init_sysctl.c
diff -u src/sys/kern/init_sysctl.c:1.203 src/sys/kern/init_sysctl.c:1.204
--- src/sys/kern/init_sysctl.c:1.203 Thu May 8 08:21:53 2014
+++ src/sys/kern/init_sysctl.c Sun Aug 3 09:15:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: init_sysctl.c,v 1.203 2014/05/08 08:21:53 hannken Exp $ */
+/* $NetBSD: init_sysctl.c,v 1.204 2014/08/03 09:15:21 apb Exp $ */
/*-
* Copyright (c) 2003, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.203 2014/05/08 08:21:53 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.204 2014/08/03 09:15:21 apb Exp $");
#include "opt_sysv.h"
#include "opt_compat_netbsd.h"
@@ -610,6 +610,19 @@ SYSCTL_SETUP(sysctl_kern_setup, "sysctl
"it doesn't"),
NULL, 1, NULL, 0,
CTL_KERN, CTL_CREATE, CTL_EOL);
+ sysctl_createv(clog, 0, NULL, NULL,
+ CTLFLAG_PERMANENT,
+ CTLTYPE_STRING, "configname",
+ SYSCTL_DESCR("Name of config file"),
+ NULL, 0, __UNCONST(kernel_ident), 0,
+ CTL_KERN, CTL_CREATE, CTL_EOL);
+ sysctl_createv(clog, 0, NULL, NULL,
+ CTLFLAG_PERMANENT,
+ CTLTYPE_STRING, "buildinfo",
+ SYSCTL_DESCR("Information from build environment"),
+ NULL, 0, __UNCONST(buildinfo), 0,
+ CTL_KERN, CTL_CREATE, CTL_EOL);
+
/* kern.posix. */
sysctl_createv(clog, 0, NULL, &rnode,
CTLFLAG_PERMANENT,
@@ -623,12 +636,6 @@ SYSCTL_SETUP(sysctl_kern_setup, "sysctl
SYSCTL_DESCR("Maximal number of semaphores"),
NULL, 0, &ksem_max, 0,
CTL_CREATE, CTL_EOL);
- sysctl_createv(clog, 0, NULL, NULL,
- CTLFLAG_PERMANENT,
- CTLTYPE_STRING, "configname",
- SYSCTL_DESCR("Name of config file"),
- NULL, 0, __UNCONST(kernel_ident), 0,
- CTL_KERN, CTL_CREATE, CTL_EOL);
}
SYSCTL_SETUP(sysctl_hw_setup, "sysctl hw subtree setup")
Index: src/sys/sys/systm.h
diff -u src/sys/sys/systm.h:1.264 src/sys/sys/systm.h:1.265
--- src/sys/sys/systm.h:1.264 Thu Jul 17 14:55:32 2014
+++ src/sys/sys/systm.h Sun Aug 3 09:15:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: systm.h,v 1.264 2014/07/17 14:55:32 riastradh Exp $ */
+/* $NetBSD: systm.h,v 1.265 2014/08/03 09:15:21 apb Exp $ */
/*-
* Copyright (c) 1982, 1988, 1991, 1993
@@ -73,6 +73,7 @@ extern const char osrelease[]; /* short
extern const char ostype[]; /* system type */
extern const char kernel_ident[];/* kernel configuration ID */
extern const char version[]; /* system version */
+extern const char buildinfo[]; /* infomation from build environment */
extern int autonicetime;/* time (in seconds) before autoniceval */
extern int autoniceval; /* proc priority after autonicetime */
CVS commit: src/sys/conf
Module Name:src
Committed By: apb
Date: Sun Aug 3 09:13:11 UTC 2014
Modified Files:
src/sys/conf: newvers.sh
Log Message:
BUILDINFO part 1: newvers.sh
If the BUILDINFO environment variable is set, then interpret it as
a string with embedded C-style escapes and store it in a new
buildinfo variable in the emitted vers.c file.
Also centralise the awk code for converting a multi-line string
to C source code.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/conf/newvers.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/newvers.sh
diff -u src/sys/conf/newvers.sh:1.59 src/sys/conf/newvers.sh:1.60
--- src/sys/conf/newvers.sh:1.59 Sat Jun 14 12:42:41 2014
+++ src/sys/conf/newvers.sh Sun Aug 3 09:13:11 2014
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: newvers.sh,v 1.59 2014/06/14 12:42:41 apb Exp $
+# $NetBSD: newvers.sh,v 1.60 2014/08/03 09:13:11 apb Exp $
#
# Copyright (c) 1984, 1986, 1990, 1993
# The Regents of the University of California. All rights reserved.
@@ -60,6 +60,12 @@
# (If the -i command line option is used, then
# BUILDID is not appended.)
#
+# BUILDINFO A string to be stored in the kernel's buildinfo
+# variable. ${BUILDINFO} may be a multi-line string,
+# and may use C-style backslash escapes.
+# Lines may be separated by either literal newlines
+# or "\n" escape sequences.
+#
# Output files:
#
# vers.cThe "vers.c" file in the current directory is
@@ -96,6 +102,44 @@
# The result is stored in the osrelease variable.
#
+# FUNCTIONS
+
+# source_lines [input] --
+#
+# Convert a multi-line string to a format that's suitable for inclusion in
+# C source code. The result should look like this:
+#
+# "first line\n"
+# "second line\n"
+#
+# with inside the quotes for each line,
+# literal quotation marks around each line,
+# and a literal newline separating one line from the next.
+#
+# Input is from "$1" if that is defined, or from stdin if $1 is not defined.
+#
+source_lines()
+{
+ if [ -n "${1+set}" ]; then
+ printf "%s" "$1"
+ else
+ cat
+ fi \
+ | awk '{
+ # awk does not care about whether or not the last line
+ # of input ends with a newline.
+ # Convert to .
+ gsub("","");
+ # Convert to
+ gsub("\"","\\\"");
+ # Add to the end of each line,
+ # and wrap each line in double quotes.
+ printf("\"%s\\n\"\n", $0);
+ }'
+}
+
+# MAIN PROGRAM
+
if [ ! -e version ]; then
echo 0 > version
fi
@@ -106,7 +150,7 @@ u=${USER-root}
h=$(hostname)
d=$(pwd)
cwd=$(dirname $0)
-copyright=$(awk '{ printf("\"%s\\n\"", $0); }' ${cwd}/copyright)
+copyright="$(cat "${cwd}/copyright")"
while [ $# -gt 0 ]; do
case "$1" in
@@ -155,6 +199,14 @@ else
fullversion="${ost} ${osr} (${id}) #${v}: ${t}\n\t${u}@${h}:${d}\n"
fi
+# Convert multi-line strings to C source code.
+# Also add an extra blank line to copyright.
+#
+copyright_source="$(printf "%s\n\n" "${copyright}" | source_lines)"
+fullversion_source="$(printf "%b" "${fullversion}" | source_lines)"
+buildinfo_source="$(printf "%b" "${BUILDINFO}" | source_lines)"
+
+# Increment the serial number in the version file
echo $(expr ${v} + 1) > version
cat << _EOF > vers.c
@@ -170,12 +222,11 @@ cat << _EOF > vers.c
const char ostype[] = "${ost}";
const char osrelease[] = "${osr}";
-const char sccs[] = "@(#)${fullversion}";
-const char version[] = "${fullversion}";
+const char sccs[] = "@(#)" ${fullversion_source};
+const char version[] = ${fullversion_source};
+const char buildinfo[] = ${buildinfo_source:-\"\"};
const char kernel_ident[] = "${id}";
-const char copyright[] =
-${copyright}
-"\n";
+const char copyright[] = ${copyright_source};
_EOF
[ ! -z "${nflag}" ] && exit 0
CVS commit: src/sys/arch
Module Name:src Committed By: martin Date: Sun Aug 3 08:53:57 UTC 2014 Modified Files: src/sys/arch/acorn26/conf: GENERIC src/sys/arch/acorn32/conf: GENERIC src/sys/arch/cats/conf: GENERIC src/sys/arch/epoc32/conf: GENERIC src/sys/arch/evbarm/conf: ADI_BRH ARMADAXP ARMADILLO210 ARMADILLO9 BCM5301X BCM56340 BEAGLEBOARD BEAGLEBOARDXM BEAGLEBONE CP3100 CUBIEBOARD CUBIETRUCK GEMINI GEMINI_MASTER GEMINI_SLAVE GOLDENGATE GUMSTIX src/sys/arch/hpcarm/conf: IPAQ JORNADA720 JORNADA820 NETBOOKPRO WZERO3 src/sys/arch/iyonix/conf: GENERIC src/sys/arch/netwinder/conf: GENERIC src/sys/arch/shark/conf: GENERIC src/sys/arch/zaurus/conf: GENERIC Log Message: Add COMPAT_NETBSD32, following the switch to eabi by default. To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 src/sys/arch/acorn26/conf/GENERIC cvs rdiff -u -r1.111 -r1.112 src/sys/arch/acorn32/conf/GENERIC cvs rdiff -u -r1.149 -r1.150 src/sys/arch/cats/conf/GENERIC cvs rdiff -u -r1.2 -r1.3 src/sys/arch/epoc32/conf/GENERIC cvs rdiff -u -r1.65 -r1.66 src/sys/arch/evbarm/conf/ADI_BRH cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/conf/ARMADAXP \ src/sys/arch/evbarm/conf/CUBIEBOARD cvs rdiff -u -r1.30 -r1.31 src/sys/arch/evbarm/conf/ARMADILLO210 cvs rdiff -u -r1.44 -r1.45 src/sys/arch/evbarm/conf/ARMADILLO9 cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/conf/BCM5301X cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/BCM56340 cvs rdiff -u -r1.53 -r1.54 src/sys/arch/evbarm/conf/BEAGLEBOARD cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/conf/BEAGLEBOARDXM cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbarm/conf/BEAGLEBONE cvs rdiff -u -r1.38 -r1.39 src/sys/arch/evbarm/conf/CP3100 cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/CUBIETRUCK cvs rdiff -u -r1.27 -r1.28 src/sys/arch/evbarm/conf/GEMINI \ src/sys/arch/evbarm/conf/GEMINI_MASTER \ src/sys/arch/evbarm/conf/GEMINI_SLAVE cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/GOLDENGATE cvs rdiff -u -r1.80 -r1.81 src/sys/arch/evbarm/conf/GUMSTIX cvs rdiff -u -r1.75 -r1.76 src/sys/arch/hpcarm/conf/IPAQ cvs rdiff -u -r1.94 -r1.95 src/sys/arch/hpcarm/conf/JORNADA720 cvs rdiff -u -r1.34 -r1.35 src/sys/arch/hpcarm/conf/JORNADA820 \ src/sys/arch/hpcarm/conf/WZERO3 cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hpcarm/conf/NETBOOKPRO cvs rdiff -u -r1.82 -r1.83 src/sys/arch/iyonix/conf/GENERIC cvs rdiff -u -r1.120 -r1.121 src/sys/arch/netwinder/conf/GENERIC cvs rdiff -u -r1.114 -r1.115 src/sys/arch/shark/conf/GENERIC cvs rdiff -u -r1.56 -r1.57 src/sys/arch/zaurus/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/acorn26/conf/GENERIC diff -u src/sys/arch/acorn26/conf/GENERIC:1.76 src/sys/arch/acorn26/conf/GENERIC:1.77 --- src/sys/arch/acorn26/conf/GENERIC:1.76 Fri Jul 12 14:28:39 2013 +++ src/sys/arch/acorn26/conf/GENERIC Sun Aug 3 08:53:56 2014 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.76 2013/07/12 14:28:39 kiyohara Exp $ +# $NetBSD: GENERIC,v 1.77 2014/08/03 08:53:56 martin Exp $ # # GENERIC machine description file # @@ -76,6 +76,7 @@ options WAPBL # File system journaling # Executable format options options EXEC_ELF32 options EXEC_SCRIPT +options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries # Networking options options GATEWAY # packet forwarding Index: src/sys/arch/acorn32/conf/GENERIC diff -u src/sys/arch/acorn32/conf/GENERIC:1.111 src/sys/arch/acorn32/conf/GENERIC:1.112 --- src/sys/arch/acorn32/conf/GENERIC:1.111 Sun Jun 30 21:38:55 2013 +++ src/sys/arch/acorn32/conf/GENERIC Sun Aug 3 08:53:56 2014 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.111 2013/06/30 21:38:55 rmind Exp $ +# $NetBSD: GENERIC,v 1.112 2014/08/03 08:53:56 martin Exp $ # # GENERIC --- NetBSD/acorn32 complete configuration # @@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.111 $" +#ident "GENERIC-$Revision: 1.112 $" # estimated number of users maxusers 32 @@ -104,6 +104,7 @@ options PPP_FILTER # Active filter supp # Compatibility options +options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries options COMPAT_43 # 4.3BSD compatibility. options COMPAT_60 # NetBSD 6.0 compatibility. options COMPAT_50 # NetBSD 5.0 compatibility. Index: src/sys/arch/cats/conf/GENERIC diff -u src/sys/arch/cats/conf/GENERIC:1.149 src/sys/arch/cats/conf/GENERIC:1.150 --- src/sys/arch/cats/conf/GENERIC:1.149 Sun Jun 30 21:38:56 2013 +++ src/sys/arch/cats/conf/GENERIC Sun Aug 3 08:53:56 2014 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.149 2013/06/30 21:38:56 rmind Exp $ +# $NetBSD: GENERIC,v 1.150 2014/08/03 08:53:56 martin Exp $ # # GENERIC machine description file # @@ -120,6 +120,7 @@ options NFS_BOOT_DHCP # Compatibility options +option
