mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
move vtpmmgr helpers from tools to stubdom
Tools.mk contains a dead CONFIG_VTPM, @vtpm@ is never expanded because
@vtpm@ is only known by stubdom/configure.ac. Move the two perl scripts
to stubdom/vtpmmgr and install them as executeable. This was introduced
by the recent commit ffa11862aa ("vtpmmgr:
add example control tools")
Also remove vtpm= from config/Stubdom.mk because vtpm= is (appearently)
not used by make itself.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Daniel De Graaf <dgdegra@tycho.nsa.gov>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
This commit is contained in:
Olaf Hering authored and Ian Campbell committed
1 parent
f049ce7bf2
commit
f9b87b670c
7 files changed
+5
-18
No files matched your search
@@ -6,7 +6,6 @@ FETCHER := @FETCHER@
|
||||
|
||||
# A debug build of stubdom? //FIXME: Someone make this do something
|
||||
debug := @debug@
|
||||
vtpm = @vtpm@
|
||||
|
||||
STUBDOM_TARGETS := @STUBDOM_TARGETS@
|
||||
STUBDOM_BUILD := @STUBDOM_BUILD@
|
||||
|
||||
@@ -59,7 +59,6 @@ CONFIG_QEMU_TRAD := @qemu_traditional@
|
||||
CONFIG_QEMU_XEN := @qemu_xen@
|
||||
CONFIG_BLKTAP1 := @blktap1@
|
||||
CONFIG_BLKTAP2 := @blktap2@
|
||||
CONFIG_VTPM := @vtpm@
|
||||
CONFIG_QEMUU_EXTRA_ARGS:= @EXTRA_QEMUU_CONFIGURE_ARGS@
|
||||
CONFIG_REMUS_NETBUF := @remus_netbuf@
|
||||
|
||||
|
||||
@@ -23,6 +23,11 @@ build: $(TARGET)
|
||||
$(TARGET): $(OBJS)
|
||||
ar -rcs $@ $^
|
||||
|
||||
install:
|
||||
$(INSTALL_DIR) "$(DESTDIR)$(LIBEXEC_BIN)"
|
||||
$(INSTALL_PROG) calc.pl "$(DESTDIR)$(LIBEXEC_BIN)"
|
||||
$(INSTALL_PROG) manage-vtpmmgr.pl "$(DESTDIR)$(LIBEXEC_BIN)"
|
||||
|
||||
clean:
|
||||
rm -f $(TARGET) $(OBJS)
|
||||
|
||||
|
||||
File renamed without changes.
File renamed without changes.
@@ -34,7 +34,6 @@ SUBDIRS-$(CONFIG_X86) += xenpaging
|
||||
SUBDIRS-$(CONFIG_X86) += debugger/gdbsx
|
||||
SUBDIRS-$(CONFIG_X86) += debugger/kdd
|
||||
SUBDIRS-$(CONFIG_TESTS) += tests
|
||||
SUBDIRS-$(CONFIG_VTPM) += vtpmmgr
|
||||
|
||||
# These don't cross-compile
|
||||
ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
XEN_ROOT=$(CURDIR)/../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
all:
|
||||
@true
|
||||
|
||||
install:
|
||||
$(INSTALL_DIR) "$(DESTDIR)$(LIBEXEC_BIN)"
|
||||
$(INSTALL_DATA) calc.pl "$(DESTDIR)$(LIBEXEC_BIN)"
|
||||
$(INSTALL_DATA) manage-vtpmmgr.pl "$(DESTDIR)$(LIBEXEC_BIN)"
|
||||
|
||||
clean:
|
||||
@true
|
||||
|
||||
.PHONY: all install clean
|
||||