From 3588b91ab5547f515c1622d54bd6fdb648d83a9924d3033e161325e94cd8a946 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 9 Dec 2024 12:15:14 +0100 Subject: [PATCH] Sync from SUSE:SLFO:Main supermin revision ec59c31745475027a711500850c95540 --- detect-aarch64-kernel.patch | 19 +++++++++++++------ supermin.changes | 6 ++++++ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/detect-aarch64-kernel.patch b/detect-aarch64-kernel.patch index 8c7f9c5..96234de 100644 --- a/detect-aarch64-kernel.patch +++ b/detect-aarch64-kernel.patch @@ -1,19 +1,26 @@ 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.3/src/format_ext2_kernel.ml -@@ -155,7 +155,7 @@ and find_kernel_from_boot debug host_cpu +--- supermin-5.3.5.orig/src/format_ext2_kernel.ml ++++ supermin-5.3.5/src/format_ext2_kernel.ml +@@ -155,7 +155,14 @@ and find_kernel_from_boot debug host_cpu if files <> [] then files else ( (* 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?-*"; "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 files ) in -@@ -262,9 +262,14 @@ and get_kernel_version debug kernel_file +@@ -262,9 +269,14 @@ and get_kernel_version debug kernel_file else ( basename ) in diff --git a/supermin.changes b/supermin.changes index 949eab4..b6c2981 100644 --- a/supermin.changes +++ b/supermin.changes @@ -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