diff options
| -rwxr-xr-x | bin/reproducible_freebsd.sh | 3 | ||||
| -rw-r--r-- | hosts/freebsd-jenkins/usr/local/etc/sudoers | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/bin/reproducible_freebsd.sh b/bin/reproducible_freebsd.sh index 9c4aa8bb..472835e9 100755 --- a/bin/reproducible_freebsd.sh +++ b/bin/reproducible_freebsd.sh @@ -34,7 +34,8 @@ save_freebsd_results() { $RSSH "sudo find $TMPDIR -newer $TMPDIR -exec touch -d '$DUMMY_DATE' {} \;" $RSSH "sudo find $TMPDIR -print0 | LC_ALL=C sort -z | sudo tar --no-recursion --null -T - -cJf $TMPDIR.tar.xz" $RSCP:$TMPDIR.tar.xz $TMPDIR/$RUN/$TARGET_NAME.tar.xz - $RSCP:/usr/obj/usr/src/repo $TMPDIR/$RUN/ + # Copy packages back with a tar pipeline + $RSSH "sudo tar -C /usr/obj/usr/src -cf - repo" | tar -x -C $TMPDIR/$RUN/ -f - $RSSH "sudo chflags -R noschg $TMPDIR ; sudo rm -r $TMPDIR $TMPDIR.tar.xz ; mkdir $TMPDIR" } diff --git a/hosts/freebsd-jenkins/usr/local/etc/sudoers b/hosts/freebsd-jenkins/usr/local/etc/sudoers index eb15bb18..79f1ed0c 100644 --- a/hosts/freebsd-jenkins/usr/local/etc/sudoers +++ b/hosts/freebsd-jenkins/usr/local/etc/sudoers @@ -110,6 +110,7 @@ jenkins ALL= NOPASSWD: /usr/bin/make -j ? buildworld, \ /usr/bin/find /srv/reproducible-results/* -newer /srv/reproducible-results/* -exec touch *, \ /usr/bin/find /srv/reproducible-results/* -print0, \ /usr/bin/tar --no-recursion --null -T - -cJf *.tar.xz, \ + /usr/bin/tar -C /usr/obj/usr/src -cf - repo \ /usr/sbin/service ntpd start, \ /usr/sbin/service ntpd stop, \ /usr/sbin/service ntpd status, \ |