Diff of the two buildlogs:

--
--- b1/build.log	2021-08-12 10:06:35.770907464 +0000
+++ b2/build.log	2021-08-12 10:12:00.470758735 +0000
@@ -1,6 +1,6 @@
 I: pbuilder: network access will be disabled during build
-I: Current time: Wed Aug 11 21:57:43 -12 2021
-I: pbuilder-time-stamp: 1628762263
+I: Current time: Fri Aug 13 00:06:55 +14 2021
+I: pbuilder-time-stamp: 1628762815
 I: Building the build Environment
 I: extracting base tarball [/var/cache/pbuilder/bullseye-reproducible-base.tgz]
 I: copying local configuration
@@ -16,8 +16,8 @@
 I: copying [./lsp-mode_7.0.1-2.debian.tar.xz]
 I: Extracting source
 gpgv: unknown type of key resource 'trustedkeys.kbx'
-gpgv: keyblock resource '/tmp/dpkg-verify-sig.xkcZ0wWa/trustedkeys.kbx': General error
-gpgv: Signature made Tue Oct 13 07:23:16 2020 -12
+gpgv: keyblock resource '/tmp/dpkg-verify-sig.FIYFYOne/trustedkeys.kbx': General error
+gpgv: Signature made Wed Oct 14 09:23:16 2020 +14
 gpgv:                using RSA key 76040205597FA696F1313BCA07FC4891042BA65A
 gpgv: Can't check signature: No public key
 dpkg-source: warning: failed to verify signature on ./lsp-mode_7.0.1-2.dsc
@@ -28,135 +28,169 @@
 dpkg-source: info: applying 01_dash-functional_version.patch
 I: using fakeroot in build.
 I: Installing the build-deps
-I: user script /srv/workspace/pbuilder/6945/tmp/hooks/D02_print_environment starting
+I: user script /srv/workspace/pbuilder/5711/tmp/hooks/D01_modify_environment starting
+debug: Running on virt64c.
+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
+Removing 'diversion of /bin/sh to /bin/sh.distrib by dash'
+Adding 'diversion of /bin/sh to /bin/sh.distrib by bash'
+Removing 'diversion of /usr/share/man/man1/sh.1.gz to /usr/share/man/man1/sh.distrib.1.gz by dash'
+Adding 'diversion of /usr/share/man/man1/sh.1.gz to /usr/share/man/man1/sh.distrib.1.gz by 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/5711/tmp/hooks/D01_modify_environment finished
+I: user script /srv/workspace/pbuilder/5711/tmp/hooks/D02_print_environment starting
 I: set
-  BUILDDIR='/build'
-  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,-fixfilepath parallel=3'
-  DISTRIBUTION=''
-  HOME='/root'
-  HOST_ARCH='armhf'
+  BASH=/bin/sh
+  BASHOPTS=checkwinsize:cmdhist:complete_fullquote:extquote:force_fignore:globasciiranges:hostcomplete:interactive_comments:progcomp:promptvars:sourcepath
+  BASH_ALIASES=()
+  BASH_ARGC=()
+  BASH_ARGV=()
+  BASH_CMDS=()
+  BASH_LINENO=([0]="12" [1]="0")
+  BASH_SOURCE=([0]="/tmp/hooks/D02_print_environment" [1]="/tmp/hooks/D02_print_environment")
+  BASH_VERSINFO=([0]="5" [1]="1" [2]="4" [3]="1" [4]="release" [5]="arm-unknown-linux-gnueabihf")
+  BASH_VERSION='5.1.4(1)-release'
+  BUILDDIR=/build
+  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,-fixfilepath parallel=4'
+  DIRSTACK=()
+  DISTRIBUTION=
+  EUID=0
+  FUNCNAME=([0]="Echo" [1]="main")
+  GROUPS=()
+  HOME=/root
+  HOSTNAME=i-capture-the-hostname
+  HOSTTYPE=arm
+  HOST_ARCH=armhf
   IFS=' 	
   '
-  INVOCATION_ID='b4f935a9679e4417a12f86cee4a5d91c'
-  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='6945'
-  PS1='# '
-  PS2='> '
+  INVOCATION_ID=507f7bd72fdc4bbe8ad8f82f54fb4e65
+  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=5711
   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/tmp.Qb7PeeBIte/pbuilderrc_qQOB --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/bullseye-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/tmp.Qb7PeeBIte/b1 --logfile b1/build.log lsp-mode_7.0.1-2.dsc'
-  SUDO_GID='116'
-  SUDO_UID='112'
-  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:8000/'
+  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/tmp.Qb7PeeBIte/pbuilderrc_91c8 --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/bullseye-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/tmp.Qb7PeeBIte/b2 --logfile b2/build.log --extrapackages usrmerge lsp-mode_7.0.1-2.dsc'
+  SUDO_GID=113
+  SUDO_UID=107
+  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:8000/
 I: uname -a
-  Linux cbxi4b 5.10.0-8-armmp #1 SMP Debian 5.10.46-4 (2021-08-03) armv7l GNU/Linux
+  Linux i-capture-the-hostname 5.10.0-8-arm64 #1 SMP Debian 5.10.46-4 (2021-08-03) aarch64 GNU/Linux
 I: ls -l /bin
   total 3580
-  -rwxr-xr-x 1 root root 816764 Aug  4 08:25 bash
-  -rwxr-xr-x 3 root root  26052 Jul 20  2020 bunzip2
-  -rwxr-xr-x 3 root root  26052 Jul 20  2020 bzcat
-  lrwxrwxrwx 1 root root      6 Jul 20  2020 bzcmp -> bzdiff
-  -rwxr-xr-x 1 root root   2225 Jul 20  2020 bzdiff
-  lrwxrwxrwx 1 root root      6 Jul 20  2020 bzegrep -> bzgrep
-  -rwxr-xr-x 1 root root   4877 Sep  4  2019 bzexe
-  lrwxrwxrwx 1 root root      6 Jul 20  2020 bzfgrep -> bzgrep
-  -rwxr-xr-x 1 root root   3775 Jul 20  2020 bzgrep
-  -rwxr-xr-x 3 root root  26052 Jul 20  2020 bzip2
-  -rwxr-xr-x 1 root root   9636 Jul 20  2020 bzip2recover
-  lrwxrwxrwx 1 root root      6 Jul 20  2020 bzless -> bzmore
-  -rwxr-xr-x 1 root root   1297 Jul 20  2020 bzmore
-  -rwxr-xr-x 1 root root  26668 Sep 22  2020 cat
-  -rwxr-xr-x 1 root root  43104 Sep 22  2020 chgrp
-  -rwxr-xr-x 1 root root  38984 Sep 22  2020 chmod
-  -rwxr-xr-x 1 root root  43112 Sep 22  2020 chown
-  -rwxr-xr-x 1 root root  92616 Sep 22  2020 cp
-  -rwxr-xr-x 1 root root  75524 Dec 10  2020 dash
-  -rwxr-xr-x 1 root root  75880 Sep 22  2020 date
-  -rwxr-xr-x 1 root root  55436 Sep 22  2020 dd
-  -rwxr-xr-x 1 root root  59912 Sep 22  2020 df
-  -rwxr-xr-x 1 root root  96764 Sep 22  2020 dir
-  -rwxr-xr-x 1 root root  55012 Jul 28 07:09 dmesg
-  lrwxrwxrwx 1 root root      8 Nov  6  2019 dnsdomainname -> hostname
-  lrwxrwxrwx 1 root root      8 Nov  6  2019 domainname -> hostname
-  -rwxr-xr-x 1 root root  22508 Sep 22  2020 echo
-  -rwxr-xr-x 1 root root     28 Nov  9  2020 egrep
-  -rwxr-xr-x 1 root root  22496 Sep 22  2020 false
-  -rwxr-xr-x 1 root root     28 Nov  9  2020 fgrep
-  -rwxr-xr-x 1 root root  47492 Jul 28 07:09 findmnt
-  -rwsr-xr-x 1 root root  26076 Feb 26 04:12 fusermount
-  -rwxr-xr-x 1 root root 124508 Nov  9  2020 grep
-  -rwxr-xr-x 2 root root   2346 Mar  2 11:30 gunzip
-  -rwxr-xr-x 1 root root   6376 Mar  2 11:30 gzexe
-  -rwxr-xr-x 1 root root  64212 Mar  2 11:30 gzip
-  -rwxr-xr-x 1 root root  13784 Nov  6  2019 hostname
-  -rwxr-xr-x 1 root root  43180 Sep 22  2020 ln
-  -rwxr-xr-x 1 root root  35068 Feb  7  2020 login
-  -rwxr-xr-x 1 root root  96764 Sep 22  2020 ls
-  -rwxr-xr-x 1 root root  99940 Jul 28 07:09 lsblk
-  -rwxr-xr-x 1 root root  51408 Sep 22  2020 mkdir
-  -rwxr-xr-x 1 root root  43184 Sep 22  2020 mknod
-  -rwxr-xr-x 1 root root  30780 Sep 22  2020 mktemp
-  -rwxr-xr-x 1 root root  34408 Jul 28 07:09 more
-  -rwsr-xr-x 1 root root  34400 Jul 28 07:09 mount
-  -rwxr-xr-x 1 root root   9824 Jul 28 07:09 mountpoint
-  -rwxr-xr-x 1 root root  88524 Sep 22  2020 mv
-  lrwxrwxrwx 1 root root      8 Nov  6  2019 nisdomainname -> hostname
-  lrwxrwxrwx 1 root root     14 Apr 18 03:38 pidof -> /sbin/killall5
-  -rwxr-xr-x 1 root root  26652 Sep 22  2020 pwd
-  lrwxrwxrwx 1 root root      4 Aug  4 08:25 rbash -> bash
-  -rwxr-xr-x 1 root root  30740 Sep 22  2020 readlink
-  -rwxr-xr-x 1 root root  43104 Sep 22  2020 rm
-  -rwxr-xr-x 1 root root  30732 Sep 22  2020 rmdir
-  -rwxr-xr-x 1 root root  14144 Sep 27  2020 run-parts
-  -rwxr-xr-x 1 root root  76012 Dec 22  2018 sed
-  lrwxrwxrwx 1 root root      4 Aug 10 21:30 sh -> dash
-  -rwxr-xr-x 1 root root  22532 Sep 22  2020 sleep
-  -rwxr-xr-x 1 root root  55360 Sep 22  2020 stty
-  -rwsr-xr-x 1 root root  46704 Jul 28 07:09 su
-  -rwxr-xr-x 1 root root  22532 Sep 22  2020 sync
-  -rwxr-xr-x 1 root root 340872 Feb 16 21:55 tar
-  -rwxr-xr-x 1 root root   9808 Sep 27  2020 tempfile
-  -rwxr-xr-x 1 root root  67696 Sep 22  2020 touch
-  -rwxr-xr-x 1 root root  22496 Sep 22  2020 true
-  -rwxr-xr-x 1 root root   9636 Feb 26 04:12 ulockmgr_server
-  -rwsr-xr-x 1 root root  22108 Jul 28 07:09 umount
-  -rwxr-xr-x 1 root root  22520 Sep 22  2020 uname
-  -rwxr-xr-x 2 root root   2346 Mar  2 11:30 uncompress
-  -rwxr-xr-x 1 root root  96764 Sep 22  2020 vdir
-  -rwxr-xr-x 1 root root  38512 Jul 28 07:09 wdctl
-  lrwxrwxrwx 1 root root      8 Nov  6  2019 ypdomainname -> hostname
-  -rwxr-xr-x 1 root root   1984 Mar  2 11:30 zcat
-  -rwxr-xr-x 1 root root   1678 Mar  2 11:30 zcmp
-  -rwxr-xr-x 1 root root   5880 Mar  2 11:30 zdiff
-  -rwxr-xr-x 1 root root     29 Mar  2 11:30 zegrep
-  -rwxr-xr-x 1 root root     29 Mar  2 11:30 zfgrep
-  -rwxr-xr-x 1 root root   2081 Mar  2 11:30 zforce
-  -rwxr-xr-x 1 root root   7585 Mar  2 11:30 zgrep
-  -rwxr-xr-x 1 root root   2206 Mar  2 11:30 zless
-  -rwxr-xr-x 1 root root   1842 Mar  2 11:30 zmore
-  -rwxr-xr-x 1 root root   4553 Mar  2 11:30 znew
-I: user script /srv/workspace/pbuilder/6945/tmp/hooks/D02_print_environment finished
+  -rwxr-xr-x 1 root root 816764 Aug  5 10:25 bash
+  -rwxr-xr-x 3 root root  26052 Jul 21  2020 bunzip2
+  -rwxr-xr-x 3 root root  26052 Jul 21  2020 bzcat
+  lrwxrwxrwx 1 root root      6 Jul 21  2020 bzcmp -> bzdiff
+  -rwxr-xr-x 1 root root   2225 Jul 21  2020 bzdiff
+  lrwxrwxrwx 1 root root      6 Jul 21  2020 bzegrep -> bzgrep
+  -rwxr-xr-x 1 root root   4877 Sep  5  2019 bzexe
+  lrwxrwxrwx 1 root root      6 Jul 21  2020 bzfgrep -> bzgrep
+  -rwxr-xr-x 1 root root   3775 Jul 21  2020 bzgrep
+  -rwxr-xr-x 3 root root  26052 Jul 21  2020 bzip2
+  -rwxr-xr-x 1 root root   9636 Jul 21  2020 bzip2recover
+  lrwxrwxrwx 1 root root      6 Jul 21  2020 bzless -> bzmore
+  -rwxr-xr-x 1 root root   1297 Jul 21  2020 bzmore
+  -rwxr-xr-x 1 root root  26668 Sep 23  2020 cat
+  -rwxr-xr-x 1 root root  43104 Sep 23  2020 chgrp
+  -rwxr-xr-x 1 root root  38984 Sep 23  2020 chmod
+  -rwxr-xr-x 1 root root  43112 Sep 23  2020 chown
+  -rwxr-xr-x 1 root root  92616 Sep 23  2020 cp
+  -rwxr-xr-x 1 root root  75524 Dec 11  2020 dash
+  -rwxr-xr-x 1 root root  75880 Sep 23  2020 date
+  -rwxr-xr-x 1 root root  55436 Sep 23  2020 dd
+  -rwxr-xr-x 1 root root  59912 Sep 23  2020 df
+  -rwxr-xr-x 1 root root  96764 Sep 23  2020 dir
+  -rwxr-xr-x 1 root root  55012 Jul 29 09:09 dmesg
+  lrwxrwxrwx 1 root root      8 Nov  8  2019 dnsdomainname -> hostname
+  lrwxrwxrwx 1 root root      8 Nov  8  2019 domainname -> hostname
+  -rwxr-xr-x 1 root root  22508 Sep 23  2020 echo
+  -rwxr-xr-x 1 root root     28 Nov 10  2020 egrep
+  -rwxr-xr-x 1 root root  22496 Sep 23  2020 false
+  -rwxr-xr-x 1 root root     28 Nov 10  2020 fgrep
+  -rwxr-xr-x 1 root root  47492 Jul 29 09:09 findmnt
+  -rwsr-xr-x 1 root root  26076 Feb 27 06:12 fusermount
+  -rwxr-xr-x 1 root root 124508 Nov 10  2020 grep
+  -rwxr-xr-x 2 root root   2346 Mar  3 13:30 gunzip
+  -rwxr-xr-x 1 root root   6376 Mar  3 13:30 gzexe
+  -rwxr-xr-x 1 root root  64212 Mar  3 13:30 gzip
+  -rwxr-xr-x 1 root root  13784 Nov  8  2019 hostname
+  -rwxr-xr-x 1 root root  43180 Sep 23  2020 ln
+  -rwxr-xr-x 1 root root  35068 Feb  8  2020 login
+  -rwxr-xr-x 1 root root  96764 Sep 23  2020 ls
+  -rwxr-xr-x 1 root root  99940 Jul 29 09:09 lsblk
+  -rwxr-xr-x 1 root root  51408 Sep 23  2020 mkdir
+  -rwxr-xr-x 1 root root  43184 Sep 23  2020 mknod
+  -rwxr-xr-x 1 root root  30780 Sep 23  2020 mktemp
+  -rwxr-xr-x 1 root root  34408 Jul 29 09:09 more
+  -rwsr-xr-x 1 root root  34400 Jul 29 09:09 mount
+  -rwxr-xr-x 1 root root   9824 Jul 29 09:09 mountpoint
+  -rwxr-xr-x 1 root root  88524 Sep 23  2020 mv
+  lrwxrwxrwx 1 root root      8 Nov  8  2019 nisdomainname -> hostname
+  lrwxrwxrwx 1 root root     14 Apr 19 05:38 pidof -> /sbin/killall5
+  -rwxr-xr-x 1 root root  26652 Sep 23  2020 pwd
+  lrwxrwxrwx 1 root root      4 Aug  5 10:25 rbash -> bash
+  -rwxr-xr-x 1 root root  30740 Sep 23  2020 readlink
+  -rwxr-xr-x 1 root root  43104 Sep 23  2020 rm
+  -rwxr-xr-x 1 root root  30732 Sep 23  2020 rmdir
+  -rwxr-xr-x 1 root root  14144 Sep 28  2020 run-parts
+  -rwxr-xr-x 1 root root  76012 Dec 23  2018 sed
+  lrwxrwxrwx 1 root root      4 Aug 13 00:08 sh -> bash
+  lrwxrwxrwx 1 root root      4 Aug 10 23:24 sh.distrib -> dash
+  -rwxr-xr-x 1 root root  22532 Sep 23  2020 sleep
+  -rwxr-xr-x 1 root root  55360 Sep 23  2020 stty
+  -rwsr-xr-x 1 root root  46704 Jul 29 09:09 su
+  -rwxr-xr-x 1 root root  22532 Sep 23  2020 sync
+  -rwxr-xr-x 1 root root 340872 Feb 17 23:55 tar
+  -rwxr-xr-x 1 root root   9808 Sep 28  2020 tempfile
+  -rwxr-xr-x 1 root root  67696 Sep 23  2020 touch
+  -rwxr-xr-x 1 root root  22496 Sep 23  2020 true
+  -rwxr-xr-x 1 root root   9636 Feb 27 06:12 ulockmgr_server
+  -rwsr-xr-x 1 root root  22108 Jul 29 09:09 umount
+  -rwxr-xr-x 1 root root  22520 Sep 23  2020 uname
+  -rwxr-xr-x 2 root root   2346 Mar  3 13:30 uncompress
+  -rwxr-xr-x 1 root root  96764 Sep 23  2020 vdir
+  -rwxr-xr-x 1 root root  38512 Jul 29 09:09 wdctl
+  lrwxrwxrwx 1 root root      8 Nov  8  2019 ypdomainname -> hostname
+  -rwxr-xr-x 1 root root   1984 Mar  3 13:30 zcat
+  -rwxr-xr-x 1 root root   1678 Mar  3 13:30 zcmp
+  -rwxr-xr-x 1 root root   5880 Mar  3 13:30 zdiff
+  -rwxr-xr-x 1 root root     29 Mar  3 13:30 zegrep
+  -rwxr-xr-x 1 root root     29 Mar  3 13:30 zfgrep
+  -rwxr-xr-x 1 root root   2081 Mar  3 13:30 zforce
+  -rwxr-xr-x 1 root root   7585 Mar  3 13:30 zgrep
+  -rwxr-xr-x 1 root root   2206 Mar  3 13:30 zless
+  -rwxr-xr-x 1 root root   1842 Mar  3 13:30 zmore
+  -rwxr-xr-x 1 root root   4553 Mar  3 13:30 znew
+I: user script /srv/workspace/pbuilder/5711/tmp/hooks/D02_print_environment finished
  -> Attempting to satisfy build-dependencies
  -> Creating pbuilder-satisfydepends-dummy package
 Package: pbuilder-satisfydepends-dummy
@@ -312,7 +346,7 @@
 Get: 100 http://deb.debian.org/debian bullseye/main armhf elpa-shut-up all 0.3.3-1 [5648 B]
 Get: 101 http://deb.debian.org/debian bullseye/main armhf elpa-spinner all 1.7.3-3 [1384 kB]
 Get: 102 http://deb.debian.org/debian bullseye/main armhf elpa-undercover all 0.8.0-1 [18.3 kB]
-Fetched 40.3 MB in 5s (7432 kB/s)
+Fetched 40.3 MB in 5s (8394 kB/s)
 debconf: delaying package configuration, since apt-utils is not installed
 Selecting previously unselected package install-info.
 (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 ... 19398 files and directories currently installed.)
@@ -729,35 +763,38 @@
 Setting up emacs-nox (1:27.1+1-3.1) ...
 update-alternatives: using /usr/bin/emacs-nox to provide /usr/bin/emacs (emacs) in auto mode
 update-alternatives: using /usr/bin/emacs to provide /usr/bin/editor (editor) in auto mode
+tsort: -: input contains a loop:
+tsort: elpa-dash
+tsort: emacsen-common
+Install elpa-dash for emacs
+install/dash-2.17.0: Handling install of emacsen flavor emacs
+install/dash-2.17.0: byte-compiling for emacs
 Install emacsen-common for emacs
 emacsen-common: Handling install of emacsen flavor emacs
-Install elpa-deferred for emacs
-install/deferred-0.5.1: Handling install of emacsen flavor emacs
-install/deferred-0.5.1: byte-compiling for emacs
 Install elpa-spinner for emacs
 install/spinner-1.7.3: Handling install of emacsen flavor emacs
 install/spinner-1.7.3: byte-compiling for emacs
-Install elpa-markdown-mode for emacs
-install/markdown-mode-2.4: Handling install of emacsen flavor emacs
-install/markdown-mode-2.4: byte-compiling for emacs
-Install elpa-dash for emacs
-install/dash-2.17.0: Handling install of emacsen flavor emacs
-install/dash-2.17.0: byte-compiling for emacs
-Install elpa-lv for emacs
-install/lv-0.15.0: Handling install of emacsen flavor emacs
-install/lv-0.15.0: byte-compiling for emacs
 Install elpa-s for emacs
 install/s-1.12.0: Handling install of emacsen flavor emacs
 install/s-1.12.0: byte-compiling for emacs
-Install elpa-shut-up for emacs
-install/shut-up-0.3.2: Handling install of emacsen flavor emacs
-install/shut-up-0.3.2: byte-compiling for emacs
 Install elpa-dash-functional for emacs
 install/dash-functional-1.2.0: Handling install of emacsen flavor emacs
 install/dash-functional-1.2.0: byte-compiling for emacs
+Install elpa-deferred for emacs
+install/deferred-0.5.1: Handling install of emacsen flavor emacs
+install/deferred-0.5.1: byte-compiling for emacs
 Install elpa-ht for emacs
 install/ht-2.3: Handling install of emacsen flavor emacs
 install/ht-2.3: byte-compiling for emacs
+Install elpa-lv for emacs
+install/lv-0.15.0: Handling install of emacsen flavor emacs
+install/lv-0.15.0: byte-compiling for emacs
+Install elpa-shut-up for emacs
+install/shut-up-0.3.2: Handling install of emacsen flavor emacs
+install/shut-up-0.3.2: byte-compiling for emacs
+Install elpa-markdown-mode for emacs
+install/markdown-mode-2.4: Handling install of emacsen flavor emacs
+install/markdown-mode-2.4: byte-compiling for emacs
 Install elpa-f for emacs
 install/f-0.20.0: Handling install of emacsen flavor emacs
 install/f-0.20.0: byte-compiling for emacs
@@ -798,9 +835,23 @@
 Building dependency tree...
 Reading state information...
 fakeroot is already the newest version (1.25.3-1.1).
-0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
+The following NEW packages will be installed:
+  usrmerge
+0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
+Need to get 13.0 kB of archives.
+After this operation, 43.0 kB of additional disk space will be used.
+Get:1 http://deb.debian.org/debian bullseye/main armhf usrmerge all 25 [13.0 kB]
+debconf: delaying package configuration, since apt-utils is not installed
+Fetched 13.0 kB in 0s (596 kB/s)
+Selecting previously unselected package usrmerge.
+(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 ... 25320 files and directories currently installed.)
+Preparing to unpack .../archives/usrmerge_25_all.deb ...
+Unpacking usrmerge (25) ...
+Setting up usrmerge (25) ...
+The system has been successfully converted.
 I: Building the package
-I: Running cd /build/lsp-mode-7.0.1/ && 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  > ../lsp-mode_7.0.1-2_source.changes
+hostname: Name or service not known
+I: Running cd /build/lsp-mode-7.0.1/ && 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  > ../lsp-mode_7.0.1-2_source.changes
 dpkg-buildpackage: info: source package lsp-mode
 dpkg-buildpackage: info: source version 7.0.1-2
 dpkg-buildpackage: info: source distribution unstable
@@ -810,7 +861,7 @@
  fakeroot debian/rules clean
 dh clean --with elpa
    dh_auto_clean
-	make -j3 clean
+	make -j4 clean
 make[1]: Entering directory '/build/lsp-mode-7.0.1'
 rm -rf .cask *.elc
 make[1]: Leaving directory '/build/lsp-mode-7.0.1'
@@ -825,29 +876,29 @@
 /bin/true
 make[1]: Leaving directory '/build/lsp-mode-7.0.1'
    dh_elpa_test
-	emacs -batch -Q -l package --eval "(add-to-list 'package-directory-list \"/usr/share/emacs/site-lisp/elpa\")" --eval "(add-to-list 'package-directory-list \"/usr/share/emacs/site-lisp/elpa-src\")" -f package-initialize -L . -L test -l test/lsp-integration-test.el -l test/lsp-clients-test.el -l test/lsp-mode-test.el -l test/lsp-protocol-test.el -l test/lsp-file-watch-test.el -l test/lsp-methods-test.el -l test/lsp-common-test.el -l test/lsp-io-test.el -l test/lsp-completion-test.el -l debian/ert-helper.el
+	emacs -batch -Q -l package --eval "(add-to-list 'package-directory-list \"/usr/share/emacs/site-lisp/elpa\")" --eval "(add-to-list 'package-directory-list \"/usr/share/emacs/site-lisp/elpa-src\")" -f package-initialize -L . -L test -l test/lsp-file-watch-test.el -l test/lsp-mode-test.el -l test/lsp-completion-test.el -l test/lsp-protocol-test.el -l test/lsp-io-test.el -l test/lsp-common-test.el -l test/lsp-clients-test.el -l test/lsp-methods-test.el -l test/lsp-integration-test.el -l debian/ert-helper.el
 Loading /build/lsp-mode-7.0.1/test/test-helper.el (source)...
-Running 42 tests (2021-08-11 22:03:32-1200, selector `(not (or (tag org) (tag no-win) "lsp-test-current-buffer-mode" "lsp-text-document-hover-request" "lsp-text-document-hover-request-tick"))')
-   passed   1/42  lsp--boolean-property (0.002147 sec)
-   passed   2/42  lsp--custom-settings-test (0.001666 sec)
-   passed   3/42  lsp--f-ancestor-of\? (0.007067 sec)
-   passed   4/42  lsp--find-session-folder (0.010912 sec)
-   passed   5/42  lsp--merge-results (0.008256 sec)
-   passed   6/42  lsp--non-related-content-on-stdout (0.001456 sec)
-   passed   7/42  lsp--parser-read--ignored-messages (0.257832 sec)
-   passed   8/42  lsp--parser-read--multibyte (0.002350 sec)
-   passed   9/42  lsp--parser-read--multibyte-nospace (0.001346 sec)
-   passed  10/42  lsp--parser-read--multibyte-received (0.002383 sec)
-   passed  11/42  lsp--parser-read--multiple-chunks (0.002797 sec)
-   passed  12/42  lsp--parser-read--multiple-messages (0.004410 sec)
-   passed  13/42  lsp--parser-read--multiple-multibyte-chunks (0.003475 sec)
-   passed  14/42  lsp--path-to-uri (0.002009 sec)
-   passed  15/42  lsp--test-find-roots-for-workspace (0.002904 sec)
-LSP :: Applying 12 edits to ` *temp*-741485' ...
-Applying 12 edits to ` *temp*-741485' ... 
-Applying 12 edits to ` *temp*-741485' ...done
-   passed  16/42  lsp--test-overlapping-updates (0.013578 sec)
-   passed  17/42  lsp--uri-to-path--handle-utf8 (0.002622 sec)
+Running 42 tests (2021-08-13 00:11:26+1400, selector `(not (or (tag org) (tag no-win) "lsp-test-current-buffer-mode" "lsp-text-document-hover-request" "lsp-text-document-hover-request-tick"))')
+   passed   1/42  lsp--boolean-property (0.000585 sec)
+   passed   2/42  lsp--custom-settings-test (0.000488 sec)
+   passed   3/42  lsp--f-ancestor-of\? (0.001198 sec)
+   passed   4/42  lsp--find-session-folder (0.002527 sec)
+   passed   5/42  lsp--merge-results (0.002102 sec)
+   passed   6/42  lsp--non-related-content-on-stdout (0.000436 sec)
+   passed   7/42  lsp--parser-read--ignored-messages (0.005788 sec)
+   passed   8/42  lsp--parser-read--multibyte (0.000380 sec)
+   passed   9/42  lsp--parser-read--multibyte-nospace (0.000348 sec)
+   passed  10/42  lsp--parser-read--multibyte-received (0.000402 sec)
+   passed  11/42  lsp--parser-read--multiple-chunks (0.000548 sec)
+   passed  12/42  lsp--parser-read--multiple-messages (0.000744 sec)
+   passed  13/42  lsp--parser-read--multiple-multibyte-chunks (0.000525 sec)
+   passed  14/42  lsp--path-to-uri (0.000526 sec)
+   passed  15/42  lsp--test-find-roots-for-workspace (0.000645 sec)
+LSP :: Applying 12 edits to ` *temp*-440694' ...
+Applying 12 edits to ` *temp*-440694' ... 
+Applying 12 edits to ` *temp*-440694' ...done
+   passed  16/42  lsp--test-overlapping-updates (0.003782 sec)
+   passed  17/42  lsp--uri-to-path--handle-utf8 (0.000591 sec)
 Testing file /build/lsp-mode-7.0.1/lsp-clients.el
 Testing file /build/lsp-mode-7.0.1/lsp-clojure.el
 Testing file /build/lsp-mode-7.0.1/lsp-completion.el
@@ -920,33 +971,33 @@
 Testing file /build/lsp-mode-7.0.1/lsp-xml.el
 Testing file /build/lsp-mode-7.0.1/lsp-yaml.el
 Testing file /build/lsp-mode-7.0.1/lsp.el
-   passed  18/42  lsp-byte-compilation-test (121.569644 sec)
-   passed  19/42  lsp-clients-extract-signature-from-clangd-on-hover (0.067969 sec)
-   passed  20/42  lsp-clients-join-region (0.003316 sec)
-   passed  21/42  lsp-common-test--path-to-uri-custom-schemes (0.254096 sec)
-   passed  22/42  lsp-common-test--unexpected-scheme (0.003035 sec)
-   passed  23/42  lsp-completion-test-candidate-kind (0.001293 sec)
-   passed  24/42  lsp-create-test (0.033182 sec)
-   passed  25/42  lsp-delete-test (0.004392 sec)
-   passed  26/42  lsp-file-watch--glob-pattern (0.001329 sec)
-   passed  27/42  lsp-flow-but-not-in-comment-tag-detection (0.001395 sec)
-   passed  28/42  lsp-flow-c-style-tag-detection (0.001965 sec)
-   passed  29/42  lsp-flow-regular-tag-detection (0.001020 sec)
-   passed  30/42  lsp-flow-should-activate-on-flow-project (0.003914 sec)
-   passed  31/42  lsp-flow-should-activate-on-flow-project-without-flow-file-comment (0.003702 sec)
-   passed  32/42  lsp-flow-should-not-activate-if-not-flow-project-or-no-tag (0.014138 sec)
-   passed  33/42  lsp-flow-should-not-activate-on-typescript-project (0.013911 sec)
-   passed  34/42  lsp-flow-simple-multiline-tag-detection (0.001268 sec)
-   passed  35/42  lsp-flow-simple-multiline-with-comments-before-tag-detection (0.002303 sec)
-   passed  36/42  lsp-flow-wrong-tag-detection (0.001493 sec)
-   passed  37/42  lsp-formatting-params-test (0.001042 sec)
-   passed  38/42  lsp-generate-unique-names (0.002137 sec)
-   passed  39/42  lsp-mode-test-merging-completion-results (0.001548 sec)
-   passed  40/42  lsp-test-lsp-interface (0.003020 sec)
-   passed  41/42  lsp-typescript-javascript-activates-based-on-file-extension (0.001552 sec)
-   passed  42/42  lsp-update-test (0.027168 sec)
+   passed  18/42  lsp-byte-compilation-test (20.026650 sec)
+   passed  19/42  lsp-clients-extract-signature-from-clangd-on-hover (0.085981 sec)
+   passed  20/42  lsp-clients-join-region (0.000658 sec)
+   passed  21/42  lsp-common-test--path-to-uri-custom-schemes (0.000645 sec)
+   passed  22/42  lsp-common-test--unexpected-scheme (0.000636 sec)
+   passed  23/42  lsp-completion-test-candidate-kind (0.000341 sec)
+   passed  24/42  lsp-create-test (0.007004 sec)
+   passed  25/42  lsp-delete-test (0.000993 sec)
+   passed  26/42  lsp-file-watch--glob-pattern (0.000421 sec)
+   passed  27/42  lsp-flow-but-not-in-comment-tag-detection (0.000408 sec)
+   passed  28/42  lsp-flow-c-style-tag-detection (0.000343 sec)
+   passed  29/42  lsp-flow-regular-tag-detection (0.000314 sec)
+   passed  30/42  lsp-flow-should-activate-on-flow-project (0.000837 sec)
+   passed  31/42  lsp-flow-should-activate-on-flow-project-without-flow-file-comment (0.000743 sec)
+   passed  32/42  lsp-flow-should-not-activate-if-not-flow-project-or-no-tag (0.004148 sec)
+   passed  33/42  lsp-flow-should-not-activate-on-typescript-project (0.003968 sec)
+   passed  34/42  lsp-flow-simple-multiline-tag-detection (0.000418 sec)
+   passed  35/42  lsp-flow-simple-multiline-with-comments-before-tag-detection (0.000374 sec)
+   passed  36/42  lsp-flow-wrong-tag-detection (0.000356 sec)
+   passed  37/42  lsp-formatting-params-test (0.000304 sec)
+   passed  38/42  lsp-generate-unique-names (0.000370 sec)
+   passed  39/42  lsp-mode-test-merging-completion-results (0.000472 sec)
+   passed  40/42  lsp-test-lsp-interface (0.001012 sec)
+   passed  41/42  lsp-typescript-javascript-activates-based-on-file-extension (0.000402 sec)
+   passed  42/42  lsp-update-test (0.007598 sec)
 
-Ran 42 tests, 42 results as expected, 0 unexpected (2021-08-11 22:05:34-1200, 122.381444 sec)
+Ran 42 tests, 42 results as expected, 0 unexpected (2021-08-13 00:11:46+1400, 20.175566 sec)
 
    create-stamp debian/debhelper-build-stamp
  fakeroot debian/rules binary
@@ -976,12 +1027,14 @@
 dpkg-buildpackage: info: binary-only upload (no source included)
 dpkg-genchanges: info: not including original source code in upload
 I: copying local configuration
+I: user script /srv/workspace/pbuilder/5711/tmp/hooks/B01_cleanup starting
+I: user script /srv/workspace/pbuilder/5711/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/6945 and its subdirectories
-I: Current time: Wed Aug 11 22:06:31 -12 2021
-I: pbuilder-time-stamp: 1628762791
+I: removing directory /srv/workspace/pbuilder/5711 and its subdirectories
+I: Current time: Fri Aug 13 00:11:57 +14 2021
+I: pbuilder-time-stamp: 1628763117