From d1541bc2724d680d8a49302d881efc1f05dd15e6 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 12 Apr 2024 11:27:21 +0100 Subject: [PATCH 1/7] gating: Match any version of RHEL (cherry picked from commit a8d4e145288e02dad33136d71446683da5a87691) --- gating.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gating.yaml b/gating.yaml index 9234236..309384e 100755 --- a/gating.yaml +++ b/gating.yaml @@ -1,6 +1,6 @@ --- !Policy product_versions: - - rhel-9 + - rhel-* decision_context: osci_compose_gate rules: - !PassingTestCaseRule {test_case_name: xen-ci.brew-build.tier1.functional} From 0315cfe71820602ce0e209e7d31eb398f79eb3c3 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 12 Apr 2024 22:13:53 +0100 Subject: [PATCH 2/7] Unconditionally run autoreconf (cherry picked from commit de8348178796dc25edcb9396e1d28e27bc0af98c) --- libguestfs.spec | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index c21f5a3..96ff7e9 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -29,14 +29,6 @@ ExcludeArch: %{ix86} # Verify tarball signature with GPGv2. %global verify_tarball_signature 1 -# If there are patches which touch autotools files, set this to 1. -%if !0%{?rhel} -%global patches_touch_autotools %{nil} -%else -# On RHEL the downstream patches always touch autotools files. -%global patches_touch_autotools 1 -%endif - # The source directory. %global source_directory 1.52-stable @@ -84,9 +76,7 @@ Source7: libguestfs.keyring # Maintainer script which helps with handling patches. Source8: copy-patches.sh -%if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool, gettext-devel -%endif # Basic build requirements. BuildRequires: gcc, gcc-c++ @@ -696,9 +686,7 @@ for %{name}. %setup -q %autopatch -p1 -%if 0%{patches_touch_autotools} -autoreconf -i -%endif +autoreconf -fiv # For sVirt to work, the local temporary directory we use in the tests # must be labelled the same way as /tmp. This doesn't work if either From b68f2bb6d10071c2160b766cd421c64abbf69f86 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 13 May 2024 15:19:49 +0100 Subject: [PATCH 3/7] New stable branch version 1.52.1 --- libguestfs.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index 96ff7e9..af0227d 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -41,8 +41,8 @@ ExcludeArch: %{ix86} Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.52.0 -Release: 7%{?dist} +Version: 1.52.1 +Release: 1%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -1087,6 +1087,9 @@ rm ocaml/html/.gitignore %changelog +* Mon May 13 2024 Richard W.M. Jones - 1:1.52.1-1 +- New stable branch version 1.52.1 + * Thu Jan 25 2024 Fedora Release Engineering - 1:1.52.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index efde8ee..e1f0953 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.52.0.tar.gz) = 48dfaabb6b371ab3476b42310d363addf2fd1dfe43876be3bc984953f6919a30c7de13ef235d83fdd39117d71aa6bbfb5fbb645c1b17bc3031798a2a2b3df9d7 -SHA512 (libguestfs-1.52.0.tar.gz.sig) = c147e3b894c65137145228d70bcda3975a4dd4faa04c066d6783799e3d4825c2eee7c093601002f3a352989d81a75dd63c754f149201921abdded96ecb7a6214 +SHA512 (libguestfs-1.52.1.tar.gz) = 13ccc03a72ddf8dee33ca3b2f4c26235b43d395a9dfc75d8020d7f55350c0f79a0fe557591c8fcf893e02dd868e1420480fa7b356dfe25f275bdee62aeb189ed +SHA512 (libguestfs-1.52.1.tar.gz.sig) = f9edfc4260f00f100d521ddc6cc8c2f3838cc178d5b0fafe4208d6734909cf145b9424ac287f06087d835393f8d70e0ccec44384753ddf03dd4096011f615651 From e472c432fc52386ac40f11a58e75934f576f6b58 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 8 Jul 2024 16:47:55 +0100 Subject: [PATCH 4/7] New stable branch version 1.52.2 --- libguestfs.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index af0227d..7cfb184 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -41,7 +41,7 @@ ExcludeArch: %{ix86} Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.52.1 +Version: 1.52.2 Release: 1%{?dist} License: LGPL-2.1-or-later @@ -1087,6 +1087,9 @@ rm ocaml/html/.gitignore %changelog +* Mon Jul 08 2024 Richard W.M. Jones - 1:1.52.2-1 +- New stable branch version 1.52.2 + * Mon May 13 2024 Richard W.M. Jones - 1:1.52.1-1 - New stable branch version 1.52.1 diff --git a/sources b/sources index e1f0953..a5a8f4f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.52.1.tar.gz) = 13ccc03a72ddf8dee33ca3b2f4c26235b43d395a9dfc75d8020d7f55350c0f79a0fe557591c8fcf893e02dd868e1420480fa7b356dfe25f275bdee62aeb189ed -SHA512 (libguestfs-1.52.1.tar.gz.sig) = f9edfc4260f00f100d521ddc6cc8c2f3838cc178d5b0fafe4208d6734909cf145b9424ac287f06087d835393f8d70e0ccec44384753ddf03dd4096011f615651 +SHA512 (libguestfs-1.52.2.tar.gz) = 5eb4fbcc8e8879932a212c38c515598cd229e0e10b3e86d5655a10f30f5cc8c3df4e6f4b60095ccdaddbd493114ea84d9c0cdb9db7496dc83283fc4d369ece71 +SHA512 (libguestfs-1.52.2.tar.gz.sig) = d43128be62848372e6c52a39ef8dd5e898e8b8005df5ba2b4269c9757d6f480b21bfd60b16df165b8b4bcadefa71aa8daaae8755789f48b6736f4a5475aa1c59 From 69a9e2a43b6224155de0e443b243e439a0937a6a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 16 Aug 2024 09:01:00 +0100 Subject: [PATCH 5/7] Fix kernel hang (RHBZ#2303267) (cherry picked from commit 481bf76bdaadf8523507cd945b8f235fef8d6f1e) --- ...on-t-set-impossible-noop-disk-schedu.patch | 108 ++++++++++++++++++ libguestfs.spec | 10 +- 2 files changed, 117 insertions(+), 1 deletion(-) create mode 100644 0001-appliance-init-Don-t-set-impossible-noop-disk-schedu.patch diff --git a/0001-appliance-init-Don-t-set-impossible-noop-disk-schedu.patch b/0001-appliance-init-Don-t-set-impossible-noop-disk-schedu.patch new file mode 100644 index 0000000..2babe5d --- /dev/null +++ b/0001-appliance-init-Don-t-set-impossible-noop-disk-schedu.patch @@ -0,0 +1,108 @@ +From b2d682a4730ead8b4ae07e5aaf6fa230c5eec305 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Fri, 16 Aug 2024 08:26:34 +0100 +Subject: [PATCH] appliance/init: Don't set impossible "noop" disk scheduler + +Since RHEL 7.4, the noop scheduler is no longer a thing. Trying to +set it results in the error: + + + echo noop + /init: line 108: echo: write error: Invalid argument + +The current recommendation (https://access.redhat.com/solutions/5427) +is to use mq-deadline, but that's also the default so we don't have to +do anything. + +A bigger reason to remove these lines is that kernel 6.11.0 has +introduced a hang where -- rarely -- the ext4 filesystem hangs if you +try to change the scheduler while handing a page fault, even if you're +setting a scheduler that doesn't exist. I couldn't get much detail +except for a couple of stack traces from different VMs: + + crash> set 234 + PID: 234 + COMMAND: "modprobe" + TASK: ffff9f5ec3a22f40 [THREAD_INFO: ffff9f5ec3a22f40] + CPU: 0 + STATE: TASK_UNINTERRUPTIBLE + crash> bt + PID: 234 TASK: ffff9f5ec3a22f40 CPU: 0 COMMAND: "modprobe" + #0 [ffffb21e002e7840] __schedule at ffffffffa718f6d0 + #1 [ffffb21e002e78f8] schedule at ffffffffa7190a27 + #2 [ffffb21e002e7908] __bio_queue_enter at ffffffffa67e121c + #3 [ffffb21e002e7968] blk_mq_submit_bio at ffffffffa67f358c + #4 [ffffb21e002e79f0] __submit_bio at ffffffffa67e1e3c + #5 [ffffb21e002e7a58] submit_bio_noacct_nocheck at ffffffffa67e2326 + #6 [ffffb21e002e7ac0] ext4_mpage_readpages at ffffffffa65ceafc + #7 [ffffb21e002e7be0] read_pages at ffffffffa6381d17 + #8 [ffffb21e002e7c40] page_cache_ra_unbounded at ffffffffa6381ff5 + #9 [ffffb21e002e7ca8] filemap_fault at ffffffffa63761b5 + #10 [ffffb21e002e7d48] __do_fault at ffffffffa63d1892 + #11 [ffffb21e002e7d70] do_fault at ffffffffa63d2425 + #12 [ffffb21e002e7da0] __handle_mm_fault at ffffffffa63d8c6b + #13 [ffffb21e002e7e88] handle_mm_fault at ffffffffa63d95c2 + #14 [ffffb21e002e7ec8] do_user_addr_fault at ffffffffa60b34ea + #15 [ffffb21e002e7f28] exc_page_fault at ffffffffa7186e4e + #16 [ffffb21e002e7f50] asm_exc_page_fault at ffffffffa72012a6 + RIP: 000055d16159f8d8 RSP: 00007ffdd4c1f340 RFLAGS: 00010206 + RAX: 00000000000bec82 RBX: 00007ff2fd00dc82 RCX: 000055d1615b492a + RDX: 00007ffdd4c216b0 RSI: 00000000200bec82 RDI: 000055d185725960 + RBP: 00007ffdd4c1f5a0 R8: 0000000000000000 R9: 0000000000000000 + R10: 0000000000000000 R11: 0000000000000202 R12: 00000000200bec82 + R13: 000055d185725960 R14: 00007ffdd4c216b0 R15: 000055d1615b9708 + ORIG_RAX: ffffffffffffffff CS: 0033 SS: 002b + + crash> set 230 + PID: 230 + COMMAND: "modprobe" + TASK: ffff98ce03ca3040 [THREAD_INFO: ffff98ce03ca3040] + CPU: 0 + STATE: TASK_UNINTERRUPTIBLE + crash> bt + PID: 230 TASK: ffff98ce03ca3040 CPU: 0 COMMAND: "modprobe" + #0 [ffffaf9940307840] __schedule at ffffffff9618f6d0 + #1 [ffffaf99403078f8] schedule at ffffffff96190a27 + #2 [ffffaf9940307908] __bio_queue_enter at ffffffff957e121c + #3 [ffffaf9940307968] blk_mq_submit_bio at ffffffff957f358c + #4 [ffffaf99403079f0] __submit_bio at ffffffff957e1e3c + #5 [ffffaf9940307a58] submit_bio_noacct_nocheck at ffffffff957e2326 + #6 [ffffaf9940307ac0] ext4_mpage_readpages at ffffffff955ceafc + #7 [ffffaf9940307be0] read_pages at ffffffff95381d1a + #8 [ffffaf9940307c40] page_cache_ra_unbounded at ffffffff95381ff5 + #9 [ffffaf9940307ca8] filemap_fault at ffffffff953761b5 + #10 [ffffaf9940307d48] __do_fault at ffffffff953d1895 + #11 [ffffaf9940307d70] do_fault at ffffffff953d2425 + #12 [ffffaf9940307da0] __handle_mm_fault at ffffffff953d8c6b + #13 [ffffaf9940307e88] handle_mm_fault at ffffffff953d95c2 + #14 [ffffaf9940307ec8] do_user_addr_fault at ffffffff950b34ea + #15 [ffffaf9940307f28] exc_page_fault at ffffffff96186e4e + #16 [ffffaf9940307f50] asm_exc_page_fault at ffffffff962012a6 + RIP: 0000556b7a7468d8 RSP: 00007ffde2ffb560 RFLAGS: 00000206 + RAX: 00000000000bec82 RBX: 00007f5331a0dc82 RCX: 0000556b7a75b92a + RDX: 00007ffde2ffd8d0 RSI: 00000000200bec82 RDI: 0000556ba8edf960 + RBP: 00007ffde2ffb7c0 R8: 0000000000000000 R9: 0000000000000000 + R10: 0000000000000000 R11: 0000000000000202 R12: 00000000200bec82 + R13: 0000556ba8edf960 R14: 00007ffde2ffd8d0 R15: 0000556b7a760708 + ORIG_RAX: ffffffffffffffff CS: 0033 SS: 002b + +Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2303267 +--- + appliance/init | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/appliance/init b/appliance/init +index 128a3c20e1..dae06dbbe5 100755 +--- a/appliance/init ++++ b/appliance/init +@@ -104,8 +104,6 @@ udevadm settle --timeout=600 + # Increase the SCSI timeout so we can read remote images. + shopt -s nullglob + for f in /sys/block/sd*/device/timeout; do echo 300 > $f; done +-# https://access.redhat.com/site/solutions/5427 +-for f in /sys/block/{h,s,ub,v}d*/queue/scheduler; do echo noop > $f; done + shopt -u nullglob + + # Set up the network. +-- +2.46.0 + diff --git a/libguestfs.spec b/libguestfs.spec index 7cfb184..ba6e411 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -42,7 +42,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.52.2 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -76,6 +76,11 @@ Source7: libguestfs.keyring # Maintainer script which helps with handling patches. Source8: copy-patches.sh +# Fix kernel hang. +# https://bugzilla.redhat.com/show_bug.cgi?id=2303267 +# Upstream in > 1.53.5 +Patch: 0001-appliance-init-Don-t-set-impossible-noop-disk-schedu.patch + BuildRequires: autoconf, automake, libtool, gettext-devel # Basic build requirements. @@ -1087,6 +1092,9 @@ rm ocaml/html/.gitignore %changelog +* Fri Aug 16 2024 Richard W.M. Jones - 1:1.52.2-2 +- Fix kernel hang (RHBZ#2303267) + * Mon Jul 08 2024 Richard W.M. Jones - 1:1.52.2-1 - New stable branch version 1.52.2 From f5077208dfac66eb2ff441fc186a4bd480ae4ab5 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 8 Oct 2024 15:01:19 +0100 Subject: [PATCH 6/7] New upstream stable version 1.54.0 (cherry picked from commit 0b9d476db99a7c84dc9f3b754c88f7d797da7139) --- ...on-t-set-impossible-noop-disk-schedu.patch | 108 ------------------ libguestfs.spec | 15 +-- sources | 4 +- 3 files changed, 8 insertions(+), 119 deletions(-) delete mode 100644 0001-appliance-init-Don-t-set-impossible-noop-disk-schedu.patch diff --git a/0001-appliance-init-Don-t-set-impossible-noop-disk-schedu.patch b/0001-appliance-init-Don-t-set-impossible-noop-disk-schedu.patch deleted file mode 100644 index 2babe5d..0000000 --- a/0001-appliance-init-Don-t-set-impossible-noop-disk-schedu.patch +++ /dev/null @@ -1,108 +0,0 @@ -From b2d682a4730ead8b4ae07e5aaf6fa230c5eec305 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Fri, 16 Aug 2024 08:26:34 +0100 -Subject: [PATCH] appliance/init: Don't set impossible "noop" disk scheduler - -Since RHEL 7.4, the noop scheduler is no longer a thing. Trying to -set it results in the error: - - + echo noop - /init: line 108: echo: write error: Invalid argument - -The current recommendation (https://access.redhat.com/solutions/5427) -is to use mq-deadline, but that's also the default so we don't have to -do anything. - -A bigger reason to remove these lines is that kernel 6.11.0 has -introduced a hang where -- rarely -- the ext4 filesystem hangs if you -try to change the scheduler while handing a page fault, even if you're -setting a scheduler that doesn't exist. I couldn't get much detail -except for a couple of stack traces from different VMs: - - crash> set 234 - PID: 234 - COMMAND: "modprobe" - TASK: ffff9f5ec3a22f40 [THREAD_INFO: ffff9f5ec3a22f40] - CPU: 0 - STATE: TASK_UNINTERRUPTIBLE - crash> bt - PID: 234 TASK: ffff9f5ec3a22f40 CPU: 0 COMMAND: "modprobe" - #0 [ffffb21e002e7840] __schedule at ffffffffa718f6d0 - #1 [ffffb21e002e78f8] schedule at ffffffffa7190a27 - #2 [ffffb21e002e7908] __bio_queue_enter at ffffffffa67e121c - #3 [ffffb21e002e7968] blk_mq_submit_bio at ffffffffa67f358c - #4 [ffffb21e002e79f0] __submit_bio at ffffffffa67e1e3c - #5 [ffffb21e002e7a58] submit_bio_noacct_nocheck at ffffffffa67e2326 - #6 [ffffb21e002e7ac0] ext4_mpage_readpages at ffffffffa65ceafc - #7 [ffffb21e002e7be0] read_pages at ffffffffa6381d17 - #8 [ffffb21e002e7c40] page_cache_ra_unbounded at ffffffffa6381ff5 - #9 [ffffb21e002e7ca8] filemap_fault at ffffffffa63761b5 - #10 [ffffb21e002e7d48] __do_fault at ffffffffa63d1892 - #11 [ffffb21e002e7d70] do_fault at ffffffffa63d2425 - #12 [ffffb21e002e7da0] __handle_mm_fault at ffffffffa63d8c6b - #13 [ffffb21e002e7e88] handle_mm_fault at ffffffffa63d95c2 - #14 [ffffb21e002e7ec8] do_user_addr_fault at ffffffffa60b34ea - #15 [ffffb21e002e7f28] exc_page_fault at ffffffffa7186e4e - #16 [ffffb21e002e7f50] asm_exc_page_fault at ffffffffa72012a6 - RIP: 000055d16159f8d8 RSP: 00007ffdd4c1f340 RFLAGS: 00010206 - RAX: 00000000000bec82 RBX: 00007ff2fd00dc82 RCX: 000055d1615b492a - RDX: 00007ffdd4c216b0 RSI: 00000000200bec82 RDI: 000055d185725960 - RBP: 00007ffdd4c1f5a0 R8: 0000000000000000 R9: 0000000000000000 - R10: 0000000000000000 R11: 0000000000000202 R12: 00000000200bec82 - R13: 000055d185725960 R14: 00007ffdd4c216b0 R15: 000055d1615b9708 - ORIG_RAX: ffffffffffffffff CS: 0033 SS: 002b - - crash> set 230 - PID: 230 - COMMAND: "modprobe" - TASK: ffff98ce03ca3040 [THREAD_INFO: ffff98ce03ca3040] - CPU: 0 - STATE: TASK_UNINTERRUPTIBLE - crash> bt - PID: 230 TASK: ffff98ce03ca3040 CPU: 0 COMMAND: "modprobe" - #0 [ffffaf9940307840] __schedule at ffffffff9618f6d0 - #1 [ffffaf99403078f8] schedule at ffffffff96190a27 - #2 [ffffaf9940307908] __bio_queue_enter at ffffffff957e121c - #3 [ffffaf9940307968] blk_mq_submit_bio at ffffffff957f358c - #4 [ffffaf99403079f0] __submit_bio at ffffffff957e1e3c - #5 [ffffaf9940307a58] submit_bio_noacct_nocheck at ffffffff957e2326 - #6 [ffffaf9940307ac0] ext4_mpage_readpages at ffffffff955ceafc - #7 [ffffaf9940307be0] read_pages at ffffffff95381d1a - #8 [ffffaf9940307c40] page_cache_ra_unbounded at ffffffff95381ff5 - #9 [ffffaf9940307ca8] filemap_fault at ffffffff953761b5 - #10 [ffffaf9940307d48] __do_fault at ffffffff953d1895 - #11 [ffffaf9940307d70] do_fault at ffffffff953d2425 - #12 [ffffaf9940307da0] __handle_mm_fault at ffffffff953d8c6b - #13 [ffffaf9940307e88] handle_mm_fault at ffffffff953d95c2 - #14 [ffffaf9940307ec8] do_user_addr_fault at ffffffff950b34ea - #15 [ffffaf9940307f28] exc_page_fault at ffffffff96186e4e - #16 [ffffaf9940307f50] asm_exc_page_fault at ffffffff962012a6 - RIP: 0000556b7a7468d8 RSP: 00007ffde2ffb560 RFLAGS: 00000206 - RAX: 00000000000bec82 RBX: 00007f5331a0dc82 RCX: 0000556b7a75b92a - RDX: 00007ffde2ffd8d0 RSI: 00000000200bec82 RDI: 0000556ba8edf960 - RBP: 00007ffde2ffb7c0 R8: 0000000000000000 R9: 0000000000000000 - R10: 0000000000000000 R11: 0000000000000202 R12: 00000000200bec82 - R13: 0000556ba8edf960 R14: 00007ffde2ffd8d0 R15: 0000556b7a760708 - ORIG_RAX: ffffffffffffffff CS: 0033 SS: 002b - -Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2303267 ---- - appliance/init | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/appliance/init b/appliance/init -index 128a3c20e1..dae06dbbe5 100755 ---- a/appliance/init -+++ b/appliance/init -@@ -104,8 +104,6 @@ udevadm settle --timeout=600 - # Increase the SCSI timeout so we can read remote images. - shopt -s nullglob - for f in /sys/block/sd*/device/timeout; do echo 300 > $f; done --# https://access.redhat.com/site/solutions/5427 --for f in /sys/block/{h,s,ub,v}d*/queue/scheduler; do echo noop > $f; done - shopt -u nullglob - - # Set up the network. --- -2.46.0 - diff --git a/libguestfs.spec b/libguestfs.spec index ba6e411..8b99162 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -30,7 +30,7 @@ ExcludeArch: %{ix86} %global verify_tarball_signature 1 # The source directory. -%global source_directory 1.52-stable +%global source_directory 1.54-stable # Filter perl provides. %{?perl_default_filter} @@ -41,8 +41,8 @@ ExcludeArch: %{ix86} Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.52.2 -Release: 2%{?dist} +Version: 1.54.0 +Release: 1%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -76,11 +76,6 @@ Source7: libguestfs.keyring # Maintainer script which helps with handling patches. Source8: copy-patches.sh -# Fix kernel hang. -# https://bugzilla.redhat.com/show_bug.cgi?id=2303267 -# Upstream in > 1.53.5 -Patch: 0001-appliance-init-Don-t-set-impossible-noop-disk-schedu.patch - BuildRequires: autoconf, automake, libtool, gettext-devel # Basic build requirements. @@ -313,7 +308,6 @@ Requires: xz Requires: qemu-kvm-core %if !0%{?rhel} Suggests: qemu-block-curl -Suggests: qemu-block-gluster Suggests: qemu-block-iscsi %endif Suggests: qemu-block-rbd @@ -1092,6 +1086,9 @@ rm ocaml/html/.gitignore %changelog +* Tue Oct 08 2024 Richard W.M. Jones - 1:1.54.0-1 +- New upstream stable version 1.54.0 + * Fri Aug 16 2024 Richard W.M. Jones - 1:1.52.2-2 - Fix kernel hang (RHBZ#2303267) diff --git a/sources b/sources index a5a8f4f..e8f63e9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.52.2.tar.gz) = 5eb4fbcc8e8879932a212c38c515598cd229e0e10b3e86d5655a10f30f5cc8c3df4e6f4b60095ccdaddbd493114ea84d9c0cdb9db7496dc83283fc4d369ece71 -SHA512 (libguestfs-1.52.2.tar.gz.sig) = d43128be62848372e6c52a39ef8dd5e898e8b8005df5ba2b4269c9757d6f480b21bfd60b16df165b8b4bcadefa71aa8daaae8755789f48b6736f4a5475aa1c59 +SHA512 (libguestfs-1.54.0.tar.gz) = 45fd91a36384c15737820c9157d4a8a670c94177ab917a2600fef04ecbc8d6531ef04a4a86bea6540e04a550de7dfacbef9645f2869e7c5eab6cb63058ff2d86 +SHA512 (libguestfs-1.54.0.tar.gz.sig) = 97c27a5cafa533587ae2e22a54fed16d37c5366cca2a4c40cb098a8dacf62ee8b1bcee9d28f63b01e7034f0f211e8a8c71368ae418f1bfba4970ca1942bf40f3 From 6257dd839afce65ac64f62c1e47f1ae0f432492a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 18 Feb 2025 16:50:04 +0000 Subject: [PATCH 7/7] New upstream stable version 1.54.1 --- libguestfs.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index 8b99162..f72966e 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -41,7 +41,7 @@ ExcludeArch: %{ix86} Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.54.0 +Version: 1.54.1 Release: 1%{?dist} License: LGPL-2.1-or-later @@ -1086,6 +1086,9 @@ rm ocaml/html/.gitignore %changelog +* Tue Feb 18 2025 Richard W.M. Jones - 1:1.54.1-1 +- New upstream stable version 1.54.1 + * Tue Oct 08 2024 Richard W.M. Jones - 1:1.54.0-1 - New upstream stable version 1.54.0 diff --git a/sources b/sources index e8f63e9..1c56dd2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.54.0.tar.gz) = 45fd91a36384c15737820c9157d4a8a670c94177ab917a2600fef04ecbc8d6531ef04a4a86bea6540e04a550de7dfacbef9645f2869e7c5eab6cb63058ff2d86 -SHA512 (libguestfs-1.54.0.tar.gz.sig) = 97c27a5cafa533587ae2e22a54fed16d37c5366cca2a4c40cb098a8dacf62ee8b1bcee9d28f63b01e7034f0f211e8a8c71368ae418f1bfba4970ca1942bf40f3 +SHA512 (libguestfs-1.54.1.tar.gz) = 0113ea1cd26aba9b935b65299cf34d53c3d669508238d642a1a97622eb24948df05b55072d4c715cacb4fdfc7339c69ca25f65ca51ac87c40c5325175e939a0d +SHA512 (libguestfs-1.54.1.tar.gz.sig) = 84a59583fb7eb47ef26dc7b12f59ec4b1d211cae4d9434d0a3847a4e526ba3668cac14217f878f233658011434fb9cf28544b4661650de3033e5f65b23094ffc