dependencies: Trisquel: Add 'unifont' for Trisquel 11.

Without this fix we have the following error on Trisquel 11 when
building the GRUB payload:
    configure: error: qemu, coreboot and loongson ports need unifont

Trisquel 10 also has an 'unifont' package, and installing it doesn't
break the build of the GRUB payload.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
This commit is contained in:
Denis 'GNUtoo' Carikli 2024-09-23 16:43:08 +02:00 committed by Adrien 'neox' Bourmault
parent 009b7f0660
commit 8c0341e3b6
Signed by: neox
GPG Key ID: 57BC26A3687116F6
8 changed files with 12 additions and 12 deletions

View File

@ -84,7 +84,7 @@ distclean:
install-dependencies-ubuntu:
echo 'Makefile: running $@ target' >> $(LOG)
set -o pipefail ; ./build dependencies trisquel-10 | tee -a $(LOG)
set -o pipefail ; ./build dependencies trisquel | tee -a $(LOG)
@echo "[ OK ] Makefile: $@ target. See $(LOG) for the log."
install-dependencies-pureos-10:

View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash
# trisquel-10 script: installs build dependencies for Ubuntu 20.04
# trisquel script: installs build dependencies for Trisquel 9 and 10.
#
# Copyright (C) 2014-2016, 2020-2021 Leah Rowe <info@minifree.org>
# Copyright (C) 2016, Klemens Nanni <contact@autoboot.org>
@ -113,7 +113,7 @@ install_packages libncurses5-dev doxygen acpica-tools gdb flex bison build-essen
# GRUB build dependencies (also requires build-essential, bison and flex)
# ------------------------------------------------------------
install_packages ttf-unifont libopts25 libselinux1-dev autogen m4 autoconf help2man libopts25-dev libfont-freetype-perl automake autotools-dev build-essential bison flex libfuse-dev liblzma-dev gawk libdevmapper-dev libtool libfreetype6-dev
install_packages ttf-unifont libopts25 libselinux1-dev autogen m4 autoconf help2man libopts25-dev libfont-freetype-perl automake autotools-dev build-essential bison flex libfuse-dev liblzma-dev gawk libdevmapper-dev libtool libfreetype6-dev unifont
# BucTS build dependencies (external script)
# ------------------------------------------------------------

View File

@ -50,7 +50,7 @@ fi
# as for instance Trisquel 10 has ID_LIKE=debian and not
# ID_LIKE=ubuntu.
if is_base_distro "trisquel" ; then
"$(dirname $0)"/../../dependencies/trisquel-10 $@
"$(dirname $0)"/../../dependencies/trisquel $@
exit $?
elif is_base_distro "pureos" ; then # PureOS doesn't have ID_LIKE
"$(dirname $0)"/../../dependencies/pureos-10 $@
@ -64,7 +64,7 @@ elif is_base_distro "debian" ; then
elif is_base_distro "fedora" ; then
"$(dirname $0)"/../../dependencies/fedora35 $@
elif is_base_distro "ubuntu" ; then
"$(dirname $0)"/../../dependencies/trisquel-10 $@
"$(dirname $0)"/../../dependencies/trisquel $@
elif is_base_distro "void" ; then
"$(dirname $0)"/../../dependencies/void $@
fi

View File

@ -234,7 +234,7 @@ First, install build dependencies
GNU Boot includes a script that automatically installs dependencies in
Trisquel 10 (nabia):
sudo ./build dependencies trisquel-10
sudo ./build dependencies trisquel
and for PureOS 10 (byzantium):

View File

@ -56,7 +56,7 @@ Install the build dependencies. For Ubuntu 20.04 and similar, you can run
the following command in the libreboot build system, from the root directory
of the libreboot Git repository.
./build dependencies trisquel-10
./build dependencies trisquel
Then, download coreboot:

View File

@ -89,7 +89,7 @@ This assumes that you already downloaded coreboot:
This, in turn, assumes that you have installed the build dependencies for
Libreboot. On Ubuntu 20.04 and other apt-get distros, you can do this:
./build dependencies trisquel-10
./build dependencies trisquel
The `cbfstool` executables will be under each coreboot directory, under
each `coreboot/boardname/` directory for each board. Just pick one, presumably

View File

@ -118,7 +118,7 @@ So far the copyright headers were verified on the following files:
aca12bde3f7af5b17969d57f7da1a8d700e0a36f ("website: serve.sh: update
copyright headers.")
* resources/dependencies/trisquel-10 (details in the commit
* resources/dependencies/trisquel (details in the commit
805127f0301294e41a4409a2c9a7d121214a594e ("dependencies: Trisquel
10: Add copyright header.")).

View File

@ -235,20 +235,20 @@ install flashrom. Do this after downloading the
cd lbmk
sudo ./build install dependencies
NOTE: debian, arch or void can be written instead of trisquel-10. the debian
NOTE: debian, arch or void can be written instead of trisquel. the debian
script is also applicable to newer ubuntu versions
./download flashrom
./build module flashrom
If the script complains about missing dependencies, just modify the
resources/dependencies/trisquel-10 script and remove those dependencies.
resources/dependencies/trisquel script and remove those dependencies.
The script is written for Ubuntu 20.04, but it should work fine in other
GNU/Linux distributions that use the `apt-get` package manager.
A `flashrom/` directory will be present, with a `flashrom` executable inside
of it. If you got an error about missing package when running the dependencies
command above, tweak `resources/dependencies/trisquel-10`. That
command above, tweak `resources/dependencies/trisquel`. That
script downloads and installs build dependencies in apt-get and it is intended
for use on x86-64 systems running Ubuntu 20.04, but it should work in Raspbian
on the Raspberry Pi.