File detect-aarch64-kernel.patch of Package supermin

Overview Repositories Revisions Requests Users Attributes Meta

File detect-aarch64-kernel.patch of Package supermin (Revision d979ab3094dab3a4cafe05cbcff8a340)

Currently displaying revision d979ab3094dab3a4cafe05cbcff8a340 , Show latest

References: bsc#1187532 - virt-make-fs hangs forever

Index: supermin-5.3.5/src/format_ext2_kernel.ml
===================================================================
--- supermin-5.3.5.orig/src/format_ext2_kernel.ml
+++ supermin-5.3.5/src/format_ext2_kernel.ml
@@ -45,18 +45,26 @@ let rec build_kernel debug host_cpu copy
    * are not present then we look in /lib/modules and /boot.
    *)
   let kernel_file, kernel_name, kernel_version, modpath =
-    if debug >= 1 then
+    if debug >= 1 then (
       printf "supermin: kernel: looking for kernel using environment variables ...\n%!";
+      printf "CEA:supermin:build_kernel: host_cpu = %s\n%!" host_cpu;
+      printf "CEA:supermin:build_kernel: kernel = %s\n%!" kernel;
+    );
     match find_kernel_from_env_vars debug with
     | Some k -> k
     | None ->
-       if debug >= 1 then
+       if debug >= 1 then (
          printf "supermin: kernel: looking for kernels in /lib/modules/*/vmlinuz ...\n%!";
+         printf "CEA:supermin:build_kernel: looking for kernels in /lib/modules/*/vmlinuz ...\n%!";
+         printf "CEA:supermin:build_kernel: Calling find_kernel_from_lib_modules ...\n%!";
+       );
        match find_kernel_from_lib_modules debug host_cpu with
        | Some k -> k
        | None ->
-          if debug >= 1 then
+          if debug >= 1 then (
             printf "supermin: kernel: looking for kernels in /boot ...\n%!";
+            printf "CEA:supermin:build_kernel: Calling find_kernel_from_boot ...\n%!";
+          );
           match find_kernel_from_boot debug host_cpu with
           | Some k -> k
           | None ->
@@ -64,8 +72,11 @@ let rec build_kernel debug host_cpu copy
 
   if debug >= 1 then (
     printf "supermin: kernel: picked vmlinuz %s\n%!" kernel_file;
+    printf "CEA:supermin:build_kernel: picked vmlinuz %s\n%!" kernel_file;
     printf "supermin: kernel: kernel_version %s\n" kernel_version;
+    printf "CEA:supermin:build_kernel: kernel_version %s\n" kernel_version;
     printf "supermin: kernel: modpath %s\n%!" modpath;
+    printf "CEA:supermin:build_kernel: modpath %s\n%!" modpath;
   );
 
   (* RISC-V relies on the bootloader or firmware to uncompress the
@@ -96,6 +107,8 @@ supermin use, you shouldn't boot the Xen
     host_cpu
 
 and find_kernel_from_env_vars debug  =
+  if debug >= 1 then
+    printf "CEA:supermin:find_kernel_from_env_vars: kernel: \n%!";
   try
     let kernel_env = getenv "SUPERMIN_KERNEL" in
     if debug >= 1 then
@@ -111,6 +124,8 @@ and find_kernel_from_env_vars debug  =
         | Some v -> v
         | None -> raise Not_found in
     let kernel_name = Filename.basename kernel_env in
+    if debug >= 1 then
+      printf "CEA:supermin:find_kernel_from_env_vars: kernel_name = =%s\n%!" kernel_name;
     let modpath = find_modpath debug kernel_version in
     Some (kernel_env, kernel_name, kernel_version, modpath)
   with Not_found -> None
@@ -119,8 +134,20 @@ and find_kernel_from_lib_modules debug h
   let files = glob "/lib/modules/*/vmlinuz" [GLOB_NOSORT; GLOB_NOESCAPE] in
   let files = Array.to_list files in
 
+  if debug >= 1 then (
+    printf "CEA:supermin:find_kernel_from_lib_modules: host_cpu = %s\n%!" host_cpu;
+    printf "CEA:supermin:find_kernel_from_lib_modules: Calling ignore_unbootable_kernels\n%!"
+  );
   let files = ignore_unbootable_kernels host_cpu files in
 
+  if debug >= 1 then
+    printf "CEA:supermin:find_kernel_from_lib_modules: Got files from ignore_unbootable_kernels, now lets try to print it\n%!";
+
+  let () = List.iter (printf "    CEA:supermin:find_kernel_lib_modules: files = %s\n ") files in
+
+  if debug >= 1 then
+    printf "CEA:supermin:find_kernel_from_lib_modules: Anything print above? \n%!";
+
   let kernels =
     let kernels =
       filter_map (
@@ -129,8 +156,14 @@ and find_kernel_from_lib_modules debug h
           if size < 10000_L then None
           else (
             let kernel_name = Filename.basename kernel_file in
+            if debug >= 1 then
+              printf "  CEA:supermin:find_kernel_from_lib_modules: kernel_name = %s\n%!" kernel_name;
             let modpath = Filename.dirname kernel_file in
+            if debug >= 1 then
+              printf "  CEA:supermin:find_kernel_from_lib_modules: modpath = %s\n%!" modpath;
             let kernel_version = Filename.basename modpath in
+            if debug >= 1 then
+              printf "  CEA:supermin:find_kernel_from_lib_modules: kernel_version = %s\n%!" kernel_version;
             Some (kernel_file, kernel_name, kernel_version, modpath)
           )
       ) files in
@@ -151,24 +184,54 @@ and find_kernel_from_boot debug host_cpu
   let files = files_matching_globs patterns all_files in
   let files = ignore_unbootable_kernels host_cpu files in
 
+  if debug >= 1 then
+    printf "CEA:supermin:find_kernel_from_boot: host_cpu = %s\n%!" host_cpu;
+
+  let () = List.iter (printf "    CEA:supermin:find_kernel_from_boot: all_files = %s\n ") all_files in
+
+  let () = List.iter (printf "    CEA:supermin:find_kernel_from_boot: files = %s\n ") files in
+
   let files =
     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 =
+        if string_prefix "aarch64" host_cpu
+        then (
+          files_matching_globs ["Image-*"] all_files
+        )
+        else (
+          files_matching_globs ["vmlinu?-*"; "Image-*"] all_files
+        ) in
       let files = ignore_unbootable_kernels host_cpu files in
       files
     ) in
 
+  if debug >= 1 then
+    printf "CEA:supermin:find_kernel_from_boot: Sort list\n%!";
   let files = List.sort (fun a b -> compare_version b a) files in
+  if debug >= 1 then
+    printf "CEA:supermin:find_kernel_from_boot: List now sorted. Can we print it?\n%!";
+
+  let () = List.iter (printf "    CEA:supermin:find_kernel_from_boot: files = %s\n ") files in
+
+  if debug >= 1 then
+    printf "CEA:supermin:find_kernel_from_boot: Did the list print above?\n%!";
+
   let kernels =
     filter_map (
       fun kernel_name ->
         let kernel_file = "/boot" // kernel_name in
+        if debug >= 1 then (
+          printf "  CEA:supermin:find_kernel_from_boot: kernel_file = %s\n%!" kernel_file;
+          printf "  CEA:supermin:find_kernel_from_boot: Calling get_kernel_version\n%!"
+        );
         match get_kernel_version debug kernel_file with
         | None -> None
         | Some kernel_version ->
            let modpath = find_modpath debug kernel_version in
+           if debug >= 1 then
+             printf "  CEA:supermin:find_kernel_from_boot: modpath = %s\n%!" modpath;
            if not (has_modpath modpath) then None
            else Some (kernel_file, kernel_name, kernel_version, modpath)
     ) files in
@@ -243,8 +306,11 @@ and has_modpath modpath =
  * filename.
  *)
 and get_kernel_version debug kernel_file =
-  if debug >= 1 then
-    printf "supermin: kernel: kernel version of %s%!" kernel_file;
+  if debug >= 1 then (
+    printf "supermin: kernel: kernel version of %s\n%!" kernel_file;
+    printf "CEA:supermin:get_kernel_version: kernel_file = %s\n%!" kernel_file;
+    printf "CEA:supermin:get_kernel_version: no host_cpu passed here\n%!";
+  );
   match get_kernel_version_from_file_content kernel_file with
   | Some version ->
      if debug >= 1 then printf " = %s (from content)\n%!" version;
@@ -262,9 +328,16 @@ and get_kernel_version debug kernel_file
        else (
          basename
        ) in
-     if string_prefix "vmlinuz-" basename || string_prefix "vmlinux-" basename
+     if debug >= 1 then
+       printf "CEA:supermin:get_kernel_version: basename = %s\n%!" basename;
+     if string_prefix "vmlinuz-" basename || string_prefix "vmlinux-" basename || string_prefix "Image-" basename
      then (
-       let version = String.sub basename 8 (String.length basename - 8) in
+       let version =
+         if string_prefix "Image-" basename then (
+           String.sub basename 6 (String.length basename - 6)
+         ) else (
+           String.sub basename 8 (String.length basename - 8)
+         ) in
        (* Does the version look reasonable? *)
        let modpath = "/lib/modules" // version in
        if has_modpath modpath then (
@@ -296,6 +369,7 @@ and get_kernel_version debug kernel_file
  * Bugs: probably limited to x86 kernels.
  *)
 and get_kernel_version_from_file_content file =
+  printf "CEA:supermin:get_kernel_version_from_file_content: file = %s\n%!" file;
   try
     let chan = open_in file in
     let buf = read_string chan 514 4 in

Places

File detect-aarch64-kernel.patch of Package supermin (Revision d979ab3094dab3a4cafe05cbcff8a340)

Places