SLFO-pool/supermin
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main supermin revision ec59c31745475027a711500850c95540

Browse Source
This commit is contained in:
Adrian Schröter 2024-12-09 12:15:14 +01:00
parent 3df491ba1b
commit 3588b91ab5
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
detect-aarch64-kernel.patch
View File

@ -1,19 +1,26 @@
References: bsc#1187532 - virt-make-fs hangs forever References: bsc#1187532 - virt-make-fs hangs forever
Index: supermin-5.3.3/src/format_ext2_kernel.ml Index: supermin-5.3.5/src/format_ext2_kernel.ml
=================================================================== ===================================================================
--- supermin-5.3.3.orig/src/format_ext2_kernel.ml --- supermin-5.3.5.orig/src/format_ext2_kernel.ml
+++ supermin-5.3.3/src/format_ext2_kernel.ml +++ supermin-5.3.5/src/format_ext2_kernel.ml
@@ -155,7 +155,7 @@ and find_kernel_from_boot debug host_cpu @@ -155,7 +155,14 @@ and find_kernel_from_boot debug host_cpu
if files <> [] then files if files <> [] then files
else ( else (
(* In original: ls -1dvr /boot/vmlinuz-* 2>/dev/null | grep -v xen *) (* In original: ls -1dvr /boot/vmlinuz-* 2>/dev/null | grep -v xen *)
- let files = files_matching_globs ["vmlinu?-*"] all_files in - let files = files_matching_globs ["vmlinu?-*"] all_files in
+ let files = files_matching_globs ["vmlinu?-*"; "Image-*"] all_files in + let files =
+ if string_prefix "aarch64" host_cpu
+ then (
+ files_matching_globs ["Image-*"] all_files
+ )
+ else (
+ files_matching_globs ["vmlinu?-*"] all_files
+ ) in
let files = ignore_unbootable_kernels host_cpu files in let files = ignore_unbootable_kernels host_cpu files in
files files
) in ) in
@@ -262,9 +262,14 @@ and get_kernel_version debug kernel_file @@ -262,9 +269,14 @@ and get_kernel_version debug kernel_file
else ( else (
basename basename
) in ) in

6
supermin.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Oct 21 15:28:41 MDT 2024 - carnold@suse.com
- Detect the correct kernel on aarch64 (jsc#PED-10545)
detect-aarch64-kernel.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Sep 4 15:06:41 MDT 2024 - carnold@suse.com Wed Sep 4 15:06:41 MDT 2024 - carnold@suse.com