Re: [PATCH 1/2] mini-os: fix testbuilds regarding CONFIG_XC

[Samuel Thibault <samuel.thibault@xxxxxxxxxxxx>]

Juergen Gross, le lun. 04 oct. 2021 16:19:23 +0200, a ecrit:
> CONFIG_GC is requiring external support, so disable it in testbuilds.
> 
> The only reason this is working right now is its usage being inside
> a HAVE_LIBC section.
> 
> Make that more obvious by making the default setting of CONFIG_XC
> depending on libc being available.
> 
> Signed-off-by: Juergen Gross <jgross@xxxxxxxx>

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

Thanks!

> ---
>  Config.mk                     | 3 ++-
>  arch/x86/testbuild/all-yes    | 3 ++-
>  arch/x86/testbuild/newxen-yes | 3 ++-
>  3 files changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/Config.mk b/Config.mk
> index 15311ef..8f4cea9 100644
> --- a/Config.mk
> +++ b/Config.mk
> @@ -62,6 +62,7 @@ MINIOS_COMPILE_ARCH    ?= $(shell uname -m | sed -e 
> s/i.86/x86_32/ \
>  MINIOS_TARGET_ARCH     ?= $(MINIOS_COMPILE_ARCH)
>  endif
>  
> +stubdom ?= n
>  libc = $(stubdom)
>  
>  XEN_INTERFACE_VERSION ?= 0x00030205
> @@ -179,7 +180,6 @@ CONFIG-y += CONFIG_FBFRONT
>  CONFIG-y += CONFIG_KBDFRONT
>  CONFIG-y += CONFIG_CONSFRONT
>  CONFIG-y += CONFIG_XENBUS
> -CONFIG-y += CONFIG_XC
>  CONFIG-n += CONFIG_QEMU_XS_ARGS
>  CONFIG-n += CONFIG_TEST
>  CONFIG-n += CONFIG_PCIFRONT
> @@ -195,6 +195,7 @@ CONFIG-y += CONFIG_PARAVIRT
>  else
>  CONFIG-n += CONFIG_PARAVIRT
>  endif
> +CONFIG-$(libc) += CONFIG_XC
>  CONFIG-$(lwip) += CONFIG_LWIP
>  
>  $(foreach i,$(CONFIG-y),$(eval $(i) ?= y))
> diff --git a/arch/x86/testbuild/all-yes b/arch/x86/testbuild/all-yes
> index 8732e69..5464342 100644
> --- a/arch/x86/testbuild/all-yes
> +++ b/arch/x86/testbuild/all-yes
> @@ -13,7 +13,8 @@ CONFIG_FBFRONT = y
>  CONFIG_KBDFRONT = y
>  CONFIG_CONSFRONT = y
>  CONFIG_XENBUS = y
> -CONFIG_XC = y
> +# XC is special: it needs support from outside
> +CONFIG_XC = n
>  # LWIP is special: it needs support from outside
>  CONFIG_LWIP = n
>  CONFIG_BALLOON = y
> diff --git a/arch/x86/testbuild/newxen-yes b/arch/x86/testbuild/newxen-yes
> index 9c30c00..2a3ed2e 100644
> --- a/arch/x86/testbuild/newxen-yes
> +++ b/arch/x86/testbuild/newxen-yes
> @@ -13,7 +13,8 @@ CONFIG_FBFRONT = y
>  CONFIG_KBDFRONT = y
>  CONFIG_CONSFRONT = y
>  CONFIG_XENBUS = y
> -CONFIG_XC = y
> +# XC is special: it needs support from outside
> +CONFIG_XC = n
>  # LWIP is special: it needs support from outside
>  CONFIG_LWIP = n
>  CONFIG_BALLOON = y
> -- 
> 2.26.2
> 

-- 
Samuel
<k> faut en profiter, aujourd'hui, les blagues bidon sont à 100 dollars
 -+- #sos-bourse -+-