diff options
| author |   deraadt <deraadt@openbsd.org> | 2014-01-12 11:26:08 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2014-01-12 11:26:08 +0000 |
| commit | 9550f9ae67ebbcc14e9e2920a52f901beb0eb9b4 (patch) | |
| tree | c5e460880f0158d0970f80cacf2160219e280e8d /sys | |
| parent | allow prev release keys for now, transition 5.4 -> 5.5 kindof requires (diff) | |
| download | wireguard-openbsd-9550f9ae67ebbcc14e9e2920a52f901beb0eb9b4.tar.xz wireguard-openbsd-9550f9ae67ebbcc14e9e2920a52f901beb0eb9b4.zip | |
crank to 5.5beta
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 439631fd294..9afc1eed1c3 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.31 2013/07/07 18:11:50 deraadt Exp $ */ +/* $OpenBSD: bsd.tbxi,v 1.32 2014/01/12 11:26:09 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.4/macppc/bsd.rd +boot cd:,ofwboot /5.5/macppc/bsd.rd </BOOT-SCRIPT> <OS-BADGE-ICONS> 201B diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 2789184b874..9a8a466998f 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: newvers.sh,v 1.128 2013/07/29 18:43:50 kettenis Exp $ +# $OpenBSD: newvers.sh,v 1.129 2014/01/12 11:26:08 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,12 +61,12 @@ id=`basename "${d}"` # and disable POOL_DEBUG in sys/conf/GENERIC ost="OpenBSD" -osr="5.4" +osr="5.5" 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 de0f77ec92e..79fd7e70d3e 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.104 2013/07/07 18:11:49 deraadt Exp $ */ +/* $OpenBSD: param.h,v 1.105 2014/01/12 11:26:09 deraadt Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -41,8 +41,8 @@ #define BSD4_3 1 #define BSD4_4 1 -#define OpenBSD 201311 /* OpenBSD version (year & month). */ -#define OpenBSD5_4 1 /* OpenBSD 5.4 */ +#define OpenBSD 201405 /* OpenBSD version (year & month). */ +#define OpenBSD5_5 1 /* OpenBSD 5.5 */ #ifndef NULL #ifdef __GNUG__ |