Commit-ID: ad3efb18a130afba1c888bc790e2d716072eed22
Gitweb: http://git.kernel.org/tip/ad3efb18a130afba1c888bc790e2d716072eed22
Author: Pekka Enberg <penberg@xxxxxxxxxx>
AuthorDate: Sun, 11 Dec 2011 21:27:16 +0200
Committer: Pekka Enberg <penberg@xxxxxxxxxx>
CommitDate: Sun, 11 Dec 2011 21:31:27 +0200
kvm tools: Call executable 'lkvm' and add 'vm' alias
Several people have raised up the issue with our 'kvm' executable name. Rusty
came up with 'lkvm' which even Ingo is reasonably happy with:
I could live with:
- keeping 'tools/kvm/' as the tool project name
- 'lkvm' as the binary
- a command alias binary (hardlink) to 'vm'. I just checked,
it's not used by any other package.
... and be done with it?
'lkvm' rhymes nicely to 'lkml' as well, so it's not a 100% bad
name.
Suggested-by: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Suggested-by: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
---
tools/kvm/.gitignore | 3 ++-
tools/kvm/Makefile | 9 +++++++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/tools/kvm/.gitignore b/tools/kvm/.gitignore
index 6ace4ec..be6c6f2 100644
--- a/tools/kvm/.gitignore
+++ b/tools/kvm/.gitignore
@@ -1,4 +1,5 @@
-/kvm
+/lkvm
+/vm
*.o
*.d
.cscope
diff --git a/tools/kvm/Makefile b/tools/kvm/Makefile
index cef3c44..579e7b0 100644
--- a/tools/kvm/Makefile
+++ b/tools/kvm/Makefile
@@ -23,7 +23,8 @@ FIND := find
CSCOPE := cscope
TAGS := ctags
-PROGRAM := kvm
+PROGRAM := lkvm
+PROGRAM_ALIAS := vm
GUEST_INIT := guest/init
GUEST_INIT_S2 := guest/init_stage2
@@ -209,7 +210,7 @@ WARNINGS += -Wwrite-strings
CFLAGS += $(WARNINGS)
-all: arch_support_check $(PROGRAM) $(GUEST_INIT) $(GUEST_INIT_S2)
+all: arch_support_check $(PROGRAM) $(PROGRAM_ALIAS) $(GUEST_INIT) $(GUEST_INIT_S2)
arch_support_check:
$(UNSUPP_ERR)
@@ -222,6 +223,10 @@ $(PROGRAM): $(DEPS) $(OBJS)
$(E) " LINK " $@
$(Q) $(CC) $(OBJS) $(LIBS) -o $@
+$(PROGRAM_ALIAS): $(PROGRAM)
+ $(E) " LN " $@
+ $(Q) ln -f $(PROGRAM) $@
+
$(GUEST_INIT): guest/init.c
$(E) " LINK " $@
$(Q) $(CC) -static guest/init.c -o $@
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|