From a184eb00af46502f22410fc020352a2c97032a54 Mon Sep 17 00:00:00 2001 From: Oleg Kalachev Date: Thu, 8 Apr 2021 11:44:15 +0300 Subject: [PATCH] image: bring back moving ld.so.preload out of the way while building --- builder/image-init.sh | 3 +++ builder/image-validate.sh | 3 +++ 2 files changed, 6 insertions(+) diff --git a/builder/image-init.sh b/builder/image-init.sh index 0eb0c881..51985e80 100755 --- a/builder/image-init.sh +++ b/builder/image-init.sh @@ -55,4 +55,7 @@ echo_stamp "Set max space for syslogs" # https://unix.stackexchange.com/questions/139513/how-to-clear-journalctl sed -i 's/#SystemMaxUse=/SystemMaxUse=200M/' /etc/systemd/journald.conf +echo_stamp "Move /etc/ld.so.preload out of the way" +mv /etc/ld.so.preload /etc/ld.so.preload.disabled-for-build + echo_stamp "End of init image" diff --git a/builder/image-validate.sh b/builder/image-validate.sh index f7fec797..237e198e 100755 --- a/builder/image-validate.sh +++ b/builder/image-validate.sh @@ -26,3 +26,6 @@ cd /home/pi/catkin_ws/src/clover/builder/test/ ./tests.py ./tests_py3.py [[ $(./tests_clever.py) == "Warning: clever package is renamed to clover" ]] # test backwards compatibility + +echo "Move /etc/ld.so.preload back to its original position" +mv /etc/ld.so.preload.disabled-for-build /etc/ld.so.preload