Skip to content

Commit

Permalink
chroot: qemu-aarch64-static fixes
Browse files Browse the repository at this point in the history
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
  • Loading branch information
RobertCNelson committed Nov 14, 2015
1 parent e58b4c8 commit 91f43f7
Showing 1 changed file with 13 additions and 1 deletion.
14 changes: 13 additions & 1 deletion scripts/chroot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,12 @@ trap chroot_stopped EXIT
check_defines

if [ "x${host_arch}" != "xarmv7l" ] && [ "x${host_arch}" != "xaarch64" ] ; then
sudo cp $(which qemu-arm-static) "${tempdir}/usr/bin/"
if [ "x${deb_arch}" == "xarmel" ] || [ "x${deb_arch}" == "xarmhf" ] ; then
sudo cp $(which qemu-arm-static) "${tempdir}/usr/bin/"
fi
if [ "x${deb_arch}" == "xarm64" ] ; then
sudo cp $(which qemu-aarch64-static) "${tempdir}/usr/bin/"
fi
fi

chroot_mount_run
Expand Down Expand Up @@ -496,6 +501,9 @@ cat > "${DIR}/chroot_script.sh" <<-__EOF__
if [ -f /usr/bin/qemu-arm-static ] ; then
warn_qemu_will_fail=1
fi
if [ -f /usr/bin/qemu-aarch64-static ] ; then
warn_qemu_will_fail=1
fi
}
qemu_warning () {
Expand Down Expand Up @@ -1127,6 +1135,10 @@ if [ -f "${tempdir}/usr/bin/qemu-arm-static" ] ; then
sudo rm -f "${tempdir}/usr/bin/qemu-arm-static" || true
fi

if [ -f "${tempdir}/usr/bin/qemu-aarch64-static" ] ; then
sudo rm -f "${tempdir}/usr/bin/qemu-aarch64-static" || true
fi

echo "${rfs_username}:${rfs_password}" > /tmp/user_password.list
sudo mv /tmp/user_password.list "${DIR}/deploy/${export_filename}/user_password.list"

Expand Down

0 comments on commit 91f43f7

Please sign in to comment.