summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2016-07-29 12:53:23 -0400
committerHolger Levsen <holger@layer-acht.org>2016-07-29 12:53:23 -0400
commite37025ab13c7cb963f8176ee0cb78df32d373de9 (patch)
tree2bda17e6ebab605a365bb9e2360b17afef2cf01e
parent0cc86dc9d186a46cf3c0d789e3eba396304e3191 (diff)
downloadjenkins.debian.net-e37025ab13c7cb963f8176ee0cb78df32d373de9.tar.xz
reproducible: fix some descriptions and add links to LEDE tests
-rwxr-xr-xbin/reproducible_common.sh5
-rwxr-xr-xbin/reproducible_html_dd_list.py4
-rw-r--r--mustache-templates/reproducible/project_links.mustache2
3 files changed, 6 insertions, 5 deletions
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 04578320..af1275d6 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -274,13 +274,12 @@ write_page_header() {
write_page "<input type=\"text\" name=\"SrcPkg\" placeholder=\"Type my friend..\" value=\"$LATEST\" />"
write_page "<input type=\"submit\" value=\"submit source package name\" />"
write_page "</form>"
- elif [ "$1" = "dd-list" ] || [ "$1" = "$MAINVIEW" ] ; then
write_page "<ul>"
write_page " We are reachable via IRC (<code>#debian-reproducible</code> and <code>#reproducible-builds</code> on OFTC),"
write_page " or <a href="mailto:reproducible-builds@lists.alioth.debian.org">email</a>,"
write_page " and we care about free software in general,"
write_page " so whether you are an upstream developer or working on another distribution, or have any other feedback - we'd love to hear from you!"
- write_page " Besides Debian we are also testing <li><a href=\"/coreboot/\">coreboot</a></li>, <li><a href=\"/openwrt/\">OpenWrt</a></li>, <li><a href=\"netbsd\">NetBSD</a></li>, <li><a href=\"/freebsd/\">FreeBSD</a></li> and <li><a href=\"archlinux\">Arch Linux</a></li> now, though not as thoroughly as Debian (yet?) - and testing of <li><a href=\"/rpms/fedora-23.html\">Fedora</a></li> has just begun, and there are plans to test <a href=\"https://jenkins.debian.net/userContent/todo.html#_reproducible_fdroid\">F-Droid</a> and <a href=\"https://jenkins.debian.net/userContent/todo.html#_reproducible_guix\">GNU Guix</a> too, and more, if you contribute!"
+ write_page " Besides Debian we are also testing <li><a href=\"/coreboot/\">coreboot</a></li>, <li><a href=\"/openwrt/\">OpenWrt</a></li>, <li><a href=\"/netbsd/\">NetBSD</a></li>, <li><a href=\"/freebsd/\">FreeBSD</a></li>, <li><a href=\"/archlinux/\">Arch Linux</a></li> and <li><a href=\"/lede/\">LEDE</a></li>, though not as thoroughly as Debian (yet?) - and testing of <li><a href=\"/rpms/fedora-23.html\">Fedora</a></li> has just begun, and there are plans to test <a href=\"https://jenkins.debian.net/userContent/todo.html#_reproducible_fdroid\">F-Droid</a> and <a href=\"https://jenkins.debian.net/userContent/todo.html#_reproducible_guix\">GNU Guix</a> too, and more, if you contribute!"
write_page "</ul>"
fi
}
@@ -328,7 +327,7 @@ write_page_intro() {
write_page_footer() {
if [ "$1" = "coreboot" ] ; then
- other_distro_details="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."
+ other_distro_details="The <a href=\"http://www.coreboot.org\">Coreboot</a> logo is Copyright © 2008 by Konsult Stuge and coresystems GmbH and can freely be used to refer to the Coreboot project."
elif [ "$1" = "NetBSD" ] ; then
other_distro_details="NetBSD® is a registered trademark of The NetBSD Foundation, Inc."
elif [ "$1" = "FreeBSD" ] ; then
diff --git a/bin/reproducible_html_dd_list.py b/bin/reproducible_html_dd_list.py
index 1b75ef1a..a0d56bc7 100755
--- a/bin/reproducible_html_dd_list.py
+++ b/bin/reproducible_html_dd_list.py
@@ -50,8 +50,8 @@ for suite in SUITES:
html = '<p>The following maintainers and uploaders are listed '
html += 'for packages in ' + suite + ' which have built '
html += 'unreproducibly. Please note that the while the link '
- html += 'always points to the amd64 version, the unreproducibility '
- html += 'can be in any arch.</p>\n<p><pre>'
+ html += 'always points to the amd64 version, it\'s possible that'
+ html += 'the unreproducibility is only present in another architecture(s).</p>\n<p><pre>'
out = out.decode().splitlines()
get_mail = re.compile('<(.*)>')
for line in out:
diff --git a/mustache-templates/reproducible/project_links.mustache b/mustache-templates/reproducible/project_links.mustache
index b457982e..6ccd1afc 100644
--- a/mustache-templates/reproducible/project_links.mustache
+++ b/mustache-templates/reproducible/project_links.mustache
@@ -9,8 +9,10 @@
</li><li>
Reproducible <a href="https://tests.reproducible-builds.org/archlinux/">Arch Linux</a> /
<a href="https://tests.reproducible-builds.org/coreboot/">coreboot</a> /
+ <a href="https://tests.reproducible-builds.org/debian/">Debian</a> /
<a href="https://tests.reproducible-builds.org/fedora/">Fedora</a> /
<a href="https://tests.reproducible-builds.org/freebsd/">FreeBSD</a> /
+ <a href="https://tests.reproducible-builds.org/lede/">LEDE</a>
<a href="https://tests.reproducible-builds.org/netbsd/">NetBSD</a> /
<a href="https://tests.reproducible-builds.org/openwrt/">OpenWrt</a>
</li>