diff --git a/src/custompios b/src/custompios index a7b3ee2..16f1aff 100755 --- a/src/custompios +++ b/src/custompios @@ -30,21 +30,26 @@ function execute_chroot_script() { fi #black magic of qemu-arm-static - # cp `which qemu-arm-static` usr/bin - if [ "$(uname -m)" != "armv7l" ] || [ "$(uname -m)" != "aarch64" ] ; then + if [ "$(uname -m)" != "armv7l" ] && [ "$(uname -m)" != "aarch64" ] ; then if [ "$BASE_ARCH" == "armv7l" ] || [ "$BASE_ARCH" == "armhf" ]; then if (grep -q gentoo /etc/os-release);then ROOT="`realpath .`" emerge --usepkgonly --oneshot --nodeps qemu else - cp `which qemu-arm-static` usr/bin/qemu-arm-static + if [ "${BASE_ARCH}" != "$(uname -m)" ]; then + cp `which qemu-arm-static` usr/bin/qemu-arm-static + fi fi elif [ "$BASE_ARCH" == "aarch64" ] || [ "$BASE_ARCH" == "arm64" ]; then if (grep -q gentoo /etc/os-release);then ROOT="`realpath .`" emerge --usepkgonly --oneshot --nodeps qemu else - cp `which qemu-aarch64-static` usr/bin/qemu-aarch64-static + if [ "${BASE_ARCH}" != "$(uname -m)" ]; then + cp `which qemu-aarch64-static` usr/bin/qemu-aarch64-static + fi fi fi + elif [[ ( "$BASE_ARCH" == "armv7l" || "$BASE_ARCH" == "armhf" ) && "$(uname -m)" != "armv7l" ]]; then + cp `which qemu-aarch64-static` usr/bin/qemu-aarch64-static fi cp $2 chroot_script