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 a59712fd295..e3d90b7ba5f 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.23 2009/06/20 23:38:12 miod Exp $ */
+/* $OpenBSD: bsd.tbxi,v 1.24 2010/01/26 23:04:28 miod 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.6/macppc/bsd.rd
+boot cd:,ofwboot /4.7/macppc/bsd.rd
</BOOT-SCRIPT>
<OS-BADGE-ICONS>
201B
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 7c7de7359b9..dcb680d04a6 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: newvers.sh,v 1.100 2009/07/05 23:42:51 dlg Exp $
+# $OpenBSD: newvers.sh,v 1.101 2010/01/26 23:04:28 miod Exp $
# $NetBSD: newvers.sh,v 1.17.2.1 1995/10/12 05:17:11 jtc Exp $
#
# Copyright (c) 1984, 1986, 1990, 1993
@@ -62,14 +62,14 @@ id=`basename ${d}`
# A month or so before release, select STATUS "-beta"
ost="OpenBSD"
-osr="4.6"
+osr="4.7"
cat >vers.c <<eof
-#define STATUS "-current" /* just after a release */
#if 0
+#define STATUS "-current" /* just after a release */
#define STATUS "" /* release */
-#define STATUS "-beta" /* just before a release */
#endif
+#define STATUS "-beta" /* just before a release */
const char ostype[] = "${ost}";
const char osrelease[] = "${osr}";
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 04655564b65..6348fc9bded 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: param.h,v 1.84 2009/06/20 23:38:12 miod Exp $ */
+/* $OpenBSD: param.h,v 1.85 2010/01/26 23:04:28 miod 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 200910 /* OpenBSD version (year & month). */
-#define OpenBSD4_6 1 /* OpenBSD 4.6 */
+#define OpenBSD 201005 /* OpenBSD version (year & month). */
+#define OpenBSD4_7 1 /* OpenBSD 4.6 */
#ifndef NULL
#ifdef __GNUG__