diff --git a/website-build/Makefile.am b/website-build/Makefile.am index ce95f95..80814a0 100644 --- a/website-build/Makefile.am +++ b/website-build/Makefile.am @@ -124,5 +124,7 @@ website.tar.gz: build --sort=name \ -czf \ website.tar.gz \ - untitled/www/ \ - --transform="s#untitled/www/lbwww/site/##" + untitled/www/lbwww/site \ + index.html \ + test/index.html \ + --transform="s#untitled/www/lbwww/site#test/web#" diff --git a/website-build/README b/website-build/README index 37b9cfb..f575403 100644 --- a/website-build/README +++ b/website-build/README @@ -2,8 +2,12 @@ This project enables to easily build and deploy the Libreboot website. == Local deployments == -For local deployments you just need to extract the tarball in a -webroot and have a web server serve that content. +Here's how to deploy the website in a local webserver: +$ ./autogen.sh +$ ./configure +$ make test + +Then you can point a browser to http://localhost:8080/software/gnuboot/test/web/ == Deployment on Sourcehut == Sourcehut has a way to setup a static website by uploading a tarball diff --git a/website-build/build.sh b/website-build/build.sh index 6f50328..84707a2 100755 --- a/website-build/build.sh +++ b/website-build/build.sh @@ -17,11 +17,12 @@ # For compatibility with sysexits.h (see man 3 sysexits.h for more details) EX_USAGE=64 -lbwww_uri="https://git.sr.ht/~libreboot/lbwww" +lbwww_uri="https://git.savannah.gnu.org/git/gnuboot.git" lbwww_path="" -untitled_uri="https://git.sr.ht/~libreboot/untitled" +untitled_uri="https://notabug.org/untitled/untitled.git" untitled_path="" +untitled_commit="e69c0d0748b8fc58d1548ea4249b93b1bbd2c6aa" help() { @@ -61,7 +62,9 @@ sync_repo() git -C "${dst_path}" remote add origin "${src_uri}" git -C "${dst_path}" remote set-url origin "${src_uri}" 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 rm -rf "${dst_path}" cp -a "${src_path}" "${dst_path}" @@ -113,8 +116,10 @@ done set -e -sync_repo "untitled" "${untitled_uri}" "${untitled_path}" -sync_repo "untitled/www/lbwww" "${lbwww_uri}" "${lbwww_path}" +sync_repo "untitled" \ + "${untitled_uri}" "${untitled_path}" "${untitled_commit}" +sync_repo "untitled/www/lbwww" \ + "${lbwww_uri}" "${lbwww_path}" "origin/main" cd untitled ./build sites lbwww diff --git a/website-build/index.html b/website-build/index.html new file mode 100644 index 0000000..751ba42 --- /dev/null +++ b/website-build/index.html @@ -0,0 +1,6 @@ + + + + + + diff --git a/website-build/serve.sh b/website-build/serve.sh index 0d09c9e..66e1f29 100755 --- a/website-build/serve.sh +++ b/website-build/serve.sh @@ -31,8 +31,9 @@ basedir="$(dirname $(realpath $0))" tarball="$1" 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" \ "${basedir}/lighttpd.conf.tmpl" > \