diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-10-17 00:27:44 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-10-17 00:27:44 +0200 |
| commit | 100772e5c8294c5437114de8475fbc15cade6657 (patch) | |
| tree | 02939116831d9bf514e2230d3fed3539b9033175 /bin | |
| parent | 1b5f590d2eb0da9d22048a8de4aec94957dd976f (diff) | |
| download | jenkins.debian.net-100772e5c8294c5437114de8475fbc15cade6657.tar.xz | |
reproducible arch: explain variations between the two builds
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/reproducible_common.sh | 28 | ||||
| -rwxr-xr-x | bin/reproducible_html_archlinux.sh | 1 |
2 files changed, 21 insertions, 8 deletions
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index baa9bba5..d13a342e 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -323,16 +323,22 @@ write_explaination_table() { write_page "<tr><td>hostname</td><td colspan=\"2\"> is not yet varied between rebuilds of $1.</td></tr>" write_page "<tr><td>domainname</td><td colspan=\"2\"> is not yet varied between rebuilds of $1.</td></tr>" fi - if [ "$1" != "FreeBSD" ] ; then + if [ "$1" != "FreeBSD" ] && [ "$1" != "Archlinux" ] ; then write_page "<tr><td>env CAPTURE_ENVIRONMENT</td><td><em>not set</em></td><td>CAPTURE_ENVIRONMENT=\"I capture the environment\"</td></tr>" fi - write_page "<tr><td>env TZ</td><td>TZ=\"/usr/share/zoneinfo/Etc/GMT+12\"</td><td>TZ=\"/usr/share/zoneinfo/Etc/GMT-14\"</td></tr>" - write_page "<tr><td>env LANG</td><td>LANG=\"en_GB.UTF-8\"</td><td>LANG=\"fr_CH.UTF-8\"</td></tr>" - write_page "<tr><td>env LC_ALL</td><td><em>not set</em></td><td>LC_ALL=\"fr_CH.UTF-8\"</td></tr>" - if [ "$1" != "FreeBSD" ] ; then + if [ "$1" != "Archlinux" ] ; then + write_page "<tr><td>env TZ</td><td>TZ=\"/usr/share/zoneinfo/Etc/GMT+12\"</td><td>TZ=\"/usr/share/zoneinfo/Etc/GMT-14\"</td></tr>" + write_page "<tr><td>env LANG</td><td>LANG=\"en_GB.UTF-8\"</td><td>LANG=\"fr_CH.UTF-8\"</td></tr>" + write_page "<tr><td>env LC_ALL</td><td><em>not set</em></td><td>LC_ALL=\"fr_CH.UTF-8\"</td></tr>" + else + write_page "<tr><td>env TZ</td><td colspan=\"2\"> is not yet varied between rebuilds of $1.\"</td></tr>" + write_page "<tr><td>env LANG</td colspan=\"2\"> is not yet varied between rebuilds of $1.\"</td></tr>" + write_page "<tr><td>env LC_ALL</td colspan=\"2\"> is not yet varied between rebuilds of $1.\"</td></tr>" + fi + if [ "$1" != "FreeBSD" ] && [ "$1" != "Archlinux" ] ; then write_page "<tr><td>env PATH</td><td>PATH=\"/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:\"</td><td>PATH=\"/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path\"</td></tr>" else - write_page "<tr><td>env PATH</td><td colspan=\"2\"> is not yet varied between rebuilds of $1.\"</td><td>is not yet varied between rebuilds of $1.\"</td></tr>" + write_page "<tr><td>env PATH</td><td colspan=\"2\"> is not yet varied between rebuilds of $1.\"</td></tr>" fi if [ "$1" = "debian" ] ; then write_page "<tr><td>env BUILDUSERID</td><td>BUILDUSERID=\"1111\"</td><td>BUILDUSERID=\"2222\"</td></tr>" @@ -353,10 +359,16 @@ write_explaination_table() { if [ "$1" != "FreeBSD" ] ; then if [ "$1" = "debian" ] ; then write_page "<tr><td>kernel version, modified using /usr/bin/linux64 --uname-2.6</td></td><td>one of: $(cat /srv/reproducible-results/node-information/* | grep KERNEL1 | cut -d '=' -f2- | sort -u | tr '\n' '\0' | xargs -0 -n1 echo '<br /> ')</td><td>one of: $(cat /srv/reproducible-results/node-information/* | grep KERNEL2 | cut -d '=' -f2- | sort -u | tr '\n' '\0' | xargs -0 -n1 echo '<br /> ')</td></tr>" - else + if [ "$1" != "Archlinux" ] ; 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 + write_page "<tr><td>kernel version</td><td colspan=\"2\"> is not yet varied between rebuilds of $1.\"</td></tr>" + fi + if [ "$1" != "Archlinux" ] ; then + write_page "<tr><td>umask</td><td>0022<td>0002</td><tr>" + else + write_page "<tr><td>umask</td><td colspan=\"2\"> is not yet varied between rebuilds of $1.</td></tr>" fi - write_page "<tr><td>umask</td><td>0022<td>0002</td><tr>" else write_page "<tr><td>FreeBSD kernel version</td><td colspan=\"2\"> is not yet varied between rebuilds of $1.</td></tr>" write_page "<tr><td>umask</td><td colspan=\"2\"> is not yet varied between rebuilds of $1.</td><tr>" diff --git a/bin/reproducible_html_archlinux.sh b/bin/reproducible_html_archlinux.sh index 345547c6..327be4a9 100755 --- a/bin/reproducible_html_archlinux.sh +++ b/bin/reproducible_html_archlinux.sh @@ -27,6 +27,7 @@ cat > $PAGE <<- EOF <body> EOF write_page_intro Archlinux +write_explaination_table Archlinux write_page "<table><tr><th>source package</th><th>test date</th><th>1st build log</th><th>2nd build log</th><th>diffoscope output for binary packages</th></tr>" for PKG in $(find $ARCHBASE/* -maxdepth 1 -type d -exec basename {} \;) ; do write_page " <tr>" |