Skip to content

Commit 4cd3617

Browse files
author
taocy
committed
arm arch: 1. install required libraries; 2. umount /proc after dockerfs.
1 parent ea2dd95 commit 4cd3617

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

files/build_templates/sonic_debian_extension.j2

+3-1
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,8 @@ sudo LANG=C chroot $FILESYSTEM_ROOT systemctl disable core_uploader.service
268268
sudo cp $IMAGE_CONFIGS/corefile_uploader/core_uploader.py $FILESYSTEM_ROOT/usr/bin/
269269
sudo cp $IMAGE_CONFIGS/corefile_uploader/core_analyzer.rc.json $FILESYSTEM_ROOT_ETC_SONIC/
270270
sudo chmod og-rw $FILESYSTEM_ROOT_ETC_SONIC/core_analyzer.rc.json
271+
272+
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install libffi-dev libssl-dev
271273
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install azure-storage==0.36.0
272274
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install watchdog==0.10.2
273275
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install futures==3.3.0
@@ -461,14 +463,14 @@ echo "docker images pull complete"
461463

462464
sudo umount $FILESYSTEM_ROOT/target
463465
sudo rm -r $FILESYSTEM_ROOT/target
464-
sudo umount /proc || true
465466
if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then
466467
sudo umount $FILESYSTEM_ROOT/dockerfs
467468
sudo rm -fr $FILESYSTEM_ROOT/dockerfs
468469
sudo kill -9 `sudo $SONIC_NATIVE_DOCKERD_FOR_DOCKERFS_PID` || true
469470
else
470471
sudo chroot $FILESYSTEM_ROOT service docker stop
471472
fi
473+
sudo umount /proc || true
472474
sudo rm $FILESYSTEM_ROOT/etc/init.d/docker
473475
{% for script in installer_start_scripts.split(' ') -%}
474476
sudo cp {{script}} $FILESYSTEM_ROOT/usr/bin/

0 commit comments

Comments
 (0)