diff options
| -rw-r--r-- | share/mk/sys.mk | 6 | ||||
| -rw-r--r-- | sys/arch/macppc/stand/tbxidata/bsd.tbxi | 4 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 8 | ||||
| -rw-r--r-- | sys/sys/param.h | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/share/mk/sys.mk b/share/mk/sys.mk index 1000e722697..54c87a6d5a1 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -1,4 +1,4 @@ -# $OpenBSD: sys.mk,v 1.60 2011/01/13 23:17:50 deraadt Exp $ +# $OpenBSD: sys.mk,v 1.61 2011/07/18 07:07:52 deraadt Exp $ # $NetBSD: sys.mk,v 1.27 1996/04/10 05:47:19 mycroft Exp $ # @(#)sys.mk 5.11 (Berkeley) 3/13/91 @@ -9,8 +9,8 @@ .endif unix= We run OpenBSD. -OSMAJOR= 4 -OSMINOR= 9 +OSMAJOR= 5 +OSMINOR= 0 OSREV= $(OSMAJOR).$(OSMINOR) OSrev= $(OSMAJOR)$(OSMINOR) diff --git a/sys/arch/macppc/stand/tbxidata/bsd.tbxi b/sys/arch/macppc/stand/tbxidata/bsd.tbxi index 8fe6b948a34..0f55f655b62 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.26 2011/01/13 23:17:50 deraadt Exp $ */ +/* $OpenBSD: bsd.tbxi,v 1.27 2011/07/18 07:07:52 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 /4.9/macppc/bsd.rd +boot cd:,ofwboot /5.0/macppc/bsd.rd </BOOT-SCRIPT> <OS-BADGE-ICONS> 201B diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 96e980567a7..33677653018 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: newvers.sh,v 1.111 2011/03/02 01:58:39 deraadt Exp $ +# $OpenBSD: newvers.sh,v 1.112 2011/07/18 07:07:52 deraadt Exp $ # $NetBSD: newvers.sh,v 1.17.2.1 1995/10/12 05:17:11 jtc Exp $ # # Copyright (c) 1984, 1986, 1990, 1993 @@ -61,13 +61,13 @@ id=`basename ${d}` # and disable POOL_DEBUG in sys/conf/GENERIC ost="OpenBSD" -osr="4.9" +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 "-current" /* just after a release */ #define STATUS "" /* release */ -#define STATUS "-beta" /* just before a release */ #endif const char ostype[] = "${ost}"; diff --git a/sys/sys/param.h b/sys/sys/param.h index da7838d91fc..3383ed2cb27 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.91 2011/04/12 21:39:22 miod Exp $ */ +/* $OpenBSD: param.h,v 1.92 2011/07/18 07:07:52 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 201105 /* OpenBSD version (year & month). */ -#define OpenBSD4_9 1 /* OpenBSD 4.9 */ +#define OpenBSD 201111 /* OpenBSD version (year & month). */ +#define OpenBSD5_0 1 /* OpenBSD 5.0 */ #ifndef NULL #ifdef __GNUG__ |