diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-03-19 17:33:04 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-03-19 17:33:04 +0100 |
| commit | 186e4609f2e87687503b5ea79480ea8440d73d35 (patch) | |
| tree | 340fae4f5d48072bc2889b4a0a8285d7a5f239e2 | |
| parent | 0622d0103373c0c6818f3daaea1aabf56b21b4e5 (diff) | |
| download | jenkins.debian.net-186e4609f2e87687503b5ea79480ea8440d73d35.tar.xz | |
reproducible: use linux64 --uname-2.6 correctly, thanks lunar
| -rwxr-xr-x | bin/reproducible_build.sh | 2 | ||||
| -rwxr-xr-x | etc/pbuilder/rebuild-hooks/D01_modify_environment | 2 | ||||
| -rw-r--r-- | etc/sudoers.d/jenkins | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index c58414d6..d76e52ed 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -254,7 +254,7 @@ else TZ="/usr/share/zoneinfo/Etc/GMT-14" \ LANG="fr_CH.UTF-8" \ LC_ALL="fr_CH.UTF-8" \ - unshare --uts -- /usr/sbin/pbuilder --build --configfile $TMPCFG --hookdir /etc/pbuilder/rebuild-hooks \ + /usr/bin/linux64 --uname-2.6 /usr/bin/unshare --uts -- /usr/sbin/pbuilder --build --configfile $TMPCFG --hookdir /etc/pbuilder/rebuild-hooks \ --debbuildopts "-b" --basetgz /var/cache/pbuilder/$SUITE-reproducible-base.tgz --distribution ${SUITE} ${SRCPACKAGE}_${EVERSION}.dsc ) 2>&1 | tee -a ${RBUILDLOG} set +x diff --git a/etc/pbuilder/rebuild-hooks/D01_modify_environment b/etc/pbuilder/rebuild-hooks/D01_modify_environment index db71ccf4..57c785b3 100755 --- a/etc/pbuilder/rebuild-hooks/D01_modify_environment +++ b/etc/pbuilder/rebuild-hooks/D01_modify_environment @@ -9,5 +9,3 @@ echo "I: Changing hostname to test build reproducibility" >&2 sed -e '/^127.0.0.1/s/$/ i-capture-the-hostname i-capture-the-hostname.i-capture-the-domain/' -i /etc/hosts hostname i-capture-the-hostname domainname i-capture-the-domain -# let's pretend we're using a different kernel version -linux64 --uname-2.6 diff --git a/etc/sudoers.d/jenkins b/etc/sudoers.d/jenkins index 34dbabf7..103841a6 100644 --- a/etc/sudoers.d/jenkins +++ b/etc/sudoers.d/jenkins @@ -30,7 +30,7 @@ jenkins ALL= \ /bin/cp -rv /media/*, \ /bin/chown -R jenkins\:jenkins /var/lib/jenkins/jobs/*,\ SETENV: NOPASSWD: /usr/sbin/pbuilder *, \ - SETENV: NOPASSWD: /usr/bin/unshare --uts -- /usr/sbin/pbuilder *, \ + SETENV: NOPASSWD: /usr/bin/linux64 --uname-2.6 /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, \ |