reproducible coreboot: improve main page and link to it from rb.d.n

4 files changed, 19 insertions, 13 deletions

diff --git a/TODO b/TODO
index 4d89a528..e8c8747d 100644
--- a/TODO
+++ b/TODO
@@ -226,14 +226,11 @@ egrep -R -l '(debbindiff had trouble comparing|maybe there is still )' /var/lib/
 	<mapreri> that would be wonderful.
 
 * coreboot build job
+** output coreboot version and include in the html
 ** add more variations
 ** clone with https
 * coreboot html
-** r.d.n/coreboot.html - link from r.d.n frontpage
 ** include rom name via path in dbd output
-** link to script in git, explain job is run monthly
-** link to r.p.n, the 129 issues and wiki
-** ask for help
 * coreboot job
 ** better description
 
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 3eccd806..d9a9ea12 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -195,7 +195,7 @@ write_page_header() {
 	if [ "$1" = "dd-list" ] || [ "$1" = "stats" ] ; then
 		write_page "<p>Join <code>#debian-reproducible</code> on OFTC"
 		write_page "   or <a href="mailto:reproducible-builds@lists.alioth.debian.org">send us an email</a>"
-		write_page "   to get support for making sure your packages build reproducibly too. Also, we care about free software in general, so if you are an upstream developer or working on another distribution, we'd love to hear from you!"
+		write_page "   to get support for making sure your packages build reproducibly too. Also, we care about free software in general, so if you are an upstream developer or working on another distribution, we'd love to hear from you! And these are not empty words: we've just started to regularily test <a href=\"/coreboot/\">coreboot</a> and other projects shall follow."
 		write_page "</p>"
 	fi
 	write_page "<ul><li>Have a look at:</li>"
diff --git a/bin/reproducible_coreboot.sh b/bin/reproducible_coreboot.sh
index 9d2da652..3cf9b2fc 100755
--- a/bin/reproducible_coreboot.sh
+++ b/bin/reproducible_coreboot.sh
@@ -94,7 +94,7 @@ git clone --recursive http://review.coreboot.org/p/coreboot.git
 cd coreboot
 # still required because coreboot moved submodules and to take care of old git versions
 git submodule update --init --checkout 3rdparty/blobs
-COREBOOT="$(git log -1 | head -3)"
+COREBOOT="$(git log -1)"
 
 echo "============================================================================="
 echo "$(date -u) - Building cross compilers for ${ARCHS} now."
@@ -174,13 +174,17 @@ cat > $PAGE <<- EOF
         <p>&nbsp;</p>
         <p><center><img src="coreboot.png" width="300" class="alignnone size-medium wp-image-6" alt="coreboot" height="231" /></center></p>
         <blockquote>
-          <p><strong>coreboot&trade;</strong>: fast and flexible <em>and reproducible</em> Open Source firmware?</p>
+          <p><strong>coreboot&trade;</strong>: fast, flexible <em>and reproducible</em> Open Source firmware?</p>
           <br />
         </blockquote>
 EOF
 write_page "       <h1>Reproducible Coreboot</h1>"
-write_page "       <p>This is work in progress started on 2015-06-04.</p>"
-write_page "       <pre>$COREBOOT<pre>"
+write_page "       <p><em>This is work in progress started on 2015-06-04.</em>"
+write_page "       <em>Reproducible builds</em> enable anyone to reproduce bit by bit identical binary packages from a given source. There is a lot more information about <a href=\"https://wiki.debian.org/ReproducibleBuilds\">reproducible builds on the Debian wiki</a> and on <a href=\"https://reproducible.debian.net\">https://reproducible.debian.net</a>.<br />"
+write_page "       <em>Reproducible Coreboot</em> is an effort to apply this to coreboot. Thus each coreboot.rom is build twice, with a few varitations added and then those two ROMs are compared using <a href=\"https://tracker.debian.org/debbindiff\">debbindiff</a>.<br />"
+write_page "       Currently this is configured to be updated monthly, but as this is brand new, the udate frequency is much higher. Patches are very much welcome, the coreboot pages are solely generated by <a href=\"http://anonscm.debian.org/cgit/qa/jenkins.debian.net.git/tree/bin/reproducible_coreboot.sh\">reproducible_coreboot.sh</a>.<br />"
+write_page "        Test were run on $DATE using <code>$COREBOOT</code>"
+write_page "       </p>"
 write_explaination_table coreboot
 write_page "       <ul>"
 ROMS=0
@@ -192,9 +196,9 @@ for i in * ; do
 	call_debbindiff $i
 	if [ -f $TMPDIR/$i.html ] ; then
 		mv $TMPDIR/$i.html $BASE/coreboot/dbd/$i.html
-		write_page "         <li><a href=\"dbd/$i.html\">$i debbindiff output</li>"
+		write_page "         <li><a href=\"dbd/$i.html\"><img src=\"/userContent/static/weather-showers-scattered.png\" alt=\"unreproducible icon\" />$i</a> is unreproducible.</li>"
 	else
-		write_page "         <li>$i had no debbindiff output - it's probably reproducible :)</li>"
+		write_page "         <li><img src=\"/userContent/static/weather-clear.png\" alt=\"reproducible icon\" />$i had no debbindiff output so its probably reproducible :)</li>"
 		let RROMS+=1
 	fi
 done
@@ -203,9 +207,8 @@ write_page "       </ul><p>$RROMS ($PERCENT%) out of $ROMS built coreboot images
 cat >> $PAGE <<- EOF
       </div>
     </div>
-  </body>
-</html>
 EOF
+write_page_footer
 cd ..
 publish_page
 
diff --git a/etc/apache2/sites-available/jenkins.debian.net b/etc/apache2/sites-available/jenkins.debian.net
index 91c93fe1..e052b1e5 100644
--- a/etc/apache2/sites-available/jenkins.debian.net
+++ b/etc/apache2/sites-available/jenkins.debian.net
@@ -246,6 +246,12 @@ Use common-debian-service-https-redirect reproducible.debian.net
 	RewriteCond %{REQUEST_URI} ^/(testing|unstable|experimental)/$
 	RewriteRule ^/(.*) /$1index_suite_stats.html [R,L]
 
+	# redirect /coreboot/ to coreboot/coreboot.html
+	# note: the missing slash in the RewriteRule is wanted to avoid a double slash
+	RewriteCond %{HTTP_HOST} reproducible\.debian\.net
+	RewriteCond %{REQUEST_URI} ^/coreboot/$
+	RewriteRule ^/(.*) /coreboot/coreboot.html_ [R,L]
+
 	<Proxy *>
 		Require all granted
 	</Proxy>