Skip to content

Commit cd42f5b

Browse files
jxmxguysoft
authored andcommitted
fix logic so arm-on-arm doesn't need qemu static
1 parent 98277d1 commit cd42f5b

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/custompios

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ function execute_chroot_script() {
3030
fi
3131

3232
#black magic of qemu-arm-static
33-
# cp `which qemu-arm-static` usr/bin
34-
if [ "$(uname -m)" != "armv7l" ] || [ "$(uname -m)" != "aarch64" ] ; then
33+
if [ "$(uname -m)" != "armv7l" ] && [ "$(uname -m)" != "aarch64" ] ; then
3534
if [ "$BASE_ARCH" == "armv7l" ] || [ "$BASE_ARCH" == "armhf" ]; then
3635
if (grep -q gentoo /etc/os-release);then
3736
ROOT="`realpath .`" emerge --usepkgonly --oneshot --nodeps qemu
@@ -45,6 +44,8 @@ function execute_chroot_script() {
4544
cp `which qemu-aarch64-static` usr/bin/qemu-aarch64-static
4645
fi
4746
fi
47+
elif [[ ( "$BASE_ARCH" == "armv7l" || "$BASE_ARCH" == "armhf" ) && "$(uname -m)" != "armv7l" ]]; then
48+
cp `which qemu-aarch64-static` usr/bin/qemu-aarch64-static
4849
fi
4950

5051
cp $2 chroot_script

0 commit comments

Comments
 (0)