diff options
| author | nishi <nishi@vegaa.systems> | 2023-07-08 09:53:56 +0000 |
|---|---|---|
| committer | nishi <nishi@vegaa.systems> | 2023-07-08 09:53:56 +0000 |
| commit | df2c51f5b9a09d8f7feb54fabf9cde9f375bb752 (patch) | |
| tree | 43601aab2cb2b0bc25f013d3a5d488ae66ddec2a | |
| parent | c7aa4d882ff6b1eb1e3c19bdfd772057817ff10c (diff) | |
Made a branch/0.x.x and tags/0.0.1, following the Subversion habit.
git-svn-id: https://svn.vegaa.systems/svn/vega-Vega/trunk@11 a8a8aea2-181d-ee11-89e8-15fd0e089fc4
| -rw-r--r-- | Makefile.in | 13 | ||||
| -rwxr-xr-x | bootstrap | 2 | ||||
| -rw-r--r-- | conf/limine.cfg | 2 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | sys/kern/init_main.c | 3 | ||||
| -rwxr-xr-x | tools/ksyms | 2 |
6 files changed, 25 insertions, 7 deletions
diff --git a/Makefile.in b/Makefile.in index 7d3d8eb..c5ce256 100644 --- a/Makefile.in +++ b/Makefile.in @@ -5,13 +5,18 @@ ############################### # CFLAGS, QEMU flags + misc ############################### +override ARCH = @ARCH@ override VEGA_VERSION = @PACKAGE_VERSION@ override PROMPT := printf "%s\t\t%s\n" -override KERNEL_DEFINES = -DVEGA_VERSION="\"$(VEGA_VERSION)\"" +override KERNEL_DEFINES = -DVEGA_VERSION="\"$(VEGA_VERSION)\""\ + -DVEGA_BUILDDATE="\"@VEGA_BUILDDATE@\""\ + -DVEGA_BUILDUSER="\"@VEGA_BUILDUSER@\""\ + -DVEGA_BUILDHOST="\"@VEGA_BUILDHOST@\""\ + -DVEGA_BUILDDIR="\"@VEGA_BUILDDIR@\""\ + -DVEGA_ARCH="\"@ARCH@\"" override KERNEL_CFLAGS = @KERNEL_CFLAGS@ $(KERNEL_DEFINES) override KERNEL_LDFLAGS = -nostdlib -zmax-page-size=0x1000 -static -Tconf/link-$(ARCH).ld override QEMU_FLAGS = @QEMU_FLAGS@ -override ARCH = @ARCH@ ###################### # Binutils stuff @@ -79,8 +84,8 @@ base/boot/vega-kernel: $(KERNEL_OBJECTS) $(KERNEL_ASMOBJECTS) mv initramfs.tar iso_root/boot/ xorriso -as mkisofs -b limine-cd.bin -no-emul-boot -boot-load-size 4\ -boot-info-table --efi-boot limine-cd-efi.bin -efi-boot-part \ - --efi-boot-image --protective-msdos-label iso_root -o Vega.iso &> /dev/null - stand/limine/limine-deploy Vega.iso &> /dev/null + --efi-boot-image --protective-msdos-label iso_root -o Vega.iso > /dev/null + stand/limine/limine-deploy Vega.iso > /dev/null $(PROMPT) " ISO " $(shell pwd)/Vega.iso -include $(KERNEL_HEADER_DEPS) @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e mkdir -p lib/ diff --git a/conf/limine.cfg b/conf/limine.cfg index 5328705..6d3c02b 100644 --- a/conf/limine.cfg +++ b/conf/limine.cfg @@ -1,4 +1,4 @@ -TIMEOUT=30 +TIMEOUT=0 :Vega diff --git a/configure.ac b/configure.ac index c44b3f0..7f8f32f 100644 --- a/configure.ac +++ b/configure.ac @@ -15,6 +15,16 @@ QEMU_FLAGS_X86_64="--enable-kvm -monitor stdio \\ -M q35 -m 1G -smp 4 -cpu host \\ -cdrom Vega.iso" +VEGA_BUILDDATE=`export LANG=en_US.UTF-8 ; date` +VEGA_BUILDUSER=`whoami` +VEGA_BUILDHOST=`hostname` +VEGA_BUILDDIR=`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(KERNEL_CFLAGS, [$KERN_CFLAGS_X86_64]) AC_SUBST(QEMU_FLAGS, [$QEMU_FLAGS_X86_64]) AC_SUBST(QEMU, [qemu-system-x86_64]) diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index f4db156..6fbc48c 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -50,6 +50,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"); + processor_init(&bsp); vm_physseg_init(); diff --git a/tools/ksyms b/tools/ksyms index f09203f..5fa7dc9 100755 --- a/tools/ksyms +++ b/tools/ksyms @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # $Id$ rm -f $1 |