diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2013-01-31 23:30:41 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2013-01-31 23:30:41 +0000 |
| commit | ecc201f01f738684c1f5d5196d8b76be3a4ef95a (patch) | |
| tree | fc3913af0919c6e4934b3c468c0385411575e9d5 /sys | |
| parent | f3ae65d6105084122b4ab8dd3d1640b67f5d3331 (diff) | |
welcome to 5.3-BETA
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/macppc/stand/tbxidata/bsd.tbxi | 4 | ||||
| -rw-r--r-- | sys/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 8 | ||||
| -rw-r--r-- | sys/sys/param.h | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/sys/arch/macppc/stand/tbxidata/bsd.tbxi b/sys/arch/macppc/stand/tbxidata/bsd.tbxi index 5d09ca10f3e..a87995d8e76 100644 --- a/sys/arch/macppc/stand/tbxidata/bsd.tbxi +++ b/sys/arch/macppc/stand/tbxidata/bsd.tbxi @@ -1,6 +1,6 @@ <CHRP-BOOT> <LICENSE> -/* $OpenBSD: bsd.tbxi,v 1.29 2012/06/20 21:40:55 deraadt Exp $ */ +/* $OpenBSD: bsd.tbxi,v 1.30 2013/01/31 23:30:40 miod Exp $ */ /* * Copyright (c) 2001 Dale Rahn. * All rights reserved. @@ -34,7 +34,7 @@ MacRISC MacRISC3 MacRISC4 OpenBSD/macppc bootloader </DESCRIPTION> <BOOT-SCRIPT> -boot cd:,ofwboot /5.2/macppc/bsd.rd +boot cd:,ofwboot /5.3/macppc/bsd.rd </BOOT-SCRIPT> <OS-BADGE-ICONS> 201B diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC index 64dfe5f77c0..ae0eee30bc3 100644 --- a/sys/conf/GENERIC +++ b/sys/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.192 2012/09/19 17:50:17 yasuoka Exp $ +# $OpenBSD: GENERIC,v 1.193 2013/01/31 23:30:40 miod Exp $ # # Machine-independent option; used by all architectures for their # GENERIC kernel @@ -17,7 +17,7 @@ option KMEMSTATS # collect malloc(9) statistics option PTRACE # ptrace(2) system call #option KVA_GUARDPAGES # slow virtual address recycling (+ guarding) -option POOL_DEBUG # pool corruption detection +#option POOL_DEBUG # pool corruption detection #option VFSLCKDEBUG # VFS locking checks option CRYPTO # Cryptographic framework diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 198e828faeb..b24d77d01e8 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: newvers.sh,v 1.121 2012/07/26 15:51:22 otto Exp $ +# $OpenBSD: newvers.sh,v 1.122 2013/01/31 23:30:40 miod Exp $ # $NetBSD: newvers.sh,v 1.17.2.1 1995/10/12 05:17:11 jtc Exp $ # # Copyright (c) 1984, 1986, 1990, 1993 @@ -61,14 +61,14 @@ id=`basename ${d}` # and disable POOL_DEBUG in sys/conf/GENERIC ost="OpenBSD" -osr="5.2" +osr="5.3" cat >vers.c <<eof -#define STATUS "-current" /* just after a release */ #if 0 +#define STATUS "-current" /* just after a release */ #define STATUS "" /* release */ -#define STATUS "-beta" /* just before a release */ #endif +#define STATUS "-beta" /* just before a release */ const char ostype[] = "${ost}"; const char osrelease[] = "${osr}"; diff --git a/sys/sys/param.h b/sys/sys/param.h index 89caed132aa..a8862def9bc 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.100 2013/01/17 21:24:58 deraadt Exp $ */ +/* $OpenBSD: param.h,v 1.101 2013/01/31 23:30:40 miod Exp $ */ /* $NetBSD: param.h,v 1.23 1996/03/17 01:02:29 thorpej Exp $ */ /*- @@ -41,8 +41,8 @@ #define BSD4_3 1 #define BSD4_4 1 -#define OpenBSD 201211 /* OpenBSD version (year & month). */ -#define OpenBSD5_2 1 /* OpenBSD 5.2 */ +#define OpenBSD 201305 /* OpenBSD version (year & month). */ +#define OpenBSD5_3 1 /* OpenBSD 5.3 */ #ifndef NULL #ifdef __GNUG__ |