diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2014-07-15 21:59:18 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2014-07-15 21:59:18 +0000 |
| commit | 2240ca688243d678dbe9e5b2ac2dc0bc24b63e81 (patch) | |
| tree | 0802d9fd6555c26199114fd26345a1c427d2ae13 /sys | |
| parent | 47c129757da54fd9a8fff715b9f736a6e125e54d (diff) | |
crank to 5.6-beta
Diffstat (limited to 'sys')
| -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 |
3 files changed, 9 insertions, 9 deletions
diff --git a/sys/arch/macppc/stand/tbxidata/bsd.tbxi b/sys/arch/macppc/stand/tbxidata/bsd.tbxi index 9afc1eed1c3..d4a0f57728c 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.32 2014/01/12 11:26:09 deraadt Exp $ */ +/* $OpenBSD: bsd.tbxi,v 1.33 2014/07/15 21:59:17 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.5/macppc/bsd.rd +boot cd:,ofwboot /5.6/macppc/bsd.rd </BOOT-SCRIPT> <OS-BADGE-ICONS> 201B diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 17c4ab60338..f68776999e7 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: newvers.sh,v 1.131 2014/03/05 18:54:32 chris Exp $ +# $OpenBSD: newvers.sh,v 1.132 2014/07/15 21:59:17 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,14 +61,14 @@ id=`basename "${d}"` # and disable POOL_DEBUG in sys/conf/GENERIC ost="OpenBSD" -osr="5.5" +osr="5.6" cat >vers.c <<eof +#define STATUS "-beta" /* just before a release */ #if 0 #define STATUS "" /* release */ -#define STATUS "-beta" /* just before a release */ -#endif #define STATUS "-current" /* just after a release */ +#endif const char ostype[] = "${ost}"; const char osrelease[] = "${osr}"; diff --git a/sys/sys/param.h b/sys/sys/param.h index 2c21e4a634a..27de803333e 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.106 2014/05/02 19:03:06 deraadt Exp $ */ +/* $OpenBSD: param.h,v 1.107 2014/07/15 21:59:17 deraadt Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -41,8 +41,8 @@ #define BSD4_3 1 #define BSD4_4 1 -#define OpenBSD 201405 /* OpenBSD version (year & month). */ -#define OpenBSD5_5 1 /* OpenBSD 5.5 */ +#define OpenBSD 201411 /* OpenBSD version (year & month). */ +#define OpenBSD5_6 1 /* OpenBSD 5.6 */ #ifndef NULL #ifdef __GNUG__ |