[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 07/10] pc-bios/s390-ccw: always build network bootloader
From: |
Nina Schoetterl-Glausch |
Subject: |
Re: [PATCH 07/10] pc-bios/s390-ccw: always build network bootloader |
Date: |
Fri, 16 Jun 2023 17:20:13 +0200 |
User-agent: |
Evolution 3.46.4 (3.46.4-1.fc37) |
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 03/10] git-submodule: allow partial update of .git-submodule-status, (continued)
- [PATCH 06/10] configure: move SLOF submodule handling to pc-bios/s390-ccw, Paolo Bonzini, 2023/06/05
- [PATCH 09/10] build: remove git submodule handling from main makefile, Paolo Bonzini, 2023/06/05
- [PATCH 05/10] meson: subprojects: replace submodules with wrap files, Paolo Bonzini, 2023/06/05
- [PATCH 08/10] meson: subprojects: replace berkeley-{soft, test}float-3 with wraps, Paolo Bonzini, 2023/06/05