From 8874990002da2bccd046d0fce9e06418529b6705 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 11 Dec 2023 16:51:09 +0300 Subject: [PATCH] import ostree-2022.2-8.el8 --- ...614a1ac1950ebde3df0e26cc9ab1d72b2f1f.patch | 27 +++++++++++++++++++ SPECS/ostree.spec | 9 +++++-- 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 SOURCES/0018-Backport-7f70614a1ac1950ebde3df0e26cc9ab1d72b2f1f.patch diff --git a/SOURCES/0018-Backport-7f70614a1ac1950ebde3df0e26cc9ab1d72b2f1f.patch b/SOURCES/0018-Backport-7f70614a1ac1950ebde3df0e26cc9ab1d72b2f1f.patch new file mode 100644 index 0000000..fff515d --- /dev/null +++ b/SOURCES/0018-Backport-7f70614a1ac1950ebde3df0e26cc9ab1d72b2f1f.patch @@ -0,0 +1,27 @@ +From 3443baa6e63b36d169f57027d7e80df614592c8e Mon Sep 17 00:00:00 2001 +From: Joseph Marrero +Date: Fri, 4 Aug 2023 16:09:20 -0400 +Subject: [PATCH] Backport: 7f70614a1ac1950ebde3df0e26cc9ab1d72b2f1f + +--- + src/libostree/ostree-sysroot-deploy.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c +index 2454a587..4d6d796e 100644 +--- a/src/libostree/ostree-sysroot-deploy.c ++++ b/src/libostree/ostree-sysroot-deploy.c +@@ -1613,9 +1613,8 @@ static void * + sync_in_thread (void *ptr) + { + SyncData *syncdata = ptr; +- // Ensure that the caller is blocked waiting +- g_mutex_lock (&syncdata->mutex); + sync (); ++ g_mutex_lock (&syncdata->mutex); + // Signal success + syncdata->success = true; + g_cond_broadcast (&syncdata->cond); +-- +2.41.0 + diff --git a/SPECS/ostree.spec b/SPECS/ostree.spec index 63e7688..cc84a40 100644 --- a/SPECS/ostree.spec +++ b/SPECS/ostree.spec @@ -8,7 +8,7 @@ Summary: Tool for managing bootable, immutable filesystem trees Name: ostree Version: 2022.2 -Release: 7%{?dist} +Release: 8%{?dist} Source0: https://github.com/ostreedev/%{name}/releases/download/v%{version}/libostree-%{version}.tar.xz License: LGPLv2+ URL: https://ostree.readthedocs.io/en/latest/ @@ -28,6 +28,7 @@ Patch8: 0001-Support-overlayfs-whiteouts-on-checkout.patch # Patches for https://bugzilla.redhat.com/show_bug.cgi?id=2224102 Patch16: 0016-commit-fix-ostree-deployment-on-64-bit-inode-fs.patch Patch17: 0017-Add-an-always-on-inode64-feature.patch +Patch18: 0018-Backport-7f70614a1ac1950ebde3df0e26cc9ab1d72b2f1f.patch BuildRequires: make BuildRequires: git @@ -179,11 +180,15 @@ find %{buildroot} -name '*.la' -delete %endif %changelog +* Tue Aug 08 2023 Joseph Marrero - 2022.2-8 +- Backport for https://github.com/ostreedev/ostree/commit/7f70614a1ac1950ebde3df0e26cc9ab1d72b2f1f +- Resolves: rhbz#2229895 + * Wed Jul 26 2023 MSVSphere Packaging Team - 2022.2-7 - Rebuilt for MSVSphere 8.8 * Thu Jul 20 2023 Colin Walters - 2022.2-7 -- Backport for https://bugzilla.redhat.com/show_bug.cgi?id=2224107 +- Backport for https://bugzilla.redhat.com/show_bug.cgi?id=2224102 * Fri Oct 14 2022 Colin Walters - 2022.2-6 - Backport https://github.com/ostreedev/ostree/commit/0085494e350c72599fc5c0e00422885d80b3c660