Re: [PATCH 27/28] move vtpmmgr helpers from tools to stubdom

From: Ian Campbell <Ian.Campbell@citrix.com>
To: Olaf Hering <olaf@aepfle.de>
Cc: Wei Liu <wei.liu2@citrix.com>,
	Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
	Ian Jackson <ian.jackson@eu.citrix.com>,
	xen-devel@lists.xen.org,
	Samuel Thibault <samuel.thibault@ens-lyon.org>,
	Daniel De Graaf <dgdegra@tycho.nsa.gov>
Subject: Re: [PATCH 27/28] move vtpmmgr helpers from tools to stubdom
Date: Tue, 30 Sep 2014 17:02:01 +0100	[thread overview]
Message-ID: <1412092921.31276.24.camel@citrix.com> (raw)
In-Reply-To: <1411658423-18877-28-git-send-email-olaf@aepfle.de>

On Thu, 2014-09-25 at 17:20 +0200, Olaf Hering wrote:
> 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")

Not exactly recent any more ;-)

> Also remove vtpm= from config/Stubdom.mk because vtpm= is (appearently)
> not used by make itself.
> 
> Signed-off-by: Olaf Hering <olaf@aepfle.de>
> Cc: Daniel De Graaf <dgdegra@tycho.nsa.gov>

Acked-by: Ian Campbell <ian.campbell@citrix.com>

I'd like to see Daniels opinion though.

> 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>
> ---
>  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(-)
> 
> diff --git a/config/Stubdom.mk.in b/config/Stubdom.mk.in
> index 9098cbf..5990fc4 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 73b578a..5239f4e 100644
> --- a/config/Tools.mk.in
> +++ b/config/Tools.mk.in
> @@ -57,7 +57,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_SYSTEMD      := @systemd@
> diff --git a/stubdom/vtpmmgr/Makefile b/stubdom/vtpmmgr/Makefile
> index a39a22c..c5e17c5 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 38b4c48..4afadfd 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 b14c170..0000000
> --- 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