diff options
| -rw-r--r-- | TODO | 2 | ||||
| -rwxr-xr-x | bin/reproducible_common.sh | 7 | ||||
| -rwxr-xr-x | bin/reproducible_freebsd.sh | 4 | ||||
| -rwxr-xr-x | hosts/bpi0-armhf-rb/etc/rc.local | 11 | ||||
| -rwxr-xr-x | hosts/hb0-armhf-rb/etc/rc.local | 11 | ||||
| -rwxr-xr-x | hosts/profitbricks-build3-amd64/etc/rc.local | 11 | ||||
| -rwxr-xr-x | hosts/profitbricks-build5-amd64/etc/rc.local | 2 | ||||
| -rwxr-xr-x | hosts/profitbricks-build6-amd64/etc/rc.local | 2 | ||||
| -rwxr-xr-x | hosts/wbq0-armhf-rb/etc/rc.local | 11 |
9 files changed, 8 insertions, 53 deletions
@@ -127,7 +127,6 @@ This is about Debian, below are more todo entries for other projects… *** make maintenance job detect and reschedule logs with: 'E: 10mount: error: Directory '.*' does not exist' *** make maintenance job detect and reschedule logs with: '^Bus Error$' -* mention +398 days variation in variation table once this is declared stable * reenable disorderfs setup, check that it *always* unmounts + cleans up nicely * diffoscope needs to be run on the target arch... (or rather: run on a 64bit architecture for 64bit architectures and on 32bit for 32 bit archs), this should probably be doable with a simple i386 chroot on the host (so using qemu-static to run it on armhf should not be needed, probably.) * on SIGTERM, also ssh to remote host and cleanup there! (via ssh &) @@ -251,7 +250,6 @@ This is about Debian, below are more todo entries for other projects… ==== reproducible FreeBSD -* run 2nd build 398 days in future * useful improvements: ** investigate how to use tmpfs on freebsd and build there ** find a way to be informed about updates and keep it updated diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index eb95bd1b..efe59908 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -395,15 +395,16 @@ write_explaination_table() { fi fi if [ "$1" != "FreeBSD" ] ; then - write_page "<tr><td>hour, minute</td><td>hour and minute will probably vary between two builds...</td><td>but this is not enforced systematically... (currently, work in progress)</td></tr>" if [ "$1" = "debian" ] ; then + write_page "<tr><td>hour, minute</td><td>hour and minute will probably vary between two builds...</td><td>but this is not enforced systematically... (currently, work in progress)</td></tr>" write_page "<tr><td>filesystem</td><td>tmpfs</td><td><em>temporarily not</em> varied using <a href=\"https://tracker.debian.org/disorderfs\">disorderfs</a> (<a href=\"https://sources.debian.net/src/disorderfs/sid/disorderfs.1.txt/\">manpage</a>)</td></tr>" else + write_page "<tr><td>hour, minute</td><td>hour and minute will probably vary between two builds...</td><td>additionally the \"future builds\" also run 6h and 23min ahead.</td></tr>" write_page "<tr><td>Filesystem</td><td>tmpfs</td><td>same for both builds (currently, this could be varied using <a href=\"https://tracker.debian.org/disorderfs\">disorderfs</a>)</td></tr>" fi else - write_page "<tr><td>year, month, date</td><td>today ($DATE)</td><td>the 2nd build done with the build node set 1 year, 1 month and 5 days in the future</td></tr>" - write_page "<tr><td>hour, minute</td><td>hour and minute will vary between two builds...</td><td>but this is not enforced systematically...)</td></tr>" + write_page "<tr><td>year, month, date</td><td>today ($DATE)</td><td>the 2nd build done with the build node set 1 year, 1 month and 1 day in the future</td></tr>" + write_page "<tr><td>hour, minute</td><td>hour and minute will vary between two builds...</td><td>additionally the \"future build\" also runs 6h and 23min ahead.</td></tr>" write_page "<tr><td>filesystem of the build directory</td><td>ufs</td><td>same for both builds</td></tr>" fi if [ "$1" = "debian" ] ; then diff --git a/bin/reproducible_freebsd.sh b/bin/reproducible_freebsd.sh index 4eed40bd..038a7ad8 100755 --- a/bin/reproducible_freebsd.sh +++ b/bin/reproducible_freebsd.sh @@ -93,8 +93,8 @@ for FREEBSD_TARGET in ${FREEBSD_TARGETS} ;do break fi - # set time forward 398 days - $RSSH "sudo service ntpd stop ; sudo date --set='+398 days' ; date" + # set time forward 398 days and some + $RSSH "sudo service ntpd stop ; sudo date --set='+398 days +6 hours +23 minutes' ; date" echo "$(date) - system is running in the future now." echo "=============================================================================" diff --git a/hosts/bpi0-armhf-rb/etc/rc.local b/hosts/bpi0-armhf-rb/etc/rc.local index e8721439..9493d09d 100755 --- a/hosts/bpi0-armhf-rb/etc/rc.local +++ b/hosts/bpi0-armhf-rb/etc/rc.local @@ -13,15 +13,4 @@ echo "$(date) - system was rebooted" | mail -s "$(hostname -f) rebooted" root -# disable running in the future for now -exit 0 - -systemctl disable systemd-timesyncd -systemctl disable systemd-timedated -systemctl stop systemd-timesyncd -systemctl stop systemd-timedated -ntpdate -b de.pool.ntp.org -date --set="+398 days" -echo "$(date) - system is running in the future now" | mail -s "$(hostname -f) in the future" root - exit 0 diff --git a/hosts/hb0-armhf-rb/etc/rc.local b/hosts/hb0-armhf-rb/etc/rc.local index e8721439..9493d09d 100755 --- a/hosts/hb0-armhf-rb/etc/rc.local +++ b/hosts/hb0-armhf-rb/etc/rc.local @@ -13,15 +13,4 @@ echo "$(date) - system was rebooted" | mail -s "$(hostname -f) rebooted" root -# disable running in the future for now -exit 0 - -systemctl disable systemd-timesyncd -systemctl disable systemd-timedated -systemctl stop systemd-timesyncd -systemctl stop systemd-timedated -ntpdate -b de.pool.ntp.org -date --set="+398 days" -echo "$(date) - system is running in the future now" | mail -s "$(hostname -f) in the future" root - exit 0 diff --git a/hosts/profitbricks-build3-amd64/etc/rc.local b/hosts/profitbricks-build3-amd64/etc/rc.local index e8721439..9493d09d 100755 --- a/hosts/profitbricks-build3-amd64/etc/rc.local +++ b/hosts/profitbricks-build3-amd64/etc/rc.local @@ -13,15 +13,4 @@ echo "$(date) - system was rebooted" | mail -s "$(hostname -f) rebooted" root -# disable running in the future for now -exit 0 - -systemctl disable systemd-timesyncd -systemctl disable systemd-timedated -systemctl stop systemd-timesyncd -systemctl stop systemd-timedated -ntpdate -b de.pool.ntp.org -date --set="+398 days" -echo "$(date) - system is running in the future now" | mail -s "$(hostname -f) in the future" root - exit 0 diff --git a/hosts/profitbricks-build5-amd64/etc/rc.local b/hosts/profitbricks-build5-amd64/etc/rc.local index d3b00d7c..ae0a771a 100755 --- a/hosts/profitbricks-build5-amd64/etc/rc.local +++ b/hosts/profitbricks-build5-amd64/etc/rc.local @@ -18,7 +18,7 @@ systemctl disable systemd-timedated systemctl stop systemd-timesyncd systemctl stop systemd-timedated ntpdate -b de.pool.ntp.org -date --set="+398 days" +date --set="+398 days +6 hours + 23 minutes" echo "$(date) - system is running in the future now" | mail -s "$(hostname -f) in the future" root exit 0 diff --git a/hosts/profitbricks-build6-amd64/etc/rc.local b/hosts/profitbricks-build6-amd64/etc/rc.local index d3b00d7c..ae0a771a 100755 --- a/hosts/profitbricks-build6-amd64/etc/rc.local +++ b/hosts/profitbricks-build6-amd64/etc/rc.local @@ -18,7 +18,7 @@ systemctl disable systemd-timedated systemctl stop systemd-timesyncd systemctl stop systemd-timedated ntpdate -b de.pool.ntp.org -date --set="+398 days" +date --set="+398 days +6 hours + 23 minutes" echo "$(date) - system is running in the future now" | mail -s "$(hostname -f) in the future" root exit 0 diff --git a/hosts/wbq0-armhf-rb/etc/rc.local b/hosts/wbq0-armhf-rb/etc/rc.local index e8721439..9493d09d 100755 --- a/hosts/wbq0-armhf-rb/etc/rc.local +++ b/hosts/wbq0-armhf-rb/etc/rc.local @@ -13,15 +13,4 @@ echo "$(date) - system was rebooted" | mail -s "$(hostname -f) rebooted" root -# disable running in the future for now -exit 0 - -systemctl disable systemd-timesyncd -systemctl disable systemd-timedated -systemctl stop systemd-timesyncd -systemctl stop systemd-timedated -ntpdate -b de.pool.ntp.org -date --set="+398 days" -echo "$(date) - system is running in the future now" | mail -s "$(hostname -f) in the future" root - exit 0 |