Commit 63498f86 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

Set bootable flag on boot partition; add Zen3 build support

parent fa529912
...@@ -138,13 +138,13 @@ ...@@ -138,13 +138,13 @@
<target name="make-disk-mbr" if="mbr_label"> <target name="make-disk-mbr" if="mbr_label">
<exec executable="bash" failonerror="true"> <exec executable="bash" failonerror="true">
<arg line="-c 'LIBGUESTFS_BACKEND=direct guestfish sparse ${builddir}/disk.img ${imagesize}M : run : part-init /dev/sda mbr : part-add /dev/sda p $((${BootStart} * 2048)) $((${SystemStart} * 2048 - 1)) : part-set-mbr-id /dev/sda 1 0x0c : part-add /dev/sda p $((${SystemStart} * 2048)) $((${imagesize} * 2048 - 1)) : part-set-mbr-id /dev/sda 2 0x83 : mkfs ext4 /dev/sda2 label:CLFS'"/> <arg line="-c 'LIBGUESTFS_BACKEND=direct guestfish sparse ${builddir}/disk.img ${imagesize}M : run : part-init /dev/sda mbr : part-add /dev/sda p $((${BootStart} * 2048)) $((${SystemStart} * 2048 - 1)) : part-set-mbr-id /dev/sda 1 0x0c : part-set-bootable /dev/sda 1 true : part-add /dev/sda p $((${SystemStart} * 2048)) $((${imagesize} * 2048 - 1)) : part-set-mbr-id /dev/sda 2 0x83 : mkfs ext4 /dev/sda2 label:CLFS'"/>
</exec> </exec>
</target> </target>
<target name="make-disk-gpt" if="gpt_label"> <target name="make-disk-gpt" if="gpt_label">
<exec executable="bash" failonerror="true"> <exec executable="bash" failonerror="true">
<arg line="-c 'LIBGUESTFS_BACKEND=direct guestfish sparse ${builddir}/disk.img ${imagesize}M : run : part-init /dev/sda gpt : part-add /dev/sda p $((${BootStart} * 2048)) $((${SystemStart} * 2048 - 1)) : part-set-gpt-type /dev/sda 1 C12A7328-F81F-11D2-BA4B-00A0C93EC93B : part-add /dev/sda p $((${SystemStart} * 2048)) $((${imagesize} * 2048 - 34)) : part-set-gpt-type /dev/sda 2 0FC63DAF-8483-4772-8E79-3D69D8477DE4 : mkfs ext4 /dev/sda2 label:CLFS'"/> <arg line="-c 'LIBGUESTFS_BACKEND=direct guestfish sparse ${builddir}/disk.img ${imagesize}M : run : part-init /dev/sda gpt : part-add /dev/sda p $((${BootStart} * 2048)) $((${SystemStart} * 2048 - 1)) : part-set-gpt-type /dev/sda 1 C12A7328-F81F-11D2-BA4B-00A0C93EC93B : part-set-bootable /dev/sda 1 true : part-add /dev/sda p $((${SystemStart} * 2048)) $((${imagesize} * 2048 - 34)) : part-set-gpt-type /dev/sda 2 0FC63DAF-8483-4772-8E79-3D69D8477DE4 : mkfs ext4 /dev/sda2 label:CLFS'"/>
</exec> </exec>
</target> </target>
...@@ -374,6 +374,20 @@ ...@@ -374,6 +374,20 @@
</exec> </exec>
</target> </target>
<target name="run-system-zen3">
<exec executable="qemu-system-x86_64">
<env key="QEMU_AUDIO_DRV" value="none"/>
<arg line=" -kernel ${builddir}/boot/vmlinuz -cpu EPYC ${ENABLE_KVM_X86_64} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-rng-pci -nographic"/>
</exec>
</target>
<target name="run-system-with-secondary-zen3">
<exec executable="qemu-system-x86_64">
<env key="QEMU_AUDIO_DRV" value="none"/>
<arg line=" -kernel ${builddir}/boot/vmlinuz -cpu EPYC ${ENABLE_KVM_X86_64} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-scsi-pci -drive format=raw,file=${builddir}/secondary.img,if=none,id=secondary,cache=writeback,discard=unmap -device scsi-hd,drive=secondary -device virtio-rng-pci -nographic"/>
</exec>
</target>
<target name="build-boot-kernel"> <target name="build-boot-kernel">
<fail unless="BOARD" message="Correct machine type must be specified"/> <fail unless="BOARD" message="Correct machine type must be specified"/>
<antcall target="mount"/> <antcall target="mount"/>
......
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