Commit Graph

413 Commits

Author SHA1 Message Date
Denis 'GNUtoo' Carikli 98313fccd8
u-boot-libre: Use Guix for the tests
This should make it more reproducible than without Guix.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
2023-11-13 16:35:59 +01:00
Denis 'GNUtoo' Carikli a1538782f3
releases: u-boot-libre: download: fix tag fetching
Using git pull had several issues:
- It didn't necessarily fetch the required tags
- It doesn't work for diverging histories

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
2023-11-13 16:35:58 +01:00
Denis 'GNUtoo' Carikli cf2ccb080e
u-boot-libre: download: fix download with existing u-boot directory
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
2023-11-13 16:35:58 +01:00
Denis 'GNUtoo' Carikli b9b224daa1
u-boot-libre: Add guix support
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
2023-11-13 16:35:58 +01:00
Denis 'GNUtoo' Carikli 6d6a64e6c7
dependencies: Add install-guix.sh from Guix 1.4.0
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
2023-11-13 16:35:58 +01:00
Denis 'GNUtoo' Carikli dcdefe3a7e
u-boot-libre: fix help when run with './build release u-boot-libre'
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
2023-11-13 16:35:57 +01:00
Denis 'GNUtoo' Carikli 981d9de953
u-boot-libre: download: sync versions with source release script
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
2023-11-13 16:35:57 +01:00
Denis 'GNUtoo' Carikli 70446a99a4
u-boot-libre: help: fix version line
While technically the version is optional, the line being printed
only describes runinng this script with a given version.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
2023-11-13 16:35:57 +01:00
Denis 'GNUtoo' Carikli 12ab793e53
u-boot-libre: help: fix typo
The code only works for one version at the same time.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
2023-11-13 16:35:57 +01:00
Denis 'GNUtoo' Carikli 023d76fb77
u-boot-libre: Add support for u-boot v2022.10 to v2023.04 source tarballs
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@a-lec.org>
2023-11-13 16:35:57 +01:00
Alper Nebi Yasak b89fd73e68
u-boot-libre: Add support for deblobbing U-Boot v2022.07
Add a 'v2022.07' pseudo-board for the U-Boot download script with the
default blobs list, and mark the version as supported in u-boot-libre
release script.

Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
2023-11-13 16:35:56 +01:00
Alper Nebi Yasak 8634dc88e3
.gitignore: Ignore u-boot directory
The "u-boot" directory and its contents are created at build-time,
ignore it in git.

Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
2023-11-13 16:35:56 +01:00
Alper Nebi Yasak 96e9da62dd
u-boot-libre: Set tar mtime to SOURCE_DATE_EPOCH or @0
The u-boot-libre tarball contents' mtimes are an unconventional value
due to timezone confusion. For reproducibility, timestamps like these
are usually set by a SOURCE_DATE_EPOCH which is respected by both
coreboot and U-Boot. Use it in the u-boot-libre release script as well,
and properly set the mtimes to the Unix epoch when it's not defined.

Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
2023-11-13 16:35:56 +01:00
Alper Nebi Yasak 114a9c85f7
u-boot-libre: Fix releasing blob list as deblob script
The u-boot-libre release script copies the blobs list into the release
as the deblob script, presumably due to a copy-paste error. Fix it to
correctly copy the generated deblob script.

Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
2023-11-13 16:35:56 +01:00
Denis 'GNUtoo' Carikli 6c36d171a4
u-boot-libre: remove nonfree firmware in drivers/dma/MCD_tasks.c
This firmware lack corresponding source code.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
2023-11-13 16:35:55 +01:00
Alper Nebi Yasak 85314490b3
u-boot-libre: Fix reproducability issue due to timezone
The checksums in tests/u-boot-libre.sha512 do not match the tarballs
generated by this script when ran on a different timezone, e.g. UTC+3.
Explicitly specify a timezone for the tar command that makes the
tarballs match the checksums.

Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
2023-11-13 16:35:55 +01:00
Denis 'GNUtoo' Carikli ab1a833ffe
u-boot-libre: command line parsing: fix comparisons
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
2023-11-13 16:35:55 +01:00
Denis 'GNUtoo' Carikli 5dae8ea88c
u-boot-libre: command line parsing: fix [version]
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
2023-11-13 16:35:55 +01:00
Denis 'GNUtoo' Carikli ea7d513293
u-boot-libre: command line parsing: fix tests
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
2023-11-13 16:35:54 +01:00
Denis 'GNUtoo' Carikli adc578ae49
site: license.md: fix x-reviewed.
For some reasons having both 'x-reviewed: true' and 'x-toc-enable:
true' results in having the following content on the top-right of the
page:
    title: Code
    review
    x-toc-
    enable:
    true
    x-reviewed:
    true
    Return to
    index
    …
    GNU Boot
    repositories

Since using the Untitled static website generator is meant to be
temporary, fixing this issue is not a priority right now.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
2023-11-12 01:47:41 +01:00
Denis 'GNUtoo' Carikli 1ed30528c1
site: footer.include: Fix links when in subdirectories.
If we are in test/web the links work fine but if we go in
test/web/docs/, the links are relative to the current page and stop
working.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
2023-11-12 01:46:54 +01:00
Denis 'GNUtoo' Carikli a1fd263021
site: template.include: Fix links when in subdirectories.
If we are in test/web the links work fine but if we go in
test/web/docs/, the links are relative to the current page and stop
working.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
2023-11-12 01:46:30 +01:00
Denis 'GNUtoo' Carikli 87770e7482
site: git.md: update contribution instructions.
For some reasons having both 'x-reviewed: true' and 'x-toc-enable:
true' results in having the following content on the top-right of the
page:
    title: Code
    review
    x-toc-
    enable:
    true
    x-reviewed:
    true
    Return to
    index
    …
    GNU Boot
    repositories

Since using the Untitled static website generator is meant to be
temporary, fixing this issue is not a priority right now.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
2023-11-12 01:46:03 +01:00
Denis 'GNUtoo' Carikli ccb5c6fe49
site: git.md: fix typo.
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
2023-11-12 01:45:45 +01:00
Denis 'GNUtoo' Carikli cd6514123b
site: git.md: fix privacy issue.
Using simply 'git log' or 'git show' shows the author but not the
commiter.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
2023-11-12 01:45:29 +01:00
Denis 'GNUtoo' Carikli 27ddd0fd8e
Fix website <title></title>.
The new untitled revision has a fix for having spaces inside the
website title.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
2023-11-12 01:45:07 +01:00
Denis 'GNUtoo' Carikli 20d122e94a
website-build: use website from local git repository.
Before we needed to fetch the website from git because it was in a
separate repository.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
2023-11-12 01:44:50 +01:00
Denis 'GNUtoo' Carikli 399360485d
website-build: build.sh: i="$(expr "$i" + 1)": fix double quote.
Without that fix, we end up with 'Fix SC2086 (info): Double quote to
prevent globbing and word splitting.' shellcheck warnings.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
2023-11-12 01:44:35 +01:00
Denis 'GNUtoo' Carikli 4b122e8989
website-build: build.sh: fix missing double quote in $i comparison.
Without that fix, using shellcheck on this file results in several warning
like this one:
    In website-build/build.sh line 101:
    			if [ $i -ge $# ] ; then
                                 ^-- SC2086 (info):
				 Double quote to prevent
				 globbing and word splitting.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
2023-11-12 01:44:18 +01:00
Denis 'GNUtoo' Carikli 971eae0ca5
website-build: check.sh: Improve grep usage.
Without that fix, using shellcheck on this file results in this
warning:
    In website-build/check.sh line 56:
    	nr_files=$(tar tf "${tarball}" | grep -v '/' | wc -l)
                                             ^---------^ SC2126 (style):
					     Consider using
					     'grep -c' instead of 'grep|wc -l'.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
2023-11-12 01:44:04 +01:00
Denis 'GNUtoo' Carikli 1645d7abe1
website-build: build.sh: Use bash.
Without that fix, using shellcheck on this file results in several warning
like this one:
    In website-build/build.sh line 32:
    	echo -e "\t-h, --help"
                 ^-- SC3037 (warning):
		 In POSIX sh, echo flags are undefined.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
2023-11-12 01:43:31 +01:00
Denis 'GNUtoo' Carikli 56af2d62fe
website-build: check.sh: fix missing double quote.
Without that fix, using shellcheck on this file results in this
warning:
    In website-build/check.sh line 58:
    	if [ ${nr_files} -eq 1 ] ; then
                 ^---------^ SC2086 (info):
		 Double quote to prevent globbing and word splitting.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
2023-11-12 01:43:09 +01:00
Denis 'GNUtoo' Carikli c5694162d2
website-build: check.sh: Use bash.
Without that fix, using shellcheck on this file results in several warning
like this one:
    In website-build/check.sh line 27:
    	echo -e "\t-h, --help"
                 ^-- SC3037 (warning):
		 In POSIX sh, echo flags are undefined.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
2023-11-12 01:42:30 +01:00
Denis 'GNUtoo' Carikli 25c5ac1d8d
Add code style checks to track regressions.
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
2023-11-12 01:42:03 +01:00
Denis 'GNUtoo' Carikli a705ef9e78
website: Remove absolute links.
Without that fix, clicking to Download will go to
https://gnu.org/download.html.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
2023-11-07 19:10:15 +01:00
Denis 'GNUtoo' Carikli 36214d6fa1
website-build: Fix build target with --disable-guix option.
This was broken by commit a6e4a2a225
("configure.ac: Add --disable-guix option").

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
2023-11-07 19:10:00 +01:00
Denis 'GNUtoo' Carikli 4af4722580
website-build: README: Add information on how to test modifications.
The build.sh script currently hardcodes the repository URL and
revisions or branches name it uses.

If contributors aren't aware of that they could end up testing a
revision that is different from the one that they are working on.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
2023-11-07 19:09:46 +01:00
Denis 'GNUtoo' Carikli be72474aa0
website-build: Use rsync for deploying the website.
The website and documentation originally comes from Libreboot and
Libreboot didn't have separate website and documentation.

And we need to reuse it because without it, GNU Boot would be almost
useless as without documentation most users would not be able to
install it.

The website is about 900 files and consist in about 27 MiB of
pictures.

Given that the website is not ready yet and that we are looking for
contributions to help us fixing it, we will end up having to update it
often, and ideally in a timely manner as well not to discourage
contributions.

So we needed some way to deployment the website with very few
commands.

GNU typically use CVS for deploying the website, but it is harder to
use than rsync for automatizing the deployment of a website.

To do that someone would have to write or adapt code to do the
deployment automatically, but that can potentially be time consuming
to do, especially if it needs to be done efficiently (for instance by
only adding files that changed since the last time) not to load too
much the CVS server.

Because of all that, an rsync access was temporarily setup for us, to
enable us to publish the website now and to be able to fixing this
deployment issue later and/or ask for help on the website to fix it.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
2023-11-07 19:09:21 +01:00
Denis 'GNUtoo' Carikli 19a26051d1
website-build: Makefile: rename upload target to deploy.
Guix is being used to build the website and Guix has the 'guix deploy'
command, so this should look more familiar to people using Guix.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
2023-11-07 19:09:01 +01:00
Denis 'GNUtoo' Carikli 75f335ee5f
website-build: Add Savannah CVS constraint.
Most GNU projects use a CVS repository to publish their web pages.

For some reasons, in the CVS root directory (inside the gnuboot CVS
module) the only file that we can add is index.html. Subdirectories
don't have this limitation.

So we add a test for that.

In addition when the website will be ready we will most likely have an
html file that redirect to a subdirectory (like /web/) and so we add
the html file for doing that too.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
2023-11-07 19:08:48 +01:00
Denis 'GNUtoo' Carikli c007ab227d
website-build: build.sh: switch to GNU Boot repositories.
Since the website and the images were merged in GNU boot respectively
in site/ and www/, we can now modify GNU boot to only be cloned once
to build the website.

The image path was also modified to make images work both in the local
served website and at gnu.org and also to minimize the differences
between the test and deployment setups.

Libreboot.at also hosted a copy of Untitled to make it simple to
control the revision being used.

But in the longer term, it would be a bad idea to do that again for
GNU boot since there are plans to convert the website and/or
documentation to the texinfo format, and so at some point Untitled
will stop being used, and we don't want to end up with a git
repository that needs to be kept for historic reasons but that is
unused.

Since the website isn't ready we also have a redirection to Savannah
to make sure that visitors are redirected to something meaningful.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Neox: Suggested the split in smaller commits and various ways to do
    that (including some that were used).
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
2023-11-07 19:08:25 +01:00
Denis 'GNUtoo' Carikli 3adc217cf1
Move the website to /software/gnuboot/test
The website will be published to https://gnu.org/software/gnuboot. But
for now it is not ready yet to be published as-is because there are no
contribution instructions yet and we also need to agree on what to put
on the main page.

So until that's fixed, it will be published to
https://gnu.org/software/gnuboot/test.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Neox: Suggested the split from the "website-build: build.sh: switch to
      GNU Boot repositories." commit.
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
2023-11-07 19:08:13 +01:00
Denis 'GNUtoo' Carikli cc3dea2d7b
Move images in the website directory
Since the website and the images were merged in GNU boot respectively
in site/ and www/, we can now modify GNU boot to only be cloned once
to build the website.

This also requires to move the images inside site/ at the place where
website-build expects them.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Neox: Suggested the split from the "website-build: build.sh: switch to
      GNU Boot repositories." commit.
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
2023-11-07 19:07:59 +01:00
Denis 'GNUtoo' Carikli 0ef17277de
website-build: Enable to use specific revisions for git repositories.
This for instance enable users to manually override the revisions to
test branches of git repositories.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
2023-11-07 19:07:43 +01:00
Denis 'GNUtoo' Carikli dc6e1f32c1
Import website-build to build the GNU Boot website.
Having that code inside the same repository than GNU Boot makes it
easier to keep Untitled versions (and possibly additional patches on
top) in sync with the documentation/website being worked on.

This is relevant as there are plans within GNU Boot to convert the
website to Texinfo but that would require to patch untitled (to add
support for Texinfo pages in untitled) to do a progressive transition
to Texinfo.

Using an external repository to temporarily maintain a patched version
of Untitled is not optimal as we would end up having to warn users not
to use that repository anymore at some point.

Bringing in the whole untitled source code and documentation in this
GNU Boot repository is also not a good option since we only need
minimal patching on top of untitled, so in the long run not doing that
would help keep the GNU Boot repository smaller and more simple.

In addition we currently do need to wrap the build with a fixed Guix
revision as for instance with a more recent Guix revision than the one
used by website-built, for instance at the commit ("gnu: nyxt: Update
to 3.9.0."), if we run ./build.sh directly without using a fixed Guix
revision, the build is broken:
    Generating 'www/lbwww/site/index.html'
    Generating 'www/lbwww/site/license.html'
    YAML parse exception at line 7, column 0,
    while scanning a simple key:
    could not find expected ':'

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
2023-11-07 18:28:16 +01:00
Denis 'GNUtoo' Carikli 54c6ae497d
Merge the documentation/website pictures into GNU Boot
The documentation/website pictures are currently in a separate
repository, but they are needed to build the documentation/website.

Since we want to be able to have commits that modify both the code and
the documentation, including its pictures in order to keep everything
in sync, we need to merge both histories.

It's also a good idea to do that as early as possible as we don't need
to deal with the confusion of having to keep an extra unused git
repository for historic purposes.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
2023-10-12 16:19:08 +02:00
Denis 'GNUtoo' Carikli b42fd2220c
Merge the website into GNU Boot
The website and the documentation are currently in a separate
repository.

Since we want to be able to have commits that modify both the code and
the documentation in order to keep everything in sync, we need to
merge both histories.

It's also a good idea to do that as early as possible as we don't need
to deal with the confusion of having to keep an extra unused git
repository for historic purposes.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
2023-10-07 19:27:31 +02:00
Denis 'GNUtoo' Carikli 364cf80216
website: index: inform about the RC1 and tests status
Now there are probably too much people to thank to have all that on
the main page.

If we want to keep their names, a better idea would be to collect all
their names and add them to the release announcement.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
2023-10-04 21:34:48 +02:00
Denis 'GNUtoo' Carikli 8bd31b5c2e
Add warning about unreviewed web pages.
For the GNU Boot website and documentation we reused:

- The Libreboot website as it contains a lot of documentation
  (installation instructions, documentation on supported computers,
  etc). And we don't want to re-do all that from scratch.

- The libreboot.at website as some of its modifications (like the
  ability to include images from the same domain, the fact that it
  mention that it's not libreboot.org, etc) are useful to us, and here
  too it's a good idea not to have to re-do all that work from
  scratch.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
2023-10-04 21:34:08 +02:00
Denis 'GNUtoo' Carikli d7fc6bc94b
website: index: help: reorder paragraphs and adapt to GNU Boot.
Informing about Libreboot freedom status and/or switching URLs to GNU
Boot are two approaches meant to deal with the same issue.

Informing people about GNU Boot however is not necessarily directly
related to that.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
2023-10-04 21:24:18 +02:00