Commit 4b876fd7 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

Fixed building of armv7 on armv7l

parent 3c587a2e
...@@ -35,6 +35,11 @@ ...@@ -35,6 +35,11 @@
<arg value="if [ -c /dev/kvm ] &amp;&amp; [ `uname -m` = 'armv7l' ] ; then echo -n '-enable-kvm' ; fi"/> <arg value="if [ -c /dev/kvm ] &amp;&amp; [ `uname -m` = 'armv7l' ] ; then echo -n '-enable-kvm' ; fi"/>
</exec> </exec>
<exec executable="bash" outputproperty="VIRTUALIZATION_ARM">
<arg value="-c"/>
<arg value="if [ ! -c /dev/kvm ] &amp;&amp; [ `uname -m` = 'armv7l' ] ; then echo -n '-M virtualization=true' ; fi"/>
</exec>
<exec executable="bash" outputproperty="ENABLE_KVM_AARCH64"> <exec executable="bash" outputproperty="ENABLE_KVM_AARCH64">
<arg value="-c"/> <arg value="-c"/>
<arg value="if [ -c /dev/kvm ] &amp;&amp; [ `uname -m` = 'aarch64' ] ; then echo -n '-enable-kvm' ; fi"/> <arg value="if [ -c /dev/kvm ] &amp;&amp; [ `uname -m` = 'aarch64' ] ; then echo -n '-enable-kvm' ; fi"/>
...@@ -212,14 +217,14 @@ ...@@ -212,14 +217,14 @@
<target name="run-system-armv7"> <target name="run-system-armv7">
<exec executable="qemu-system-arm"> <exec executable="qemu-system-arm">
<env key="QEMU_AUDIO_DRV" value="none"/> <env key="QEMU_AUDIO_DRV" value="none"/>
<arg line=" -kernel ${builddir}/boot/vmlinuz -cpu cortex-a15 ${ENABLE_KVM_ARM} -m 1024 -M virt,highmem=off -no-reboot -append &quot;console=${CONSOLE} root=/dev/${DISK}2 rootwait panic=1 rootfstype=ext4 rootflags=discard rw systemd.unit=rescue.target net.ifnames=0&quot; -device sdhci-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device sd-card,drive=disk -device virtio-rng-pci -nographic"/> <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu cortex-a7 ${ENABLE_KVM_ARM} -m 1024 -M virt,highmem=off ${VIRTUALIZATION_ARM} -no-reboot -append &quot;console=${CONSOLE} root=/dev/${DISK}2 rootwait panic=1 rootfstype=ext4 rootflags=discard rw systemd.unit=rescue.target net.ifnames=0&quot; -device sdhci-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device sd-card,drive=disk -device virtio-rng-pci -nographic"/>
</exec> </exec>
</target> </target>
<target name="run-system-with-secondary-armv7"> <target name="run-system-with-secondary-armv7">
<exec executable="qemu-system-arm"> <exec executable="qemu-system-arm">
<env key="QEMU_AUDIO_DRV" value="none"/> <env key="QEMU_AUDIO_DRV" value="none"/>
<arg line=" -kernel ${builddir}/boot/vmlinuz -cpu cortex-a15 ${ENABLE_KVM_ARM} -m 1024 -M virt,highmem=off -no-reboot -append &quot;console=${CONSOLE} root=/dev/${DISK}2 rootwait panic=1 rootfstype=ext4 rootflags=discard rw systemd.unit=rescue.target net.ifnames=0&quot; -device sdhci-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device sd-card,drive=disk -device sdhci-pci -drive format=raw,file=${builddir}/secondary.img,if=none,id=secondary,cache=writeback,discard=unmap -device sd-card,drive=secondary -device virtio-rng-pci -nographic"/> <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu cortex-a7 ${ENABLE_KVM_ARM} -m 1024 -M virt,highmem=off ${VIRTUALIZATION_ARM} -no-reboot -append &quot;console=${CONSOLE} root=/dev/${DISK}2 rootwait panic=1 rootfstype=ext4 rootflags=discard rw systemd.unit=rescue.target net.ifnames=0&quot; -device sdhci-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device sd-card,drive=disk -device sdhci-pci -drive format=raw,file=${builddir}/secondary.img,if=none,id=secondary,cache=writeback,discard=unmap -device sd-card,drive=secondary -device virtio-rng-pci -nographic"/>
</exec> </exec>
</target> </target>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment