From f9b87b670cb2757d2f537f38f836deae4dc63fb8 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 1 Oct 2014 18:41:29 +0200 Subject: [PATCH] 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 ffa11862aa431494e809c6e99f7358c12cb67e44 ("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 Acked-by: Ian Campbell Acked-by: Daniel De Graaf Cc: Ian Campbell Cc: Ian Jackson Cc: Samuel Thibault Cc: Stefano Stabellini Cc: Wei Liu --- config/Stubdom.mk.in | 1 - config/Tools.mk.in | 1 - stubdom/vtpmmgr/Makefile | 5 +++++ {tools => stubdom}/vtpmmgr/calc.pl | 0 {tools => stubdom}/vtpmmgr/manage-vtpmmgr.pl | 0 tools/Makefile | 1 - tools/vtpmmgr/Makefile | 15 --------------- 7 files changed, 5 insertions(+), 18 deletions(-) rename {tools => stubdom}/vtpmmgr/calc.pl (100%) rename {tools => stubdom}/vtpmmgr/manage-vtpmmgr.pl (100%) delete mode 100644 tools/vtpmmgr/Makefile diff --git a/config/Stubdom.mk.in b/config/Stubdom.mk.in index 9098cbf85d..5990fc4e04 100644 --- a/config/Stubdom.mk.in +++ b/config/Stubdom.mk.in @@ -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@ diff --git a/config/Tools.mk.in b/config/Tools.mk.in index 545bdc0d12..89de5bd99c 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -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@ diff --git a/stubdom/vtpmmgr/Makefile b/stubdom/vtpmmgr/Makefile index a39a22c375..c5e17c59b1 100644 --- a/stubdom/vtpmmgr/Makefile +++ b/stubdom/vtpmmgr/Makefile @@ -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) diff --git a/tools/vtpmmgr/calc.pl b/stubdom/vtpmmgr/calc.pl similarity index 100% rename from tools/vtpmmgr/calc.pl rename to stubdom/vtpmmgr/calc.pl diff --git a/tools/vtpmmgr/manage-vtpmmgr.pl b/stubdom/vtpmmgr/manage-vtpmmgr.pl similarity index 100% rename from tools/vtpmmgr/manage-vtpmmgr.pl rename to stubdom/vtpmmgr/manage-vtpmmgr.pl diff --git a/tools/Makefile b/tools/Makefile index 452510ab6d..543cd29a13 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -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)) diff --git a/tools/vtpmmgr/Makefile b/tools/vtpmmgr/Makefile deleted file mode 100644 index b14c1700b0..0000000000 --- a/tools/vtpmmgr/Makefile +++ /dev/null @@ -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 -- 2.30.2