reproducible coreboot: more polishing for coreboot.html

2 files changed, 12 insertions, 17 deletions

diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index ee30e835..b175f93c 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -244,8 +244,11 @@ write_page_header() {
 }
 
 write_page_footer() {
-	write_page "<hr/><p style=\"font-size:0.9em;\">There is more information <a href=\"$JENKINS_URL/userContent/about.html\">about jenkins.debian.net</a> and about <a href=\"https://wiki.debian.org/ReproducibleBuilds\"> reproducible builds of Debian</a> available elsewhere. Last update: $(date +'%Y-%m-%d %H:%M %Z'). Copyright 2014-2015 <a href=\"mailto:holger@layer-acht.org\">Holger Levsen</a> and others, GPL2 licensed. The weather icons are public domain and have been taken from the <a href="http://tango.freedesktop.org/Tango_Icon_Library" target="_blank">Tango Icon Library</a>.</p>"
-	write_page "</body></html>"
+	write_page "<hr/><p style=\"font-size:0.9em;\">There is more information <a href=\"$JENKINS_URL/userContent/about.html\">about jenkins.debian.net</a> and about <a href=\"https://wiki.debian.org/ReproducibleBuilds\"> reproducible builds of Debian</a> available elsewhere. Last update: $(date +'%Y-%m-%d %H:%M %Z'). Copyright 2014-2015 <a href=\"mailto:holger@layer-acht.org\">Holger Levsen</a> and others, GPL2 licensed. The weather icons are public domain and have been taken from the <a href="http://tango.freedesktop.org/Tango_Icon_Library" target="_blank">Tango Icon Library</a>."
+	if [ "$1" = "coreboot" ] ; then
+		write_page "The <a href=\"http://www.coreboot.org\">Coreboot</a> logo is Copyright © 2008 by Konsult Stuge and coresystems GmbH and can be freely used to refer to the Coreboot project."
+	fi
+	write_page "</p></body></html>"
 }
 
 write_page_meta_sign() {
diff --git a/bin/reproducible_coreboot.sh b/bin/reproducible_coreboot.sh
index ebc315e0..c672a8bf 100755
--- a/bin/reproducible_coreboot.sh
+++ b/bin/reproducible_coreboot.sh
@@ -67,14 +67,6 @@ call_debbindiff() {
 	esac
 }
 
-# FIXME: include these variations
-#build_rebuild() {
-#( timeout -k 12h 12h nice ionice -c 3 sudo \
-#		printf "BUILDUSERID=2222\nBUILDUSERNAME=pbuilder2\n" > $TMPCFG
-#		  /usr/bin/linux64 --uname-2.6 \
-#			/usr/bin/unshare --uts -- \
-#					--hookdir /etc/pbuilder/rebuild-hooks \
-
 #
 # main
 #
@@ -83,7 +75,7 @@ TMPDIR=$(mktemp --tmpdir=/srv/reproducible-results -d)  # where everything actua
 trap cleanup_tmpdir INT TERM EXIT
 cd $TMPDIR
 
-DATE=$(date -u +'%Y-%m-%d %H:%M')
+DATE=$(date -u +'%Y-%m-%d')
 START=$(date +'%s')
 mkdir b1 b2
 
@@ -185,18 +177,18 @@ cat > $PAGE <<- EOF
     <div class="content">
       <div class="page-content">
         <p>&nbsp;</p>
-        <p><center><img src="coreboot.png" width="300" class="alignnone size-medium wp-image-6" alt="coreboot" height="231" /></center></p>
+        <p><center><img src="coreboot.png" width="300" class="alignnone size-medium wp-image-6" alt="coreboot" height="231" /><br />
         <blockquote>
-          <p><strong>coreboot&trade;</strong>: fast, flexible <em>and reproducible</em> Open Source firmware?</p>
-          <br />
+          <strong>coreboot&trade;</strong>: fast, flexible <em>and reproducible</em> Open Source firmware?
         </blockquote>
+       </center></p>
 EOF
 write_page "       <h1>Reproducible Coreboot</h1>"
 write_page "       <p><em>This is work in progress started on 2015-06-04.</em>"
 write_page "       <p><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>.</p>"
 write_page "       <p><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>.</p>"
-write_page "       <p>Currently this set up 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>.</p>"
-write_page "       <p>Test were run on $DATE for version ${COREBOOT_VERSION}.</p><p><code>$COREBOOT</code></p>"
+write_page "       <p>This set up to test the <code>master</code> branch of <a href=\"https://review.coreboot.org/p/coreboot.git\">coreboot.git</a> monthly, but as this is brand new, currently updates are triggered much more often. 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>.</p>"
+write_page "       <p>These tests were last run on $DATE for version ${COREBOOT_VERSION}.</p><p><code>$(echo -n '$COREBOOT')</code></p>"
 write_explaination_table coreboot
 write_page "       <ul>"
 ROMS=0
@@ -220,7 +212,7 @@ cat >> $PAGE <<- EOF
       </div>
     </div>
 EOF
-write_page_footer
+write_page_footer coreboot
 cd ..
 PAGE=coreboot/coreboot.html
 publish_page