diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-12-03 12:18:26 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-12-03 12:18:26 +0200 |
| commit | a84a80c8132baff5bf048259dd821fc6782b04c8 (patch) | |
| tree | b1a04684e3de83745b497c3e81375af5ec6d320a | |
| parent | d52f716c9aa3209d43c6eeb4e276d6dad95ba869 (diff) | |
| download | jenkins.debian.net-a84a80c8132baff5bf048259dd821fc6782b04c8.tar.xz | |
reproducible: don't modify the kernel version with linux64 (for now), as this is broken in sid atm (bug about to be filed)
| -rwxr-xr-x | bin/reproducible_build.sh | 1 | ||||
| -rwxr-xr-x | bin/reproducible_common.sh | 2 | ||||
| -rw-r--r-- | hosts/profitbricks-build1-amd64/etc/sudoers.d/jenkins | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index 19f7a656..238b95c3 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -596,7 +596,6 @@ EOF set +e # remember to change the sudoers setting if you change the following command sudo timeout -k 12.1h 12h /usr/bin/ionice -c 3 /usr/bin/nice \ - /usr/bin/linux64 --uname-2.6 \ /usr/bin/unshare --uts -- \ /usr/sbin/pbuilder --build \ --configfile $TMPCFG \ diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index 27daaeae..467a2f40 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -374,7 +374,7 @@ write_explaination_table() { fi 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>" + write_page "<tr><td>kernel version, <em>currently not</em> 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>" 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 diff --git a/hosts/profitbricks-build1-amd64/etc/sudoers.d/jenkins b/hosts/profitbricks-build1-amd64/etc/sudoers.d/jenkins index 2dab2ae5..22751009 100644 --- a/hosts/profitbricks-build1-amd64/etc/sudoers.d/jenkins +++ b/hosts/profitbricks-build1-amd64/etc/sudoers.d/jenkins @@ -34,7 +34,7 @@ jenkins ALL= \ /bin/chown -R jenkins\:jenkins /var/lib/jenkins/jobs/*,\ SETENV: NOPASSWD: /usr/sbin/pbuilder *, \ SETENV: NOPASSWD: /usr/bin/timeout -k 12.1h 12h /usr/bin/ionice -c 3 /usr/bin/nice /usr/sbin/pbuilder *, \ - SETENV: NOPASSWD: /usr/bin/timeout -k 12.1h 12h /usr/bin/ionice -c 3 /usr/bin/nice /usr/bin/linux64 --uname-2.6 /usr/bin/unshare --uts -- /usr/sbin/pbuilder *, \ + SETENV: NOPASSWD: /usr/bin/timeout -k 12.1h 12h /usr/bin/ionice -c 3 /usr/bin/nice /usr/bin/unshare --uts -- /usr/sbin/pbuilder *, \ /bin/mv /var/cache/pbuilder/*base*.tgz /var/cache/pbuilder/*base*.tgz, \ /bin/rm /var/cache/pbuilder/*base*.tgz, \ /bin/rm -v /var/cache/pbuilder/*base*.tgz, \ |