Re: [PATCH 1/2] stubdom: fix build with disabled pv-grub

[Samuel Thibault <samuel.thibault@xxxxxxxxxxxx>]

Juergen Gross, le jeu. 09 sept. 2021 10:27:04 +0200, a ecrit:
> Today the build will fail if --disable-pv-grub as a parameter of
> configure, as the main Makefile will unconditionally try to build a
> 32-bit pv-grub stubdom.
> 
> Fix that by introducing a pv-grub32 target in stubdom/Makefile taking
> care of this situation.
> 
> Signed-off-by: Juergen Gross <jgross@xxxxxxxx>

Reviewed-by: Samuel Thibault <samuel.thibault@xxxxxxxxxxxx>

> ---
>  Makefile         |  4 ++--
>  stubdom/Makefile | 13 +++++++++++++
>  2 files changed, 15 insertions(+), 2 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 96d32cfd50..5b5cef3e49 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -72,7 +72,7 @@ build-tools-oxenstored: build-tools-public-headers
>  build-stubdom: mini-os-dir build-tools-public-headers
>       $(MAKE) -C stubdom build
>  ifeq (x86_64,$(XEN_TARGET_ARCH))
> -     XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom pv-grub
> +     XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom pv-grub32
>  endif
>  
>  .PHONY: build-docs
> @@ -143,7 +143,7 @@ install-tools: install-tools-public-headers
>  install-stubdom: mini-os-dir install-tools
>       $(MAKE) -C stubdom install
>  ifeq (x86_64,$(XEN_TARGET_ARCH))
> -     XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom install-grub
> +     XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom install-grub32
>  endif
>  
>  .PHONY: tools/firmware/seabios-dir-force-update
> diff --git a/stubdom/Makefile b/stubdom/Makefile
> index 06aa69d8bc..b339ae701c 100644
> --- a/stubdom/Makefile
> +++ b/stubdom/Makefile
> @@ -531,6 +531,13 @@ vtpmmgr-stubdom: mini-os-$(XEN_TARGET_ARCH)-vtpmmgr 
> vtpmmgr
>  pv-grub: mini-os-$(XEN_TARGET_ARCH)-grub libxenguest grub
>       DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" 
> DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/grub/minios.cfg" 
> $(MAKE) DESTDIR= -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< 
> APP_OBJS=$(CURDIR)/grub-$(XEN_TARGET_ARCH)/main.a
>  
> +.PHONY: pv-grub32
> +ifneq ($(filter grub,$(STUBDOM_TARGETS)),)
> +pv-grub32: pv-grub
> +else
> +pv-grub32:
> +endif
> +
>  .PHONY: xenstore-stubdom
>  xenstore-stubdom: mini-os-$(XEN_TARGET_ARCH)-xenstore libxenguest xenstore
>       DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" 
> DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/xenstore-minios.cfg" 
> $(MAKE) DESTDIR= -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< 
> APP_OBJS=$(CURDIR)/xenstore/xenstored.a
> @@ -560,6 +567,12 @@ install-grub: pv-grub
>       $(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)"
>       $(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-grub/mini-os.gz 
> "$(DESTDIR)$(XENFIRMWAREDIR)/pv-grub-$(XEN_TARGET_ARCH).gz"
>  
> +ifneq ($(filter grub,$(STUBDOM_TARGETS)),)
> +install-grub32: install-grub
> +else
> +install-grub32:
> +endif
> +
>  install-c: c-stubdom
>  
>  install-caml: caml-stubdom
> -- 
> 2.26.2
> 

-- 
Samuel
The nice thing about Windows is - It does not just crash, it displays a
dialog box and lets you press 'OK' first.
(Arno Schaefer's .sig)