bin/reproducible_common.sh

@@ -359,10 +359,7 @@ write_page_intro() {
 		write_page " <li>cross references to <a href=\"https://tests.reproducible-builds.org/debian/index_issues.html\">Debian notes</a> - and having Arch Linux specific notes.</li>"
 		write_page "</ul></p>"
 		write_page "<p>Missing bits for Arch Linux:<ul>"
-		write_page " <li>pacman 5.1.0 is now in the official Arch repository, with full support by default for reproducible builds. In order to test this:<ul>"
-		write_page "  <li>all packages need to be rebuilt so that they include .BUILDINFO files.</li>"
 		write_page " <li>code needs to be written to compare the packages built twice here against newly built packages from the Official Arch Linux repositories.</li>"
-		write_page " </ul></li>"
 		write_page " <li>user tools, for users to verify all of this easily.</li>"
 		write_page "</ul></p>"
 		write_page "<p>If you want to help out or discuss reproducible builds in $PROJECTNAME, please join #archlinux-reproducible on freenode.</p>"
@@ -375,7 +372,7 @@ write_page_intro() {
 		write_page "       <p>There is a weekly run <a href=\"https://jenkins.debian.net/view/reproducible/job/reproducible_$SMALLPROJECTNAME/\">jenkins job</a> to test the <code>$BRANCH</code> branch of <a href=\"$PROJECTURL\">$PROJECTNAME.git</a>. The jenkins job is running <a href=\"https://salsa.debian.org/qa/jenkins.debian.net/tree/master/bin/reproducible_$SMALLPROJECTNAME.sh\">reproducible_$SMALLPROJECTNAME.sh</a>$BUILD_ENVIRONMENT and this script is solely responsible for creating this page. Feel invited to join <code>#reproducible-builds</code> (on irc.oftc.net) to request job runs whenever sensible. Patches and other <a href=\"mailto:reproducible-builds@lists.alioth.debian.org\">feedback</a> are very much appreciated - if you want to help, please start by looking at the <a href=\"https://jenkins.debian.net/userContent/todo.html#_reproducible_$(echo $1|tr '[:upper:]' '[:lower:]')\">ToDo list for $1</a>, you might find something easy to contribute."
 		write_page "       <br />Thanks to <a href=\"https://www.profitbricks.co.uk\">Profitbricks</a> for donating the virtual machines this is running on!</p>"
 	elif [ "$1" = "fedora-23" ] ; then
-		write_page "       <p><img src=\"/userContent/static/weather-storm.png\"> FIXME: explain $PROJECTNAME test setup here.</p>"
+		write_page "       <p><img src=\"/userContent/static/weather-storm.png\"> TODO: explain $PROJECTNAME test setup here.</p>"
 	fi
 }
 
@@ -389,7 +386,7 @@ write_page_footer() {
 	elif [ "$1" = "Arch Linux" ] ; then
 		other_distro_details='The <a href=\"https://www.archlinux.org\">Arch Linux</a> name and logo are recognized trademarks. Some rights reserved. The registered trademark Linux® is used pursuant to a sublicense from LMI, the exclusive licensee of Linus Torvalds, owner of the mark on a world-wide basis.'
 	elif [ "$1" = "fedora-23" ] ; then
-		other_distro_details="FIXME: add fedora copyright+trademark disclaimers here."
+			other_distro_details="Fedora is sponsored by Red Hat. © 2017 Red Hat, Inc. and others."
 	else
 		other_distro_details=''
 	fi
@@ -507,7 +504,7 @@ write_variation_table() {
 		elif [ "$1" != "Arch Linux" ]  ; then
 			write_page "<tr><td>kernel version, modified using /usr/bin/linux64 --uname-2.6</td><td>$(uname -sr)</td><td>$(/usr/bin/linux64 --uname-2.6 uname -sr)</td></tr>"
 		else
-			# FIXME: collect information about arch build nodes in /srv/reproducible-results/node-information/ and include this here
+			# FIXME: include information from /srv/reproducible-results/node-information/ here...
 			write_page "<tr><td>kernel version</td><td colspan=\"2\"> is varied between rebuilds of $1.</td></tr>"
 		fi
 		if [ "$1" != "OpenWrt" ] ; then