Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
B
build-system
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
certo
build-system
Commits
63498f86
Commit
63498f86
authored
Jun 27, 2023
by
Vladimir Bashkirtsev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set bootable flag on boot partition; add Zen3 build support
parent
fa529912
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
2 deletions
+16
-2
common.xml
common.xml
+16
-2
No files found.
common.xml
View file @
63498f86
...
@@ -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 "console=${CONSOLE} root=/dev/${DISK}2 rootwait panic=1 rootfstype=ext4 rootflags=discard rw systemd.unit=rescue.target net.ifnames=0" -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 "console=${CONSOLE} root=/dev/${DISK}2 rootwait panic=1 rootfstype=ext4 rootflags=discard rw systemd.unit=rescue.target net.ifnames=0" -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"
/>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment