xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2026-10-21 07:08:12 +00:00
Code Issues Releases Wiki Activity

refactor(genesis): share common machine image policy

Browse Source 
Keep hardware and tuning settings in each machine. Use a common include for the repeated image and recommendation settings without changing their override semantics.
This commit is contained in:
Vinícius Ferrão
2026-10-12 19:27:45 -03:00
parent a1bb33d1d3
commit c66822cd60
9 changed files with 13 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xCAT-genesis-base/oe/meta-xcat-genesis/conf/machine/include/xcat-genesis-base.inc
+5
View File
@@ -0,0 +1,5 @@
# Shared image policy; tuning and hardware settings belong to each machine.
MACHINE_FEATURES_DEFAULTS = ""
MACHINE_EXTRA_RRECOMMENDS = ""
IMAGE_FSTYPES = "cpio.gz ext4"
QB_DEFAULT_FSTYPE = "ext4"
xCAT-genesis-base/oe/meta-xcat-genesis/conf/machine/xcat-genesis-aarch64.conf
+1 -5
View File
@@ -11,17 +11,13 @@ KERNEL_IMAGETYPE = "Image"
SERIAL_CONSOLES = "115200;ttyAMA0"
XCAT_GENESIS_CONSOLE_TTY = "ttyAMA0"
MACHINE_FEATURES_DEFAULTS = ""
require conf/machine/include/xcat-genesis-base.inc
MACHINE_FEATURES = "pci"
MACHINE_ESSENTIAL_EXTRA_RDEPENDS = ""
MACHINE_EXTRA_RRECOMMENDS = ""
IMAGE_FSTYPES = "cpio.gz ext4"
QB_SYSTEM_NAME = "qemu-system-aarch64"
QB_MACHINE = "-machine virt"
QB_CPU = "-cpu cortex-a57"
QB_SMP = "-smp 2"
QB_DEFAULT_FSTYPE = "ext4"
QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0"
QB_OPT_APPEND = ""
xCAT-genesis-base/oe/meta-xcat-genesis/conf/machine/xcat-genesis-armv7hf.conf
+1 -5
View File
@@ -12,17 +12,13 @@ KERNEL_IMAGETYPE = "zImage"
SERIAL_CONSOLES = "115200;ttyAMA0"
XCAT_GENESIS_CONSOLE_TTY = "ttyAMA0"
MACHINE_FEATURES_DEFAULTS = ""
require conf/machine/include/xcat-genesis-base.inc
MACHINE_FEATURES = "pci"
MACHINE_ESSENTIAL_EXTRA_RDEPENDS = ""
MACHINE_EXTRA_RRECOMMENDS = ""
IMAGE_FSTYPES = "cpio.gz ext4"
QB_SYSTEM_NAME = "qemu-system-arm"
QB_MACHINE = "-machine virt,highmem=off"
QB_CPU = "-cpu cortex-a15"
QB_SMP = "-smp 2"
QB_DEFAULT_FSTYPE = "ext4"
QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0"
QB_OPT_APPEND = ""
xCAT-genesis-base/oe/meta-xcat-genesis/conf/machine/xcat-genesis-ppc64.conf
+1 -5
View File
@@ -13,17 +13,13 @@ KERNEL_IMAGETYPE = "vmlinux"
SERIAL_CONSOLES = "115200;hvc0"
XCAT_GENESIS_CONSOLE_TTY = "hvc0"
MACHINE_FEATURES_DEFAULTS = ""
require conf/machine/include/xcat-genesis-base.inc
MACHINE_FEATURES = "pci"
MACHINE_ESSENTIAL_EXTRA_RDEPENDS = ""
MACHINE_EXTRA_RRECOMMENDS = ""
IMAGE_FSTYPES = "cpio.gz ext4"
QB_SYSTEM_NAME = "qemu-system-ppc64"
QB_MACHINE = "-machine pseries"
QB_CPU = "-cpu POWER8"
QB_SMP = "-smp 2"
QB_DEFAULT_FSTYPE = "ext4"
QB_KERNEL_CMDLINE_APPEND = "console=hvc0 nohugevmalloc"
QB_OPT_APPEND = ""
xCAT-genesis-base/oe/meta-xcat-genesis/conf/machine/xcat-genesis-ppc64le.conf
+1 -5
View File
@@ -13,17 +13,13 @@ KERNEL_IMAGETYPE = "vmlinux"
SERIAL_CONSOLES = "115200;hvc0"
XCAT_GENESIS_CONSOLE_TTY = "hvc0"
MACHINE_FEATURES_DEFAULTS = ""
require conf/machine/include/xcat-genesis-base.inc
MACHINE_FEATURES = "pci"
MACHINE_ESSENTIAL_EXTRA_RDEPENDS = ""
MACHINE_EXTRA_RRECOMMENDS = ""
IMAGE_FSTYPES = "cpio.gz ext4"
QB_SYSTEM_NAME = "qemu-system-ppc64"
QB_MACHINE = "-machine pseries"
QB_CPU = "-cpu POWER8"
QB_SMP = "-smp 2"
QB_DEFAULT_FSTYPE = "ext4"
QB_KERNEL_CMDLINE_APPEND = "console=hvc0 nohugevmalloc"
QB_OPT_APPEND = ""
xCAT-genesis-base/oe/meta-xcat-genesis/conf/machine/xcat-genesis-riscv64.conf
+1 -5
View File
@@ -11,12 +11,9 @@ KERNEL_IMAGETYPES = ""
SERIAL_CONSOLES = "115200;ttyS0"
XCAT_GENESIS_CONSOLE_TTY = "ttyS0"
MACHINE_FEATURES_DEFAULTS = ""
require conf/machine/include/xcat-genesis-base.inc
MACHINE_FEATURES = "pci"
MACHINE_ESSENTIAL_EXTRA_RDEPENDS = ""
MACHINE_EXTRA_RRECOMMENDS = ""
IMAGE_FSTYPES = "cpio.gz ext4"
EXTRA_IMAGEDEPENDS = "opensbi"
RISCV_SBI_PLAT = "generic"
@@ -25,6 +22,5 @@ QB_MACHINE = "-machine virt"
QB_CPU = "-cpu rv64"
QB_SMP = "-smp 2"
QB_DEFAULT_BIOS = "fw_jump.elf"
QB_DEFAULT_FSTYPE = "ext4"
QB_KERNEL_CMDLINE_APPEND = "console=ttyS0 earlycon=sbi"
QB_OPT_APPEND = ""
xCAT-genesis-base/oe/meta-xcat-genesis/conf/machine/xcat-genesis-s390x.conf
+1 -5
View File
@@ -14,12 +14,9 @@ KERNEL_IMAGETYPE = "bzImage"
SERIAL_CONSOLES = "115200;ttysclp0"
XCAT_GENESIS_CONSOLE_TTY = "ttysclp0"
MACHINE_FEATURES_DEFAULTS = ""
require conf/machine/include/xcat-genesis-base.inc
MACHINE_FEATURES = ""
MACHINE_ESSENTIAL_EXTRA_RDEPENDS = ""
MACHINE_EXTRA_RRECOMMENDS = ""
IMAGE_FSTYPES = "cpio.gz ext4"
QB_SYSTEM_NAME = "qemu-system-s390x"
QB_MACHINE = "-machine s390-ccw-virtio"
@@ -27,7 +24,6 @@ QB_MACHINE = "-machine s390-ccw-virtio"
QB_CPU = "-cpu z10EC-base,msa=off,msa1=off,dfp=off,dfphp=off,parseh=off,hfpue=off,hfpm=off,pfpo=off,dateh2=off,csske=off,asnlxr=off,tods=off"
QB_SMP = "-smp 2"
QB_MEM = "-m 4096"
QB_DEFAULT_FSTYPE = "ext4"
QB_KERNEL_CMDLINE_APPEND = "console=ttysclp0"
QB_NETWORK_DEVICE = "-device virtio-net-ccw,netdev=net0,mac=@MAC@"
QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=none,format=raw -device virtio-blk-ccw,drive=disk0"
xCAT-genesis-base/oe/meta-xcat-genesis/conf/machine/xcat-genesis-x86-64.conf
+1 -5
View File
@@ -14,14 +14,10 @@ KERNEL_IMAGETYPE = "bzImage"
SERIAL_CONSOLES = "115200;ttyS0"
XCAT_GENESIS_CONSOLE_TTY = "ttyS0"
MACHINE_FEATURES_DEFAULTS = ""
require conf/machine/include/xcat-genesis-base.inc
MACHINE_FEATURES = "pci"
MACHINE_EXTRA_RRECOMMENDS = ""
IMAGE_FSTYPES = "cpio.gz ext4"
QB_SYSTEM_NAME = "qemu-system-x86_64"
QB_DEFAULT_FSTYPE = "ext4"
QB_CPU:x86-64 = "-cpu qemu64 -machine q35,i8042=off"
QB_CPU_KVM:x86-64 = "-cpu qemu64 -machine q35,i8042=off"
QB_KERNEL_CMDLINE_APPEND = "console=ttyS0"
xCAT-genesis-base/oe/meta-xcat-genesis/conf/machine/xcat-genesis-x86.conf
+1 -5
View File
@@ -12,13 +12,9 @@ KERNEL_IMAGETYPE = "bzImage"
SERIAL_CONSOLES = "115200;ttyS0"
XCAT_GENESIS_CONSOLE_TTY = "ttyS0"
MACHINE_FEATURES_DEFAULTS = ""
require conf/machine/include/xcat-genesis-base.inc
MACHINE_FEATURES = "pci"
MACHINE_ESSENTIAL_EXTRA_RDEPENDS = ""
MACHINE_EXTRA_RRECOMMENDS = ""
IMAGE_FSTYPES = "cpio.gz ext4"
QB_SYSTEM_NAME = "qemu-system-i386"
QB_DEFAULT_FSTYPE = "ext4"
QB_KERNEL_CMDLINE_APPEND = "console=ttyS0"