diff options
| author | Andre Przywara <andre.przywara@arm.com> | 2015-01-20 23:49:03 +0000 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2015-06-01 16:40:11 +0100 |
| commit | 17725a8d8fcbee90766e98e07c7b850e74f91e49 (patch) | |
| tree | 5bb68be3b5d1ea13d9e8d38455512fcc66a563aa | |
| parent | 3ac7d904df004216556658f94425ea193a35ba6b (diff) | |
| download | kvmtool-17725a8d8fcbee90766e98e07c7b850e74f91e49.tar.gz | |
kvmtool: Remove references to top level kernel directory
The Makefile used to reference ../.. on some occasions to point
to the Linux source tree. Since this is no longer there, remove
those bogus paths.
Since we cannot (and don't want to) determine the Linux kernel
version on this way, we hardcode v3.18.0 for now, which is the version
the in-kernel-tree version used at the point of forking.
This should be later revisited and adjusted to whatever versioning
scheme we will use.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
| -rw-r--r-- | Makefile | 10 | ||||
| -rwxr-xr-x | util/KVMTOOLS-VERSION-GEN | 4 |
2 files changed, 4 insertions, 10 deletions
@@ -9,12 +9,7 @@ else E = @\# Q = endif -ifneq ($(I), ) - KINCL_PATH=$(I) -else - KINCL_PATH=../.. -endif -export E Q KINCL_PATH +export E Q include config/utilities.mak include config/feature-tests.mak @@ -302,7 +297,7 @@ DEFINES += -DKVMTOOLS_VERSION='"$(KVMTOOLS_VERSION)"' DEFINES += -DBUILD_ARCH='"$(ARCH)"' KVM_INCLUDE := include -CFLAGS += $(CPPFLAGS) $(DEFINES) -I$(KVM_INCLUDE) -I$(ARCH_INCLUDE) -I$(KINCL_PATH)/include/uapi -I$(KINCL_PATH)/include -I$(KINCL_PATH)/arch/$(ARCH)/include/uapi -I$(KINCL_PATH)/arch/$(ARCH)/include/ -I$(KINCL_PATH)/scripts/dtc/libfdt -O2 -fno-strict-aliasing -g +CFLAGS += $(CPPFLAGS) $(DEFINES) -I$(KVM_INCLUDE) -I$(ARCH_INCLUDE) -O2 -fno-strict-aliasing -g WARNINGS += -Wall WARNINGS += -Wformat=2 @@ -424,7 +419,6 @@ BIOS_CFLAGS += -march=i386 BIOS_CFLAGS += -mregparm=3 BIOS_CFLAGS += -fno-stack-protector -BIOS_CFLAGS += -I../../arch/$(ARCH) x86/bios.o: x86/bios/bios.bin x86/bios/bios-rom.h diff --git a/util/KVMTOOLS-VERSION-GEN b/util/KVMTOOLS-VERSION-GEN index 1af9d6c2..f0dcfdea 100755 --- a/util/KVMTOOLS-VERSION-GEN +++ b/util/KVMTOOLS-VERSION-GEN @@ -11,7 +11,7 @@ LF=' # First check if there is a .git to get the version from git describe # otherwise try to get the version from the kernel makefile -if test -d ../../.git -o -f ../../.git && +if test -d .git -o -f .git && VN=$(git describe --abbrev=4 HEAD 2>/dev/null) && case "$VN" in *$LF*) (exit 1) ;; @@ -23,7 +23,7 @@ if test -d ../../.git -o -f ../../.git && then VN=$(echo "$VN" | sed -e 's/-/./g'); else - VN=$(MAKEFLAGS= make -sC ../.. kernelversion) + VN=3.18.0 fi VN=$(expr "$VN" : v*'\(.*\)') |