From c1d59e81c274964f135ae30a1db68a4a09fae5ad Mon Sep 17 00:00:00 2001 From: Alexander Boettcher Date: Wed, 24 Oct 2012 12:55:47 +0200 Subject: [PATCH] NOVA: use latest kernel from github Related to issue #431. Requires toolchain rebuild to bump version to 2.22 !!! Fixes #429 --- base-nova/Makefile | 4 ++-- base-nova/src/kernel/target.mk | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/base-nova/Makefile b/base-nova/Makefile index 801531747..d9e2c96ff 100644 --- a/base-nova/Makefile +++ b/base-nova/Makefile @@ -7,8 +7,8 @@ VERBOSE ?= @ ECHO = @echo -GIT_URL = https://github.com/IntelLabs/NOVA.git -GIT_REV = ad92f48564b1ed53e67f58e194c918af4da6a32d +GIT_URL = git://github.com/IntelLabs/NOVA.git +GIT_REV = 16dd65c15dac298dc5b36d636d79fa0110bd5736 CONTRIB_DIR = contrib PATCHES = $(shell find patches -name '*.patch') diff --git a/base-nova/src/kernel/target.mk b/base-nova/src/kernel/target.mk index 13ac1a2fc..9802473fa 100644 --- a/base-nova/src/kernel/target.mk +++ b/base-nova/src/kernel/target.mk @@ -30,7 +30,8 @@ $(error Unsupported environment) endif endif -CXX_LINK_OPT = -Wl,--gc-sections -Wl,--warn-common -Wl,-static -Wl,-n +git_version = $(shell cd $(NOVA_SRC_DIR) && (git rev-parse HEAD 2>/dev/null || echo 0) | cut -c1-7) +CXX_LINK_OPT = -Wl,--gc-sections -Wl,--warn-common -Wl,-static -Wl,-n -Wl,--defsym=GIT_VER=0x$(call git_version) LD_TEXT_ADDR = # 0xc000000000 - when setting this 64bit compile fails because of relocation issues!! LD_SCRIPT_STATIC = hypervisor.o