summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--TODO2
-rwxr-xr-xbin/reproducible_build.sh8
-rwxr-xr-xbin/reproducible_common.sh4
-rwxr-xr-xbin/reproducible_coreboot.sh2
-rwxr-xr-xbin/reproducible_freebsd.sh2
-rwxr-xr-xbin/reproducible_netbsd.sh2
-rwxr-xr-xbin/reproducible_openwrt.sh2
7 files changed, 11 insertions, 11 deletions
diff --git a/TODO b/TODO
index 50cc36f3..2ef5b59c 100644
--- a/TODO
+++ b/TODO
@@ -176,7 +176,7 @@ properties:
** fix https://jenkins.debian.net/munin/debian.net/jenkins.debian.net/jenkins_builds.html which is broken since jessie upgrade
** repo-comparison: check for binaries without source
** link source-data-epoch spec from rb.d.n
-** s#debbindiff#diffoscope#g and s#dbd#ds#g everywhere and manually rename the jobs accordingly... also the .debbindiff.html+txt files need to be renamed, as well as the dbd directories...
+** do final s#debbindiff#diffoscope#g and s#dbd#ds#g and rename .debbindiff.html+txt files as well as the dbd directories...
** explain status in plain english on each coreboot/openwrt/netbsd/freebsd page, also on the Debian dashboard plus add an "executive summary about reproducible builds in the free software world"
** link howto on each coreboot/openwrt/netbsd/freebsd page
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 5bf21dc8..174b7570 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -282,19 +282,19 @@ call_diffoscope_on_changes_files() {
local TIMEOUT="30m"
DBDSUITE=$SUITE
if [ "$SUITE" = "experimental" ] ; then
- # there is no extra debbindiff-schroot for experimental because we specical case ghc enough already ;)
+ # there is no extra diffoscope-schroot for experimental because we specical case ghc enough already ;)
DBDSUITE="unstable"
fi
# TEMP is recognized by python's tempfile module to create temp stuff inside
local TEMP=$(mktemp --tmpdir=$TMPDIR -d dbd-tmp-XXXXXXX)
- DIFFOSCOPE="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-debbindiff debbindiff -- --version 2>&1)"
+ DIFFOSCOPE="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-diffoscope diffoscope -- --version 2>&1)"
echo "$(date) - $DIFFOSCOPE will be used to compare the two builds:" | tee -a ${RBUILDLOG}
set +e
set -x
( timeout $TIMEOUT schroot \
--directory $TMPDIR \
- -c source:jenkins-reproducible-${DBDSUITE}-debbindiff \
- -- sh -c "export TMPDIR=$TEMP ; debbindiff \
+ -c source:jenkins-reproducible-${DBDSUITE}-diffoscope \
+ -- sh -c "export TMPDIR=$TEMP ; diffoscope \
--html $TMPDIR/${DBDREPORT} \
--text $TMPDIR/$DBDTXT \
$TMPDIR/b1/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes \
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index ad0ec176..485e4113 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -425,8 +425,8 @@ call_diffoscope() {
set +e
( timeout $TIMEOUT schroot \
--directory $TMPDIR \
- -c source:jenkins-reproducible-${DBDSUITE}-debbindiff \
- debbindiff -- \
+ -c source:jenkins-reproducible-${DBDSUITE}-diffoscope \
+ diffoscope -- \
--html $TMPDIR/$1/$2.html \
$TMPDIR/b1/$1/$2 \
$TMPDIR/b2/$1/$2 2>&1 \
diff --git a/bin/reproducible_coreboot.sh b/bin/reproducible_coreboot.sh
index bb8c024a..54e95372 100755
--- a/bin/reproducible_coreboot.sh
+++ b/bin/reproducible_coreboot.sh
@@ -151,7 +151,7 @@ rm -r $TMPBUILDDIR/coreboot
# run diffoscope on the results
TIMEOUT="30m"
DBDSUITE="unstable"
-DIFFOSCOPE="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-debbindiff debbindiff -- --version 2>&1)"
+DIFFOSCOPE="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-diffoscope diffoscope -- --version 2>&1)"
echo "============================================================================="
echo "$(date -u) - Running $DIFFOSCOPE on coreboot images."
echo "============================================================================="
diff --git a/bin/reproducible_freebsd.sh b/bin/reproducible_freebsd.sh
index 4ced72e2..1c17402f 100755
--- a/bin/reproducible_freebsd.sh
+++ b/bin/reproducible_freebsd.sh
@@ -111,7 +111,7 @@ umask 0022
# run diffoscope on the results
TIMEOUT="30m"
DBDSUITE="unstable"
-DIFFOSCOPE="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-debbindiff debbindiff -- --version 2>&1)"
+DIFFOSCOPE="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-diffoscope diffoscope -- --version 2>&1)"
echo "============================================================================="
echo "$(date -u) - Running $DIFFOSCOPE on freebsd..."
echo "============================================================================="
diff --git a/bin/reproducible_netbsd.sh b/bin/reproducible_netbsd.sh
index 3be712e4..9aa35869 100755
--- a/bin/reproducible_netbsd.sh
+++ b/bin/reproducible_netbsd.sh
@@ -120,7 +120,7 @@ rm -r $TMPBUILDDIR/netbsd
# run diffoscope on the results
TIMEOUT="30m"
DBDSUITE="unstable"
-DIFFOSCOPE="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-debbindiff debbindiff -- --version 2>&1)"
+DIFFOSCOPE="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-diffoscope diffoscope -- --version 2>&1)"
echo "============================================================================="
echo "$(date -u) - Running $DIFFOSCOPE on netbsd..."
echo "============================================================================="
diff --git a/bin/reproducible_openwrt.sh b/bin/reproducible_openwrt.sh
index b5ce8a27..0c851bef 100755
--- a/bin/reproducible_openwrt.sh
+++ b/bin/reproducible_openwrt.sh
@@ -205,7 +205,7 @@ rm -r $TMPBUILDDIR/openwrt
# (this needs refactoring rather badly)
TIMEOUT="30m"
DBDSUITE="unstable"
-DIFFOSCOPE="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-debbindiff debbindiff -- --version 2>&1)"
+DIFFOSCOPE="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-diffoscope diffoscope -- --version 2>&1)"
echo "============================================================================="
echo "$(date -u) - Running $DIFFOSCOPE on OpenWrt images and packages."
echo "============================================================================="