Mailing List Archive

commit 92abe1481c1181b95c7f91846bd1d77f37ee5c5e
Author: Juergen Gross <jgross@suse.com>
AuthorDate: Sun Oct 25 06:45:46 2020 +0100
Commit: Wei Liu <wl@xen.org>
CommitDate: Mon Oct 26 11:04:59 2020 +0000

tools/helpers: fix Arm build by excluding init-xenstore-domain

The support for PVH xenstore-stubdom has broken the Arm build.

Xenstore stubdom isn't supported on Arm, so there is no need to build
the init-xenstore-domain helper.

Build the helper on x86 only.

Signed-off-by: Juergen Gross <jgross@suse.com>
Acked-by: Wei Liu <wl@xen.org>
---
tools/helpers/Makefile | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/tools/helpers/Makefile b/tools/helpers/Makefile
index f759528322..1bcc97ea8a 100644
--- a/tools/helpers/Makefile
+++ b/tools/helpers/Makefile
@@ -7,8 +7,10 @@ include $(XEN_ROOT)/tools/Rules.mk

PROGS += xen-init-dom0
ifeq ($(CONFIG_Linux),y)
+ifeq ($(CONFIG_X86),y)
PROGS += init-xenstore-domain
endif
+endif

XEN_INIT_DOM0_OBJS = xen-init-dom0.o init-dom-json.o
$(XEN_INIT_DOM0_OBJS): CFLAGS += $(CFLAGS_libxentoollog)
@@ -37,17 +39,11 @@ init-xenstore-domain: $(INIT_XENSTORE_DOMAIN_OBJS)
.PHONY: install
install: all
$(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
- $(INSTALL_PROG) xen-init-dom0 $(DESTDIR)$(LIBEXEC_BIN)
-ifeq ($(CONFIG_Linux),y)
- $(INSTALL_PROG) init-xenstore-domain $(DESTDIR)$(LIBEXEC_BIN)
-endif
+ for i in $(PROGS); do $(INSTALL_PROG) $$i $(DESTDIR)$(LIBEXEC_BIN); done

.PHONY: uninstall
uninstall:
-ifeq ($(CONFIG_Linux),y)
- rm -f $(DESTDIR)$(LIBEXEC_BIN)/init-xenstore-domain
-endif
- rm -f $(DESTDIR)$(LIBEXEC_BIN)/xen-init-dom0
+ for i in $(PROGS); do rm -f $(DESTDIR)$(LIBEXEC_BIN)/$$i; done

.PHONY: clean
clean:
--
generated by git-patchbot for /home/xen/git/xen.git#staging