From 7b56685a59a86d97cb6dcb8e0dda0a1141b11b91 Mon Sep 17 00:00:00 2001
From: ian <ian>
Date: Fri, 14 Jul 2023 03:27:05 +0000
Subject: kernel: Update build info

git-svn-id: https://svn.vegaa.systems/svn/vega-Vega/trunk@16 a8a8aea2-181d-ee11-89e8-15fd0e089fc4
---
 Makefile.in          | 4 +---
 configure.ac         | 8 ++------
 sys/kern/init_main.c | 5 +++--
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index c5ce256..2318c91 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -10,9 +10,7 @@ override VEGA_VERSION = @PACKAGE_VERSION@
 override PROMPT := printf "%s\t\t%s\n"
 override KERNEL_DEFINES =  -DVEGA_VERSION="\"$(VEGA_VERSION)\""\
 			   -DVEGA_BUILDDATE="\"@VEGA_BUILDDATE@\""\
-			   -DVEGA_BUILDUSER="\"@VEGA_BUILDUSER@\""\
-			   -DVEGA_BUILDHOST="\"@VEGA_BUILDHOST@\""\
-			   -DVEGA_BUILDDIR="\"@VEGA_BUILDDIR@\""\
+			   -DVEGA_BUILDBRANCH="\"@VEGA_BUILDBRANCH@\""\
 			   -DVEGA_ARCH="\"@ARCH@\""
 override KERNEL_CFLAGS = @KERNEL_CFLAGS@ $(KERNEL_DEFINES)
 override KERNEL_LDFLAGS = -nostdlib -zmax-page-size=0x1000 -static -Tconf/link-$(ARCH).ld
diff --git a/configure.ac b/configure.ac
index 7f8f32f..c054c48 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,14 +16,10 @@ QEMU_FLAGS_X86_64="--enable-kvm -monitor stdio 	\\
 			      -cdrom Vega.iso"
 
 VEGA_BUILDDATE=`export LANG=en_US.UTF-8 ; date`
-VEGA_BUILDUSER=`whoami`
-VEGA_BUILDHOST=`hostname`
-VEGA_BUILDDIR=`pwd`
+VEGA_BUILDBRANCH="`basename $PWD`"
 
 AC_SUBST(VEGA_BUILDDATE, [$VEGA_BUILDDATE])
-AC_SUBST(VEGA_BUILDUSER, [$VEGA_BUILDUSER])
-AC_SUBST(VEGA_BUILDHOST, [$VEGA_BUILDHOST])
-AC_SUBST(VEGA_BUILDDIR, [$VEGA_BUILDDIR])
+AC_SUBST(VEGA_BUILDBRANCH, [$VEGA_BUILDBRANCH])
 
 AC_SUBST(KERNEL_CFLAGS, [$KERN_CFLAGS_X86_64])
 AC_SUBST(QEMU_FLAGS, [$QEMU_FLAGS_X86_64])
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index b3a1e8b..e77b2ce 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -51,8 +51,9 @@ main(void)
     syslog_init();
     PRINT_LOGO();
 
-    kprintf("Vega/" VEGA_ARCH " " VEGA_VERSION ": " VEGA_BUILDDATE "\n");
-    kprintf("\t" VEGA_BUILDUSER "@" VEGA_BUILDHOST ":" VEGA_BUILDDIR "\n");
+    kprintf("Vega/%s v%s: %s (%s)\n",
+            VEGA_ARCH, VEGA_VERSION, VEGA_BUILDDATE,
+            VEGA_BUILDBRANCH);
 
     processor_init(&bsp);
     vm_physseg_init();
-- 
cgit v1.2.3