diff options
| author |   deraadt <deraadt@openbsd.org> | 2006-07-26 20:34:11 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2006-07-26 20:34:11 +0000 |
| commit | 5b789f355f43b938a0435ce90e887a5636db65d8 (patch) | |
| tree | 5bd86c0aadd17facb223b4dee7142ceaaa2571ba /sys | |
| parent | don't call vn_rdwr() with IO_NODELOCKED when the vnode actually isn't (diff) | |
| download | wireguard-openbsd-5b789f355f43b938a0435ce90e887a5636db65d8.tar.xz wireguard-openbsd-5b789f355f43b938a0435ce90e887a5636db65d8.zip | |
crank to 4.0-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 0f619972f33..9f86a4fd541 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.16 2006/02/28 13:34:07 kettenis Exp $ */ +/* $OpenBSD: bsd.tbxi,v 1.17 2006/07/26 20:34:11 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 /3.9/macppc/bsd.rd +boot cd:,ofwboot /4.0/macppc/bsd.rd </BOOT-SCRIPT> <OS-BADGE-ICONS> 201B diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 62851e236ce..0655c620f56 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: newvers.sh,v 1.76 2006/03/04 11:40:22 grange Exp $ +# $OpenBSD: newvers.sh,v 1.77 2006/07/26 20:34:11 deraadt Exp $ # $NetBSD: newvers.sh,v 1.17.2.1 1995/10/12 05:17:11 jtc Exp $ # # Copyright (c) 1984, 1986, 1990, 1993 @@ -64,12 +64,12 @@ id=`basename ${d}` # A month or so before release, select STATUS "-beta" ost="OpenBSD" -osr="3.9" +osr="4.0" cat >vers.c <<eof -#define STATUS "-current" -#if 0 #define STATUS "-beta" +#if 0 +#define STATUS "-current" #define STATUS "" /* release */ #endif diff --git a/sys/sys/param.h b/sys/sys/param.h index ea08206543d..e38e2c0aba3 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.67 2006/06/19 19:52:04 steven Exp $ */ +/* $OpenBSD: param.h,v 1.68 2006/07/26 20:34:11 deraadt 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 200605 /* OpenBSD version (year & month). */ -#define OpenBSD3_9 1 /* OpenBSD 3.9 */ +#define OpenBSD 200611 /* OpenBSD version (year & month). */ +#define OpenBSD4_0 1 /* OpenBSD 4.0 */ #ifndef NULL #ifdef __GNUG__ |