Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package supermin for openSUSE:Factory checked in at 2022-03-18 16:42:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/supermin (Old) and /work/SRC/openSUSE:Factory/.supermin.new.25692 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "supermin" Fri Mar 18 16:42:14 2022 rev:16 rq:962538 version:5.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/supermin/supermin.changes 2022-01-04 19:38:37.110018672 +0100 +++ /work/SRC/openSUSE:Factory/.supermin.new.25692/supermin.changes 2022-03-18 16:42:22.125191313 +0100 @@ -1,0 +2,6 @@ +Mon Mar 7 14:54:48 MST 2022 - carn...@suse.com + +- bsc#1187532 - virt-make-fs hangs forever + detect-aarch64-kernel.patch + +------------------------------------------------------------------- New: ---- detect-aarch64-kernel.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ supermin.spec ++++++ --- /var/tmp/diff_new_pack.OEsuzy/_old 2022-03-18 16:42:22.601191653 +0100 +++ /var/tmp/diff_new_pack.OEsuzy/_new 2022-03-18 16:42:22.609191659 +0100 @@ -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 @@ 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=%{_bindir}/zypper touch INSTALL NEWS AUTHORS ChangeLog #.gnulib/gnulib-tool --update -#autoreconf -fi +autoreconf -fi %configure --help %configure --disable-network-tests %make_build \ ++++++ detect-aarch64-kernel.patch ++++++ 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 (
