futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: Adjust ‘guix system’ test for EFI bootloader.

Browse Source 
This is a followup to e5078ff321, which
broke this test:

  $ guix system disk-image -n gnu/system/examples/desktop.tmpl
  guix system: warning: 'disk-image' is deprecated: use 'image' instead
  guix system: error: EFI bootloader required with GPT partitioning

* tests/guix-system.sh: Use ‘guix system image’ instead of ‘guix system
disk-image’.  Pass ‘-t efi-raw’ for ‘desktop.tmpl’.

Change-Id: I6877085ab33d9e8b471315b806fed22a7d1241a3
This commit is contained in:
Ludovic Courtès 2024-06-13 22:34:00 +02:00
parent 8355756d1a
commit af2ca0226f
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/guix-system.sh
View File

@ -1,5 +1,5 @@
# GNU Guix --- Functional package management for GNU # GNU Guix --- Functional package management for GNU
# Copyright © 2014-2022 Ludovic Courtès <ludo@gnu.org> # Copyright © 2014-2022, 2024 Ludovic Courtès <ludo@gnu.org>
# Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> # Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
# Copyright © 2018 Chris Marusich <cmmarusich@gmail.com> # Copyright © 2018 Chris Marusich <cmmarusich@gmail.com>
# #
@ -355,17 +355,22 @@ for example in gnu/system/examples/*.tmpl; do
# Skip it. # Skip it.
continue continue
;; ;;
*desktop*)
# This image uses 'grub-efi-bootloader' so it needs a GPT
# partition.
options="-t efi-raw --system=x86_64-linux";;
*) *)
options="" options=""
;; ;;
esac esac
guix system -n disk-image $options "$example" guix system -n image $options "$example"
done done
# Make sure the desktop image can be built on major architectures. # Make sure the desktop image can be built on major architectures.
for system in x86_64-linux aarch64-linux for system in x86_64-linux aarch64-linux
do do
guix system -n image -s "$system" gnu/system/examples/desktop.tmpl guix system -n image -s "$system" -t efi-raw \
gnu/system/examples/desktop.tmpl
done done
# Verify that the images can be built. # Verify that the images can be built.