CVS import: src
Module Name:src Committed By: kardel Date: Mon Jun 10 06:04:35 UTC 2013 Update of /cvsroot/src In directory ivanova.netbsd.org:/tmp/cvs-serv13274 Log Message: Import of proposed patch to OpenBSD for supporting GPIO and status leds on a Soekris net6501 patch posted on 2013-01-14 17:11:00 at http://permalink.gmane.org/gmane.os.openbsd.tech/31317 Status: Vendor Tag: matt_dainty Release Tags: GMANE_20130114171100 N src/sys/dev/isa/soekrisgpio.c N src/share/man/man4/man4.x86/soekrisgpio.4 No conflicts created by this import
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Mon Jun 10 06:41:58 UTC 2013 Modified Files: src/share/man/man9: usbdi.9 Log Message: Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/share/man/man9/usbdi.9 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/man9/usbdi.9 diff -u src/share/man/man9/usbdi.9:1.27 src/share/man/man9/usbdi.9:1.28 --- src/share/man/man9/usbdi.9:1.27 Mon Jun 10 05:11:20 2013 +++ src/share/man/man9/usbdi.9 Mon Jun 10 06:41:58 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: usbdi.9,v 1.27 2013/06/10 05:11:20 mrg Exp $ +.\ $NetBSD: usbdi.9,v 1.28 2013/06/10 06:41:58 wiz Exp $ .\ .\ Copyright (c) 2012 Matthew R. Green .\ All rights reserved. @@ -54,7 +54,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd January 22, 2013 +.Dd June 10, 2013 .Dt USBDI 9 .Os .Sh NAME
CVS commit: src
Module Name:src Committed By: kardel Date: Mon Jun 10 07:14:02 UTC 2013 Modified Files: src/distrib/sets/lists/man: mi src/doc: CHANGES src/share/man/man4: gpio.4 isa.4 src/share/man/man4/man4.x86: Makefile soekrisgpio.4 src/sys/arch/amd64/conf: GENERIC src/sys/arch/i386/conf: ALL GENERIC src/sys/dev/isa: files.isa soekrisgpio.c Log Message: adjust soekrisgpio driver to NetBSD To generate a diff of this commit: cvs rdiff -u -r1.1429 -r1.1430 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.1826 -r1.1827 src/doc/CHANGES cvs rdiff -u -r1.24 -r1.25 src/share/man/man4/gpio.4 cvs rdiff -u -r1.42 -r1.43 src/share/man/man4/isa.4 cvs rdiff -u -r1.13 -r1.14 src/share/man/man4/man4.x86/Makefile cvs rdiff -u -r1.1.1.1 -r1.2 src/share/man/man4/man4.x86/soekrisgpio.4 cvs rdiff -u -r1.377 -r1.378 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.359 -r1.360 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1094 -r1.1095 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.162 -r1.163 src/sys/dev/isa/files.isa cvs rdiff -u -r1.1.1.1 -r1.2 src/sys/dev/isa/soekrisgpio.c 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/man/mi diff -u src/distrib/sets/lists/man/mi:1.1429 src/distrib/sets/lists/man/mi:1.1430 --- src/distrib/sets/lists/man/mi:1.1429 Sun Jun 9 18:40:50 2013 +++ src/distrib/sets/lists/man/mi Mon Jun 10 07:14:01 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1429 2013/06/09 18:40:50 christos Exp $ +# $NetBSD: mi,v 1.1430 2013/06/10 07:14:01 kardel Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1910,6 +1910,7 @@ ./usr/share/man/cat4/x86/mem.0 man-sys-catman .cat ./usr/share/man/cat4/x86/odcm.0 man-sys-catman .cat ./usr/share/man/cat4/x86/powernow.0 man-sys-catman .cat +./usr/share/man/cat4/x86/soekrisgpio.0 man-sys-catman .cat ./usr/share/man/cat4/x86/tprof_pmi.0 man-sys-catman .cat ./usr/share/man/cat4/x86/tprof_amdpmi.0 man-sys-catman .cat ./usr/share/man/cat4/x86/vmt.0 man-sys-catman .cat @@ -4795,6 +4796,7 @@ ./usr/share/man/html4/x86/mem.html man-sys-htmlman html ./usr/share/man/html4/x86/odcm.html man-sys-htmlman html ./usr/share/man/html4/x86/powernow.html man-sys-htmlman html +./usr/share/man/html4/x86/soekrisgpio.html man-sys-htmlman html ./usr/share/man/html4/x86/tprof_amdpmi.html man-sys-htmlman html ./usr/share/man/html4/x86/tprof_pmi.html man-sys-htmlman html ./usr/share/man/html4/x86/vmt.html man-sys-htmlman html @@ -7610,6 +7612,7 @@ ./usr/share/man/man4/x86/mem.4 man-sys-man .man ./usr/share/man/man4/x86/odcm.4 man-sys-man .man ./usr/share/man/man4/x86/powernow.4 man-sys-man .man +./usr/share/man/man4/x86/soekrisgpio.4 man-sys-man .man ./usr/share/man/man4/x86/tprof_amdpmi.4 man-sys-man .man ./usr/share/man/man4/x86/tprof_pmi.4 man-sys-man .man ./usr/share/man/man4/x86/vmt.4 man-sys-man .man Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1826 src/doc/CHANGES:1.1827 --- src/doc/CHANGES:1.1826 Thu Jun 6 06:48:25 2013 +++ src/doc/CHANGES Mon Jun 10 07:14:01 2013 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1826 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1827 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -247,3 +247,5 @@ Changes from NetBSD 6.0 to NetBSD 7.0: wm(4): Add support for I217 and I218 [msaitoh 20130602] X11: Updated all Xorg packages that could be, for Xorg SA 2003-05-23, and general. [mrg 20130605] + kernel: Add driver soekrisgpio for Soekris net6501 + Ported by kardel@ from a patch for OpenBSD. [kardel 20130609] Index: src/share/man/man4/gpio.4 diff -u src/share/man/man4/gpio.4:1.24 src/share/man/man4/gpio.4:1.25 --- src/share/man/man4/gpio.4:1.24 Sun Dec 16 13:13:35 2012 +++ src/share/man/man4/gpio.4 Mon Jun 10 07:14:01 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: gpio.4,v 1.24 2012/12/16 13:13:35 mbalmer Exp $ +.\ $NetBSD: gpio.4,v 1.25 2013/06/10 07:14:01 kardel Exp $ .\ $OpenBSD: gpio.4,v 1.5 2004/11/23 09:39:29 reyk Exp $ .\ .\ Copyright (c) 2004 Alexander Yurchenko gra...@openbsd.org @@ -29,6 +29,7 @@ .Cd gpio* at gscpcib? .Cd gpio* at ichlpcib? .Cd gpio* at nsclpcsio? +.Cd gpio* at soekrisgpio? .Cd gpio* at ppbus? .Cd gpio* at ptcd? .Pp Index: src/share/man/man4/isa.4 diff -u src/share/man/man4/isa.4:1.42 src/share/man/man4/isa.4:1.43 --- src/share/man/man4/isa.4:1.42 Sun Feb 21 09:02:19 2010 +++ src/share/man/man4/isa.4 Mon Jun 10 07:14:01 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: isa.4,v 1.42 2010/02/21 09:02:19 wiz Exp $ +.\ $NetBSD: isa.4,v 1.43 2013/06/10 07:14:01 kardel Exp $ .\ .\ Copyright (c) 1997 Jason R. Thorpe. All rights reserved. .\ Copyright (c) 1997 Jonathan Stone @@ -271,6 +271,8 @@ AIMS Lab Radiotrack FM radio. AIMS Lab Radiotrack II FM radio. .It sf2r SoundForte RadioLink SF16-FMR2 FM radio. +.It
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Mon Jun 10 08:32:04 UTC 2013 Modified Files: src/share/man/man4: gpio.4 isa.4 Log Message: Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/share/man/man4/gpio.4 cvs rdiff -u -r1.43 -r1.44 src/share/man/man4/isa.4 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/man4/gpio.4 diff -u src/share/man/man4/gpio.4:1.25 src/share/man/man4/gpio.4:1.26 --- src/share/man/man4/gpio.4:1.25 Mon Jun 10 07:14:01 2013 +++ src/share/man/man4/gpio.4 Mon Jun 10 08:32:04 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: gpio.4,v 1.25 2013/06/10 07:14:01 kardel Exp $ +.\ $NetBSD: gpio.4,v 1.26 2013/06/10 08:32:04 wiz Exp $ .\ $OpenBSD: gpio.4,v 1.5 2004/11/23 09:39:29 reyk Exp $ .\ .\ Copyright (c) 2004 Alexander Yurchenko gra...@openbsd.org @@ -15,7 +15,7 @@ .\ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\ -.Dd December 16, 2012 +.Dd June 10, 2013 .Dt GPIO 4 .Os .Sh NAME Index: src/share/man/man4/isa.4 diff -u src/share/man/man4/isa.4:1.43 src/share/man/man4/isa.4:1.44 --- src/share/man/man4/isa.4:1.43 Mon Jun 10 07:14:01 2013 +++ src/share/man/man4/isa.4 Mon Jun 10 08:32:04 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: isa.4,v 1.43 2013/06/10 07:14:01 kardel Exp $ +.\ $NetBSD: isa.4,v 1.44 2013/06/10 08:32:04 wiz Exp $ .\ .\ Copyright (c) 1997 Jason R. Thorpe. All rights reserved. .\ Copyright (c) 1997 Jonathan Stone @@ -29,7 +29,7 @@ .\ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ -.Dd February 21, 2010 +.Dd June 10, 2013 .Dt ISA 4 .Os .Sh NAME
CVS commit: src/share/man/man4/man4.x86
Module Name:src Committed By: wiz Date: Mon Jun 10 08:33:42 UTC 2013 Modified Files: src/share/man/man4/man4.x86: soekrisgpio.4 Log Message: Fix date, sort SEE ALSO, more and better macro use. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/man4.x86/soekrisgpio.4 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/man4/man4.x86/soekrisgpio.4 diff -u src/share/man/man4/man4.x86/soekrisgpio.4:1.2 src/share/man/man4/man4.x86/soekrisgpio.4:1.3 --- src/share/man/man4/man4.x86/soekrisgpio.4:1.2 Mon Jun 10 07:14:01 2013 +++ src/share/man/man4/man4.x86/soekrisgpio.4 Mon Jun 10 08:33:41 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: soekrisgpio.4,v 1.2 2013/06/10 07:14:01 kardel Exp $ +.\ $NetBSD: soekrisgpio.4,v 1.3 2013/06/10 08:33:41 wiz Exp $ .\ from OpenBSD .\ .\ Copyright (c) 2013 Matt Dainty matt at bodgit-n-scarper.com @@ -15,7 +15,7 @@ .\ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\ -.Dd $Mdocdate$ +.Dd June 10, 2013 .Dt SOEKRIS 4 x86 .Os .Sh NAME @@ -39,25 +39,26 @@ to the error and ready LEDs respectively Both may be used with .Xr gpioctl 8 . .Sh SEE ALSO +.Xr gpio 4 , .Xr intro 4 , .Xr isa 4 , -.Xr gpio 4 , .Xr gpioctl 8 .Sh HISTORY The .Nm driver first appeared in -.Nx -7.0 . +.Nx 7.0 . .Sh AUTHORS The .Nm driver was written by .An Matt Dainty Aq matt@... -and imported from a patch for OpenBSD to +and imported from a patch for +.Ox +to .Nx by .An Frank Kardel Aq kar...@netbsd.org . .Sh BUGS If the Xilinx FPGA is programmed with a different bitstream, the driver will -likely not function. \ No newline at end of file +likely not function.
CVS commit: src/sys/ufs/lfs
Module Name:src Committed By: hannken Date: Mon Jun 10 09:25:05 UTC 2013 Modified Files: src/sys/ufs/lfs: lfs_vfsops.c Log Message: Make DEBUG kernel compile: di_u.inumber - di_inumber To generate a diff of this commit: cvs rdiff -u -r1.304 -r1.305 src/sys/ufs/lfs/lfs_vfsops.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/lfs/lfs_vfsops.c diff -u src/sys/ufs/lfs/lfs_vfsops.c:1.304 src/sys/ufs/lfs/lfs_vfsops.c:1.305 --- src/sys/ufs/lfs/lfs_vfsops.c:1.304 Sat Jun 8 02:14:46 2013 +++ src/sys/ufs/lfs/lfs_vfsops.c Mon Jun 10 09:25:05 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: lfs_vfsops.c,v 1.304 2013/06/08 02:14:46 dholland Exp $ */ +/* $NetBSD: lfs_vfsops.c,v 1.305 2013/06/10 09:25:05 hannken Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2002, 2003, 2007, 2007 @@ -61,7 +61,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: lfs_vfsops.c,v 1.304 2013/06/08 02:14:46 dholland Exp $); +__KERNEL_RCSID(0, $NetBSD: lfs_vfsops.c,v 1.305 2013/06/10 09:25:05 hannken Exp $); #if defined(_KERNEL_OPT) #include opt_lfs.h @@ -1471,8 +1471,8 @@ retry: (*bpp)-b_blkno); dp = (struct ulfs1_dinode *)(*bpp)-b_data; for (i = 0; i INOPB(fs); i++) - if (dp[i].di_u.inumber) -printf(%d , dp[i].di_u.inumber); + if (dp[i].di_inumber) +printf(%d , dp[i].di_inumber); printf(\n); } }
CVS commit: src/sys/arch/sparc/stand/bootblk
Module Name:src Committed By: hannken Date: Mon Jun 10 10:26:22 UTC 2013 Modified Files: src/sys/arch/sparc/stand/bootblk: genfth.cf genlfs.cf Log Message: Move member di_inumber from ufs1_dinode to ulfs1_dinode. No functional change intended. Tested on sparc64. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sparc/stand/bootblk/genfth.cf cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sparc/stand/bootblk/genlfs.cf 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/sparc/stand/bootblk/genfth.cf diff -u src/sys/arch/sparc/stand/bootblk/genfth.cf:1.8 src/sys/arch/sparc/stand/bootblk/genfth.cf:1.9 --- src/sys/arch/sparc/stand/bootblk/genfth.cf:1.8 Tue Jan 22 09:39:14 2013 +++ src/sys/arch/sparc/stand/bootblk/genfth.cf Mon Jun 10 10:26:22 2013 @@ -1,4 +1,4 @@ -# $NetBSD: genfth.cf,v 1.8 2013/01/22 09:39:14 dholland Exp $ +# $NetBSD: genfth.cf,v 1.9 2013/06/10 10:26:22 hannken Exp $ # # Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -136,7 +136,6 @@ member di1_size di_size member di1_mode di_mode member di1_db di_db member di1_ib di_ib -member di_inumber di_inumber # # ufs2 dinode Index: src/sys/arch/sparc/stand/bootblk/genlfs.cf diff -u src/sys/arch/sparc/stand/bootblk/genlfs.cf:1.1 src/sys/arch/sparc/stand/bootblk/genlfs.cf:1.2 --- src/sys/arch/sparc/stand/bootblk/genlfs.cf:1.1 Sat Feb 13 23:38:17 2010 +++ src/sys/arch/sparc/stand/bootblk/genlfs.cf Mon Jun 10 10:26:22 2013 @@ -1,4 +1,4 @@ -# $NetBSD: genlfs.cf,v 1.1 2010/02/13 23:38:17 eeh Exp $ +# $NetBSD: genlfs.cf,v 1.2 2013/06/10 10:26:22 hannken Exp $ # Copyright (c) 2010 Eduardo Horvath. # All rights reserved. @@ -70,8 +70,10 @@ member if2_version if_version member if2_daddr if_daddr # -# the dinode is the same as ffs v1 +# LFS v1 dinode # +struct ulfs1_dinode +member di_inumber di_inumber define lfs_magic_value LFS_MAGIC define lfs_unused_daddr LFS_UNUSED_DADDR
CVS commit: src/sys/rump/librump/rumpvfs
Module Name:src
Committed By: pooka
Date: Mon Jun 10 14:15:03 UTC 2013
Modified Files:
src/sys/rump/librump/rumpvfs: rumpfs.c
Log Message:
Create inodes with the specified mode instead of hardcoding to 0755.
To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 src/sys/rump/librump/rumpvfs/rumpfs.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/librump/rumpvfs/rumpfs.c
diff -u src/sys/rump/librump/rumpvfs/rumpfs.c:1.114 src/sys/rump/librump/rumpvfs/rumpfs.c:1.115
--- src/sys/rump/librump/rumpvfs/rumpfs.c:1.114 Tue Apr 30 00:03:54 2013
+++ src/sys/rump/librump/rumpvfs/rumpfs.c Mon Jun 10 14:15:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpfs.c,v 1.114 2013/04/30 00:03:54 pooka Exp $ */
+/* $NetBSD: rumpfs.c,v 1.115 2013/06/10 14:15:03 pooka Exp $ */
/*
* Copyright (c) 2009, 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rumpfs.c,v 1.114 2013/04/30 00:03:54 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rumpfs.c,v 1.115 2013/06/10 14:15:03 pooka Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -218,8 +218,9 @@ struct rumpfs_mount {
static int lastino = 2;
static kmutex_t reclock;
+#define RUMPFS_DEFAULTMODE 0755
static void freedir(struct rumpfs_node *, struct componentname *);
-static struct rumpfs_node *makeprivate(enum vtype, dev_t, off_t, bool);
+static struct rumpfs_node *makeprivate(enum vtype, mode_t, dev_t, off_t, bool);
/*
* Extra Terrestrial stuff. We map a given key (pathname) to a file on
@@ -373,7 +374,8 @@ doregister(const char *key, const char *
et = kmem_alloc(sizeof(*et), KM_SLEEP);
strcpy(et-et_key, key);
et-et_keylen = strlen(et-et_key);
- et-et_rn = rn = makeprivate(ettype_to_vtype(ftype), rdev, size, true);
+ et-et_rn = rn = makeprivate(ettype_to_vtype(ftype), RUMPFS_DEFAULTMODE,
+ rdev, size, true);
et-et_removing = false;
et-et_blkmin = dmin;
@@ -510,12 +512,13 @@ rump_etfs_remove(const char *key)
*/
static struct rumpfs_node *
-makeprivate(enum vtype vt, dev_t rdev, off_t size, bool et)
+makeprivate(enum vtype vt, mode_t mode, dev_t rdev, off_t size, bool et)
{
struct rumpfs_node *rn;
struct vattr *va;
struct timespec ts;
+ KASSERT((mode ~ALLPERMS) == 0);
rn = kmem_zalloc(sizeof(*rn), KM_SLEEP);
switch (vt) {
@@ -536,7 +539,7 @@ makeprivate(enum vtype vt, dev_t rdev, o
va = rn-rn_va;
va-va_type = vt;
- va-va_mode = 0755;
+ va-va_mode = mode;
if (vt == VDIR)
va-va_nlink = 2;
else
@@ -742,7 +745,8 @@ rump_vop_lookup(void *v)
return ENOENT;
}
- rn = makeprivate(hft_to_vtype(hft), NODEV, fsize, true);
+ rn = makeprivate(hft_to_vtype(hft), RUMPFS_DEFAULTMODE,
+ NODEV, fsize, true);
rn-rn_flags |= RUMPNODE_CANRECLAIM;
if (rnd-rn_flags RUMPNODE_DIR_ETSUBS) {
rn-rn_flags |= RUMPNODE_DIR_ET | RUMPNODE_DIR_ETSUBS;
@@ -997,10 +1001,11 @@ rump_vop_mkdir(void *v)
struct vnode *dvp = ap-a_dvp;
struct vnode **vpp = ap-a_vpp;
struct componentname *cnp = ap-a_cnp;
+ struct vattr *va = ap-a_vap;
struct rumpfs_node *rnd = dvp-v_data, *rn;
int rv = 0;
- rn = makeprivate(VDIR, NODEV, DEV_BSIZE, false);
+ rn = makeprivate(VDIR, va-va_mode ALLPERMS, NODEV, DEV_BSIZE, false);
if ((cnp-cn_flags ISWHITEOUT) != 0)
rn-rn_va.va_flags |= UF_OPAQUE;
rn-rn_parent = rnd;
@@ -1102,7 +1107,8 @@ rump_vop_mknod(void *v)
struct rumpfs_node *rnd = dvp-v_data, *rn;
int rv;
- rn = makeprivate(va-va_type, va-va_rdev, DEV_BSIZE, false);
+ rn = makeprivate(va-va_type, va-va_mode ALLPERMS, va-va_rdev,
+ DEV_BSIZE, false);
if ((cnp-cn_flags ISWHITEOUT) != 0)
rn-rn_va.va_flags |= UF_OPAQUE;
rv = makevnode(dvp-v_mount, rn, vpp);
@@ -1134,7 +1140,8 @@ rump_vop_create(void *v)
int rv;
newsize = va-va_type == VSOCK ? DEV_BSIZE : 0;
- rn = makeprivate(va-va_type, NODEV, newsize, false);
+ rn = makeprivate(va-va_type, va-va_mode ALLPERMS, NODEV,
+ newsize, false);
if ((cnp-cn_flags ISWHITEOUT) != 0)
rn-rn_va.va_flags |= UF_OPAQUE;
rv = makevnode(dvp-v_mount, rn, vpp);
@@ -1161,6 +1168,7 @@ rump_vop_symlink(void *v)
struct vnode *dvp = ap-a_dvp;
struct vnode **vpp = ap-a_vpp;
struct componentname *cnp = ap-a_cnp;
+ struct vattr *va = ap-a_vap;
struct rumpfs_node *rnd = dvp-v_data, *rn;
const char *target = ap-a_target;
size_t linklen;
@@ -1168,7 +1176,7 @@ rump_vop_symlink(void *v)
linklen = strlen(target);
KASSERT(linklen MAXPATHLEN);
- rn = makeprivate(VLNK, NODEV, linklen, false);
+ rn = makeprivate(VLNK, va-va_mode ALLPERMS, NODEV, linklen, false);
if ((cnp-cn_flags ISWHITEOUT) != 0)
rn-rn_va.va_flags |= UF_OPAQUE;
rv = makevnode(dvp-v_mount, rn, vpp);
@@ -1748,7 +1756,7 @@ rumpfs_mountfs(struct mount *mp)
rfsmp = kmem_alloc(sizeof(*rfsmp), KM_SLEEP);
- rn = makeprivate(VDIR, NODEV, DEV_BSIZE, false);
+ rn = makeprivate(VDIR,
CVS commit: src/sys/kern
Module Name:src
Committed By: pooka
Date: Mon Jun 10 14:53:52 UTC 2013
Modified Files:
src/sys/kern: kern_proc.c
Log Message:
g/c unused static variable
To generate a diff of this commit:
cvs rdiff -u -r1.186 -r1.187 src/sys/kern/kern_proc.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/kern/kern_proc.c
diff -u src/sys/kern/kern_proc.c:1.186 src/sys/kern/kern_proc.c:1.187
--- src/sys/kern/kern_proc.c:1.186 Sat Jun 9 02:31:14 2012
+++ src/sys/kern/kern_proc.c Mon Jun 10 14:53:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_proc.c,v 1.186 2012/06/09 02:31:14 christos Exp $ */
+/* $NetBSD: kern_proc.c,v 1.187 2013/06/10 14:53:52 pooka Exp $ */
/*-
* Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_proc.c,v 1.186 2012/06/09 02:31:14 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_proc.c,v 1.187 2013/06/10 14:53:52 pooka Exp $);
#ifdef _KERNEL_OPT
#include opt_kstack.h
@@ -172,7 +172,7 @@ struct pgrp pgrp0 = {
};
filedesc_t filedesc0;
struct cwdinfo cwdi0 = {
- .cwdi_cmask = CMASK, /* see cmask below */
+ .cwdi_cmask = CMASK,
.cwdi_refcnt = 1,
};
struct plimit limit0;
@@ -206,7 +206,6 @@ kauth_cred_t cred0;
static const int nofile = NOFILE;
static const int maxuprc = MAXUPRC;
-static const int cmask = CMASK;
static int sysctl_doeproc(SYSCTLFN_PROTO);
static int sysctl_kern_proc_args(SYSCTLFN_PROTO);
CVS commit: src/usr.bin/make
Module Name:src
Committed By: christos
Date: Mon Jun 10 16:46:19 UTC 2013
Modified Files:
src/usr.bin/make: main.c var.c
Log Message:
1. Don't export .MAKE.LEVEL, because this is an illegal variable name for
some shells; export MAKELEVEL like gmake(1) does.
2. It is absurd for the environment variable to be one greater than the
make variable!?!?! To wit...
printf 'all:\n\t@echo ${.MAKE.LEVEL}; printenv .MAKE.LEVEL' | make -f -
To generate a diff of this commit:
cvs rdiff -u -r1.210 -r1.211 src/usr.bin/make/main.c
cvs rdiff -u -r1.175 -r1.176 src/usr.bin/make/var.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.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.210 src/usr.bin/make/main.c:1.211
--- src/usr.bin/make/main.c:1.210 Sat Mar 23 01:31:29 2013
+++ src/usr.bin/make/main.c Mon Jun 10 12:46:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.210 2013/03/23 05:31:29 sjg Exp $ */
+/* $NetBSD: main.c,v 1.211 2013/06/10 16:46:19 christos Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: main.c,v 1.210 2013/03/23 05:31:29 sjg Exp $;
+static char rcsid[] = $NetBSD: main.c,v 1.211 2013/06/10 16:46:19 christos Exp $;
#else
#include sys/cdefs.h
#ifndef lint
@@ -81,7 +81,7 @@ __COPYRIGHT(@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = @(#)main.c 8.3 (Berkeley) 3/19/94;
#else
-__RCSID($NetBSD: main.c,v 1.210 2013/03/23 05:31:29 sjg Exp $);
+__RCSID($NetBSD: main.c,v 1.211 2013/06/10 16:46:19 christos Exp $);
#endif
#endif /* not lint */
#endif
@@ -937,13 +937,11 @@ main(int argc, char **argv)
* Set some other useful macros
*/
{
- char tmp[64];
- const char *ep;
+ char tmp[64], *ep;
- if (!(ep = getenv(MAKE_LEVEL))) {
- ep = 0;
- }
- Var_Set(MAKE_LEVEL, ep, VAR_GLOBAL, 0);
+ snprintf(tmp, sizeof(tmp), %d,
+ (ep = getenv(MAKELEVEL)) ? atoi(ep) + 1 : 0);
+ Var_Set(MAKELEVEL, tmp, VAR_GLOBAL, 0);
snprintf(tmp, sizeof(tmp), %u, myPid);
Var_Set(.MAKE.PID, tmp, VAR_GLOBAL, 0);
snprintf(tmp, sizeof(tmp), %u, getppid());
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.175 src/usr.bin/make/var.c:1.176
--- src/usr.bin/make/var.c:1.175 Tue May 28 20:23:31 2013
+++ src/usr.bin/make/var.c Mon Jun 10 12:46:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.175 2013/05/29 00:23:31 sjg Exp $ */
+/* $NetBSD: var.c,v 1.176 2013/06/10 16:46:19 christos Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: var.c,v 1.175 2013/05/29 00:23:31 sjg Exp $;
+static char rcsid[] = $NetBSD: var.c,v 1.176 2013/06/10 16:46:19 christos Exp $;
#else
#include sys/cdefs.h
#ifndef lint
#if 0
static char sccsid[] = @(#)var.c 8.3 (Berkeley) 3/19/94;
#else
-__RCSID($NetBSD: var.c,v 1.175 2013/05/29 00:23:31 sjg Exp $);
+__RCSID($NetBSD: var.c,v 1.176 2013/06/10 16:46:19 christos Exp $);
#endif
#endif /* not lint */
#endif
@@ -778,7 +778,7 @@ Var_UnExport(char *str)
if (unexport_env) {
char **newenv;
- cp = getenv(MAKE_LEVEL); /* we should preserve this */
+ cp = getenv(MAKELEVEL); /* we should preserve this */
if (environ == savedEnv) {
/* we have been here before! */
newenv = bmake_realloc(environ, 2 * sizeof(char *));
@@ -795,7 +795,7 @@ Var_UnExport(char *str)
environ = savedEnv = newenv;
newenv[0] = NULL;
newenv[1] = NULL;
- setenv(MAKE_LEVEL, cp, 1);
+ setenv(MAKELEVEL, cp, 1);
} else {
for (; *str != '\n' isspace((unsigned char) *str); str++)
continue;
@@ -960,14 +960,8 @@ Var_Set(const char *name, const char *va
* We allow the makefiles to update .MAKE.LEVEL and ensure
* children see a correctly incremented value.
*/
-if (ctxt == VAR_GLOBAL strcmp(MAKE_LEVEL, name) == 0) {
- char tmp[64];
- int level;
-
- level = atoi(val);
- snprintf(tmp, sizeof(tmp), %u, level + 1);
- setenv(MAKE_LEVEL, tmp, 1);
-}
+if (ctxt == VAR_GLOBAL strcmp(MAKELEVEL, name) == 0)
+ setenv(MAKELEVEL, val, 1);
out:
CVS commit: src/external/mit/xorg/lib/freetype/freetype
Module Name:src
Committed By: mrg
Date: Mon Jun 10 17:37:22 UTC 2013
Modified Files:
src/external/mit/xorg/lib/freetype/freetype: Makefile
Log Message:
revert part of the previous; it ends up putting this Makefile into
freetype-config due to the use of ${.ALLSRC}.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/lib/freetype/freetype/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/lib/freetype/freetype/Makefile
diff -u src/external/mit/xorg/lib/freetype/freetype/Makefile:1.14 src/external/mit/xorg/lib/freetype/freetype/Makefile:1.15
--- src/external/mit/xorg/lib/freetype/freetype/Makefile:1.14 Sat Jun 8 00:37:33 2013
+++ src/external/mit/xorg/lib/freetype/freetype/Makefile Mon Jun 10 17:37:22 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2013/06/08 00:37:33 mrg Exp $
+# $NetBSD: Makefile,v 1.15 2013/06/10 17:37:22 mrg Exp $
.include bsd.own.mk
@@ -39,7 +39,7 @@ CONFIG_SUBST= ${TOOL_SED} \
-e 's,@LIBBZ2@,-lbz2,'
.PATH: ${X11SRCDIR.freetype}/builds/unix
-freetype-config: freetype-config.in Makefile
+freetype-config: freetype-config.in
${_MKTARGET_CREATE}
${CONFIG_SUBST} ${.ALLSRC} ${.TARGET}
CVS commit: src/usr.bin/crunch/crunchgen
Module Name:src
Committed By: joerg
Date: Mon Jun 10 18:27:30 UTC 2013
Modified Files:
src/usr.bin/crunch/crunchgen: crunchgen.c
Log Message:
Strip .eh_frame and .eh_frame_hdr from crunched binaries.
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/usr.bin/crunch/crunchgen/crunchgen.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.bin/crunch/crunchgen/crunchgen.c
diff -u src/usr.bin/crunch/crunchgen/crunchgen.c:1.80 src/usr.bin/crunch/crunchgen/crunchgen.c:1.81
--- src/usr.bin/crunch/crunchgen/crunchgen.c:1.80 Tue Aug 30 23:10:45 2011
+++ src/usr.bin/crunch/crunchgen/crunchgen.c Mon Jun 10 18:27:30 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: crunchgen.c,v 1.80 2011/08/30 23:10:45 joerg Exp $ */
+/* $NetBSD: crunchgen.c,v 1.81 2013/06/10 18:27:30 joerg Exp $ */
/*
* Copyright (c) 1994 University of Maryland
* All Rights Reserved.
@@ -38,7 +38,7 @@
#include sys/cdefs.h
#if !defined(lint)
-__RCSID($NetBSD: crunchgen.c,v 1.80 2011/08/30 23:10:45 joerg Exp $);
+__RCSID($NetBSD: crunchgen.c,v 1.81 2013/06/10 18:27:30 joerg Exp $);
#endif
#include stdlib.h
@@ -957,7 +957,7 @@ top_makefile_rules(FILE *outmk)
fprintf(outmk, \t@[ -f ${PROG}.unstripped -a ! ${PROG} -nt ${PROG}.unstripped ] || { \\\n);
fprintf(outmk, \t\t${_MKSHMSG:Uecho} \ strip \ ${PROG}; \\\n);
fprintf(outmk, \t\tcp ${PROG} ${PROG}.unstripped \\\n);
-fprintf(outmk, \t\t${OBJCOPY} -S -R .note -R .ident -R .comment -R .copyright ${PROG} \\\n);
+fprintf(outmk, \t\t${OBJCOPY} -S -R .eh_frame -R .eh_frame_hdr -R .note -R .ident -R .comment -R .copyright ${PROG} \\\n);
fprintf(outmk, \t\ttouch ${PROG}.unstripped; \\\n);
fprintf(outmk, \t}\n);
fprintf(outmk, objs: $(SUBMAKE_TARGETS)\n);
CVS commit: src/usr.bin/make
Module Name:src
Committed By: joerg
Date: Mon Jun 10 19:07:09 UTC 2013
Modified Files:
src/usr.bin/make: main.c var.c
Log Message:
Revert last, it doesn't even build.
To generate a diff of this commit:
cvs rdiff -u -r1.211 -r1.212 src/usr.bin/make/main.c
cvs rdiff -u -r1.176 -r1.177 src/usr.bin/make/var.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.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.211 src/usr.bin/make/main.c:1.212
--- src/usr.bin/make/main.c:1.211 Mon Jun 10 16:46:19 2013
+++ src/usr.bin/make/main.c Mon Jun 10 19:07:09 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.211 2013/06/10 16:46:19 christos Exp $ */
+/* $NetBSD: main.c,v 1.212 2013/06/10 19:07:09 joerg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: main.c,v 1.211 2013/06/10 16:46:19 christos Exp $;
+static char rcsid[] = $NetBSD: main.c,v 1.212 2013/06/10 19:07:09 joerg Exp $;
#else
#include sys/cdefs.h
#ifndef lint
@@ -81,7 +81,7 @@ __COPYRIGHT(@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = @(#)main.c 8.3 (Berkeley) 3/19/94;
#else
-__RCSID($NetBSD: main.c,v 1.211 2013/06/10 16:46:19 christos Exp $);
+__RCSID($NetBSD: main.c,v 1.212 2013/06/10 19:07:09 joerg Exp $);
#endif
#endif /* not lint */
#endif
@@ -937,11 +937,13 @@ main(int argc, char **argv)
* Set some other useful macros
*/
{
- char tmp[64], *ep;
+ char tmp[64];
+ const char *ep;
- snprintf(tmp, sizeof(tmp), %d,
- (ep = getenv(MAKELEVEL)) ? atoi(ep) + 1 : 0);
- Var_Set(MAKELEVEL, tmp, VAR_GLOBAL, 0);
+ if (!(ep = getenv(MAKE_LEVEL))) {
+ ep = 0;
+ }
+ Var_Set(MAKE_LEVEL, ep, VAR_GLOBAL, 0);
snprintf(tmp, sizeof(tmp), %u, myPid);
Var_Set(.MAKE.PID, tmp, VAR_GLOBAL, 0);
snprintf(tmp, sizeof(tmp), %u, getppid());
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.176 src/usr.bin/make/var.c:1.177
--- src/usr.bin/make/var.c:1.176 Mon Jun 10 16:46:19 2013
+++ src/usr.bin/make/var.c Mon Jun 10 19:07:09 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.176 2013/06/10 16:46:19 christos Exp $ */
+/* $NetBSD: var.c,v 1.177 2013/06/10 19:07:09 joerg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: var.c,v 1.176 2013/06/10 16:46:19 christos Exp $;
+static char rcsid[] = $NetBSD: var.c,v 1.177 2013/06/10 19:07:09 joerg Exp $;
#else
#include sys/cdefs.h
#ifndef lint
#if 0
static char sccsid[] = @(#)var.c 8.3 (Berkeley) 3/19/94;
#else
-__RCSID($NetBSD: var.c,v 1.176 2013/06/10 16:46:19 christos Exp $);
+__RCSID($NetBSD: var.c,v 1.177 2013/06/10 19:07:09 joerg Exp $);
#endif
#endif /* not lint */
#endif
@@ -778,7 +778,7 @@ Var_UnExport(char *str)
if (unexport_env) {
char **newenv;
- cp = getenv(MAKELEVEL); /* we should preserve this */
+ cp = getenv(MAKE_LEVEL); /* we should preserve this */
if (environ == savedEnv) {
/* we have been here before! */
newenv = bmake_realloc(environ, 2 * sizeof(char *));
@@ -795,7 +795,7 @@ Var_UnExport(char *str)
environ = savedEnv = newenv;
newenv[0] = NULL;
newenv[1] = NULL;
- setenv(MAKELEVEL, cp, 1);
+ setenv(MAKE_LEVEL, cp, 1);
} else {
for (; *str != '\n' isspace((unsigned char) *str); str++)
continue;
@@ -960,8 +960,14 @@ Var_Set(const char *name, const char *va
* We allow the makefiles to update .MAKE.LEVEL and ensure
* children see a correctly incremented value.
*/
-if (ctxt == VAR_GLOBAL strcmp(MAKELEVEL, name) == 0)
- setenv(MAKELEVEL, val, 1);
+if (ctxt == VAR_GLOBAL strcmp(MAKE_LEVEL, name) == 0) {
+ char tmp[64];
+ int level;
+
+ level = atoi(val);
+ snprintf(tmp, sizeof(tmp), %u, level + 1);
+ setenv(MAKE_LEVEL, tmp, 1);
+}
out:
CVS commit: src/usr.bin/crunch/crunchgen
Module Name:src Committed By: joerg Date: Mon Jun 10 19:40:53 UTC 2013 Modified Files: src/usr.bin/crunch/crunchgen: crunchgen.1 Log Message: Document section stripping. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/usr.bin/crunch/crunchgen/crunchgen.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/crunch/crunchgen/crunchgen.1 diff -u src/usr.bin/crunch/crunchgen/crunchgen.1:1.29 src/usr.bin/crunch/crunchgen/crunchgen.1:1.30 --- src/usr.bin/crunch/crunchgen/crunchgen.1:1.29 Sun Apr 8 22:00:38 2012 +++ src/usr.bin/crunch/crunchgen/crunchgen.1 Mon Jun 10 19:40:53 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: crunchgen.1,v 1.29 2012/04/08 22:00:38 wiz Exp $ +.\ $NetBSD: crunchgen.1,v 1.30 2013/06/10 19:40:53 joerg Exp $ .\ .\ Copyright (c) 1994 University of Maryland .\ All Rights Reserved. @@ -24,7 +24,7 @@ .\ Computer Science Department .\ University of Maryland at College Park .\ -.Dd October 18, 2006 +.Dd June 10, 2013 .Dt CRUNCHGEN 1 .Os .Sh NAME @@ -272,6 +272,28 @@ If they are not valid for a particular p program is skipped in the .Ar objs target. +.Pp +The makefile produced by +.Nm +strips certain sections from the final binary to reduce its size. +This includes: +.Bl -tag -width .Li .eh_frame_hdr +.It Li .eh_frame +Unwinding tables for exceptions and backtraces. +.It Li .eh_frame_hdr +Index of the +.Li .eh_frame +section. +.It Li .note +Optional data for the kernel and/or runtime linker. +.It Li .comment +Comments in the binary. +.It Li .ident +Embedded source revisions used by +.Xr ident 1 . +.It Li .copyright +Embedded copyright notes. +.El .Sh ENVIRONMENT .Bl -tag -width MAKEOBJDIRPREFIX .It Ev MAKEOBJDIRPREFIX
CVS commit: src/sys/rump/librump/rumpvfs
Module Name:src Committed By: pooka Date: Mon Jun 10 19:48:22 UTC 2013 Modified Files: src/sys/rump/librump/rumpvfs: rump_vfs.c Log Message: create /dev with 0755 instead of 0777 (though it's now effectively the same due to cmask) To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 src/sys/rump/librump/rumpvfs/rump_vfs.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/librump/rumpvfs/rump_vfs.c diff -u src/sys/rump/librump/rumpvfs/rump_vfs.c:1.76 src/sys/rump/librump/rumpvfs/rump_vfs.c:1.77 --- src/sys/rump/librump/rumpvfs/rump_vfs.c:1.76 Mon Apr 29 19:31:46 2013 +++ src/sys/rump/librump/rumpvfs/rump_vfs.c Mon Jun 10 19:48:22 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rump_vfs.c,v 1.76 2013/04/29 19:31:46 pooka Exp $ */ +/* $NetBSD: rump_vfs.c,v 1.77 2013/06/10 19:48:22 pooka Exp $ */ /* * Copyright (c) 2008 Antti Kantee. All Rights Reserved. @@ -29,7 +29,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rump_vfs.c,v 1.76 2013/04/29 19:31:46 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: rump_vfs.c,v 1.77 2013/06/10 19:48:22 pooka Exp $); #include sys/param.h #include sys/buf.h @@ -135,7 +135,7 @@ RUMP_COMPONENT(RUMP__FACTION_VFS) vfs_mountroot(); /* mtree: create /dev */ - do_sys_mkdir(/dev, 0777, UIO_SYSSPACE); + do_sys_mkdir(/dev, 0755, UIO_SYSSPACE); rump_proc_vfs_init = pvfs_init; rump_proc_vfs_release = pvfs_rele;
CVS commit: src/sys/conf
Module Name:src Committed By: gdt Date: Mon Jun 10 20:08:35 UTC 2013 Modified Files: src/sys/conf: files Log Message: Drop references to kame_ipsec, which has been gone for a while. To generate a diff of this commit: cvs rdiff -u -r1.1071 -r1.1072 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1071 src/sys/conf/files:1.1072 --- src/sys/conf/files:1.1071 Sun May 26 18:07:42 2013 +++ src/sys/conf/files Mon Jun 10 20:08:35 2013 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1071 2013/05/26 18:07:42 kardel Exp $ +# $NetBSD: files,v 1.1072 2013/06/10 20:08:35 gdt Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20100430 @@ -1702,7 +1702,7 @@ file net/route.c file net/rtbl.c file net/rtsock.c file net/slcompress.c sl | ppp | strip | (irip irip_vj) -file net/zlib.c (ppp ppp_deflate) | kame_ipsec | opencrypto | vnd_compression +file net/zlib.c (ppp ppp_deflate) | opencrypto | vnd_compression file netinet/accf_data.c accf_data file netinet/accf_http.c accf_http file netinet/cpu_in_cksum.c (inet | inet6) !cpu_in_cksum @@ -1712,7 +1712,7 @@ file netinet/in4_cksum.c inet file netinet/in_cksum.c inet file netinet/in_gif.c gif inet file netinet/ip_carp.c carp (inet | inet6) needs-flag -file netinet/ip_ecn.c kame_ipsec | fast_ipsec | gif | stf +file netinet/ip_ecn.c fast_ipsec | gif | stf file netinet/ip_encap.c inet | inet6 file netinet/ip_etherip.c etherip inet file netinet6/ip6_etherip.c etherip inet6
CVS commit: src/usr.bin/make
Module Name:src
Committed By: christos
Date: Mon Jun 10 20:24:58 UTC 2013
Modified Files:
src/usr.bin/make: main.c var.c
Log Message:
put back previous change
To generate a diff of this commit:
cvs rdiff -u -r1.212 -r1.213 src/usr.bin/make/main.c
cvs rdiff -u -r1.177 -r1.178 src/usr.bin/make/var.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.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.212 src/usr.bin/make/main.c:1.213
--- src/usr.bin/make/main.c:1.212 Mon Jun 10 15:07:09 2013
+++ src/usr.bin/make/main.c Mon Jun 10 16:24:58 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.212 2013/06/10 19:07:09 joerg Exp $ */
+/* $NetBSD: main.c,v 1.213 2013/06/10 20:24:58 christos Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: main.c,v 1.212 2013/06/10 19:07:09 joerg Exp $;
+static char rcsid[] = $NetBSD: main.c,v 1.213 2013/06/10 20:24:58 christos Exp $;
#else
#include sys/cdefs.h
#ifndef lint
@@ -81,7 +81,7 @@ __COPYRIGHT(@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = @(#)main.c 8.3 (Berkeley) 3/19/94;
#else
-__RCSID($NetBSD: main.c,v 1.212 2013/06/10 19:07:09 joerg Exp $);
+__RCSID($NetBSD: main.c,v 1.213 2013/06/10 20:24:58 christos Exp $);
#endif
#endif /* not lint */
#endif
@@ -937,13 +937,11 @@ main(int argc, char **argv)
* Set some other useful macros
*/
{
- char tmp[64];
- const char *ep;
+ char tmp[64], *ep;
- if (!(ep = getenv(MAKE_LEVEL))) {
- ep = 0;
- }
- Var_Set(MAKE_LEVEL, ep, VAR_GLOBAL, 0);
+ snprintf(tmp, sizeof(tmp), %d,
+ (ep = getenv(MAKELEVEL)) ? atoi(ep) + 1 : 0);
+ Var_Set(MAKE_LEVEL, tmp, VAR_GLOBAL, 0);
snprintf(tmp, sizeof(tmp), %u, myPid);
Var_Set(.MAKE.PID, tmp, VAR_GLOBAL, 0);
snprintf(tmp, sizeof(tmp), %u, getppid());
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.177 src/usr.bin/make/var.c:1.178
--- src/usr.bin/make/var.c:1.177 Mon Jun 10 15:07:09 2013
+++ src/usr.bin/make/var.c Mon Jun 10 16:24:58 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.177 2013/06/10 19:07:09 joerg Exp $ */
+/* $NetBSD: var.c,v 1.178 2013/06/10 20:24:58 christos Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: var.c,v 1.177 2013/06/10 19:07:09 joerg Exp $;
+static char rcsid[] = $NetBSD: var.c,v 1.178 2013/06/10 20:24:58 christos Exp $;
#else
#include sys/cdefs.h
#ifndef lint
#if 0
static char sccsid[] = @(#)var.c 8.3 (Berkeley) 3/19/94;
#else
-__RCSID($NetBSD: var.c,v 1.177 2013/06/10 19:07:09 joerg Exp $);
+__RCSID($NetBSD: var.c,v 1.178 2013/06/10 20:24:58 christos Exp $);
#endif
#endif /* not lint */
#endif
@@ -778,7 +778,7 @@ Var_UnExport(char *str)
if (unexport_env) {
char **newenv;
- cp = getenv(MAKE_LEVEL); /* we should preserve this */
+ cp = getenv(MAKELEVEL); /* we should preserve this */
if (environ == savedEnv) {
/* we have been here before! */
newenv = bmake_realloc(environ, 2 * sizeof(char *));
@@ -795,7 +795,7 @@ Var_UnExport(char *str)
environ = savedEnv = newenv;
newenv[0] = NULL;
newenv[1] = NULL;
- setenv(MAKE_LEVEL, cp, 1);
+ setenv(MAKELEVEL, cp, 1);
} else {
for (; *str != '\n' isspace((unsigned char) *str); str++)
continue;
@@ -960,14 +960,8 @@ Var_Set(const char *name, const char *va
* We allow the makefiles to update .MAKE.LEVEL and ensure
* children see a correctly incremented value.
*/
-if (ctxt == VAR_GLOBAL strcmp(MAKE_LEVEL, name) == 0) {
- char tmp[64];
- int level;
-
- level = atoi(val);
- snprintf(tmp, sizeof(tmp), %u, level + 1);
- setenv(MAKE_LEVEL, tmp, 1);
-}
+if (ctxt == VAR_GLOBAL strcmp(MAKE_LEVEL, name) == 0)
+ setenv(MAKELEVEL, val, 1);
out:
CVS commit: src/sys/conf
Module Name:src Committed By: christos Date: Mon Jun 10 20:28:36 UTC 2013 Modified Files: src/sys/conf: files Log Message: there is no more fast_ipsec To generate a diff of this commit: cvs rdiff -u -r1.1072 -r1.1073 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1072 src/sys/conf/files:1.1073 --- src/sys/conf/files:1.1072 Mon Jun 10 16:08:35 2013 +++ src/sys/conf/files Mon Jun 10 16:28:36 2013 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1072 2013/06/10 20:08:35 gdt Exp $ +# $NetBSD: files,v 1.1073 2013/06/10 20:28:36 christos Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20100430 @@ -1712,7 +1712,7 @@ file netinet/in4_cksum.c inet file netinet/in_cksum.c inet file netinet/in_gif.c gif inet file netinet/ip_carp.c carp (inet | inet6) needs-flag -file netinet/ip_ecn.c fast_ipsec | gif | stf +file netinet/ip_ecn.c ipsec | gif | stf file netinet/ip_encap.c inet | inet6 file netinet/ip_etherip.c etherip inet file netinet6/ip6_etherip.c etherip inet6
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: mrg
Date: Mon Jun 10 20:33:31 UTC 2013
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
implement SOURCEMODE version of fontconfig.
To generate a diff of this commit:
cvs rdiff -u -r1.150 -r1.151 src/usr.sbin/postinstall/postinstall
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/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.150 src/usr.sbin/postinstall/postinstall:1.151
--- src/usr.sbin/postinstall/postinstall:1.150 Thu Jun 6 07:06:42 2013
+++ src/usr.sbin/postinstall/postinstall Mon Jun 10 20:33:31 2013
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.150 2013/06/06 07:06:42 mrg Exp $
+# $NetBSD: postinstall,v 1.151 2013/06/10 20:33:31 mrg Exp $
#
# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -819,7 +819,13 @@ do_fontconfig()
failed=0
# First, check for updates we can handle.
- populate_dir $op false ${SRC_DIR}/etc/fonts/conf.avail ${DEST_DIR}/etc/fonts/conf.avail 444 \
+ if ! $SOURCEMODE; then
+ FONTCONFIG_DIR=${SRC_DIR}/etc/fonts/conf.avail
+ else
+ FONTCONFIG_DIR=${XSRC_DIR}/external/mit/fontconfig/dist/conf.d
+ fi
+
+ populate_dir $op false ${FONTCONFIG_DIR} ${DEST_DIR}/etc/fonts/conf.avail 444 \
10-autohint.conf \
10-no-sub-pixel.conf \
10-scale-bitmap-fonts.conf \
@@ -1856,7 +1862,7 @@ do_ptyfsoldnodes()
usage()
{
cat 12 _USAGE_
-Usage: ${PROGNAME} [-s srcdir] [-d destdir] [-m mach] [-a arch] op [item [...]]
+Usage: ${PROGNAME} [-s srcdir] [-x xsrcdir] [-d destdir] [-m mach] [-a arch] op [item [...]]
Perform post-installation checks and/or fixes on a system's
configuration files.
If no items are provided, a default set of checks or fixes is applied.
@@ -1871,7 +1877,10 @@ Usage: ${PROGNAME} [-s srcdir] [-d destd
multiple such files;
* A temporary directory in which one or both of
etc.tgz and xetc.tgz have been extracted.
- [${SRC_DIR:-/}]
+ [${SRC_DIR:-/usr/src}]
+ -x xsrcdir Location of the X11 source files. This must be
+ a directory that contains a NetBSD xsrc tree.
+ [${XSRC_DIR:-/usr/src/../xsrc}]
-d destdir Destination directory to check. [${DEST_DIR:-/}]
-m mach MACHINE. [${MACHINE}]
-a arch MACHINE_ARCH. [${MACHINE_ARCH}]
@@ -1914,12 +1923,13 @@ main()
TGZLIST= # quoted list list of tgz files
SRC_ARGLIST= # quoted list of one or more -s args
SRC_DIR=${SRC_ARG} # set default value for early usage()
+ XSRC_DIR=${SRC_ARG}/../xsrc
N_SRC_ARGS=0 # number of -s args
TGZMODE=false # true if -s specifies a tgz file
DIRMODE=false # true if -s specified a directory
SOURCEMODE=false # true if -s specified a source directory
- while getopts s:d:m:a: ch; do
+ while getopts s:x:d:m:a: ch; do
case ${ch} in
s)
qarg=$(shell_quote ${OPTARG})
@@ -1950,6 +1960,14 @@ main()
err 2 Invalid argument for -s option
fi
;;
+ x)
+ if [ -d ${OPTARG} ]; then
+# arg refers to a directory.
+XSRC_DIR=${OPTARG}
+ else
+err 2 Not a directory for -x option
+ fi
+ ;;
d)
DEST_DIR=${OPTARG}
;;
