import UBI ostree-2023.1-7.el9_2

This commit is contained in:
eabdullin 2023-09-12 13:02:45 +00:00
parent ca435b3fa3
commit 2f7b881a49
2 changed files with 34 additions and 1 deletions

View File

@ -0,0 +1,27 @@
From 3443baa6e63b36d169f57027d7e80df614592c8e Mon Sep 17 00:00:00 2001
From: Joseph Marrero <jmarrero@redhat.com>
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

View File

@ -8,7 +8,7 @@
Summary: Tool for managing bootable, immutable filesystem trees
Name: ostree
Version: 2023.1
Release: 6%{?dist}
Release: 7%{?dist}
Source0: https://github.com/ostreedev/%{name}/releases/download/v%{version}/libostree-%{version}.tar.xz
Source1: ostree-readonly-sysroot-migration
Source2: ostree-readonly-sysroot-migration.service
@ -17,6 +17,8 @@ Source2: ostree-readonly-sysroot-migration.service
Patch0: 0001-commit-fix-ostree-deployment-on-64-bit-inode-fs.patch
# https://github.com/ostreedev/ostree/pull/2946
Patch1: 0001-Add-an-always-on-inode64-feature.patch
# https://github.com/ostreedev/ostree/pull/2969
Patch2: 0002-Backport-7f70614a1ac1950ebde3df0e26cc9ab1d72b2f1f.patch
License: LGPLv2+
URL: https://ostree.readthedocs.io/en/latest/
@ -183,6 +185,10 @@ find %{buildroot} -name '*.la' -delete
%endif
%changelog
* Wed Aug 08 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2023.1-7
- Backport https://github.com/ostreedev/ostree/pull/2969/commits/402e04280b54c058ad47be99fe6a9326caf2ae00
Resolves: rhbz#2230111
* Mon Jul 24 2023 Colin Walters <walters@verbum.org> - 2023.1-6
- Resolves: rhbz#2224105