merge version directly into code

3 files changed, 5 insertions, 50 deletions

diff --git a/sys/arch/sgi/stand/boot/boot.c b/sys/arch/sgi/stand/boot/boot.c
index 1a5ec3be92a..3eb8722185c 100644
--- a/sys/arch/sgi/stand/boot/boot.c
+++ b/sys/arch/sgi/stand/boot/boot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: boot.c,v 1.25 2019/04/10 04:17:36 deraadt Exp $ */
+/*	$OpenBSD: boot.c,v 1.26 2019/10/28 04:11:30 deraadt Exp $ */
 
 /*
  * Copyright (c) 2004 Opsycon AB, www.opsycon.se.
@@ -60,8 +60,6 @@ int	IP;
 
 char   rnddata[BOOTRANDOM_MAX];
 
-#include "version"
-
 /*
  * OpenBSD/sgi Boot Loader.
  */
@@ -74,6 +72,7 @@ boot_main(int argc, char *argv[])
 	u_long entry;
 	int fd;
 	extern int arcbios_init(void);
+	extern char version[];
 
 	IP = arcbios_init();
 	printf("\nOpenBSD/sgi-IP%d ARCBios boot version %s\n", IP, version);
diff --git a/sys/arch/sgi/stand/boot/conf.c b/sys/arch/sgi/stand/boot/conf.c
index b8c70ac1a01..97312c9ad6b 100644
--- a/sys/arch/sgi/stand/boot/conf.c
+++ b/sys/arch/sgi/stand/boot/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.5 2012/03/19 17:38:31 miod Exp $ */
+/*	$OpenBSD: conf.c,v 1.6 2019/10/28 04:11:31 deraadt Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -27,6 +27,8 @@
  */
 #include <stand.h>
 
+const char version[] = "1.10";
+
 extern void	nullsys();
 extern int	nodev();
 extern int	noioctl();
diff --git a/sys/arch/sgi/stand/boot/version b/sys/arch/sgi/stand/boot/version
deleted file mode 100644
index f8c6a64f6cf..00000000000
--- a/sys/arch/sgi/stand/boot/version
+++ /dev/null
@@ -1,46 +0,0 @@
-/*	$OpenBSD: version,v 1.10 2018/03/02 15:36:39 visa Exp $	*/
-/* Public domain. Come on, this can hardly be considered as code. */
-
-#if 0
-
-No version strings up to 2012
-	many changes, but nothing to tell bootblocks apart, except perhaps
-	their size (har, har)
-
-1.1
-	smarter argv[] analysis: the first argument which does neither look
-	like an environment variable nor dash-prefixed options, is assumed
-	to be a file path. If there are no signs of it being a full ARC
-	path, OSLoadPartition is prepended to it.
-	The old behaviour was to only accept filenames starting with "/", and
-	thus always relative to OSLoadPartition.
-
-1.2
-	IP28 support. Also, no longer refuse to run on IP26 systems, they
-	will hopefully run at some point in the future.
-
-1.3
-	IP26 support, for real.
-
-1.4
-	Unbreak IP27 support, broken by accident in 1.3
-
-1.5
-	Loadfile support for .openbsd.randomdata section
-
-1.6
-	/etc/random.seed support
-
-1.7
-	Loadfile support for .SUNW_ctf section
-
-1.8
-	Use the OpenBSD disklabel instead of assuming OpenBSD partition `a`
-	starts at the beginning of the volume header partition #0.
-
-1.9
-	Fix non-512 byte per sector media, broken in 1.8.
-
-#endif
-
-static const char version[] = "1.9";