From 5d440d853d22da625f99dfa30c36266153d1aa93 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jul 29 2020 18:51:27 +0000 Subject: import ostree-2020.4-1.el8 --- diff --git a/.gitignore b/.gitignore index dc39bc8..d6d355e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libostree-2020.3.tar.xz +SOURCES/libostree-2020.4.tar.xz diff --git a/.ostree.metadata b/.ostree.metadata index f991c97..89805e1 100644 --- a/.ostree.metadata +++ b/.ostree.metadata @@ -1 +1 @@ -68a3ca414ddb14596ab92d170f43dabfa78f100e SOURCES/libostree-2020.3.tar.xz +1150d6a41bffce24ab3953aa50ccf4d80a819e2a SOURCES/libostree-2020.4.tar.xz diff --git a/SOURCES/0001-switchroot-remount-Neuter-sysroot.readonly-for-now.patch b/SOURCES/0001-switchroot-remount-Neuter-sysroot.readonly-for-now.patch deleted file mode 100644 index 980dca9..0000000 --- a/SOURCES/0001-switchroot-remount-Neuter-sysroot.readonly-for-now.patch +++ /dev/null @@ -1,33 +0,0 @@ -From e35b82fb891daee823fcce421ae8f1442b630ea2 Mon Sep 17 00:00:00 2001 -From: Jonathan Lebon -Date: Wed, 20 May 2020 16:18:45 -0400 -Subject: [PATCH] switchroot/remount: Neuter sysroot.readonly for now - -We're hitting issues with the read-only remounts racing with various -services coming up. Let's neuter it for now until we rework how it -works. - -See: https://github.com/coreos/fedora-coreos-tracker/issues/488 ---- - src/switchroot/ostree-remount.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/switchroot/ostree-remount.c b/src/switchroot/ostree-remount.c -index 326b104f..00e21296 100644 ---- a/src/switchroot/ostree-remount.c -+++ b/src/switchroot/ostree-remount.c -@@ -93,7 +93,10 @@ sysroot_is_configured_ro (void) - if (!g_key_file_load_from_file (keyfile, config_path, 0, NULL)) - return false; - -- return g_key_file_get_boolean (keyfile, "sysroot", "readonly", NULL); -+ if (g_key_file_get_boolean (keyfile, "sysroot", "readonly", NULL)) -+ puts ("Ignoring sysroot.readonly config; see https://github.com/coreos/fedora-coreos-tracker/issues/488."); -+ -+ return false; - } - - int --- -2.25.4 - diff --git a/SPECS/ostree.spec b/SPECS/ostree.spec index eab7d58..19e2ea9 100644 --- a/SPECS/ostree.spec +++ b/SPECS/ostree.spec @@ -7,14 +7,12 @@ Summary: Tool for managing bootable, immutable filesystem trees Name: ostree -Version: 2020.3 -Release: 3%{?dist} +Version: 2020.4 +Release: 1%{?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-switchroot-remount-Neuter-sysroot.readonly-for-now.patch - BuildRequires: git # We always run autogen.sh BuildRequires: autoconf automake libtool @@ -164,6 +162,11 @@ find %{buildroot} -name '*.la' -delete %endif %changelog +* Tue Jul 28 2020 Colin Walters - 2020.4-1 +- https://github.com/ostreedev/ostree/releases/tag/v2020.4 +- We plan to use per-object-fsync for etcd in OpenShift 4 +- Resolves: #1861507 + * Thu May 21 2020 Colin Walters - 2020.3-3 - Backport https://github.com/ostreedev/ostree/pull/2108