From 6a92f70491218b84bda539cac30263b4980ec2d4aa0ab6cc79c358ef5bd65c8d Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Wed, 5 Jan 2022 14:24:03 +0000 Subject: [PATCH 1/3] The patch initrd_support_ztd-compressed_modules.patch requires us to run autoreconf on build. OBS-URL: https://build.opensuse.org/package/show/Virtualization/supermin?expand=0&rev=70 --- supermin.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/supermin.spec b/supermin.spec index 95eecfe..57c61a6 100644 --- a/supermin.spec +++ b/supermin.spec @@ -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 @@ -81,7 +81,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 \ From cf3cdcf660cc64caa5ae5a19a9dc5450968f6739356a14ccb036146af94a3389 Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Thu, 17 Feb 2022 22:10:58 +0000 Subject: [PATCH 2/3] Add Requires for zstd OBS-URL: https://build.opensuse.org/package/show/Virtualization/supermin?expand=0&rev=71 --- supermin.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/supermin.spec b/supermin.spec index 57c61a6..a832c9e 100644 --- a/supermin.spec +++ b/supermin.spec @@ -59,6 +59,7 @@ Requires: distribution-release Requires: sysconfig-netconfig Requires: tar Requires: xmlstarlet +Requires: zstd Requires: zypper Provides: febootstrap %{?ocaml_preserve_bytecode} From ddacb33d5144935bd3946c3a6d2f3d8d07d25ce15b3e49028abb2dac841173ed Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Thu, 10 Mar 2022 22:28:48 +0000 Subject: [PATCH 3/3] - bsc#1187532 - virt-make-fs hangs forever detect-aarch64-kernel.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/supermin?expand=0&rev=72 --- detect-aarch64-kernel.patch | 34 ++++++++++++++++++++++++++++++++++ supermin.changes | 6 ++++++ supermin.spec | 2 +- 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 detect-aarch64-kernel.patch diff --git a/detect-aarch64-kernel.patch b/detect-aarch64-kernel.patch new file mode 100644 index 0000000..bb4fc9c --- /dev/null +++ b/detect-aarch64-kernel.patch @@ -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 ( diff --git a/supermin.changes b/supermin.changes index cf2dfb6..7f4315e 100644 --- a/supermin.changes +++ b/supermin.changes @@ -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 diff --git a/supermin.spec b/supermin.spec index a832c9e..3011652 100644 --- a/supermin.spec +++ b/supermin.spec @@ -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 @@ -59,7 +60,6 @@ Requires: distribution-release Requires: sysconfig-netconfig Requires: tar Requires: xmlstarlet -Requires: zstd Requires: zypper Provides: febootstrap %{?ocaml_preserve_bytecode}