Diff of the two buildlogs: -- --- b1/build.log 2025-01-23 10:48:02.269200769 +0000 +++ b2/build.log 2025-01-23 10:52:57.423857058 +0000 @@ -1,6 +1,6 @@ I: pbuilder: network access will be disabled during build -I: Current time: Wed Jan 22 22:45:09 -12 2025 -I: pbuilder-time-stamp: 1737629109 +I: Current time: Fri Jan 24 00:48:19 +14 2025 +I: pbuilder-time-stamp: 1737629299 I: Building the build Environment I: extracting base tarball [/var/cache/pbuilder/trixie-reproducible-base.tgz] I: copying local configuration @@ -22,52 +22,84 @@ dpkg-source: info: unpacking wiggle_1.3-1.debian.tar.xz I: Not using root during the build. I: Installing the build-deps -I: user script /srv/workspace/pbuilder/8787/tmp/hooks/D02_print_environment starting +I: user script /srv/workspace/pbuilder/5370/tmp/hooks/D01_modify_environment starting +debug: Running on ff64a. +I: Changing host+domainname to test build reproducibility +I: Adding a custom variable just for the fun of it... +I: Changing /bin/sh to bash +'/bin/sh' -> '/bin/bash' +lrwxrwxrwx 1 root root 9 Jan 23 10:49 /bin/sh -> /bin/bash +I: Setting pbuilder2's login shell to /bin/bash +I: Setting pbuilder2's GECOS to second user,second room,second work-phone,second home-phone,second other +I: user script /srv/workspace/pbuilder/5370/tmp/hooks/D01_modify_environment finished +I: user script /srv/workspace/pbuilder/5370/tmp/hooks/D02_print_environment starting I: set - BUILDDIR='/build/reproducible-path' - BUILDUSERGECOS='first user,first room,first work-phone,first home-phone,first other' - BUILDUSERNAME='pbuilder1' - BUILD_ARCH='armhf' - DEBIAN_FRONTEND='noninteractive' - DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=3 ' - DISTRIBUTION='trixie' - HOME='/root' - HOST_ARCH='armhf' + BASH=/bin/sh + BASHOPTS=checkwinsize:cmdhist:complete_fullquote:extquote:force_fignore:globasciiranges:globskipdots:hostcomplete:interactive_comments:patsub_replacement:progcomp:promptvars:sourcepath + BASH_ALIASES=() + BASH_ARGC=() + BASH_ARGV=() + BASH_CMDS=() + BASH_LINENO=([0]="12" [1]="0") + BASH_LOADABLES_PATH=/usr/local/lib/bash:/usr/lib/bash:/opt/local/lib/bash:/usr/pkg/lib/bash:/opt/pkg/lib/bash:. + BASH_SOURCE=([0]="/tmp/hooks/D02_print_environment" [1]="/tmp/hooks/D02_print_environment") + BASH_VERSINFO=([0]="5" [1]="2" [2]="37" [3]="1" [4]="release" [5]="arm-unknown-linux-gnueabihf") + BASH_VERSION='5.2.37(1)-release' + BUILDDIR=/build/reproducible-path + BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other' + BUILDUSERNAME=pbuilder2 + BUILD_ARCH=armhf + DEBIAN_FRONTEND=noninteractive + DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=6 ' + DIRSTACK=() + DISTRIBUTION=trixie + EUID=0 + FUNCNAME=([0]="Echo" [1]="main") + GROUPS=() + HOME=/root + HOSTNAME=i-capture-the-hostname + HOSTTYPE=arm + HOST_ARCH=armhf IFS=' ' - INVOCATION_ID='f258fe613884428ea6a07b04f62bcb65' - LANG='C' - LANGUAGE='en_US:en' - LC_ALL='C' - MAIL='/var/mail/root' - OPTIND='1' - PATH='/usr/sbin:/usr/bin:/sbin:/bin:/usr/games' - PBCURRENTCOMMANDLINEOPERATION='build' - PBUILDER_OPERATION='build' - PBUILDER_PKGDATADIR='/usr/share/pbuilder' - PBUILDER_PKGLIBDIR='/usr/lib/pbuilder' - PBUILDER_SYSCONFDIR='/etc' - PPID='8787' - PS1='# ' - PS2='> ' + INVOCATION_ID=3341026e62684e45a2750ea8e1c1a9ab + LANG=C + LANGUAGE=it_CH:it + LC_ALL=C + MACHTYPE=arm-unknown-linux-gnueabihf + MAIL=/var/mail/root + OPTERR=1 + OPTIND=1 + OSTYPE=linux-gnueabihf + PATH=/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path + PBCURRENTCOMMANDLINEOPERATION=build + PBUILDER_OPERATION=build + PBUILDER_PKGDATADIR=/usr/share/pbuilder + PBUILDER_PKGLIBDIR=/usr/lib/pbuilder + PBUILDER_SYSCONFDIR=/etc + PIPESTATUS=([0]="0") + POSIXLY_CORRECT=y + PPID=5370 PS4='+ ' - PWD='/' - SHELL='/bin/bash' - SHLVL='2' - SUDO_COMMAND='/usr/bin/timeout -k 18.1h 18h /usr/bin/ionice -c 3 /usr/bin/nice /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.gSj4YQjJ/pbuilderrc_o9th --distribution trixie --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/trixie-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.gSj4YQjJ/b1 --logfile b1/build.log wiggle_1.3-1.dsc' - SUDO_GID='110' - SUDO_UID='103' - SUDO_USER='jenkins' - TERM='unknown' - TZ='/usr/share/zoneinfo/Etc/GMT+12' - USER='root' - _='/usr/bin/systemd-run' - http_proxy='http://10.0.0.15:3142/' + PWD=/ + SHELL=/bin/bash + SHELLOPTS=braceexpand:errexit:hashall:interactive-comments:posix + SHLVL=3 + SUDO_COMMAND='/usr/bin/timeout -k 24.1h 24h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 /usr/bin/unshare --uts -- /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.gSj4YQjJ/pbuilderrc_NbGo --distribution trixie --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/trixie-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.gSj4YQjJ/b2 --logfile b2/build.log wiggle_1.3-1.dsc' + SUDO_GID=114 + SUDO_UID=109 + SUDO_USER=jenkins + TERM=unknown + TZ=/usr/share/zoneinfo/Etc/GMT-14 + UID=0 + USER=root + _='I: set' + http_proxy=http://10.0.0.15:3142/ I: uname -a - Linux virt32z 6.1.0-30-armmp-lpae #1 SMP Debian 6.1.124-1 (2025-01-12) armv7l GNU/Linux + Linux i-capture-the-hostname 6.1.0-30-arm64 #1 SMP Debian 6.1.124-1 (2025-01-12) aarch64 GNU/Linux I: ls -l /bin lrwxrwxrwx 1 root root 7 Nov 22 14:40 /bin -> usr/bin -I: user script /srv/workspace/pbuilder/8787/tmp/hooks/D02_print_environment finished +I: user script /srv/workspace/pbuilder/5370/tmp/hooks/D02_print_environment finished -> Attempting to satisfy build-dependencies -> Creating pbuilder-satisfydepends-dummy package Package: pbuilder-satisfydepends-dummy @@ -156,7 +188,7 @@ Get: 45 http://deb.debian.org/debian trixie/main armhf libncurses6 armhf 6.5-2+b1 [82.3 kB] Get: 46 http://deb.debian.org/debian trixie/main armhf libncurses-dev armhf 6.5-2+b1 [310 kB] Get: 47 http://deb.debian.org/debian trixie/main armhf time armhf 1.9-0.2 [50.9 kB] -Fetched 33.6 MB in 7s (4877 kB/s) +Fetched 33.6 MB in 1s (26.6 MB/s) Preconfiguring packages ... Selecting previously unselected package sensible-utils. (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 19569 files and directories currently installed.) @@ -361,7 +393,11 @@ Building tag database... -> Finished parsing the build-deps I: Building the package -I: Running cd /build/reproducible-path/wiggle-1.3/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-genchanges -S > ../wiggle_1.3-1_source.changes +I: user script /srv/workspace/pbuilder/5370/tmp/hooks/A99_set_merged_usr starting +Not re-configuring usrmerge for trixie +I: user script /srv/workspace/pbuilder/5370/tmp/hooks/A99_set_merged_usr finished +hostname: Name or service not known +I: Running cd /build/reproducible-path/wiggle-1.3/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-genchanges -S > ../wiggle_1.3-1_source.changes dpkg-buildpackage: info: source package wiggle dpkg-buildpackage: info: source version 1.3-1 dpkg-buildpackage: info: source distribution unstable @@ -371,7 +407,7 @@ debian/rules clean dh clean dh_auto_clean - make -j3 clean + make -j6 clean make[1]: Entering directory '/build/reproducible-path/wiggle-1.3' CLEAN targets CLEAN artifacts @@ -399,7 +435,7 @@ debian/rules override_dh_auto_build make[1]: Entering directory '/build/reproducible-path/wiggle-1.3' dh_auto_build -- CFLAGS="-g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wiggle-1.3=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -Wall -Wno-unused-result -I. -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 -Wdate-time -D_FORTIFY_SOURCE=2 -Wl,-z,relro -Wl,-z,now " - make -j3 "INSTALL=install --strip-program=true" "CFLAGS=-g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wiggle-1.3=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -Wall -Wno-unused-result -I. -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 -Wdate-time -D_FORTIFY_SOURCE=2 -Wl,-z,relro -Wl,-z,now " + make -j6 "INSTALL=install --strip-program=true" "CFLAGS=-g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wiggle-1.3=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -Wall -Wno-unused-result -I. -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 -Wdate-time -D_FORTIFY_SOURCE=2 -Wl,-z,relro -Wl,-z,now " make[2]: Entering directory '/build/reproducible-path/wiggle-1.3' CC O/wiggle.o CC O/ReadMe.o @@ -417,263 +453,263 @@ AR O/libwiggle.a LINK wiggle ./dotest -./mdadm/offroot/merge SUCCEEDED 0.01 -7 unresolved conflicts found -./lustre/pool/merge SUCCEEDED 0.13 -./contrib/mod_tbill/merge SUCCEEDED 0.00 +./mdadm/offroot/merge SUCCEEDED 0.08 1 already-applied change ignored -./contrib/xfaces/merge SUCCEEDED 0.06 -./contrib/pfkey_v2_parse.c/merge SUCCEEDED 0.01 +./contrib/xfaces/merge SUCCEEDED 0.41 +./contrib/nmi.c/merge SUCCEEDED 0.01 +./contrib/series/merge SUCCEEDED 17.94 +./contrib/series/diff SUCCEEDED 16.56 +./contrib/series/ldiff SUCCEEDED 0.35 1 unresolved conflict found ./contrib/abstract/bmerge SUCCEEDED 0.00 -./contrib/series/ldiff SUCCEEDED 0.06 -./contrib/series/diff SUCCEEDED 4.60 -./contrib/series/merge SUCCEEDED 4.63 -./contrib/nmi.c/merge SUCCEEDED 0.00 +./contrib/mod_tbill/merge SUCCEEDED 0.00 +./contrib/pfkey_v2_parse.c/merge SUCCEEDED 0.08 +7 unresolved conflicts found +./lustre/pool/merge SUCCEEDED 0.72 1 unresolved conflict found -./simple/show-wiggle-3/Wmerge SUCCEEDED 0.00 -./simple/show-wiggle-2/Wmerge SUCCEEDED 0.00 -./simple/show-wiggle-1/Wmerge SUCCEEDED 0.00 -./simple/base/ldiff SUCCEEDED 0.00 -./simple/base/diff SUCCEEDED 0.00 -./simple/base/merge SUCCEEDED 0.00 +./simple/trivial-conflict/merge SUCCEEDED 0.00 1 unresolved conflict found -./simple/all-different-2/lmerge SUCCEEDED 0.00 +./simple/conflict/wmerge SUCCEEDED 0.00 1 unresolved conflict found -./simple/all-different-2/merge SUCCEEDED 0.00 -10 unresolved conflicts found -./simple/all-different-2/wmerge SUCCEEDED 0.00 -./simple/multideletes/lmerge SUCCEEDED 0.00 -./simple/multideletes/merge SUCCEEDED 0.00 -./simple/conflict/ldiff SUCCEEDED 0.00 +./simple/conflict/merge SUCCEEDED 0.00 ./simple/conflict/diff SUCCEEDED 0.00 +./simple/conflict/ldiff SUCCEEDED 0.00 +./simple/brokenlines/merge SUCCEEDED 0.00 +./simple/brokenlines/diff SUCCEEDED 0.00 +./simple/changeafteradd/merge SUCCEEDED 0.00 +./simple/show-wiggle-1/Wmerge SUCCEEDED 0.00 1 unresolved conflict found -./simple/conflict/merge SUCCEEDED 0.00 +./simple/conflictmixed/wmerge SUCCEEDED 0.00 1 unresolved conflict found -./simple/conflict/wmerge SUCCEEDED 0.00 +./simple/conflictmixed/merge SUCCEEDED 0.00 1 unresolved conflict found -./simple/trivial-conflict/merge SUCCEEDED 0.00 +./simple/conflictmixed/lmerge SUCCEEDED 0.00 +./simple/conflictmixed/diff SUCCEEDED 0.00 +./simple/conflictmixed/ldiff SUCCEEDED 0.00 +3 already-applied changes ignored +./simple/bothadd/merge SUCCEEDED 0.00 +1 already-applied change ignored +./simple/bothadd/lmerge SUCCEEDED 0.00 +./simple/base/merge SUCCEEDED 0.00 +./simple/base/diff SUCCEEDED 0.00 +./simple/base/ldiff SUCCEEDED 0.00 1 unresolved conflict found -./simple/multiple-add/lmerge SUCCEEDED 0.00 +./simple/multiple-add/wmerge SUCCEEDED 0.00 1 unresolved conflict found ./simple/multiple-add/merge SUCCEEDED 0.00 1 unresolved conflict found -./simple/multiple-add/wmerge SUCCEEDED 0.00 -./simple/brokenlines/diff SUCCEEDED 0.00 -./simple/brokenlines/merge SUCCEEDED 0.00 -./simple/conflictmixed/ldiff SUCCEEDED 0.00 +./simple/multiple-add/lmerge SUCCEEDED 0.00 +./simple/show-wiggle-2/Wmerge SUCCEEDED 0.00 +10 unresolved conflicts found +./simple/all-different-2/wmerge SUCCEEDED 0.00 1 unresolved conflict found -./simple/conflictmixed/lmerge SUCCEEDED 0.00 -./simple/conflictmixed/diff SUCCEEDED 0.00 +./simple/all-different-2/merge SUCCEEDED 0.00 1 unresolved conflict found -./simple/conflictmixed/merge SUCCEEDED 0.00 +./simple/all-different-2/lmerge SUCCEEDED 0.00 +10 unresolved conflicts found +./simple/all-different/wmerge SUCCEEDED 0.00 1 unresolved conflict found -./simple/conflictmixed/wmerge SUCCEEDED 0.00 -1 already-applied change ignored -./simple/already-applied/merge SUCCEEDED 0.00 +./simple/all-different/merge SUCCEEDED 0.00 1 unresolved conflict found ./simple/all-different/lmerge SUCCEEDED 0.00 -1 unresolved conflict found -./simple/all-different/merge SUCCEEDED 0.00 -10 unresolved conflicts found -./simple/all-different/wmerge SUCCEEDED 0.00 +./simple/multideletes/merge SUCCEEDED 0.00 +./simple/multideletes/lmerge SUCCEEDED 0.00 1 already-applied change ignored -./simple/bothadd/lmerge SUCCEEDED 0.00 -3 already-applied changes ignored -./simple/bothadd/merge SUCCEEDED 0.00 -./simple/changeafteradd/merge SUCCEEDED 0.00 +./simple/already-applied/merge SUCCEEDED 0.00 1 unresolved conflict found -4 already-applied changes ignored -./linux/md-autostart/merge SUCCEEDED 0.02 +./simple/show-wiggle-3/Wmerge SUCCEEDED 0.00 1 unresolved conflict found -./linux/raid5line/lmerge SUCCEEDED 0.00 +./linux/rpc_tcp_nonagle/merge SUCCEEDED 0.08 +2 unresolved conflicts found +./linux/raid10-race/merge SUCCEEDED 0.77 +./linux/md-messy/diff SUCCEEDED 0.00 1 unresolved conflict found -./linux/raid5line/merge SUCCEEDED 0.00 +./linux/inode-fullpatch/wmerge SUCCEEDED 0.13 +1 unresolved conflict found +./linux/inode-fullpatch/merge SUCCEEDED 0.13 +./linux/inode-fullpatch/diff SUCCEEDED 0.12 +./linux/inode-fullpatch/rediff SUCCEEDED 0.00 +2 unresolved conflicts found +1 already-applied change ignored +./linux/iomap/merge SUCCEEDED 0.08 2 unresolved conflicts found ./linux/raid5line/wmerge SUCCEEDED 0.00 -./linux/inode-fullpatch/diff SUCCEEDED 0.02 1 unresolved conflict found -./linux/inode-fullpatch/merge SUCCEEDED 0.02 +./linux/raid5line/merge SUCCEEDED 0.00 1 unresolved conflict found -./linux/inode-fullpatch/wmerge SUCCEEDED 0.02 -./linux/inode-fullpatch/rediff SUCCEEDED 0.00 +./linux/raid5line/lmerge SUCCEEDED 0.00 +2 unresolved conflicts found +./linux/md-loop/merge SUCCEEDED 0.69 17 unresolved conflicts found 10 already-applied changes ignored -./linux/raid5/merge SUCCEEDED 0.45 +./linux/raid5/merge SUCCEEDED 2.27 +1 unresolved conflict found +./linux/inode-justrej/wmerge SUCCEEDED 0.04 +1 unresolved conflict found +./linux/inode-justrej/merge SUCCEEDED 0.02 +1 unresolved conflict found +./linux/inode-justrej/lmerge SUCCEEDED 0.00 1 already-applied change ignored -./linux/md/replace SUCCEEDED 0.14 +./linux/md/wmerge SUCCEEDED 0.49 1 already-applied change ignored -./linux/md/lmerge SUCCEEDED 0.01 -./linux/md/diff SUCCEEDED 0.14 +./linux/md/merge SUCCEEDED 0.50 1 already-applied change ignored -./linux/md/merge SUCCEEDED 0.15 +./linux/md/lmerge SUCCEEDED 0.05 +./linux/md/diff SUCCEEDED 0.49 1 already-applied change ignored -./linux/md/wmerge SUCCEEDED 0.15 +./linux/md/replace SUCCEEDED 0.50 ./linux/md/rediff SUCCEEDED 0.00 +2 already-applied changes ignored +./linux/nfsd-defines/merge SUCCEEDED 0.01 1 unresolved conflict found -./linux/inode-justrej/lmerge SUCCEEDED 0.00 -1 unresolved conflict found -./linux/inode-justrej/merge SUCCEEDED 0.00 -1 unresolved conflict found -./linux/inode-justrej/wmerge SUCCEEDED 0.01 -2 unresolved conflicts found -1 already-applied change ignored -./linux/iomap/merge SUCCEEDED 0.01 +4 already-applied changes ignored +./linux/md-autostart/merge SUCCEEDED 0.09 4 unresolved conflicts found -./linux/raid1-A/merge SUCCEEDED 0.11 +./linux/raid1-A/merge SUCCEEDED 0.38 +2 unresolved conflicts found +./linux/raid5build/merge SUCCEEDED 0.00 9 unresolved conflicts found 6 already-applied changes ignored -./linux/md-resync/merge SUCCEEDED 0.32 -2 already-applied changes ignored -./linux/nfsd-defines/merge SUCCEEDED 0.00 -2 unresolved conflicts found -./linux/md-loop/merge SUCCEEDED 0.12 +./linux/md-resync/merge SUCCEEDED 1.54 1 unresolved conflict found ./linux/idmap.h/merge SUCCEEDED 0.00 -1 unresolved conflict found -./linux/rpc_tcp_nonagle/merge SUCCEEDED 0.01 -2 unresolved conflicts found -./linux/raid5build/merge SUCCEEDED 0.00 -2 unresolved conflicts found -./linux/raid10-race/merge SUCCEEDED 0.14 -./linux/md-messy/diff SUCCEEDED 0.00 71 succeeded and 0 failed make[2]: Leaving directory '/build/reproducible-path/wiggle-1.3' make[1]: Leaving directory '/build/reproducible-path/wiggle-1.3' dh_auto_test - make -j3 test + make -j6 test make[1]: Entering directory '/build/reproducible-path/wiggle-1.3' ./dotest -./mdadm/offroot/merge SUCCEEDED 0.01 -7 unresolved conflicts found -./lustre/pool/merge SUCCEEDED 0.12 -./contrib/mod_tbill/merge SUCCEEDED 0.00 +./mdadm/offroot/merge SUCCEEDED 0.07 1 already-applied change ignored -./contrib/xfaces/merge SUCCEEDED 0.06 -./contrib/pfkey_v2_parse.c/merge SUCCEEDED 0.01 +./contrib/xfaces/merge SUCCEEDED 0.26 +./contrib/nmi.c/merge SUCCEEDED 0.01 +./contrib/series/merge SUCCEEDED 20.09 +./contrib/series/diff SUCCEEDED 19.85 +./contrib/series/ldiff SUCCEEDED 0.27 1 unresolved conflict found ./contrib/abstract/bmerge SUCCEEDED 0.00 -./contrib/series/ldiff SUCCEEDED 0.06 -./contrib/series/diff SUCCEEDED 4.54 -./contrib/series/merge SUCCEEDED 4.63 -./contrib/nmi.c/merge SUCCEEDED 0.00 +./contrib/mod_tbill/merge SUCCEEDED 0.00 +./contrib/pfkey_v2_parse.c/merge SUCCEEDED 0.08 +7 unresolved conflicts found +./lustre/pool/merge SUCCEEDED 0.72 1 unresolved conflict found -./simple/show-wiggle-3/Wmerge SUCCEEDED 0.00 -./simple/show-wiggle-2/Wmerge SUCCEEDED 0.00 -./simple/show-wiggle-1/Wmerge SUCCEEDED 0.00 -./simple/base/ldiff SUCCEEDED 0.00 -./simple/base/diff SUCCEEDED 0.00 -./simple/base/merge SUCCEEDED 0.00 +./simple/trivial-conflict/merge SUCCEEDED 0.00 1 unresolved conflict found -./simple/all-different-2/lmerge SUCCEEDED 0.00 +./simple/conflict/wmerge SUCCEEDED 0.00 1 unresolved conflict found -./simple/all-different-2/merge SUCCEEDED 0.00 -10 unresolved conflicts found -./simple/all-different-2/wmerge SUCCEEDED 0.00 -./simple/multideletes/lmerge SUCCEEDED 0.00 -./simple/multideletes/merge SUCCEEDED 0.00 -./simple/conflict/ldiff SUCCEEDED 0.00 +./simple/conflict/merge SUCCEEDED 0.00 ./simple/conflict/diff SUCCEEDED 0.00 +./simple/conflict/ldiff SUCCEEDED 0.00 +./simple/brokenlines/merge SUCCEEDED 0.00 +./simple/brokenlines/diff SUCCEEDED 0.00 +./simple/changeafteradd/merge SUCCEEDED 0.00 +./simple/show-wiggle-1/Wmerge SUCCEEDED 0.00 1 unresolved conflict found -./simple/conflict/merge SUCCEEDED 0.00 +./simple/conflictmixed/wmerge SUCCEEDED 0.00 1 unresolved conflict found -./simple/conflict/wmerge SUCCEEDED 0.00 +./simple/conflictmixed/merge SUCCEEDED 0.00 1 unresolved conflict found -./simple/trivial-conflict/merge SUCCEEDED 0.00 +./simple/conflictmixed/lmerge SUCCEEDED 0.00 +./simple/conflictmixed/diff SUCCEEDED 0.00 +./simple/conflictmixed/ldiff SUCCEEDED 0.00 +3 already-applied changes ignored +./simple/bothadd/merge SUCCEEDED 0.00 +1 already-applied change ignored +./simple/bothadd/lmerge SUCCEEDED 0.00 +./simple/base/merge SUCCEEDED 0.00 +./simple/base/diff SUCCEEDED 0.00 +./simple/base/ldiff SUCCEEDED 0.00 1 unresolved conflict found -./simple/multiple-add/lmerge SUCCEEDED 0.00 +./simple/multiple-add/wmerge SUCCEEDED 0.00 1 unresolved conflict found ./simple/multiple-add/merge SUCCEEDED 0.00 1 unresolved conflict found -./simple/multiple-add/wmerge SUCCEEDED 0.00 -./simple/brokenlines/diff SUCCEEDED 0.00 -./simple/brokenlines/merge SUCCEEDED 0.00 -./simple/conflictmixed/ldiff SUCCEEDED 0.00 +./simple/multiple-add/lmerge SUCCEEDED 0.00 +./simple/show-wiggle-2/Wmerge SUCCEEDED 0.00 +10 unresolved conflicts found +./simple/all-different-2/wmerge SUCCEEDED 0.00 1 unresolved conflict found -./simple/conflictmixed/lmerge SUCCEEDED 0.00 -./simple/conflictmixed/diff SUCCEEDED 0.00 +./simple/all-different-2/merge SUCCEEDED 0.00 1 unresolved conflict found -./simple/conflictmixed/merge SUCCEEDED 0.00 +./simple/all-different-2/lmerge SUCCEEDED 0.00 +10 unresolved conflicts found +./simple/all-different/wmerge SUCCEEDED 0.00 1 unresolved conflict found -./simple/conflictmixed/wmerge SUCCEEDED 0.00 -1 already-applied change ignored -./simple/already-applied/merge SUCCEEDED 0.00 +./simple/all-different/merge SUCCEEDED 0.00 1 unresolved conflict found ./simple/all-different/lmerge SUCCEEDED 0.00 -1 unresolved conflict found -./simple/all-different/merge SUCCEEDED 0.00 -10 unresolved conflicts found -./simple/all-different/wmerge SUCCEEDED 0.00 +./simple/multideletes/merge SUCCEEDED 0.00 +./simple/multideletes/lmerge SUCCEEDED 0.00 1 already-applied change ignored -./simple/bothadd/lmerge SUCCEEDED 0.00 -3 already-applied changes ignored -./simple/bothadd/merge SUCCEEDED 0.00 -./simple/changeafteradd/merge SUCCEEDED 0.00 +./simple/already-applied/merge SUCCEEDED 0.00 1 unresolved conflict found -4 already-applied changes ignored -./linux/md-autostart/merge SUCCEEDED 0.03 +./simple/show-wiggle-3/Wmerge SUCCEEDED 0.00 1 unresolved conflict found -./linux/raid5line/lmerge SUCCEEDED 0.00 +./linux/rpc_tcp_nonagle/merge SUCCEEDED 0.07 +2 unresolved conflicts found +./linux/raid10-race/merge SUCCEEDED 0.79 +./linux/md-messy/diff SUCCEEDED 0.00 1 unresolved conflict found -./linux/raid5line/merge SUCCEEDED 0.00 +./linux/inode-fullpatch/wmerge SUCCEEDED 0.12 +1 unresolved conflict found +./linux/inode-fullpatch/merge SUCCEEDED 0.13 +./linux/inode-fullpatch/diff SUCCEEDED 0.12 +./linux/inode-fullpatch/rediff SUCCEEDED 0.00 +2 unresolved conflicts found +1 already-applied change ignored +./linux/iomap/merge SUCCEEDED 0.08 2 unresolved conflicts found ./linux/raid5line/wmerge SUCCEEDED 0.00 -./linux/inode-fullpatch/diff SUCCEEDED 0.02 1 unresolved conflict found -./linux/inode-fullpatch/merge SUCCEEDED 0.02 +./linux/raid5line/merge SUCCEEDED 0.00 1 unresolved conflict found -./linux/inode-fullpatch/wmerge SUCCEEDED 0.02 -./linux/inode-fullpatch/rediff SUCCEEDED 0.00 +./linux/raid5line/lmerge SUCCEEDED 0.00 +2 unresolved conflicts found +./linux/md-loop/merge SUCCEEDED 0.69 17 unresolved conflicts found 10 already-applied changes ignored -./linux/raid5/merge SUCCEEDED 0.46 +./linux/raid5/merge SUCCEEDED 2.46 +1 unresolved conflict found +./linux/inode-justrej/wmerge SUCCEEDED 0.04 +1 unresolved conflict found +./linux/inode-justrej/merge SUCCEEDED 0.04 +1 unresolved conflict found +./linux/inode-justrej/lmerge SUCCEEDED 0.00 1 already-applied change ignored -./linux/md/replace SUCCEEDED 0.14 +./linux/md/wmerge SUCCEEDED 0.78 1 already-applied change ignored -./linux/md/lmerge SUCCEEDED 0.01 -./linux/md/diff SUCCEEDED 0.15 +./linux/md/merge SUCCEEDED 0.79 1 already-applied change ignored -./linux/md/merge SUCCEEDED 0.15 +./linux/md/lmerge SUCCEEDED 0.05 +./linux/md/diff SUCCEEDED 0.80 1 already-applied change ignored -./linux/md/wmerge SUCCEEDED 0.15 +./linux/md/replace SUCCEEDED 0.60 ./linux/md/rediff SUCCEEDED 0.00 +2 already-applied changes ignored +./linux/nfsd-defines/merge SUCCEEDED 0.00 1 unresolved conflict found -./linux/inode-justrej/lmerge SUCCEEDED 0.00 -1 unresolved conflict found -./linux/inode-justrej/merge SUCCEEDED 0.01 -1 unresolved conflict found -./linux/inode-justrej/wmerge SUCCEEDED 0.01 -2 unresolved conflicts found -1 already-applied change ignored -./linux/iomap/merge SUCCEEDED 0.01 +4 already-applied changes ignored +./linux/md-autostart/merge SUCCEEDED 0.09 4 unresolved conflicts found -./linux/raid1-A/merge SUCCEEDED 0.11 +./linux/raid1-A/merge SUCCEEDED 0.38 +2 unresolved conflicts found +./linux/raid5build/merge SUCCEEDED 0.00 9 unresolved conflicts found 6 already-applied changes ignored -./linux/md-resync/merge SUCCEEDED 0.33 -2 already-applied changes ignored -./linux/nfsd-defines/merge SUCCEEDED 0.00 -2 unresolved conflicts found -./linux/md-loop/merge SUCCEEDED 0.13 +./linux/md-resync/merge SUCCEEDED 1.08 1 unresolved conflict found ./linux/idmap.h/merge SUCCEEDED 0.00 -1 unresolved conflict found -./linux/rpc_tcp_nonagle/merge SUCCEEDED 0.01 -2 unresolved conflicts found -./linux/raid5build/merge SUCCEEDED 0.00 -2 unresolved conflicts found -./linux/raid10-race/merge SUCCEEDED 0.15 -./linux/md-messy/diff SUCCEEDED 0.00 71 succeeded and 0 failed make[1]: Leaving directory '/build/reproducible-path/wiggle-1.3' - rm -fr -- /tmp/dh-xdg-rundir-X7RDKBPt + rm -fr -- /tmp/dh-xdg-rundir-rZ1Dp_rz create-stamp debian/debhelper-build-stamp dh_prep rm -f -- debian/wiggle.substvars rm -fr -- debian/.debhelper/generated/wiggle/ debian/wiggle/ debian/tmp/ dh_auto_install --destdir=debian/wiggle/ install -m0755 -d /build/reproducible-path/wiggle-1.3/debian/wiggle - make -j3 install DESTDIR=/build/reproducible-path/wiggle-1.3/debian/wiggle AM_UPDATE_INFO_DIR=no "INSTALL=install --strip-program=true" + make -j6 install DESTDIR=/build/reproducible-path/wiggle-1.3/debian/wiggle AM_UPDATE_INFO_DIR=no "INSTALL=install --strip-program=true" make[1]: Entering directory '/build/reproducible-path/wiggle-1.3' install --strip-program=true -d /build/reproducible-path/wiggle-1.3/debian/wiggle/usr/bin /build/reproducible-path/wiggle-1.3/debian/wiggle/usr/share/man/man1 install: WARNING: ignoring --strip-program option as -s option was not specified @@ -766,12 +802,14 @@ dpkg-buildpackage: info: binary-only upload (no source included) dpkg-genchanges: info: including full source code in upload I: copying local configuration +I: user script /srv/workspace/pbuilder/5370/tmp/hooks/B01_cleanup starting +I: user script /srv/workspace/pbuilder/5370/tmp/hooks/B01_cleanup finished I: unmounting dev/ptmx filesystem I: unmounting dev/pts filesystem I: unmounting dev/shm filesystem I: unmounting proc filesystem I: unmounting sys filesystem I: cleaning the build env -I: removing directory /srv/workspace/pbuilder/8787 and its subdirectories -I: Current time: Wed Jan 22 22:47:58 -12 2025 -I: pbuilder-time-stamp: 1737629278 +I: removing directory /srv/workspace/pbuilder/5370 and its subdirectories +I: Current time: Fri Jan 24 00:52:53 +14 2025 +I: pbuilder-time-stamp: 1737629573