From 04a83d4414177086aa458c48d1f7a990375cf093 Mon Sep 17 00:00:00 2001 From: Sabareesh Kumar Anandan Date: Thu, 24 Dec 2020 12:06:59 +0530 Subject: [PATCH] [arm][build_debian] arm compilation fix Clean up qemu-arm bins after collecting post-versions info Signed-off-by: Sabareesh Kumar Anandan --- build_debian.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build_debian.sh b/build_debian.sh index 4838d3c8779..8cc6dd27fdd 100755 --- a/build_debian.sh +++ b/build_debian.sh @@ -568,12 +568,6 @@ sudo LANG=C chroot $FILESYSTEM_ROOT fuser -km /proc || true sleep 15 sudo LANG=C chroot $FILESYSTEM_ROOT umount /proc || true -if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then - # Remove qemu arm bin executable used for cross-building - sudo rm -f $FILESYSTEM_ROOT/usr/bin/qemu*static || true - DOCKERFS_PATH=../dockerfs/ -fi - ## Prepare empty directory to trigger mount move in initramfs-tools/mount_loop_root, implemented by patching sudo mkdir $FILESYSTEM_ROOT/host @@ -585,7 +579,13 @@ sudo du -hsx $FILESYSTEM_ROOT sudo mkdir -p $FILESYSTEM_ROOT/var/lib/docker sudo mksquashfs $FILESYSTEM_ROOT $FILESYSTEM_SQUASHFS -e boot -e var/lib/docker -e $PLATFORM_DIR -scripts/collect_host_image_version_files.sh $TARGET_PATH $FILESYSTEM_ROOT +sudo scripts/collect_host_image_version_files.sh $TARGET_PATH $FILESYSTEM_ROOT + +if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then + # Remove qemu arm bin executable used for cross-building + sudo rm -f $FILESYSTEM_ROOT/usr/bin/qemu*static || true + DOCKERFS_PATH=../dockerfs/ +fi ## Compress docker files pushd $FILESYSTEM_ROOT && sudo tar czf $OLDPWD/$FILESYSTEM_DOCKERFS -C ${DOCKERFS_PATH}var/lib/docker .; popd