diff options
| -rwxr-xr-x | bin/reproducible_build.sh | 4 | ||||
| -rw-r--r-- | etc/sudoers.d/jenkins | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index ccb49cce..abb142a0 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -172,12 +172,12 @@ for SRCPACKAGE in ${PACKAGES} ; do dcmd cp /var/cache/pbuilder/result/${SRCPACKAGE}_${EVERSION}_amd64.changes b1 # the .changes file might not contain the original sources archive # so first delete files from .dsc, then from .changes file - sudo dcmd rm /var/cache/pbuilder/result/${SRCPACKAGE}_${EVERSION}_amd64.dsc + sudo dcmd rm /var/cache/pbuilder/result/${SRCPACKAGE}_${EVERSION}.dsc sudo dcmd rm /var/cache/pbuilder/result/${SRCPACKAGE}_${EVERSION}_amd64.changes sudo DEB_BUILD_OPTIONS="parallel=$NUM_CPU" pbuilder --build --debbuildopts "-b" --basetgz /var/cache/pbuilder/base-reproducible.tgz --distribution sid ${SRCPACKAGE}_${EVERSION}.dsc dcmd cp /var/cache/pbuilder/result/${SRCPACKAGE}_${EVERSION}_amd64.changes b2 # and again (see comment 5 lines above) - sudo dcmd rm /var/cache/pbuilder/result/${SRCPACKAGE}_${EVERSION}_amd64.dsc + sudo dcmd rm /var/cache/pbuilder/result/${SRCPACKAGE}_${EVERSION}.dsc sudo dcmd rm /var/cache/pbuilder/result/${SRCPACKAGE}_${EVERSION}_amd64.changes cat b1/${SRCPACKAGE}_${EVERSION}_amd64.changes | tee -a ${RBUILDLOG} LOGFILE=$(ls ${SRCPACKAGE}_${EVERSION}.dsc) diff --git a/etc/sudoers.d/jenkins b/etc/sudoers.d/jenkins index 2e24ae7f..7c66e9a8 100644 --- a/etc/sudoers.d/jenkins +++ b/etc/sudoers.d/jenkins @@ -32,7 +32,6 @@ jenkins ALL= \ /bin/rm /var/cache/pbuilder/result/*, \ /usr/bin/dcmd rm *.changes, \ /usr/bin/dcmd rm *.dsc, \ - /usr/bin/dcmd rm -f *.dsc, \ /usr/bin/apt-get update # keep these environment variables |