dependencies: rename ubuntu2004 in trisquel-10.

We can't require contributors to install Ubuntu as it has freedom
issues[1] but for contributors, installing Trisquel is easier since
it's at least FSDG compliant[2]. So it makes sense to show that
Trisquel is the primary target here.

This is also reflected in the reality as the current GNU Boot
maintainers already installed Trisquel 10 inside virtual machines
and/or containers to test this script.

[1]https://www.gnu.org/distros/common-distros.html#Ubuntu
[2]https://www.gnu.org/distros/free-distros.html

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 2023-12-09 02:07:14 +01:00 committed by Adrien 'neox' Bourmault
parent 290769d016
commit dbdeb37326
Signed by: neox
GPG Key ID: 2974E1D5F25DFCC8
8 changed files with 10 additions and 10 deletions

View File

@ -63,7 +63,7 @@ distclean:
./build distclean all ./build distclean all
install-dependencies-ubuntu: install-dependencies-ubuntu:
./build dependencies ubuntu2004 ./build dependencies trisquel-10
install-dependencies-debian: install-dependencies-debian:
./build dependencies debian ./build dependencies debian

View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# ubuntu2004 script: installs build dependencies for Ubuntu 20.04 # trisquel-10 script: installs build dependencies for Ubuntu 20.04
# #
# Copyright (C) 2014, 2015, 2021 Leah Rowe <info@minifree.org> # Copyright (C) 2014, 2015, 2021 Leah Rowe <info@minifree.org>
# #

View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# ubuntu2004 script: installs build dependencies for Ubuntu 20.04 # trisquel-10 script: installs build dependencies for Ubuntu 20.04
# #
# Copyright (C) 2014, 2015, 2021 Leah Rowe <info@minifree.org> # Copyright (C) 2014, 2015, 2021 Leah Rowe <info@minifree.org>
# #

View File

@ -54,7 +54,7 @@ elif is_base_distro "fedora" ; then
elif is_base_distro "pureos" ; then # PureOS doesn't have ID_LIKE elif is_base_distro "pureos" ; then # PureOS doesn't have ID_LIKE
"$(dirname $0)"/../dependencies/debian $@ "$(dirname $0)"/../dependencies/debian $@
elif is_base_distro "ubuntu" ; then elif is_base_distro "ubuntu" ; then
"$(dirname $0)"/../dependencies/ubuntu2004 $@ "$(dirname $0)"/../dependencies/trisquel-10 $@
elif is_base_distro "void" ; then elif is_base_distro "void" ; then
"$(dirname $0)"/../dependencies/void $@ "$(dirname $0)"/../dependencies/void $@
fi fi

View File

@ -135,7 +135,7 @@ First, install build dependencies
GNU Boot includes a script that automatically installs dependencies in GNU Boot includes a script that automatically installs dependencies in
Trisquel 10 (nabia): Trisquel 10 (nabia):
sudo ./build dependencies ubuntu2004 sudo ./build dependencies trisquel-10
and for PureOS 10 (byzantium): 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 the following command in the libreboot build system, from the root directory
of the libreboot Git repository. of the libreboot Git repository.
./build dependencies ubuntu2004 ./build dependencies trisquel-10
Then, download coreboot: 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 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: Libreboot. On Ubuntu 20.04 and other apt-get distros, you can do this:
./build dependencies ubuntu2004 ./build dependencies trisquel-10
The `cbfstool` executables will be under each coreboot directory, under The `cbfstool` executables will be under each coreboot directory, under
each `coreboot/boardname/` directory for each board. Just pick one, presumably each `coreboot/boardname/` directory for each board. Just pick one, presumably

View File

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