diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-03-07 00:06:01 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-03-07 00:06:01 +0000 |
| commit | 949450cd84686d2323c0c0c4286a086ee404b428 (patch) | |
| tree | aa81e1da350ca49ccf7be0b432f2e7886cfae899 /sys | |
| parent | 3d1f1086014063ef681d7ef28abc781847c2f9f9 (diff) | |
move to 3.7-beta
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/macppc/stand/tbxidata/bsd.tbxi | 4 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 10 | ||||
| -rw-r--r-- | sys/sys/param.h | 6 |
3 files changed, 9 insertions, 11 deletions
diff --git a/sys/arch/macppc/stand/tbxidata/bsd.tbxi b/sys/arch/macppc/stand/tbxidata/bsd.tbxi index 222b2e2b5fd..16d44286915 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.12 2004/08/09 18:09:23 deraadt Exp $ */ +/* $OpenBSD: bsd.tbxi,v 1.13 2005/03/07 00:06:00 deraadt Exp $ */ /* * Copyright (c) 2001 Dale Rahn. * All rights reserved. @@ -34,7 +34,7 @@ MacRISC MacRISC3 OpenBSD/macppc bootloader </DESCRIPTION> <BOOT-SCRIPT> -boot cd:,ofwboot /3.6/macppc/bsd.rd +boot cd:,ofwboot /3.7/macppc/bsd.rd </BOOT-SCRIPT> <OS-BADGE-ICONS> 201B diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index cb49dc9e85b..ee9fb162d9e 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: newvers.sh,v 1.65 2004/09/14 22:00:32 deraadt Exp $ +# $OpenBSD: newvers.sh,v 1.66 2005/03/07 00:06:00 deraadt Exp $ # $NetBSD: newvers.sh,v 1.17.2.1 1995/10/12 05:17:11 jtc Exp $ # # Copyright (c) 1984, 1986, 1990, 1993 @@ -48,8 +48,6 @@ id=`basename ${d}` # src/share/tmac/mdoc/doc-common # change . ds oS OpenBSD X.X # add . if "\\$2"X.X" .as oS \0X.X -# src/share/tmac/mdoc/doc-syms -# ensure new release is listed # src/share/mk/sys.mk # OSMAJOR # OSMINOR @@ -66,12 +64,12 @@ id=`basename ${d}` # A month or so before release, select STATUS "-beta" ost="OpenBSD" -osr="3.6" +osr="3.7" 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 03f08aa15c5..8c13e430ef6 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.59 2004/11/28 01:36:38 mickey Exp $ */ +/* $OpenBSD: param.h,v 1.60 2005/03/07 00:05:59 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 200411 /* OpenBSD version (year & month). */ -#define OpenBSD3_6 1 /* OpenBSD 3.6 */ +#define OpenBSD 200501 /* OpenBSD version (year & month). */ +#define OpenBSD3_7 1 /* OpenBSD 3.7 */ #ifndef NULL #ifdef __GNUG__ |