From 8c0341e3b6c2805f812df2dfef507d392a837076 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Mon, 23 Sep 2024 16:43:08 +0200 Subject: [PATCH] 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 Acked-by: Adrien 'neox' Bourmault --- Makefile.am | 2 +- resources/dependencies/{trisquel-10 => trisquel} | 4 ++-- resources/packages/dependencies/install | 4 ++-- website/pages/docs/build/index.md | 2 +- website/pages/docs/gnulinux/grub_cbfs.md | 2 +- website/pages/docs/gnulinux/grub_hardening.md | 2 +- website/pages/docs/history/index.md | 2 +- website/pages/docs/install/spi.md | 6 +++--- 8 files changed, 12 insertions(+), 12 deletions(-) rename resources/dependencies/{trisquel-10 => trisquel} (97%) diff --git a/Makefile.am b/Makefile.am index dacddd3..f80cd59 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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: diff --git a/resources/dependencies/trisquel-10 b/resources/dependencies/trisquel similarity index 97% rename from resources/dependencies/trisquel-10 rename to resources/dependencies/trisquel index c3c6f97..ed85fbd 100755 --- a/resources/dependencies/trisquel-10 +++ b/resources/dependencies/trisquel @@ -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 # Copyright (C) 2016, Klemens Nanni @@ -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) # ------------------------------------------------------------ diff --git a/resources/packages/dependencies/install b/resources/packages/dependencies/install index 28654e0..cb53f29 100755 --- a/resources/packages/dependencies/install +++ b/resources/packages/dependencies/install @@ -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 diff --git a/website/pages/docs/build/index.md b/website/pages/docs/build/index.md index d25dd5e..0fa7aae 100644 --- a/website/pages/docs/build/index.md +++ b/website/pages/docs/build/index.md @@ -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): diff --git a/website/pages/docs/gnulinux/grub_cbfs.md b/website/pages/docs/gnulinux/grub_cbfs.md index e17716d..672783d 100644 --- a/website/pages/docs/gnulinux/grub_cbfs.md +++ b/website/pages/docs/gnulinux/grub_cbfs.md @@ -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: diff --git a/website/pages/docs/gnulinux/grub_hardening.md b/website/pages/docs/gnulinux/grub_hardening.md index 54d5cd5..8c8bafc 100644 --- a/website/pages/docs/gnulinux/grub_hardening.md +++ b/website/pages/docs/gnulinux/grub_hardening.md @@ -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 diff --git a/website/pages/docs/history/index.md b/website/pages/docs/history/index.md index 5addc92..ed2f230 100644 --- a/website/pages/docs/history/index.md +++ b/website/pages/docs/history/index.md @@ -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.")). diff --git a/website/pages/docs/install/spi.md b/website/pages/docs/install/spi.md index 5897646..5121555 100644 --- a/website/pages/docs/install/spi.md +++ b/website/pages/docs/install/spi.md @@ -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.