commit supermin for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package supermin for openSUSE:Factory checked in at 2024-07-29 21:54:01 Comparing /work/SRC/openSUSE:Factory/supermin (Old) and /work/SRC/openSUSE:Factory/.supermin.new.1882 (New) Package is "supermin" Mon Jul 29 21:54:01 2024 rev:25 rq:1190315 version:5.3.4 Changes: --- /work/SRC/openSUSE:Factory/supermin/supermin.changes2024-07-15 19:47:01.262700611 +0200 +++ /work/SRC/openSUSE:Factory/.supermin.new.1882/supermin.changes 2024-07-29 21:55:10.283482857 +0200 @@ -1,0 +2,8 @@ +Mon Jul 29 10:16:35 MDT 2024 - carn...@suse.com + +- bsc#1228373 - supermin regression in Tumbleweed / Factory causes + virt-inspector to fail + add-rpm-database-location.patch +- Drop disable-test-if-newer-ext2.patch + +--- Old: disable-test-if-newer-ext2.patch New: add-rpm-database-location.patch BETA DEBUG BEGIN: Old: add-rpm-database-location.patch - Drop disable-test-if-newer-ext2.patch BETA DEBUG END: BETA DEBUG BEGIN: New: virt-inspector to fail add-rpm-database-location.patch - Drop disable-test-if-newer-ext2.patch BETA DEBUG END: Other differences: -- ++ supermin.spec ++ --- /var/tmp/diff_new_pack.jZCVtM/_old 2024-07-29 21:55:10.755501972 +0200 +++ /var/tmp/diff_new_pack.jZCVtM/_new 2024-07-29 21:55:10.755501972 +0200 @@ -28,8 +28,8 @@ Source9:supermin.keyring Patch30:suse_release.patch Patch31:supermin-kernel_version_compressed.patch -Patch32:disable-test-if-newer-ext2.patch -Patch33:detect-aarch64-kernel.patch +Patch32:detect-aarch64-kernel.patch +Patch33:add-rpm-database-location.patch BuildRequires: augeas BuildRequires: autoconf BuildRequires: automake ++ add-rpm-database-location.patch ++ References: bsc#1228373 --- a/src/ph_rpm.ml +++ b/src/ph_rpm.ml @@ -239,6 +239,7 @@ let rpm_package_name pkg = rpm.name let rpmdb_locations = [ + "/usr/lib/sysimage/rpm/Packages.db"; "/usr/lib/sysimage/rpm/rpmdb.sqlite"; "/var/lib/rpm/rpmdb.sqlite"; "/var/lib/rpm/Packages"
commit supermin for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package supermin for openSUSE:Factory checked in at 2024-07-15 19:46:37 Comparing /work/SRC/openSUSE:Factory/supermin (Old) and /work/SRC/openSUSE:Factory/.supermin.new.17339 (New) Package is "supermin" Mon Jul 15 19:46:37 2024 rev:24 rq:1187213 version:5.3.4 Changes: --- /work/SRC/openSUSE:Factory/supermin/supermin.changes2024-05-08 11:42:32.490917130 +0200 +++ /work/SRC/openSUSE:Factory/.supermin.new.17339/supermin.changes 2024-07-15 19:47:01.262700611 +0200 @@ -1,0 +2,21 @@ +Wed Jul 10 15:34:55 MDT 2024 - carn...@suse.com + +- Update to version 5.3.4 (jsc#PED-6305) + * Add support for OCaml 5 + * Add kylinsecos support + * rpm: Detect dnf5 and omit missing options + * ocamlc: Use -output-complete-exe instead of -custom + * Fix kernel filtering for aarch64 architecture + * Uncompress kernel on RISC-V +- Drop patches contained in new tarball + 001-Improved-debugging-of-the-supermin-if-newer-calculation.patch + 002-Fix-if-newer-copy-kernel.patch + 003-Fix-kernel-filtering-for-aarch64-architecture.patch + 004-Use-output-complete-exe-instead-of-custom.patch + 005-Only-supply-output-complete-exe-to-final-link.patch + 006-Rename-function-file-kernel.patch + 007-Uncompress-kernel-on-RISC-V.patch + 008-Fix-link-to-renamed-kernel-documentation.patch + 009-New-mailing-list-email-address.patch + +--- Old: 001-Improved-debugging-of-the-supermin-if-newer-calculation.patch 002-Fix-if-newer-copy-kernel.patch 003-Fix-kernel-filtering-for-aarch64-architecture.patch 004-Use-output-complete-exe-instead-of-custom.patch 005-Only-supply-output-complete-exe-to-final-link.patch 006-Rename-function-file-kernel.patch 007-Uncompress-kernel-on-RISC-V.patch 008-Fix-link-to-renamed-kernel-documentation.patch 009-New-mailing-list-email-address.patch supermin-5.3.3.tar.gz supermin-5.3.3.tar.gz.sig New: supermin-5.3.4.tar.gz supermin-5.3.4.tar.gz.sig BETA DEBUG BEGIN: Old:- Drop patches contained in new tarball 001-Improved-debugging-of-the-supermin-if-newer-calculation.patch 002-Fix-if-newer-copy-kernel.patch Old: 001-Improved-debugging-of-the-supermin-if-newer-calculation.patch 002-Fix-if-newer-copy-kernel.patch 003-Fix-kernel-filtering-for-aarch64-architecture.patch Old: 002-Fix-if-newer-copy-kernel.patch 003-Fix-kernel-filtering-for-aarch64-architecture.patch 004-Use-output-complete-exe-instead-of-custom.patch Old: 003-Fix-kernel-filtering-for-aarch64-architecture.patch 004-Use-output-complete-exe-instead-of-custom.patch 005-Only-supply-output-complete-exe-to-final-link.patch Old: 004-Use-output-complete-exe-instead-of-custom.patch 005-Only-supply-output-complete-exe-to-final-link.patch 006-Rename-function-file-kernel.patch Old: 005-Only-supply-output-complete-exe-to-final-link.patch 006-Rename-function-file-kernel.patch 007-Uncompress-kernel-on-RISC-V.patch Old: 006-Rename-function-file-kernel.patch 007-Uncompress-kernel-on-RISC-V.patch 008-Fix-link-to-renamed-kernel-documentation.patch Old: 007-Uncompress-kernel-on-RISC-V.patch 008-Fix-link-to-renamed-kernel-documentation.patch 009-New-mailing-list-email-address.patch Old: 008-Fix-link-to-renamed-kernel-documentation.patch 009-New-mailing-list-email-address.patch BETA DEBUG END: Other differences: -- ++ supermin.spec ++ --- /var/tmp/diff_new_pack.Hn7zF4/_old 2024-07-15 19:47:01.830721424 +0200 +++ /var/tmp/diff_new_pack.Hn7zF4/_new 2024-07-15 19:47:01.834721571 +0200 @@ -17,24 +17,15 @@ Name: supermin -Version:5.3.3 +Version:5.3.4 Release:0 Summary:Bootstrapping tool for creating supermin appliances License:GPL-3.0-or-later Group: System/Filesystems URL:https://libguestfs.org/ -Source0: https://download.libguestfs.org/supermin/5.3-development/supermin-5.3.3.tar.gz -Source1: https://download.libguestfs.org/supermin/5.3-development/supermin-5.3.3.tar.gz.sig +Source0: https://download.libguestfs.org/supermin/5.3-development/supermin-5.3.4.tar.gz +Source1: https://download.libguestfs.org/supermin/5.3-development/supermin-5.3.4.tar.gz.sig Source9:supermin.keyring -Patch1: 001-Improved-debugging-of-the-supermin-if-newer-calculation.patch -Patch2: 002-Fix-if-newer-copy-kernel.patch -Patch3: 003-Fix-kernel-filtering-for-aarch64-architecture.patch -Patch4: 004-Use-output-complete-exe-instead-of-custom.patch -Patch5: 005-Only-supply-output-complete-exe-to-final-link.patch -Patch6:
commit supermin for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package supermin for openSUSE:Factory checked in at 2024-05-08 11:39:46 Comparing /work/SRC/openSUSE:Factory/supermin (Old) and /work/SRC/openSUSE:Factory/.supermin.new.1880 (New) Package is "supermin" Wed May 8 11:39:46 2024 rev:23 rq:1172599 version:5.3.3 Changes: --- /work/SRC/openSUSE:Factory/supermin/supermin.changes2024-01-08 23:45:25.906681706 +0100 +++ /work/SRC/openSUSE:Factory/.supermin.new.1880/supermin.changes 2024-05-08 11:40:55.791383576 +0200 @@ -1,0 +2,6 @@ +Mon May 6 15:27:43 MDT 2024 - carn...@suse.com + +- Supermin uses mke2fs. Add Requires e2fsprogs for this command. + supermin.spec + +--- Other differences: -- ++ supermin.spec ++ --- /var/tmp/diff_new_pack.1uQjiu/_old 2024-05-08 11:40:56.379404960 +0200 +++ /var/tmp/diff_new_pack.1uQjiu/_new 2024-05-08 11:40:56.379404960 +0200 @@ -62,6 +62,7 @@ BuildRequires: pkgconfig(ext2fs) BuildRequires: pkgconfig(rpm) Requires: distribution-release +Requires: e2fsprogs %if 0%{?suse_version} < 1599 Requires: sysconfig-netconfig %endif
commit supermin for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package supermin for openSUSE:Factory checked in at 2024-01-08 23:45:18 Comparing /work/SRC/openSUSE:Factory/supermin (Old) and /work/SRC/openSUSE:Factory/.supermin.new.21961 (New) Package is "supermin" Mon Jan 8 23:45:18 2024 rev:22 rq:1137604 version:5.3.3 Changes: --- /work/SRC/openSUSE:Factory/supermin/supermin.changes2024-01-05 21:45:47.827901813 +0100 +++ /work/SRC/openSUSE:Factory/.supermin.new.21961/supermin.changes 2024-01-08 23:45:25.906681706 +0100 @@ -4 +4 @@ -- Update to version 5.3.3 +- Update to version 5.3.3 (jsc#PED-6305) Other differences: --
commit supermin for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package supermin for openSUSE:Factory checked in at 2024-01-05 21:43:23 Comparing /work/SRC/openSUSE:Factory/supermin (Old) and /work/SRC/openSUSE:Factory/.supermin.new.28375 (New) Package is "supermin" Fri Jan 5 21:43:23 2024 rev:21 rq:1136944 version:5.3.3 Changes: --- /work/SRC/openSUSE:Factory/supermin/supermin.changes2023-01-03 18:49:30.882193013 +0100 +++ /work/SRC/openSUSE:Factory/.supermin.new.28375/supermin.changes 2024-01-05 21:45:47.827901813 +0100 @@ -1,0 +2,25 @@ +Thu Jan 4 11:07:03 MST 2024 - carn...@suse.com + +- Update to version 5.3.3 + * initrd: Support ztd-compressed modules + * pacman: Recognise Artix, an Arch derivative + * Add a separate variable to store link flags, and use that to +supply + * Add appropriate globs for arm based kernels. The file names end +in -arm64 but the architecture is named aarch64. + * Add support for OCaml 5.0 + * Add LFS support for fts functions + * Numerous bug fixes +- Upstream bug fixes and features + 001-Improved-debugging-of-the-supermin-if-newer-calculation.patch + 002-Fix-if-newer-copy-kernel.patch + 003-Fix-kernel-filtering-for-aarch64-architecture.patch + 004-Use-output-complete-exe-instead-of-custom.patch + 005-Only-supply-output-complete-exe-to-final-link.patch + 006-Rename-function-file-kernel.patch + 007-Uncompress-kernel-on-RISC-V.patch + 008-Fix-link-to-renamed-kernel-documentation.patch + 009-New-mailing-list-email-address.patch +- Dropped initrd_support_ztd-compressed_modules.patch + +--- Old: initrd_support_ztd-compressed_modules.patch supermin-5.2.2.tar.gz supermin-5.2.2.tar.gz.sig New: 001-Improved-debugging-of-the-supermin-if-newer-calculation.patch 002-Fix-if-newer-copy-kernel.patch 003-Fix-kernel-filtering-for-aarch64-architecture.patch 004-Use-output-complete-exe-instead-of-custom.patch 005-Only-supply-output-complete-exe-to-final-link.patch 006-Rename-function-file-kernel.patch 007-Uncompress-kernel-on-RISC-V.patch 008-Fix-link-to-renamed-kernel-documentation.patch 009-New-mailing-list-email-address.patch supermin-5.3.3.tar.gz supermin-5.3.3.tar.gz.sig BETA DEBUG BEGIN: Old: 009-New-mailing-list-email-address.patch - Dropped initrd_support_ztd-compressed_modules.patch BETA DEBUG END: BETA DEBUG BEGIN: New:- Upstream bug fixes and features 001-Improved-debugging-of-the-supermin-if-newer-calculation.patch 002-Fix-if-newer-copy-kernel.patch New: 001-Improved-debugging-of-the-supermin-if-newer-calculation.patch 002-Fix-if-newer-copy-kernel.patch 003-Fix-kernel-filtering-for-aarch64-architecture.patch New: 002-Fix-if-newer-copy-kernel.patch 003-Fix-kernel-filtering-for-aarch64-architecture.patch 004-Use-output-complete-exe-instead-of-custom.patch New: 003-Fix-kernel-filtering-for-aarch64-architecture.patch 004-Use-output-complete-exe-instead-of-custom.patch 005-Only-supply-output-complete-exe-to-final-link.patch New: 004-Use-output-complete-exe-instead-of-custom.patch 005-Only-supply-output-complete-exe-to-final-link.patch 006-Rename-function-file-kernel.patch New: 005-Only-supply-output-complete-exe-to-final-link.patch 006-Rename-function-file-kernel.patch 007-Uncompress-kernel-on-RISC-V.patch New: 006-Rename-function-file-kernel.patch 007-Uncompress-kernel-on-RISC-V.patch 008-Fix-link-to-renamed-kernel-documentation.patch New: 007-Uncompress-kernel-on-RISC-V.patch 008-Fix-link-to-renamed-kernel-documentation.patch 009-New-mailing-list-email-address.patch New: 008-Fix-link-to-renamed-kernel-documentation.patch 009-New-mailing-list-email-address.patch - Dropped initrd_support_ztd-compressed_modules.patch BETA DEBUG END: Other differences: -- ++ supermin.spec ++ --- /var/tmp/diff_new_pack.UNtoS8/_old 2024-01-05 21:45:50.103985107 +0100 +++ /var/tmp/diff_new_pack.UNtoS8/_new 2024-01-05 21:45:50.107985253 +0100 @@ -1,7 +1,7 @@ # # spec file for package supermin # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,22 +17,28 @@ Name: supermin -Version:5.2.2 +Version:5.3.3 Release:0 Summary:Bootstrapping tool for creating supermin appliances License:GPL-3.0-or-later Group: System/Filesystems URL:https://libguestfs.org/ -Source0: https://download.libguestfs.org/supermin/5.2-stable/supermin-5.2.2.tar.gz -Source1:
commit supermin for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package supermin for openSUSE:Factory checked in at 2023-01-03 18:49:29 Comparing /work/SRC/openSUSE:Factory/supermin (Old) and /work/SRC/openSUSE:Factory/.supermin.new.1563 (New) Package is "supermin" Tue Jan 3 18:49:29 2023 rev:20 rq:1046569 version:5.2.2 Changes: --- /work/SRC/openSUSE:Factory/supermin/supermin.changes2022-12-10 21:18:23.461753896 +0100 +++ /work/SRC/openSUSE:Factory/.supermin.new.1563/supermin.changes 2023-01-03 18:49:30.882193013 +0100 @@ -1,0 +2,5 @@ +Tue Dec 27 15:59:57 UTC 2022 - Andreas Schwab + +- Enable build on riscv64 + +--- Other differences: -- ++ supermin.spec ++ --- /var/tmp/diff_new_pack.sdKNl3/_old 2023-01-03 18:49:31.358196362 +0100 +++ /var/tmp/diff_new_pack.sdKNl3/_new 2023-01-03 18:49:31.366196418 +0100 @@ -65,7 +65,7 @@ Provides: febootstrap %{?ocaml_preserve_bytecode} # this must follow libguestfs, which is the only consumer of this pkg -ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64 +ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64 riscv64 %description supermin is a tool for building supermin appliances. These are tiny
commit supermin for openSUSE:Factory
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-12-10 21:18:06 Comparing /work/SRC/openSUSE:Factory/supermin (Old) and /work/SRC/openSUSE:Factory/.supermin.new.1835 (New) Package is "supermin" Sat Dec 10 21:18:06 2022 rev:19 rq:1041863 version:5.2.2 Changes: --- /work/SRC/openSUSE:Factory/supermin/supermin.changes2022-10-28 19:29:48.258713767 +0200 +++ /work/SRC/openSUSE:Factory/.supermin.new.1835/supermin.changes 2022-12-10 21:18:23.461753896 +0100 @@ -1,0 +2,6 @@ +Fri Dec 9 09:22:50 UTC 2022 - Thorsten Kukuk + +- Include sysconfig-netconfig only until SLE15, newer versions + don't use it anymore [jsc#PED-1734] + +--- Other differences: -- ++ supermin.spec ++ --- /var/tmp/diff_new_pack.GT9oAK/_old 2022-12-10 21:18:23.869756282 +0100 +++ /var/tmp/diff_new_pack.GT9oAK/_new 2022-12-10 21:18:23.873756305 +0100 @@ -56,7 +56,9 @@ BuildRequires: pkgconfig(ext2fs) BuildRequires: pkgconfig(rpm) Requires: distribution-release +%if 0%{?suse_version} < 1599 Requires: sysconfig-netconfig +%endif Requires: tar Requires: xmlstarlet Requires: zypper
commit supermin for openSUSE:Factory
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-10-28 19:29:28 Comparing /work/SRC/openSUSE:Factory/supermin (Old) and /work/SRC/openSUSE:Factory/.supermin.new.2275 (New) Package is "supermin" Fri Oct 28 19:29:28 2022 rev:18 rq:1031596 version:5.2.2 Changes: --- /work/SRC/openSUSE:Factory/supermin/supermin.changes2022-04-25 23:36:44.782518926 +0200 +++ /work/SRC/openSUSE:Factory/.supermin.new.2275/supermin.changes 2022-10-28 19:29:48.258713767 +0200 @@ -1,0 +2,6 @@ +Tue Oct 4 14:00:46 MDT 2022 - carn...@suse.com + +- jsc#PED-2113 [Virt Tools] Refresh Virtualization Tools for Xen + and KVM Management + +--- Other differences: --
commit supermin for openSUSE:Factory
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-04-25 23:36:22 Comparing /work/SRC/openSUSE:Factory/supermin (Old) and /work/SRC/openSUSE:Factory/.supermin.new.1538 (New) Package is "supermin" Mon Apr 25 23:36:22 2022 rev:17 rq:972720 version:5.2.2 Changes: --- /work/SRC/openSUSE:Factory/supermin/supermin.changes2022-03-18 16:42:22.125191313 +0100 +++ /work/SRC/openSUSE:Factory/.supermin.new.1538/supermin.changes 2022-04-25 23:36:44.782518926 +0200 @@ -1,0 +2,16 @@ +Mon Apr 25 13:03:38 MDT 2022 - carn...@suse.com + +- Update to 5.2.2 bug fix release + * Open Unix.LargeFile to avoid "lstat: Value too large for +defined data type" + * pacman: Skip over detached signatures when unpacking + * ext2, rpm: Don't redefine Val_none or Some_val. + * Don't attempt to build man page if perldoc is not available + * Ignore zfcpdump kernel on s390x + * Ignore unbootable kernels in /lib/modules + * Ignore debug kernels + * maintainer: Add our usual maintainer rules +- Drop + Avoid-lstat-Value-too-large-for-defined-data-type.patch + +--- Old: Avoid-lstat-Value-too-large-for-defined-data-type.patch supermin-5.2.1.tar.gz supermin-5.2.1.tar.gz.sig New: supermin-5.2.2.tar.gz supermin-5.2.2.tar.gz.sig Other differences: -- ++ supermin.spec ++ --- /var/tmp/diff_new_pack.NGklZd/_old 2022-04-25 23:36:45.954520567 +0200 +++ /var/tmp/diff_new_pack.NGklZd/_new 2022-04-25 23:36:45.958520573 +0200 @@ -17,17 +17,16 @@ Name: supermin -Version:5.2.1 +Version:5.2.2 Release:0 Summary:Bootstrapping tool for creating supermin appliances License:GPL-3.0-or-later Group: System/Filesystems URL:https://libguestfs.org/ -Source0: https://download.libguestfs.org/supermin/5.2-stable/supermin-5.2.1.tar.gz -Source1: https://download.libguestfs.org/supermin/5.2-stable/supermin-5.2.1.tar.gz.sig +Source0: https://download.libguestfs.org/supermin/5.2-stable/supermin-5.2.2.tar.gz +Source1: https://download.libguestfs.org/supermin/5.2-stable/supermin-5.2.2.tar.gz.sig Source9:supermin.keyring # Pending upstream review -Patch0: Avoid-lstat-Value-too-large-for-defined-data-type.patch Patch10:suse_release.patch Patch11:supermin-kernel_version_compressed.patch Patch12:disable-test-if-newer-ext2.patch @@ -63,10 +62,8 @@ Requires: zypper Provides: febootstrap %{?ocaml_preserve_bytecode} -%if "%{?_ignore_exclusive_arch}" == "" # this must follow libguestfs, which is the only consumer of this pkg -ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64 riscv64 -%endif +ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64 %description supermin is a tool for building supermin appliances. These are tiny ++ detect-aarch64-kernel.patch ++ --- /var/tmp/diff_new_pack.NGklZd/_old 2022-04-25 23:36:45.982520606 +0200 +++ /var/tmp/diff_new_pack.NGklZd/_new 2022-04-25 23:36:45.986520612 +0200 @@ -1,21 +1,19 @@ References: bsc#1187532 - virt-make-fs hangs forever -Index: supermin-5.2.1/src/format_ext2_kernel.ml +Index: supermin-5.2.2/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 = +--- supermin-5.2.2.orig/src/format_ext2_kernel.ml supermin-5.2.2/src/format_ext2_kernel.ml +@@ -129,7 +129,7 @@ and find_kernel_from_boot debug host_cpu if files <> [] then files - else -+ kernel_filter ["Image-*"] is_arm all_files in -+ let files = -+if files <> [] then files -+else + 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 +- let files = files_matching_globs ["vmlinu?-*"] all_files in ++ let files = files_matching_globs ["vmlinu?-*"; "Image-*"] all_files in + let files = ignore_unbootable_kernels host_cpu files in + files + ) in +@@ -235,9 +235,14 @@ and get_kernel_version debug kernel_file else ( basename ) in ++ supermin-5.2.1.tar.gz -> supermin-5.2.2.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/supermin-5.2.1/Makefile.am new/supermin-5.2.2/Makefile.am --- old/supermin-5.2.1/Makefile.am 2016-02-17
commit supermin for openSUSE:Factory
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.changes2022-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 (
commit supermin for openSUSE:Factory
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-01-04 19:38:10 Comparing /work/SRC/openSUSE:Factory/supermin (Old) and /work/SRC/openSUSE:Factory/.supermin.new.1896 (New) Package is "supermin" Tue Jan 4 19:38:10 2022 rev:15 rq:943756 version:5.2.1 Changes: --- /work/SRC/openSUSE:Factory/supermin/supermin.changes2021-09-20 23:34:41.351287432 +0200 +++ /work/SRC/openSUSE:Factory/.supermin.new.1896/supermin.changes 2022-01-04 19:38:37.110018672 +0100 @@ -1,0 +2,7 @@ +Tue Dec 21 15:33:22 UTC 2021 - Beno??t Monin + +- Add initrd_support_ztd-compressed_modules.patch: + backport of 4306a131c6cd to add support of zstd compressed kernel + modules. + +--- New: initrd_support_ztd-compressed_modules.patch Other differences: -- ++ supermin.spec ++ --- /var/tmp/diff_new_pack.OB1Tay/_old 2022-01-04 19:38:37.562019264 +0100 +++ /var/tmp/diff_new_pack.OB1Tay/_new 2022-01-04 19:38:37.570019274 +0100 @@ -31,6 +31,8 @@ Patch10:suse_release.patch 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 BuildRequires: augeas BuildRequires: autoconf BuildRequires: automake @@ -48,6 +50,7 @@ BuildRequires: xz BuildRequires: xz-devel BuildRequires: zlib-devel +BuildRequires: zstd BuildRequires: zypper BuildRequires: pkgconfig(com_err) BuildRequires: pkgconfig(ext2fs) ++ initrd_support_ztd-compressed_modules.patch ++ >From 4306a131c6cde92f8d0a2dd9376f4096ee538eff Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 5 Aug 2021 08:16:28 +0100 Subject: [PATCH] initrd: Support ztd-compressed modules Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1990209 --- README| 2 ++ configure.ac | 3 +++ src/config.ml.in | 1 + src/format_ext2_initrd.ml | 16 ++-- 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/README b/README index e5187a6..ccd6f96 100644 --- a/README +++ b/README @@ -102,6 +102,8 @@ are building: xzcat (command) - if your kernel uses xz-compressed modules + zstdcat (command) - if your kernel uses zstd-compressed modules + Building and installing --- diff --git a/configure.ac b/configure.ac index cd5d8c0..ad86ca5 100644 --- a/configure.ac +++ b/configure.ac @@ -157,6 +157,9 @@ AC_PATH_PROG(ZCAT,[zcat],[no]) dnl Check for xzcat, only needed if you have xz-compressed kernel modules. AC_PATH_PROG(XZCAT,[xzcat],[no]) +dnl Check for zstdcat, only needed if you have zstd-compressed kernel modules. +AC_PATH_PROG(ZSTDCAT,[zstdcat],[no]) + dnl mke2fs. AC_PATH_PROG([MKE2FS],[mke2fs],[no], [$PATH$PATH_SEPARATOR/sbin$PATH_SEPARATOR]) diff --git a/src/config.ml.in b/src/config.ml.in index 313d6e6..b0953dc 100644 --- a/src/config.ml.in +++ b/src/config.ml.in @@ -39,6 +39,7 @@ let urpmi = "@URPMI@" let yumdownloader = "@YUMDOWNLOADER@" let xzcat = "@XZCAT@" let zcat = "@ZCAT@" +let zstdcat = "@ZSTDCAT@" let zypper = "@ZYPPER@" let mke2fs = "@MKE2FS@" diff --git a/src/format_ext2_initrd.ml b/src/format_ext2_initrd.ml index 6268442..98d2692 100644 --- a/src/format_ext2_initrd.ml +++ b/src/format_ext2_initrd.ml @@ -106,12 +106,24 @@ let rec build_initrd debug tmpdir modpath initrd = visit deps; (* Copy module to the init directory. - * Uncompress the module, if the name ends in .xz or .gz. + * Uncompress the module, if the name ends in .zst, .xz or .gz. *) let basename = Filename.basename modl in let basename = let len = String.length basename in -if Config.xzcat <> "no" && +if Config.zstdcat <> "no" && + Filename.check_suffix basename ".zst" +then ( + let basename = String.sub basename 0 (len-4) in + let cmd = sprintf "%s %s > %s" +(quote Config.zstdcat) +(quote (modpath // modl)) +(quote (initdir // basename)) in + if debug >= 2 then printf "supermin: %s\n" cmd; + run_command cmd; + basename +) +else if Config.xzcat <> "no" && Filename.check_suffix basename ".xz" then ( let basename = String.sub basename 0 (len-3) in
commit supermin for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package supermin for openSUSE:Factory checked in at 2021-09-20 23:33:03 Comparing /work/SRC/openSUSE:Factory/supermin (Old) and /work/SRC/openSUSE:Factory/.supermin.new.1899 (New) Package is "supermin" Mon Sep 20 23:33:03 2021 rev:14 rq:920136 version:5.2.1 Changes: --- /work/SRC/openSUSE:Factory/supermin/supermin.changes2021-09-09 23:08:19.944885848 +0200 +++ /work/SRC/openSUSE:Factory/.supermin.new.1899/supermin.changes 2021-09-20 23:34:41.351287432 +0200 @@ -1,0 +2,11 @@ +Sun Sep 12 10:20:30 UTC 2021 - oher...@suse.de + +- Restore ExclusiveArch, continue to follow libguestfs + The 'almost' below is the reason. + +--- +Thu Sep 9 19:19:19 UTC 2021 - oher...@suse.de + +- arm32 may have a kernel named /boot/zImage + +--- Other differences: -- ++ supermin.spec ++ --- /var/tmp/diff_new_pack.LAcBPS/_old 2021-09-20 23:34:41.755287931 +0200 +++ /var/tmp/diff_new_pack.LAcBPS/_new 2021-09-20 23:34:41.759287936 +0200 @@ -59,8 +59,10 @@ Requires: zypper Provides: febootstrap %{?ocaml_preserve_bytecode} -# fails to run %%check -ExcludeArch:armv7l +%if "%{?_ignore_exclusive_arch}" == "" +# this must follow libguestfs, which is the only consumer of this pkg +ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64 riscv64 +%endif %description supermin is a tool for building supermin appliances. These are tiny @@ -90,7 +92,7 @@ ls -alt /boot /lib/modules || : ls -altd /lib/modules/*/* || : -for i in /boot/image* /boot/Image* /boot/vmlinu* +for i in /boot/image* /boot/Image* /boot/vmlinu* /boot/zImage* do test -f "$i" || continue if get_kernel_version "${i}" > $$
commit supermin for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package supermin for openSUSE:Factory checked in at 2021-09-09 23:07:48 Comparing /work/SRC/openSUSE:Factory/supermin (Old) and /work/SRC/openSUSE:Factory/.supermin.new.1899 (New) Package is "supermin" Thu Sep 9 23:07:48 2021 rev:13 rq:917779 version:5.2.1 Changes: --- /work/SRC/openSUSE:Factory/supermin/supermin.changes2021-09-07 21:22:20.081369195 +0200 +++ /work/SRC/openSUSE:Factory/.supermin.new.1899/supermin.changes 2021-09-09 23:08:19.944885848 +0200 @@ -1,0 +2,5 @@ +Thu Sep 9 11:38:07 UTC 2021 - Jan Engelhardt + +- Remove arch exclusion, almost all of them build. + +--- Other differences: -- ++ supermin.spec ++ --- /var/tmp/diff_new_pack.UTA3zM/_old 2021-09-09 23:08:20.336886303 +0200 +++ /var/tmp/diff_new_pack.UTA3zM/_new 2021-09-09 23:08:20.340886307 +0200 @@ -59,9 +59,8 @@ Requires: zypper Provides: febootstrap %{?ocaml_preserve_bytecode} -%if "%{?_ignore_exclusive_arch}" == "" -ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64 riscv64 -%endif +# fails to run %%check +ExcludeArch:armv7l %description supermin is a tool for building supermin appliances. These are tiny
commit supermin for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package supermin for openSUSE:Factory checked in at 2021-09-07 21:21:35 Comparing /work/SRC/openSUSE:Factory/supermin (Old) and /work/SRC/openSUSE:Factory/.supermin.new.1899 (New) Package is "supermin" Tue Sep 7 21:21:35 2021 rev:12 rq:917230 version:5.2.1 Changes: --- /work/SRC/openSUSE:Factory/supermin/supermin.changes2021-04-06 17:31:20.195229290 +0200 +++ /work/SRC/openSUSE:Factory/.supermin.new.1899/supermin.changes 2021-09-07 21:22:20.081369195 +0200 @@ -1,0 +2,12 @@ +Tue Aug 31 08:08:08 UTC 2021 - oher...@suse.de + +- s390x may have a kernel named /boot/image + +--- +Wed Aug 25 08:48:22 MDT 2021 - carn...@suse.com + +- Update to 5.2.1 bug fix release. Include post 5.2.1 upstream fix. + Avoid-lstat-Value-too-large-for-defined-data-type.patch + disable-test-if-newer-ext2.patch + +--- Old: supermin-5.2.0.tar.gz supermin-5.2.0.tar.gz.sig New: Avoid-lstat-Value-too-large-for-defined-data-type.patch disable-test-if-newer-ext2.patch supermin-5.2.1.tar.gz supermin-5.2.1.tar.gz.sig Other differences: -- ++ supermin.spec ++ --- /var/tmp/diff_new_pack.hhiVq3/_old 2021-09-07 21:22:20.497369698 +0200 +++ /var/tmp/diff_new_pack.hhiVq3/_new 2021-09-07 21:22:20.497369698 +0200 @@ -17,18 +17,20 @@ Name: supermin -Version:5.2.0 +Version:5.2.1 Release:0 Summary:Bootstrapping tool for creating supermin appliances License:GPL-3.0-or-later Group: System/Filesystems URL:https://libguestfs.org/ -Source0: https://download.libguestfs.org/supermin/5.2-stable/supermin-5.2.0.tar.gz -Source1: https://download.libguestfs.org/supermin/5.2-stable/supermin-5.2.0.tar.gz.sig +Source0: https://download.libguestfs.org/supermin/5.2-stable/supermin-5.2.1.tar.gz +Source1: https://download.libguestfs.org/supermin/5.2-stable/supermin-5.2.1.tar.gz.sig Source9:supermin.keyring # Pending upstream review -Patch0: suse_release.patch -Patch1: supermin-kernel_version_compressed.patch +Patch0: Avoid-lstat-Value-too-large-for-defined-data-type.patch +Patch10:suse_release.patch +Patch11:supermin-kernel_version_compressed.patch +Patch12:disable-test-if-newer-ext2.patch BuildRequires: augeas BuildRequires: autoconf BuildRequires: automake @@ -89,7 +91,7 @@ ls -alt /boot /lib/modules || : ls -altd /lib/modules/*/* || : -for i in /boot/Image* /boot/vmlinu* +for i in /boot/image* /boot/Image* /boot/vmlinu* do test -f "$i" || continue if get_kernel_version "${i}" > $$ ++ Avoid-lstat-Value-too-large-for-defined-data-type.patch ++ Subject: Open Unix.LargeFile to avoid "lstat: Value too large for defined data type". From: Richard W.M. Jones rjo...@redhat.com Mon Feb 1 10:07:02 2021 + Date: Mon Feb 1 10:22:45 2021 +: Git: ea2935342326893257c74098e7df0835ee495b82 On 32 bit platforms, because OCaml native ints are limited to 31 bits, there is a trap in the normal Unix.stat, Unix.lstat functions where any field in the stat struct may overflow. The result is random errors like: supermin: error: lstat: Value too large for defined data type: /tmp/tmp.Ss9aYEBASm/d2/root You would probably only see this on armv7. The OCaml Unix module has a "LargeFile" submodule which fixes this by using int64 for some (unfortunately not all) fields. For more information see the OCaml sources, file otherlibs/unix/stat.c, all instances of "EOVERFLOW". (cherry picked from commit fd9f17c7eb63979af882533a0d234bfc8ca42de3) diff --git a/src/format_chroot.ml b/src/format_chroot.ml index 346c24b..34606f7 100644 --- a/src/format_chroot.ml +++ b/src/format_chroot.ml @@ -17,6 +17,7 @@ *) open Unix +open Unix.LargeFile open Printf open Utils diff --git a/src/format_ext2.ml b/src/format_ext2.ml index 6348c29..e311ea6 100644 --- a/src/format_ext2.ml +++ b/src/format_ext2.ml @@ -17,6 +17,7 @@ *) open Unix +open Unix.LargeFile open Printf open Utils diff --git a/src/format_ext2_initrd.ml b/src/format_ext2_initrd.ml index 38977e6..6268442 100644 --- a/src/format_ext2_initrd.ml +++ b/src/format_ext2_initrd.ml @@ -17,6 +17,7 @@ *) open Unix +open Unix.LargeFile open Printf open Utils diff --git a/src/format_ext2_kernel.ml b/src/format_ext2_kernel.ml index 98bff3a..3be4413 100644 --- a/src/format_ext2_kernel.ml +++ b/src/format_ext2_kernel.ml @@ -17,6 +17,7 @@ *) open Unix +open Unix.LargeFile open Printf open Utils @@ -95,8 +96,8 @@ and
commit supermin for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package supermin for openSUSE:Factory checked in at 2021-04-06 17:29:56 Comparing /work/SRC/openSUSE:Factory/supermin (Old) and /work/SRC/openSUSE:Factory/.supermin.new.2401 (New) Package is "supermin" Tue Apr 6 17:29:56 2021 rev:11 rq:882595 version:5.2.0 Changes: --- /work/SRC/openSUSE:Factory/supermin/supermin.changes2021-02-17 18:09:38.689847575 +0100 +++ /work/SRC/openSUSE:Factory/.supermin.new.2401/supermin.changes 2021-04-06 17:31:20.195229290 +0200 @@ -1,0 +2,5 @@ +Thu Apr 1 13:56:13 UTC 2021 - Andreas Schwab + +- Fix typo risc64 -> riscv64 + +--- Other differences: -- ++ supermin.spec ++ --- /var/tmp/diff_new_pack.VZd9rC/_old 2021-04-06 17:31:20.723229887 +0200 +++ /var/tmp/diff_new_pack.VZd9rC/_new 2021-04-06 17:31:20.727229892 +0200 @@ -58,7 +58,7 @@ Provides: febootstrap %{?ocaml_preserve_bytecode} %if "%{?_ignore_exclusive_arch}" == "" -ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64 risc64 +ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64 riscv64 %endif %description
commit supermin for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package supermin for openSUSE:Factory checked in at 2021-02-17 18:09:35 Comparing /work/SRC/openSUSE:Factory/supermin (Old) and /work/SRC/openSUSE:Factory/.supermin.new.28504 (New) Package is "supermin" Wed Feb 17 18:09:35 2021 rev:10 rq:872981 version:5.2.0 Changes: --- /work/SRC/openSUSE:Factory/supermin/supermin.changes2021-02-07 15:24:19.530220175 +0100 +++ /work/SRC/openSUSE:Factory/.supermin.new.28504/supermin.changes 2021-02-17 18:09:38.689847575 +0100 @@ -6 +6 @@ - like on aarch64 and s390x + like on aarch64 and s390x (bsc#1182112, bsc#1138258) Other differences: --
commit supermin for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package supermin for openSUSE:Factory checked in at 2021-02-07 15:21:45 Comparing /work/SRC/openSUSE:Factory/supermin (Old) and /work/SRC/openSUSE:Factory/.supermin.new.28504 (New) Package is "supermin" Sun Feb 7 15:21:45 2021 rev:9 rq:869861 version:5.2.0 Changes: --- /work/SRC/openSUSE:Factory/supermin/supermin.changes2020-12-10 15:58:21.662867085 +0100 +++ /work/SRC/openSUSE:Factory/.supermin.new.28504/supermin.changes 2021-02-07 15:24:19.530220175 +0100 @@ -1,0 +2,7 @@ +Fri Feb 5 16:59:34 CET 2021 - r...@suse.de + +- add patch supermin-kernel_version_compressed.patch + find kernel module path even for compressed kernels + like on aarch64 and s390x + +--- New: supermin-kernel_version_compressed.patch Other differences: -- ++ supermin.spec ++ --- /var/tmp/diff_new_pack.6k9LLz/_old 2021-02-07 15:24:21.042221902 +0100 +++ /var/tmp/diff_new_pack.6k9LLz/_new 2021-02-07 15:24:21.046221906 +0100 @@ -1,7 +1,7 @@ # # spec file for package supermin # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,6 +28,7 @@ Source9:supermin.keyring # Pending upstream review Patch0: suse_release.patch +Patch1: supermin-kernel_version_compressed.patch BuildRequires: augeas BuildRequires: autoconf BuildRequires: automake ++ supermin-kernel_version_compressed.patch ++ --- supermin-5.2.0/src/format_ext2_kernel.ml2021/02/05 16:10:36 1.1 +++ supermin-5.2.0/src/format_ext2_kernel.ml2021/02/05 16:12:46 @@ -212,6 +212,16 @@ | None -> (* Try to work it out from the filename instead. *) let basename = Filename.basename kernel_file in + let basename = + let len = String.length basename in + if Filename.check_suffix basename ".xz" || Filename.check_suffix basename ".gz" + then ( + let basename = String.sub basename 0 (len-3) in + basename + ) + else ( + basename + ) in if string_prefix "vmlinuz-" basename || string_prefix "vmlinux-" basename then ( let version = String.sub basename 8 (String.length basename - 8) in
commit supermin for openSUSE:Factory
Hello community, here is the log from the commit of package supermin for openSUSE:Factory checked in at 2020-12-10 15:58:20 Comparing /work/SRC/openSUSE:Factory/supermin (Old) and /work/SRC/openSUSE:Factory/.supermin.new.2328 (New) Package is "supermin" Thu Dec 10 15:58:20 2020 rev:8 rq:853767 version:5.2.0 Changes: --- /work/SRC/openSUSE:Factory/supermin/supermin.changes2019-11-21 12:58:58.746522114 +0100 +++ /work/SRC/openSUSE:Factory/.supermin.new.2328/supermin.changes 2020-12-10 15:58:21.662867085 +0100 @@ -1,0 +2,14 @@ +Fri Oct 23 18:45:45 UTC 2020 - Dirk Mueller + +- update to 5.2.0: + * rpm: extend the Multiple_matches exception + * Use external command mv to rename old output directory (RHBZ#1670191). + * rpm: do not unpack parameters + * rpm: fix version comparison + * rpm: provide a dummy supermin_rpm_get_arch implementation + * ext2: Build symbolic links correctly (RHBZ#1770304). + * Update gnulib to latest. +- switch to release tarball, use keyring for gpg validation +- run tests + +--- Old: _service supermin-5.1.20.tar.xz New: supermin-5.2.0.tar.gz supermin-5.2.0.tar.gz.sig supermin.keyring Other differences: -- ++ supermin.spec ++ --- /var/tmp/diff_new_pack.l4ZD45/_old 2020-12-10 15:58:22.186867578 +0100 +++ /var/tmp/diff_new_pack.l4ZD45/_new 2020-12-10 15:58:22.194867586 +0100 @@ -1,7 +1,7 @@ # # spec file for package supermin # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,42 +17,48 @@ Name: supermin -Version:5.1.20 +Version:5.2.0 Release:0 -%{?ocaml_preserve_bytecode} -Url:http://libguestfs.org/ Summary:Bootstrapping tool for creating supermin appliances License:GPL-3.0-or-later Group: System/Filesystems -Provides: febootstrap -Requires: distribution-release -Requires: sysconfig-netconfig -Requires: tar -Requires: xmlstarlet -Requires: zypper -Source0:supermin-%{version}.tar.xz +URL:https://libguestfs.org/ +Source0: https://download.libguestfs.org/supermin/5.2-stable/supermin-5.2.0.tar.gz +Source1: https://download.libguestfs.org/supermin/5.2-stable/supermin-5.2.0.tar.gz.sig +Source9:supermin.keyring # Pending upstream review Patch0: suse_release.patch -%if "%{?_ignore_exclusive_arch}" == "" -ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64 -%endif - +BuildRequires: augeas BuildRequires: autoconf BuildRequires: automake +BuildRequires: distribution-release BuildRequires: e2fsprogs BuildRequires: glibc-devel-static BuildRequires: gzip +BuildRequires: hivex +BuildRequires: kernel-default BuildRequires: ncurses-devel BuildRequires: ocaml BuildRequires: ocaml-findlib BuildRequires: ocaml-rpm-macros >= 4.02.1 -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: xz BuildRequires: xz-devel BuildRequires: zlib-devel +BuildRequires: zypper BuildRequires: pkgconfig(com_err) BuildRequires: pkgconfig(ext2fs) BuildRequires: pkgconfig(rpm) +Requires: distribution-release +Requires: sysconfig-netconfig +Requires: tar +Requires: xmlstarlet +Requires: zypper +Provides: febootstrap +%{?ocaml_preserve_bytecode} +%if "%{?_ignore_exclusive_arch}" == "" +ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64 risc64 +%endif %description supermin is a tool for building supermin appliances. These are tiny @@ -61,27 +67,62 @@ you need to boot one of them. %prep -%setup -q -%patch0 -p1 +%autosetup -p1 %build export ZYPPER=zypper -export ZYPPER=/usr/bin/zypper +export ZYPPER=%{_bindir}/zypper touch INSTALL NEWS AUTHORS ChangeLog -autoreconf -fi +#.gnulib/gnulib-tool --update +#autoreconf -fi %configure --help -%configure -make \ +%configure --disable-network-tests +%make_build \ %{?_smp_mflags} %install -make install DESTDIR=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -ls +%make_install +find %{buildroot} -ls + +%check +ls -alt /boot /lib/modules || : +ls -altd /lib/modules/*/* || : + +for i in /boot/Image* /boot/vmlinu* +do + test -f "$i" || continue + if get_kernel_version "${i}" > $$ + then +if test -s $$ +then + read SUPERMIN_KERNEL_VERSION < $$ + export "SUPERMIN_KERNEL=$i" + export "SUPERMIN_KERNEL_VERSION=$SUPERMIN_KERNEL_VERSION" + export "SUPERMIN_MODULES=/lib/modules/${SUPERMIN_KERNEL_VERSION}" + break +fi + fi +done