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 <pbonz...@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)