summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/macppc/stand/tbxidata/bsd.tbxi4
-rw-r--r--sys/conf/newvers.sh8
-rw-r--r--sys/sys/param.h6
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 a87995d8e76..439631fd294 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.30 2013/01/31 23:30:40 miod Exp $ */
+/* $OpenBSD: bsd.tbxi,v 1.31 2013/07/07 18:11:50 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.3/macppc/bsd.rd
+boot cd:,ofwboot /5.4/macppc/bsd.rd
</BOOT-SCRIPT>
<OS-BADGE-ICONS>
201B
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index c7f90427e7c..4c3dab60117 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: newvers.sh,v 1.125 2013/04/09 18:47:14 mlarkin Exp $
+# $OpenBSD: newvers.sh,v 1.126 2013/07/07 18:11:50 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.3"
+osr="5.4"
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 bd48efb8bcd..de0f77ec92e 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: param.h,v 1.103 2013/03/25 17:46:22 deraadt Exp $ */
+/* $OpenBSD: param.h,v 1.104 2013/07/07 18:11:49 deraadt Exp $ */
/*-
* Copyright (c) 1982, 1986, 1989, 1993
@@ -41,8 +41,8 @@
#define BSD4_3 1
#define BSD4_4 1
-#define OpenBSD 201305 /* OpenBSD version (year & month). */
-#define OpenBSD5_3 1 /* OpenBSD 5.3 */
+#define OpenBSD 201311 /* OpenBSD version (year & month). */
+#define OpenBSD5_4 1 /* OpenBSD 5.4 */
#ifndef NULL
#ifdef __GNUG__