[v2] meson: replace submodules with wrap files

[PATCH 07/10] pc-bios/s390-ccw: always build network bootloader

Posted by Paolo Bonzini 2 years, 8 months ago

In the beginning, the network bootloader was considered experimental and
thus optional, but it is well established nowadays and configure always
checks for roms/SLOF before compiling pc-bios/s390-ccw.

Therefore, it makes sense to always build it together with the other
part of the s390-ccw bios.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 pc-bios/s390-ccw/Makefile | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile
index 9c5276f8ade..2e8cc015aa0 100644
--- a/pc-bios/s390-ccw/Makefile
+++ b/pc-bios/s390-ccw/Makefile
@@ -67,12 +67,7 @@ s390-ccw.img: s390-ccw.elf
 
 $(OBJECTS): Makefile
 
-ifneq ($(wildcard $(SRC_PATH)/../../roms/SLOF/lib/libnet),)
 include $(SRC_PATH)/netboot.mak
-else
-s390-netboot.img:
-	@echo "s390-netboot.img not built since roms/SLOF/ is not available."
-endif
 
 ALL_OBJS = $(sort $(OBJECTS) $(NETOBJS) $(LIBCOBJS) $(LIBNETOBJS))
 -include $(ALL_OBJS:%.o=%.d)
-- 
2.40.1

Re: [PATCH 07/10] pc-bios/s390-ccw: always build network bootloader

Posted by Nina Schoetterl-Glausch 2 years, 7 months ago

On Mon, 2023-06-05 at 11:52 +0200, Paolo Bonzini wrote:
> In the beginning, the network bootloader was considered experimental and
> thus optional, but it is well established nowadays and configure always
> checks for roms/SLOF before compiling pc-bios/s390-ccw.

Only if run in a git repository, not in a tree generated with archive-source.sh
which doesn't package roms/SLOF.
So without the check below the build fails.
This is not inteded, is it?

> 
> Therefore, it makes sense to always build it together with the other
> part of the s390-ccw bios.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  pc-bios/s390-ccw/Makefile | 5 -----
>  1 file changed, 5 deletions(-)
> 
> diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile
> index 9c5276f8ade..2e8cc015aa0 100644
> --- a/pc-bios/s390-ccw/Makefile
> +++ b/pc-bios/s390-ccw/Makefile
> @@ -67,12 +67,7 @@ s390-ccw.img: s390-ccw.elf
>  
>  $(OBJECTS): Makefile
>  
> -ifneq ($(wildcard $(SRC_PATH)/../../roms/SLOF/lib/libnet),)
>  include $(SRC_PATH)/netboot.mak
> -else
> -s390-netboot.img:
> -	@echo "s390-netboot.img not built since roms/SLOF/ is not available."
> -endif
>  
>  ALL_OBJS = $(sort $(OBJECTS) $(NETOBJS) $(LIBCOBJS) $(LIBNETOBJS))
>  -include $(ALL_OBJS:%.o=%.d)

Re: [PATCH 07/10] pc-bios/s390-ccw: always build network bootloader

Posted by Thomas Huth 2 years, 7 months ago

On 16/06/2023 17.20, Nina Schoetterl-Glausch wrote:
> On Mon, 2023-06-05 at 11:52 +0200, Paolo Bonzini wrote:
>> In the beginning, the network bootloader was considered experimental and
>> thus optional, but it is well established nowadays and configure always
>> checks for roms/SLOF before compiling pc-bios/s390-ccw.
> 
> Only if run in a git repository, not in a tree generated with archive-source.sh
> which doesn't package roms/SLOF.
> So without the check below the build fails.
> This is not inteded, is it?

I guess archive-source.sh needs to be changed to include the SLOF sources 
now? Paolo, what would you recommend?

  Thomas

Re: [PATCH 07/10] pc-bios/s390-ccw: always build network bootloader

Posted by Paolo Bonzini 2 years, 7 months ago

On 6/22/23 10:42, Thomas Huth wrote:
>>
>> Only if run in a git repository, not in a tree generated with 
>> archive-source.sh
>> which doesn't package roms/SLOF.
>> So without the check below the build fails.
>> This is not inteded, is it?
> 
> I guess archive-source.sh needs to be changed to include the SLOF 
> sources now? Paolo, what would you recommend?

It's not strictly necessary, I have sent a patch at 
https://patchew.org/QEMU/20230618212039.102052-1-pbonzini@redhat.com/ 
and I'll have to send v2 based on Nina's comments.

Paolo

Re: [PATCH 07/10] pc-bios/s390-ccw: always build network bootloader

Posted by Thomas Huth 2 years, 8 months ago

On 05/06/2023 11.52, Paolo Bonzini wrote:
> In the beginning, the network bootloader was considered experimental and
> thus optional, but it is well established nowadays and configure always
> checks for roms/SLOF before compiling pc-bios/s390-ccw.
> 
> Therefore, it makes sense to always build it together with the other
> part of the s390-ccw bios.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>   pc-bios/s390-ccw/Makefile | 5 -----
>   1 file changed, 5 deletions(-)
> 
> diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile
> index 9c5276f8ade..2e8cc015aa0 100644
> --- a/pc-bios/s390-ccw/Makefile
> +++ b/pc-bios/s390-ccw/Makefile
> @@ -67,12 +67,7 @@ s390-ccw.img: s390-ccw.elf
>   
>   $(OBJECTS): Makefile
>   
> -ifneq ($(wildcard $(SRC_PATH)/../../roms/SLOF/lib/libnet),)
>   include $(SRC_PATH)/netboot.mak
> -else
> -s390-netboot.img:
> -	@echo "s390-netboot.img not built since roms/SLOF/ is not available."
> -endif
>   
>   ALL_OBJS = $(sort $(OBJECTS) $(NETOBJS) $(LIBCOBJS) $(LIBNETOBJS))
>   -include $(ALL_OBJS:%.o=%.d)

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH 07/10] pc-bios/s390-ccw: always build network bootloader

Posted by Daniel P. Berrangé 2 years, 8 months ago

On Mon, Jun 05, 2023 at 11:52:20AM +0200, Paolo Bonzini wrote:
> In the beginning, the network bootloader was considered experimental and
> thus optional, but it is well established nowadays and configure always
> checks for roms/SLOF before compiling pc-bios/s390-ccw.
> 
> Therefore, it makes sense to always build it together with the other
> part of the s390-ccw bios.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  pc-bios/s390-ccw/Makefile | 5 -----
>  1 file changed, 5 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|