[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 05/15] packages: roms: download: fix missing qemu-img.
From: |
Denis 'GNUtoo' Carikli |
Subject: |
[PATCH v1 05/15] packages: roms: download: fix missing qemu-img. |
Date: |
Mon, 23 Sep 2024 16:42:58 +0200 |
Without that fix we have the following build error on Trisquel when
qemu-utils is not installed:
successfully built /gnu/store/[...]-gnuboot-trisquel-preseed.img-07-2024.drv
resources/packages/roms/download: line 175: qemu-img: command not found
make: *** [Makefile:713: release] Error 127
An option would be to make sure that the host has qemu_img by adding
its corresponding packages in resources/dependencies/ and to check for
it in configure.ac, but since we already build the qemu with Guix,
it's easier to just reuse that, and this also gives us less
maintenance in the long run.
This was broken by the commit 9cc02ddde1e164fabfbddc8bbd3832ef9468d92d
("packages: roms: Start adding automatic tests.").
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
---
resources/packages/roms/download | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/resources/packages/roms/download b/resources/packages/roms/download
index cea77df..ae52fe0 100755
--- a/resources/packages/roms/download
+++ b/resources/packages/roms/download
@@ -139,15 +139,26 @@ build_trisquel_rootfs_img()
return_guix_qemu_x86_64()
{
- img_install_path="bin/qemu-system-x86_64"
+ qemu_install_path="bin/qemu-system-x86_64"
# Guix produces 3 qemu outputs: one for the docs, one for the
# static version, and one for all the rest.
pkg_path="$(build_guix_qemu_x86_64 | \
grep -v '\-doc$' | grep -v '\-static$')"
- qemu_path="${pkg_path}/${img_install_path}"
+ qemu_path="${pkg_path}/${qemu_install_path}"
echo "${qemu_path}"
}
+return_guix_qemu_img()
+{
+ qemu_img_install_path="bin/qemu-img"
+ # Guix produces 3 qemu outputs: one for the docs, one for the
+ # static version, and one for all the rest.
+ pkg_path="$(build_guix_qemu_x86_64 | \
+ grep -v '\-doc$' | grep -v '\-static$')"
+ qemu_img_path="${pkg_path}/${qemu_img_install_path}"
+ echo "${qemu_img_path}"
+}
+
return_trisquel_preseed_x86_64_img()
{
img_install_path="share/trisquel-installer/preseed.img"
@@ -172,7 +183,8 @@ return_trisquel_rootfs_img()
cp "${preseed_x86_64_img}" preseed.img
chmod 770 preseed.img
- qemu-img "create" "-f" "raw" "rootfs.img" "4.1G"
+ qemu_img="$(return_guix_qemu_img)"
+ "${qemu_img}" "create" "-f" "raw" "rootfs.img" "4.1G"
extra_qemu_args=""
if [ "${kvm}" = "yes" ] ; then
--
2.46.0
- [PATCH v1 00/15] Various fixes (mostly build related) and improvements., Denis 'GNUtoo' Carikli, 2024/09/23
- [PATCH v1 04/15] guix: gnuboot-trisquel-grub.img: add missing inputs., Denis 'GNUtoo' Carikli, 2024/09/23
- [PATCH v1 06/15] website: pages: global.css: Add copyright header., Denis 'GNUtoo' Carikli, 2024/09/23
- [PATCH v1 01/15] guix: gnuboot-trisquel-preseed.img: enable to disable tests., Denis 'GNUtoo' Carikli, 2024/09/23
- [PATCH v1 03/15] guix: gnuboot-trisquel-preseed.img: add missing inputs., Denis 'GNUtoo' Carikli, 2024/09/23
- [PATCH v1 02/15] guix: gnuboot-trisquel-preseed.img: Make it reproducible., Denis 'GNUtoo' Carikli, 2024/09/23
- [PATCH v1 08/15] Remove images with the seabios_grubfirst main payload., Denis 'GNUtoo' Carikli, 2024/09/23
- [PATCH v1 14/15] dependencies: Trisquel 10: fix pandoc install., Denis 'GNUtoo' Carikli, 2024/09/23
- [PATCH v1 15/15] dependencies: Trisquel: Add 'unifont' for Trisquel 11., Denis 'GNUtoo' Carikli, 2024/09/23
- [PATCH v1 13/15] dependencies: Trisquel 10: Fix script for non-english locales., Denis 'GNUtoo' Carikli, 2024/09/23
- [PATCH v1 05/15] packages: roms: download: fix missing qemu-img.,
Denis 'GNUtoo' Carikli <=
- [PATCH v1 07/15] website: history: copyright: add reviewed website/pages/global.css file., Denis 'GNUtoo' Carikli, 2024/09/23
- [PATCH v1 10/15] images: remove 'libgfxinit' from the image names., Denis 'GNUtoo' Carikli, 2024/09/23
- [PATCH v1 09/15] rename seabios_withgrub images to seabios., Denis 'GNUtoo' Carikli, 2024/09/23
- [PATCH v1 12/15] website: history: copyright: add verified resources/dependencies/trisquel-10 file., Denis 'GNUtoo' Carikli, 2024/09/23
- [PATCH v1 11/15] dependencies: Trisquel 10: Add copyright header., Denis 'GNUtoo' Carikli, 2024/09/23