git: b86e89713694 - main - full-test.sh: Limit to just aarch64 and amd64, as that's all that works
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 09 Apr 2025 20:54:02 UTC
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b86e8971369403e1f347c0354e4ccf480d7a666a commit b86e8971369403e1f347c0354e4ccf480d7a666a Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2025-04-09 20:53:31 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2025-04-09 20:53:31 +0000 full-test.sh: Limit to just aarch64 and amd64, as that's all that works Only aarch64 and amd64 are working. For the moment, comment out everything else until I can make it work too. The others build, to be fair, but don't work or haven't been confirmed to work. Sponsored by: Netflix --- tools/boot/full-test.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/boot/full-test.sh b/tools/boot/full-test.sh index 370088f120bb..43967913e76f 100644 --- a/tools/boot/full-test.sh +++ b/tools/boot/full-test.sh @@ -366,7 +366,7 @@ make_linuxboot_scripts() if [ ${bios_code} -ot /usr/local/share/qemu/edk2-x86_64-code.fd ]; then cp /usr/local/share/qemu/edk2-x86_64-code.fd ${bios_code} # vars file works on both 32 and 64 bit x86 - cp /usr/local/share/qemu/edk2-i386-vars.fd ${bios_vars} +# cp /usr/local/share/qemu/edk2-i386-vars.fd ${bios_vars} fi ;; aarch64) @@ -448,7 +448,8 @@ EOF make_freebsd_esps() { # At the moment, we have just three (armv7 could also be here too, but we're not doing that) - for a in amd64:amd64 arm64:aarch64 riscv:riscv64; do +# for a in amd64:amd64 arm64:aarch64 riscv:riscv64; do + for a in amd64:amd64 arm64:aarch64; do m=${a%%:*} ma=${a##*:} ma_combo="${m}" @@ -470,7 +471,8 @@ make_freebsd_images() { # ESP variant: In this variant, riscv, amd64 and arm64 are created more or # less the same way. UEFI + ACPI implementations - for a in amd64:amd64 arm64:aarch64 riscv:riscv64; do +# for a in amd64:amd64 arm64:aarch64 riscv:riscv64; do + for a in amd64:amd64 arm64:aarch64; do m=${a%%:*} ma=${a##*:} ma_combo="${m}" @@ -495,6 +497,7 @@ EOF set -x +if false; then # BIOS i386 a=i386:i386 m=${a%%:*} @@ -541,6 +544,7 @@ EOF -p freebsd-boot:=${dir2}/boot/boot1.hfs \ -p freebsd-ufs:=${ufs} \ -o ${img} +fi set +x } @@ -562,7 +566,7 @@ make_freebsd_scripts() if [ ${bios_code} -ot /usr/local/share/qemu/edk2-x86_64-code.fd ]; then cp /usr/local/share/qemu/edk2-x86_64-code.fd ${bios_code} # vars file works on both 32 and 64 bit x86 - cp /usr/local/share/qemu/edk2-i386-vars.fd ${bios_vars} +# cp /usr/local/share/qemu/edk2-i386-vars.fd ${bios_vars} fi ;; aarch64) @@ -609,6 +613,7 @@ EOF esac done +if false; then set -x a=powerpc:powerpc m=${a%%:*} @@ -644,6 +649,7 @@ ${qemu_bin}/qemu-system-i386 -m 1g \\ -monitor telnet::4444,server,nowait \\ -serial stdio \$* EOF +fi } # The smallest FAT32 filesystem is 33292 KB