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>
This commit is contained in:
parent
3adc217cf1
commit
c007ab227d
GPG Key ID:
2974E1D5F25DFCC8
|
|
@ -124,5 +124,7 @@ website.tar.gz: build
|
||||||
--sort=name \
|
--sort=name \
|
||||||
-czf \
|
-czf \
|
||||||
website.tar.gz \
|
website.tar.gz \
|
||||||
untitled/www/ \
|
untitled/www/lbwww/site \
|
||||||
--transform="s#untitled/www/lbwww/site/##"
|
index.html \
|
||||||
|
test/index.html \
|
||||||
|
--transform="s#untitled/www/lbwww/site#test/web#"
|
||||||
|
|
|
||||||
|
|
@ -2,8 +2,12 @@
|
||||||
This project enables to easily build and deploy the Libreboot website.
|
This project enables to easily build and deploy the Libreboot website.
|
||||||
|
|
||||||
== Local deployments ==
|
== Local deployments ==
|
||||||
For local deployments you just need to extract the tarball in a
|
Here's how to deploy the website in a local webserver:
|
||||||
webroot and have a web server serve that content.
|
$ ./autogen.sh
|
||||||
|
$ ./configure
|
||||||
|
$ make test
|
||||||
|
|
||||||
|
Then you can point a browser to http://localhost:8080/software/gnuboot/test/web/
|
||||||
|
|
||||||
== Deployment on Sourcehut ==
|
== Deployment on Sourcehut ==
|
||||||
Sourcehut has a way to setup a static website by uploading a tarball
|
Sourcehut has a way to setup a static website by uploading a tarball
|
||||||
|
|
|
||||||
|
|
@ -17,11 +17,12 @@
|
||||||
# For compatibility with sysexits.h (see man 3 sysexits.h for more details)
|
# For compatibility with sysexits.h (see man 3 sysexits.h for more details)
|
||||||
EX_USAGE=64
|
EX_USAGE=64
|
||||||
|
|
||||||
lbwww_uri="https://git.sr.ht/~libreboot/lbwww"
|
lbwww_uri="https://git.savannah.gnu.org/git/gnuboot.git"
|
||||||
lbwww_path=""
|
lbwww_path=""
|
||||||
|
|
||||||
untitled_uri="https://git.sr.ht/~libreboot/untitled"
|
untitled_uri="https://notabug.org/untitled/untitled.git"
|
||||||
untitled_path=""
|
untitled_path=""
|
||||||
|
untitled_commit="e69c0d0748b8fc58d1548ea4249b93b1bbd2c6aa"
|
||||||
|
|
||||||
help()
|
help()
|
||||||
{
|
{
|
||||||
|
|
@ -61,7 +62,9 @@ sync_repo()
|
||||||
git -C "${dst_path}" remote add origin "${src_uri}"
|
git -C "${dst_path}" remote add origin "${src_uri}"
|
||||||
git -C "${dst_path}" remote set-url origin "${src_uri}"
|
git -C "${dst_path}" remote set-url origin "${src_uri}"
|
||||||
git -C "${dst_path}" clean -dfx
|
git -C "${dst_path}" clean -dfx
|
||||||
git -C "${dst_path}" pull --rebase
|
git -C "${dst_path}" fetch origin
|
||||||
|
git -C "${dst_path}" checkout "${src_revision}"
|
||||||
|
|
||||||
else
|
else
|
||||||
rm -rf "${dst_path}"
|
rm -rf "${dst_path}"
|
||||||
cp -a "${src_path}" "${dst_path}"
|
cp -a "${src_path}" "${dst_path}"
|
||||||
|
|
@ -113,8 +116,10 @@ done
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
sync_repo "untitled" "${untitled_uri}" "${untitled_path}"
|
sync_repo "untitled" \
|
||||||
sync_repo "untitled/www/lbwww" "${lbwww_uri}" "${lbwww_path}"
|
"${untitled_uri}" "${untitled_path}" "${untitled_commit}"
|
||||||
|
sync_repo "untitled/www/lbwww" \
|
||||||
|
"${lbwww_uri}" "${lbwww_path}" "origin/main"
|
||||||
|
|
||||||
cd untitled
|
cd untitled
|
||||||
./build sites lbwww
|
./build sites lbwww
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,6 @@
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<meta http-equiv="Refresh" content="0; url='https://savannah.gnu.org/projects/gnuboot'" />
|
||||||
|
</head>
|
||||||
|
</html>
|
||||||
|
|
@ -31,8 +31,9 @@ basedir="$(dirname $(realpath $0))"
|
||||||
tarball="$1"
|
tarball="$1"
|
||||||
|
|
||||||
tmpdir="$(mktemp -d)"
|
tmpdir="$(mktemp -d)"
|
||||||
|
mkdir -p "${tmpdir}/software/gnuboot/"
|
||||||
|
|
||||||
tar xf "${tarball}" -C "${tmpdir}"
|
tar xf "${tarball}" -C "${tmpdir}/software/gnuboot/"
|
||||||
|
|
||||||
sed "s#TMPDIR#${tmpdir}#g" \
|
sed "s#TMPDIR#${tmpdir}#g" \
|
||||||
"${basedir}/lighttpd.conf.tmpl" > \
|
"${basedir}/lighttpd.conf.tmpl" > \
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue