diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2017-03-04 16:52:48 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2017-03-04 16:52:48 +0000 |
| commit | 3ae032dd7b58607efa0c19c642a025132c091617 (patch) | |
| tree | d6b8fbb8e99ac17bb2240f90b2d63001f2459ea7 /sys | |
| parent | 72a219812a34423799fc5486fb88d0c7e6a775d0 (diff) | |
crank to 6.1-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 4050ec20eb6..4d5427a2ac2 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.37 2016/05/11 18:01:33 deraadt Exp $ */ +/* $OpenBSD: bsd.tbxi,v 1.38 2017/03/04 16:52:47 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 /6.0/macppc/bsd.rd +boot cd:,ofwboot /6.1/macppc/bsd.rd </BOOT-SCRIPT> <OS-BADGE-ICONS> 201B diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 73ff5ef1d66..24e0caea890 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: newvers.sh,v 1.150 2017/01/24 11:59:41 tb Exp $ +# $OpenBSD: newvers.sh,v 1.151 2017/03/04 16:52:47 deraadt Exp $ # $NetBSD: newvers.sh,v 1.17.2.1 1995/10/12 05:17:11 jtc Exp $ # # Copyright (c) 1984, 1986, 1990, 1993 @@ -63,12 +63,12 @@ id=`basename "${d}"` # and disable POOL_DEBUG in sys/conf/GENERIC ost="OpenBSD" -osr="6.0" +osr="6.1" cat >vers.c <<eof -#define STATUS "-current" /* just after a release */ -#if 0 #define STATUS "-beta" /* just before a release */ +#if 0 +#define STATUS "-current" /* just after a release */ #define STATUS "" /* release */ #endif diff --git a/sys/sys/param.h b/sys/sys/param.h index 81129c9466e..0f5082fac7e 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.123 2016/09/09 18:12:37 millert Exp $ */ +/* $OpenBSD: param.h,v 1.124 2017/03/04 16:52:47 deraadt Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -41,8 +41,8 @@ #define BSD4_3 1 #define BSD4_4 1 -#define OpenBSD 201609 /* OpenBSD version (year & month). */ -#define OpenBSD6_0 1 /* OpenBSD 6.0 */ +#define OpenBSD 201705 /* OpenBSD version (year & month). */ +#define OpenBSD6_1 1 /* OpenBSD 6.1 */ #include <sys/_null.h> |