diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2012-01-11 22:11:36 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2012-01-11 22:11:36 +0000 |
| commit | e126c02a18a6611a502e5c7d6f80232a0c4a96c9 (patch) | |
| tree | f277bf839f8d6efdc72f653fc128b06cac3b8ffa /sys | |
| parent | b4e898b50b506200b143b4b91d3a5808d88327ce (diff) | |
crank to 5.1-beta
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/macppc/stand/tbxidata/bsd.tbxi | 4 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 6 | ||||
| -rw-r--r-- | sys/sys/param.h | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/macppc/stand/tbxidata/bsd.tbxi b/sys/arch/macppc/stand/tbxidata/bsd.tbxi index 0f55f655b62..d93ccffe603 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.27 2011/07/18 07:07:52 deraadt Exp $ */ +/* $OpenBSD: bsd.tbxi,v 1.28 2012/01/11 22:11:35 deraadt 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.0/macppc/bsd.rd +boot cd:,ofwboot /5.1/macppc/bsd.rd </BOOT-SCRIPT> <OS-BADGE-ICONS> 201B diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index ec8dee4a8a5..ee85169c337 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: newvers.sh,v 1.114 2011/08/16 21:00:48 kettenis Exp $ +# $OpenBSD: newvers.sh,v 1.115 2012/01/11 22:11:35 deraadt Exp $ # $NetBSD: newvers.sh,v 1.17.2.1 1995/10/12 05:17:11 jtc Exp $ # # Copyright (c) 1984, 1986, 1990, 1993 @@ -64,10 +64,10 @@ ost="OpenBSD" osr="5.0" cat >vers.c <<eof -#define STATUS "-current" /* just after a release */ +#define STATUS "-beta" /* just before a release */ #if 0 #define STATUS "" /* release */ -#define STATUS "-beta" /* just before a release */ +#define STATUS "-current" /* just after a release */ #endif const char ostype[] = "${ost}"; diff --git a/sys/sys/param.h b/sys/sys/param.h index f95051cd68e..668caa7eac8 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.93 2011/11/30 10:26:56 dlg Exp $ */ +/* $OpenBSD: param.h,v 1.94 2012/01/11 22:11:34 deraadt 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 201111 /* OpenBSD version (year & month). */ -#define OpenBSD5_0 1 /* OpenBSD 5.0 */ +#define OpenBSD 201205 /* OpenBSD version (year & month). */ +#define OpenBSD5_1 1 /* OpenBSD 5.1 */ #ifndef NULL #ifdef __GNUG__ |