diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2024-02-17 16:13:25 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2024-02-17 16:13:25 +0000 |
| commit | 4d8820e31e3d328fee395e4f9d3d5708c0af5f3f (patch) | |
| tree | 2598f88627363b0b52328a728e060d439b0bbdb1 /sys | |
| parent | 94e423a7df2cff47273a043eb9ab6c32f39a35c6 (diff) | |
move to 7.5-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 b694435a51f..1f51c8da774 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.51 2023/09/18 13:16:13 deraadt Exp $ */ +/* $OpenBSD: bsd.tbxi,v 1.52 2024/02/17 16:13:24 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 /7.4/macppc/bsd.rd +boot cd:,ofwboot /7.5/macppc/bsd.rd </BOOT-SCRIPT> <OS-BADGE-ICONS> 201B diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index d0c1f277441..d982abe183c 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: newvers.sh,v 1.200 2024/01/02 16:40:03 bluhm Exp $ +# $OpenBSD: newvers.sh,v 1.201 2024/02/17 16:13:24 deraadt Exp $ # $NetBSD: newvers.sh,v 1.17.2.1 1995/10/12 05:17:11 jtc Exp $ # # Copyright (c) 1984, 1986, 1990, 1993 @@ -68,13 +68,13 @@ id=`basename "${d}"` # and disable POOL_DEBUG in sys/conf/GENERIC ost="OpenBSD" -osr="7.4" +osr="7.5" cat >vers.c <<eof -#define STATUS "-current" /* just after a release */ +#define STATUS "-beta" /* just before a release */ #if 0 #define STATUS "" /* release */ -#define STATUS "-beta" /* just before a release */ +#define STATUS "-current" /* just after a release */ #define STATUS "-stable" /* stable branch */ #endif diff --git a/sys/sys/param.h b/sys/sys/param.h index e8a89e8e893..4bc7b693911 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.141 2023/09/18 13:18:24 deraadt Exp $ */ +/* $OpenBSD: param.h,v 1.142 2024/02/17 16:13:24 deraadt Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -41,8 +41,8 @@ #define BSD4_3 1 #define BSD4_4 1 -#define OpenBSD 202310 /* OpenBSD version (year & month). */ -#define OpenBSD7_4 1 /* OpenBSD 7.4 */ +#define OpenBSD 202404 /* OpenBSD version (year & month). */ +#define OpenBSD7_5 1 /* OpenBSD 7.5 */ #include <sys/_null.h> |