From 3adf3bcb44881dd747c2e7688b2509a1d8ca9ec6 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 15 Jul 2025 15:48:51 +0300 Subject: [PATCH] - Add new patch - Add missing changes --- config.yaml | 34 +++++- ...AlmaLinux-9-to-machine-class-options.patch | 113 ++++++++++++++++++ files/osuosl-enable-ppc64.patch | 11 ++ 3 files changed, 157 insertions(+), 1 deletion(-) create mode 100644 files/0001-Add-AlmaLinux-9-to-machine-class-options.patch create mode 100644 files/osuosl-enable-ppc64.patch diff --git a/config.yaml b/config.yaml index 8e132d6..e2485b8 100644 --- a/config.yaml +++ b/config.yaml @@ -37,8 +37,32 @@ actions: %ifarch ppc64le %{_datadir}/%{name}/slof.bin %endif - count: 1 + - target: "spec" + find: | + rm -rf %{buildroot}%{_datadir}/%{name}/vgabios*bin + replace: | + %ifnarch %{power64} + rm -rf %{buildroot}%{_datadir}/%{name}/vgabios*bin + %else + rm -rf %{buildroot}%{_datadir}/%{name}/vgabios-*.bin + %endif + count: 1 + - target: "spec" + find: | + %if %{have_memlock_limits} + %{_sysconfdir}/security/limits.d/95-kvm-memlock.conf + %endif + + replace: | + %if %{have_memlock_limits} + %{_sysconfdir}/security/limits.d/95-kvm-memlock.conf + %endif + %ifarch %{power64} + %{_datadir}/%{name}/vgabios.bin + %endif + count: 1 + - add_files: - type: "patch" name: "0001-Bring-back-missing-line-in-target-ppc-cpu-models.patch" @@ -47,6 +71,14 @@ actions: - type: "patch" name: "0001-usb-add-config-options-for-hub-and-hid-devices-for-p.patch" number: "Latest" + - add_files: + - type: "patch" + name: "0001-Add-AlmaLinux-9-to-machine-class-options.patch" + number: "Latest" + - add_files: + - type: "patch" + name: "osuosl-enable-ppc64.patch" + number: "Latest" - modify_release: - suffix: ".alma.1" diff --git a/files/0001-Add-AlmaLinux-9-to-machine-class-options.patch b/files/0001-Add-AlmaLinux-9-to-machine-class-options.patch new file mode 100644 index 0000000..0012b91 --- /dev/null +++ b/files/0001-Add-AlmaLinux-9-to-machine-class-options.patch @@ -0,0 +1,113 @@ +From 149cfc4ec6367978ad764a6d99ce143c0429b996 Mon Sep 17 00:00:00 2001 +From: eabdullin +Date: Tue, 15 Jul 2025 15:00:43 +0300 +Subject: [PATCH] Add AlmaLinux 9 to machine class options + +--- + hw/ppc/spapr.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 82 insertions(+), 1 deletion(-) + +diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c +index 29e66f1b3..1001e0f92 100644 +--- a/hw/ppc/spapr.c ++++ b/hw/ppc/spapr.c +@@ -5425,6 +5425,87 @@ static void spapr_rhel_machine_default_class_options(MachineClass *mc) + mc->max_cpus = 384; + } + ++static void spapr_rhel_machine_9_6_0_class_options(MachineClass *mc) ++{ ++ SpaprMachineClass *smc = SPAPR_MACHINE_CLASS(mc); ++ ++ spapr_rhel_machine_default_class_options(mc); ++ compat_props_add(mc->compat_props, hw_compat_rhel_9_6, ++ hw_compat_rhel_9_6_len); ++ smc->pre_6_2_numa_affinity = true; ++ mc->smp_props.prefer_sockets = true; ++} ++ ++DEFINE_SPAPR_MACHINE_AS_LATEST(9, 6, 0); ++ ++static void spapr_rhel_machine_9_5_0_class_options(MachineClass *mc) ++{ ++ spapr_rhel_machine_9_6_0_class_options(mc); ++ compat_props_add(mc->compat_props, hw_compat_rhel_9_5, ++ hw_compat_rhel_9_5_len); ++} ++ ++DEFINE_SPAPR_MACHINE(9, 5, 0); ++ ++static void spapr_rhel_machine_9_4_0_class_options(MachineClass *mc) ++{ ++ spapr_rhel_machine_9_5_0_class_options(mc); ++ compat_props_add(mc->compat_props, hw_compat_rhel_9_4, ++ hw_compat_rhel_9_4_len); ++} ++ ++DEFINE_SPAPR_MACHINE(9, 4, 0); ++ ++static void spapr_rhel_machine_9_3_0_class_options(MachineClass *mc) ++{ ++ spapr_rhel_machine_9_4_0_class_options(mc); ++ compat_props_add(mc->compat_props, hw_compat_rhel_9_3, ++ hw_compat_rhel_9_3_len); ++} ++ ++DEFINE_SPAPR_MACHINE(9, 3, 0); ++ ++static void spapr_rhel_machine_9_2_0_class_options(MachineClass *mc) ++{ ++ spapr_rhel_machine_9_3_0_class_options(mc); ++ compat_props_add(mc->compat_props, hw_compat_rhel_9_2, ++ hw_compat_rhel_9_2_len); ++} ++ ++DEFINE_SPAPR_MACHINE(9, 2, 0); ++ ++static void spapr_rhel_machine_9_1_0_class_options(MachineClass *mc) ++{ ++ spapr_rhel_machine_9_2_0_class_options(mc); ++ compat_props_add(mc->compat_props, hw_compat_rhel_9_1, ++ hw_compat_rhel_9_1_len); ++} ++ ++DEFINE_SPAPR_MACHINE(9, 1, 0); ++ ++static void spapr_rhel_machine_9_0_0_class_options(MachineClass *mc) ++{ ++ spapr_rhel_machine_9_1_0_class_options(mc); ++ compat_props_add(mc->compat_props, hw_compat_rhel_9_0, ++ hw_compat_rhel_9_0_len); ++} ++ ++DEFINE_SPAPR_MACHINE(9, 0, 0); ++ ++static void spapr_rhel_machine_8_6_0_class_options(MachineClass *mc) ++{ ++ SpaprMachineClass *smc = SPAPR_MACHINE_CLASS(mc); ++ ++ /* The default machine type must apply the RHEL specific defaults */ ++ spapr_rhel_machine_default_class_options(mc); ++ compat_props_add(mc->compat_props, hw_compat_rhel_8_6, ++ hw_compat_rhel_8_6_len); ++ smc->pre_6_2_numa_affinity = true; ++ mc->smp_props.prefer_sockets = true; ++} ++ ++DEFINE_SPAPR_MACHINE(8, 6, 0); ++ + /* + * pseries-rhel8.5.0 + * like pseries-6.0 +@@ -5442,7 +5523,7 @@ static void spapr_rhel_machine_8_5_0_class_options(MachineClass *mc) + mc->smp_props.prefer_sockets = true; + } + +-DEFINE_SPAPR_MACHINE_AS_LATEST(8, 5, 0); ++DEFINE_SPAPR_MACHINE(8, 5, 0); + + /* + * pseries-rhel8.4.0 +-- +2.39.5 (Apple Git-154) + diff --git a/files/osuosl-enable-ppc64.patch b/files/osuosl-enable-ppc64.patch new file mode 100644 index 0000000..ea9344a --- /dev/null +++ b/files/osuosl-enable-ppc64.patch @@ -0,0 +1,11 @@ +diff -ur old/hw/ppc/spapr.c new/hw/ppc/spapr.c +--- old/hw/ppc/spapr.c 2025-04-17 22:54:19.662932754 +0000 ++++ new/hw/ppc/spapr.c 2025-04-18 03:45:15.811916763 +0000 +@@ -4840,7 +4840,6 @@ + { \ + MachineClass *mc = MACHINE_CLASS(oc); \ + MACHINE_VER_SYM(class_options, spapr, __VA_ARGS__)(mc); \ +- MACHINE_VER_DEPRECATION(__VA_ARGS__); \ + if (latest) { \ + spapr_machine_latest_class_options(mc); \ + } \