rpms/ostree
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Merged update from upstream sources

Browse Source 
This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/ostree.git#b8c5a6fb160aed157243c51a0375ca14ff6c0198
This commit is contained in:
DistroBaker 2020-10-30 18:05:37 +00:00
parent 3f83b3fd4f
commit 0ecd27c644
2 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
0001-gcc11.patch Normal file
View File

@ -0,0 +1,40 @@
From 267e8eb3849a539704c480512b135400c7e49309 Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build>
Date: Fri, 30 Oct 2020 11:40:03 -0600
Subject: [PATCH] gcc11
gcc-11
---
src/libostree/ostree-enumtypes.c.template | 2 +-
src/libostree/ostree-sysroot-upgrader.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/libostree/ostree-enumtypes.c.template b/src/libostree/ostree-enumtypes.c.template
index 751c458..89ad32a 100644
--- a/src/libostree/ostree-enumtypes.c.template
+++ b/src/libostree/ostree-enumtypes.c.template
@@ -36,7 +36,7 @@
GType
_@enum_name@_get_type (void)
{
- static volatile gsize the_type__volatile = 0;
+ static gsize the_type__volatile = 0;
if (g_once_init_enter (&the_type__volatile))
{
diff --git a/src/libostree/ostree-sysroot-upgrader.c b/src/libostree/ostree-sysroot-upgrader.c
index 4681335..ea68674 100644
--- a/src/libostree/ostree-sysroot-upgrader.c
+++ b/src/libostree/ostree-sysroot-upgrader.c
@@ -682,7 +682,7 @@ ostree_sysroot_upgrader_deploy (OstreeSysrootUpgrader *self,
GType
ostree_sysroot_upgrader_flags_get_type (void)
{
- static volatile gsize g_define_type_id__volatile = 0;
+ static gsize g_define_type_id__volatile = 0;
if (g_once_init_enter (&g_define_type_id__volatile))
{
--
2.28.0

6
ostree.spec
View File

@ -8,12 +8,13 @@
Summary: Tool for managing bootable, immutable filesystem trees
Name: ostree
Version: 2020.7
Release: 3%{?dist}
Release: 4%{?dist}
Source0: https://github.com/ostreedev/%{name}/releases/download/v%{version}/libostree-%{version}.tar.xz
License: LGPLv2+
URL: https://ostree.readthedocs.io/en/latest/
Patch0: 0001-ostree-prepare-root-print-st_dev-and-st_ino-as-64-bi.patch
Patch1: 0001-gcc11.patch
BuildRequires: git
# We always run autogen.sh
@ -169,6 +170,9 @@ find %{buildroot} -name '*.la' -delete
%endif
%changelog
* Fri Oct 30 2020 Jeff Law <law@redhat.com> - 2020.7-4
- Fix volatile issues exposed by gcc-11
* Thu Oct 15 2020 Jonathan Lebon <jonathan@jlebon.com> - 2020.7-3
- Backport https://github.com/ostreedev/ostree/pull/2219 for
https://bugzilla.redhat.com/show_bug.cgi?id=1888436