tools/helpers: fix Arm build by excluding init-xenstore-domain
PATCH 1/1 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 <[email protected]>
--- tools/helpers/Makefile | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
tools/helpers/Makefile +4 -8
@@ -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:
Signature · 1 line
2.26.2
Quoted 8 lines · Juergen Gross
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 <[email protected]>
Acked-by Wei Liu <[email protected]>
I have applied this patch to unblock osstest.