From d41847e5f99d22220586e1e19c998f96aeddb2ac Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 3 Jun 2021 14:30:35 +0100 Subject: [PATCH] Add --enable-appliance-format-auto Add support for Kylin Document lazy-counters setting cannot be changed in XFS version 5 resolves: rhbz#2025944, rhbz#1995391, rhbz#2024022 --- ...n-Add-support-for-Kylin-RHBZ-1995391.patch | 100 ++++++++++++++++++ ...y-counters-setting-cannot-be-changed.patch | 31 ++++++ libguestfs.spec | 15 ++- 3 files changed, 141 insertions(+), 5 deletions(-) create mode 100644 0010-daemon-inspection-Add-support-for-Kylin-RHBZ-1995391.patch create mode 100644 0011-xfs-Document-lazy-counters-setting-cannot-be-changed.patch diff --git a/0010-daemon-inspection-Add-support-for-Kylin-RHBZ-1995391.patch b/0010-daemon-inspection-Add-support-for-Kylin-RHBZ-1995391.patch new file mode 100644 index 0000000..836726a --- /dev/null +++ b/0010-daemon-inspection-Add-support-for-Kylin-RHBZ-1995391.patch @@ -0,0 +1,100 @@ +From ab80c515bfd527e1609d4e5ffd7c6b18d5a202dc Mon Sep 17 00:00:00 2001 +From: Laszlo Ersek +Date: Wed, 13 Oct 2021 18:30:23 +0200 +Subject: [PATCH] daemon: inspection: Add support for Kylin (RHBZ#1995391). + +Similar-to: cd08039d2427b584237265237c713d8cf46536a0 +Signed-off-by: Laszlo Ersek +Message-Id: <20211013163023.21786-1-lersek@redhat.com> +Acked-by: Richard W.M. Jones +(cherry picked from commit 305b02e7e74afc3777b2291783cd7634fb76ecaf) +--- + daemon/inspect_fs.ml | 2 ++ + daemon/inspect_fs_unix.ml | 1 + + daemon/inspect_types.ml | 2 ++ + daemon/inspect_types.mli | 1 + + generator/actions_inspection.ml | 4 ++++ + 5 files changed, 10 insertions(+) + +diff --git a/daemon/inspect_fs.ml b/daemon/inspect_fs.ml +index 02b5a0470..77f0f6aea 100644 +--- a/daemon/inspect_fs.ml ++++ b/daemon/inspect_fs.ml +@@ -275,6 +275,7 @@ and check_package_format { distro } = + Some PACKAGE_FORMAT_RPM + | Some DISTRO_DEBIAN + | Some DISTRO_KALI_LINUX ++ | Some DISTRO_KYLIN (* supposedly another Ubuntu derivative *) + | Some DISTRO_LINUX_MINT + | Some DISTRO_UBUNTU -> + Some PACKAGE_FORMAT_DEB +@@ -345,6 +346,7 @@ and check_package_management { distro; version } = + | Some DISTRO_ALTLINUX + | Some DISTRO_DEBIAN + | Some DISTRO_KALI_LINUX ++ | Some DISTRO_KYLIN (* supposedly another Ubuntu derivative *) + | Some DISTRO_LINUX_MINT + | Some DISTRO_UBUNTU -> + Some PACKAGE_MANAGEMENT_APT +diff --git a/daemon/inspect_fs_unix.ml b/daemon/inspect_fs_unix.ml +index 652bacc0f..7f6eb92e9 100644 +--- a/daemon/inspect_fs_unix.ml ++++ b/daemon/inspect_fs_unix.ml +@@ -146,6 +146,7 @@ and distro_of_os_release_id = function + | "frugalware" -> Some DISTRO_FRUGALWARE + | "gentoo" -> Some DISTRO_GENTOO + | "kali" -> Some DISTRO_KALI_LINUX ++ | "kylin" -> Some DISTRO_KYLIN + | "mageia" -> Some DISTRO_MAGEIA + | "neokylin" -> Some DISTRO_NEOKYLIN + | "openmandriva" -> Some DISTRO_OPENMANDRIVA +diff --git a/daemon/inspect_types.ml b/daemon/inspect_types.ml +index 18e410ce0..e2bc7165c 100644 +--- a/daemon/inspect_types.ml ++++ b/daemon/inspect_types.ml +@@ -79,6 +79,7 @@ and distro = + | DISTRO_FRUGALWARE + | DISTRO_GENTOO + | DISTRO_KALI_LINUX ++ | DISTRO_KYLIN + | DISTRO_LINUX_MINT + | DISTRO_MAGEIA + | DISTRO_MANDRIVA +@@ -211,6 +212,7 @@ and string_of_distro = function + | DISTRO_FRUGALWARE -> "frugalware" + | DISTRO_GENTOO -> "gentoo" + | DISTRO_KALI_LINUX -> "kalilinux" ++ | DISTRO_KYLIN -> "kylin" + | DISTRO_LINUX_MINT -> "linuxmint" + | DISTRO_MAGEIA -> "mageia" + | DISTRO_MANDRIVA -> "mandriva" +diff --git a/daemon/inspect_types.mli b/daemon/inspect_types.mli +index d12f7a61a..43c79818f 100644 +--- a/daemon/inspect_types.mli ++++ b/daemon/inspect_types.mli +@@ -86,6 +86,7 @@ and distro = + | DISTRO_FRUGALWARE + | DISTRO_GENTOO + | DISTRO_KALI_LINUX ++ | DISTRO_KYLIN + | DISTRO_LINUX_MINT + | DISTRO_MAGEIA + | DISTRO_MANDRIVA +diff --git a/generator/actions_inspection.ml b/generator/actions_inspection.ml +index 690afd460..0c6d39b43 100644 +--- a/generator/actions_inspection.ml ++++ b/generator/actions_inspection.ml +@@ -214,6 +214,10 @@ Gentoo. + + Kali Linux. + ++=item \"kylin\" ++ ++Kylin. ++ + =item \"linuxmint\" + + Linux Mint. +-- +2.31.1 + diff --git a/0011-xfs-Document-lazy-counters-setting-cannot-be-changed.patch b/0011-xfs-Document-lazy-counters-setting-cannot-be-changed.patch new file mode 100644 index 0000000..48a1b0d --- /dev/null +++ b/0011-xfs-Document-lazy-counters-setting-cannot-be-changed.patch @@ -0,0 +1,31 @@ +From 5c67c45b98e8471596d5fb08da76956581ab135d Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Mon, 22 Nov 2021 15:09:41 +0000 +Subject: [PATCH] xfs: Document lazy-counters setting cannot be changed in XFS + version 5 + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2024022 +(cherry picked from commit e7f72ab146b9c2aaee92a600a1fcbefb0202d41c) +--- + generator/actions_core.ml | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/generator/actions_core.ml b/generator/actions_core.ml +index 91dce1db5..155d739fe 100644 +--- a/generator/actions_core.ml ++++ b/generator/actions_core.ml +@@ -7600,7 +7600,10 @@ can modify parameters. + + Some of the parameters of a mounted filesystem can be examined + and modified using the C and +-C calls." }; ++C calls. ++ ++Beginning with XFS version 5, it is no longer possible to modify ++the lazy-counters setting (ie. C parameter has no effect)." }; + + { defaults with + name = "xfs_repair"; added = (1, 19, 36); +-- +2.31.1 + diff --git a/libguestfs.spec b/libguestfs.spec index 9fdaf5f..9e2d52f 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -57,7 +57,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.46.0 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ # Build only for architectures that have a kernel @@ -98,16 +98,14 @@ Source8: copy-patches.sh Patch0001: 0001-Go-bindings-fix-C-array-of-strings-char-allocation.patch Patch0002: 0002-daemon-inspect_fs_unix-recognize-modern-Pardus-GNU-L.patch Patch0003: 0003-m4-guestfs-ocaml.m4-Fix-deprecated-warning-format.patch - -# Downstream (RHEL-only) patches. -%if 0%{?rhel} Patch0004: 0004-RHEL-Remove-libguestfs-live-RHBZ-798980.patch Patch0005: 0005-RHEL-Remove-9p-APIs-from-RHEL-RHBZ-921710.patch Patch0006: 0006-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch Patch0007: 0007-RHEL-Remove-User-Mode-Linux-RHBZ-1144197.patch Patch0008: 0008-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch Patch0009: 0009-RHEL-Create-etc-crypto-policies-back-ends-opensslcnf.patch -%endif +Patch0010: 0010-daemon-inspection-Add-support-for-Kylin-RHBZ-1995391.patch +Patch0011: 0011-xfs-Document-lazy-counters-setting-cannot-be-changed.patch %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool, gettext-devel @@ -780,6 +778,7 @@ fi %endif PYTHON=%{__python3} \ --with-default-backend=libvirt \ + --enable-appliance-format-auto \ %if !0%{?rhel} --with-extra="fedora=%{fedora},release=%{release},libvirt" \ %else @@ -1146,6 +1145,12 @@ rm ocaml/html/.gitignore %changelog +* Tue Nov 23 2021 Richard W.M. Jones - 1:1.46.0-5 +- Add --enable-appliance-format-auto +- Add support for Kylin +- Document lazy-counters setting cannot be changed in XFS version 5 + resolves: rhbz#2025944, rhbz#1995391, rhbz#2024022 + * Fri Oct 29 2021 Richard W.M. Jones - 1:1.46.0-4 - Require libvirt-daemon-driver-storage-core resolves: rhbz#2018358