forked from pool/supermin
Accepting request 962538 from Virtualization
Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/962538 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/supermin?expand=0&rev=16
This commit is contained in:
commit
75df052fbb
34
detect-aarch64-kernel.patch
Normal file
34
detect-aarch64-kernel.patch
Normal file
@ -0,0 +1,34 @@
|
||||
References: bsc#1187532 - virt-make-fs hangs forever
|
||||
|
||||
Index: supermin-5.2.1/src/format_ext2_kernel.ml
|
||||
===================================================================
|
||||
--- supermin-5.2.1.orig/src/format_ext2_kernel.ml
|
||||
+++ supermin-5.2.1/src/format_ext2_kernel.ml
|
||||
@@ -128,6 +128,10 @@ and find_kernel_from_boot debug host_cpu
|
||||
let files =
|
||||
if files <> [] then files
|
||||
else
|
||||
+ kernel_filter ["Image-*"] is_arm all_files in
|
||||
+ let files =
|
||||
+ if files <> [] then files
|
||||
+ else
|
||||
(* In original: ls -1dvr /boot/vmlinuz-* 2>/dev/null | grep -v xen *)
|
||||
kernel_filter ["vmlinu?-*"] is_arm all_files in
|
||||
|
||||
@@ -223,9 +227,14 @@ and get_kernel_version debug kernel_file
|
||||
else (
|
||||
basename
|
||||
) in
|
||||
- if string_prefix "vmlinuz-" basename || string_prefix "vmlinux-" 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 (
|
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 7 14:54:48 MST 2022 - carnold@suse.com
|
||||
|
||||
- bsc#1187532 - virt-make-fs hangs forever
|
||||
detect-aarch64-kernel.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 21 15:33:22 UTC 2021 - Benoît Monin <benoit.monin@gmx.fr>
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package supermin
|
||||
#
|
||||
# Copyright (c) 2021 SUSE LLC
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -33,6 +33,7 @@ Patch11: supermin-kernel_version_compressed.patch
|
||||
Patch12: disable-test-if-newer-ext2.patch
|
||||
# Backport of https://github.com/libguestfs/supermin/commit/4306a131c6cde92f8d0a2dd9376f4096ee538eff.patch
|
||||
Patch13: initrd_support_ztd-compressed_modules.patch
|
||||
Patch14: detect-aarch64-kernel.patch
|
||||
BuildRequires: augeas
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
@ -81,7 +82,7 @@ export ZYPPER=zypper
|
||||
export ZYPPER=%{_bindir}/zypper
|
||||
touch INSTALL NEWS AUTHORS ChangeLog
|
||||
#.gnulib/gnulib-tool --update
|
||||
#autoreconf -fi
|
||||
autoreconf -fi
|
||||
%configure --help
|
||||
%configure --disable-network-tests
|
||||
%make_build \
|
||||
|
Loading…
Reference in New Issue
Block a user