Skip to content

Commit 9aae9c9

Browse files
[arm][build_debian] Clean up qemu-arm-static bin after collecting post-versions info (#6289)
- Why I did it scripts/collect_host_image_version_files.sh fails with below error: scripts/collect_host_image_version_files.sh target ./fsroot /usr/sbin/chroot: failed to run command 'post_run_buildinfo': No such file or directory /bin/cp: cannot stat './fsroot/usr/local/share/buildinfo/post-versions': No such file or directory - How I did it Issues is because qemu-arm-static is removed before this step. So, I moved the cleanup step to the end. Signed-off-by: Sabareesh Kumar Anandan <[email protected]>
1 parent f6d1c4a commit 9aae9c9

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

build_debian.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -568,12 +568,6 @@ sudo LANG=C chroot $FILESYSTEM_ROOT fuser -km /proc || true
568568
sleep 15
569569
sudo LANG=C chroot $FILESYSTEM_ROOT umount /proc || true
570570

571-
if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then
572-
# Remove qemu arm bin executable used for cross-building
573-
sudo rm -f $FILESYSTEM_ROOT/usr/bin/qemu*static || true
574-
DOCKERFS_PATH=../dockerfs/
575-
fi
576-
577571
## Prepare empty directory to trigger mount move in initramfs-tools/mount_loop_root, implemented by patching
578572
sudo mkdir $FILESYSTEM_ROOT/host
579573

@@ -585,7 +579,13 @@ sudo du -hsx $FILESYSTEM_ROOT
585579
sudo mkdir -p $FILESYSTEM_ROOT/var/lib/docker
586580
sudo mksquashfs $FILESYSTEM_ROOT $FILESYSTEM_SQUASHFS -e boot -e var/lib/docker -e $PLATFORM_DIR
587581

588-
scripts/collect_host_image_version_files.sh $TARGET_PATH $FILESYSTEM_ROOT
582+
sudo scripts/collect_host_image_version_files.sh $TARGET_PATH $FILESYSTEM_ROOT
583+
584+
if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then
585+
# Remove qemu arm bin executable used for cross-building
586+
sudo rm -f $FILESYSTEM_ROOT/usr/bin/qemu*static || true
587+
DOCKERFS_PATH=../dockerfs/
588+
fi
589589

590590
## Compress docker files
591591
pushd $FILESYSTEM_ROOT && sudo tar czf $OLDPWD/$FILESYSTEM_DOCKERFS -C ${DOCKERFS_PATH}var/lib/docker .; popd

0 commit comments

Comments
 (0)