diff --git a/Makefile b/Makefile index 1f2229e..1d6259d 100644 --- a/Makefile +++ b/Makefile @@ -63,7 +63,7 @@ distclean: ./build distclean all install-dependencies-ubuntu: - ./build dependencies ubuntu2004 + ./build dependencies trisquel-10 install-dependencies-debian: ./build dependencies debian diff --git a/resources/dependencies/debian b/resources/dependencies/debian index f5d4515..703028e 100755 --- a/resources/dependencies/debian +++ b/resources/dependencies/debian @@ -1,6 +1,6 @@ #!/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 # diff --git a/resources/dependencies/ubuntu2004 b/resources/dependencies/trisquel-10 similarity index 98% rename from resources/dependencies/ubuntu2004 rename to resources/dependencies/trisquel-10 index 4c241f2..6606ef3 100755 --- a/resources/dependencies/ubuntu2004 +++ b/resources/dependencies/trisquel-10 @@ -1,6 +1,6 @@ #!/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 # diff --git a/resources/packages/dependencies/install b/resources/packages/dependencies/install index e8e1780..56b63d3 100755 --- a/resources/packages/dependencies/install +++ b/resources/packages/dependencies/install @@ -54,7 +54,7 @@ elif is_base_distro "fedora" ; then elif is_base_distro "pureos" ; then # PureOS doesn't have ID_LIKE "$(dirname $0)"/../dependencies/debian $@ elif is_base_distro "ubuntu" ; then - "$(dirname $0)"/../dependencies/ubuntu2004 $@ + "$(dirname $0)"/../dependencies/trisquel-10 $@ elif is_base_distro "void" ; then "$(dirname $0)"/../dependencies/void $@ fi diff --git a/site/docs/build/index.md b/site/docs/build/index.md index bf109e3..d152a1a 100644 --- a/site/docs/build/index.md +++ b/site/docs/build/index.md @@ -135,7 +135,7 @@ First, install build dependencies GNU Boot includes a script that automatically installs dependencies in Trisquel 10 (nabia): - sudo ./build dependencies ubuntu2004 + sudo ./build dependencies trisquel-10 and for PureOS 10 (byzantium): diff --git a/site/docs/gnulinux/grub_cbfs.md b/site/docs/gnulinux/grub_cbfs.md index 3c9c49f..c3c7a09 100644 --- a/site/docs/gnulinux/grub_cbfs.md +++ b/site/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 ubuntu2004 + ./build dependencies trisquel-10 Then, download coreboot: diff --git a/site/docs/gnulinux/grub_hardening.md b/site/docs/gnulinux/grub_hardening.md index e698211..3678072 100644 --- a/site/docs/gnulinux/grub_hardening.md +++ b/site/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 ubuntu2004 + ./build dependencies trisquel-10 The `cbfstool` executables will be under each coreboot directory, under each `coreboot/boardname/` directory for each board. Just pick one, presumably diff --git a/site/docs/install/spi.md b/site/docs/install/spi.md index 5e6dc6a..509b905 100644 --- a/site/docs/install/spi.md +++ b/site/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 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 ./download flashrom ./build module flashrom 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 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/ubuntu2004`. That +command above, tweak `resources/dependencies/trisquel-10`. 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.