diff --git a/.gitignore b/.gitignore index dc39bc8..5c5ef68 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libostree-2020.3.tar.xz +SOURCES/libostree-2020.7.tar.xz diff --git a/.ostree.metadata b/.ostree.metadata index f991c97..3dc640e 100644 --- a/.ostree.metadata +++ b/.ostree.metadata @@ -1 +1 @@ -68a3ca414ddb14596ab92d170f43dabfa78f100e SOURCES/libostree-2020.3.tar.xz +c9f8ca77723040a4c87b9119305ad54e1694772c SOURCES/libostree-2020.7.tar.xz diff --git a/SOURCES/0001-gcc11.patch b/SOURCES/0001-gcc11.patch new file mode 100644 index 0000000..7a5e041 --- /dev/null +++ b/SOURCES/0001-gcc11.patch @@ -0,0 +1,40 @@ +From 267e8eb3849a539704c480512b135400c7e49309 Mon Sep 17 00:00:00 2001 +From: 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 + diff --git a/SOURCES/0001-ostree-prepare-root-print-st_dev-and-st_ino-as-64-bi.patch b/SOURCES/0001-ostree-prepare-root-print-st_dev-and-st_ino-as-64-bi.patch new file mode 100644 index 0000000..462cf38 --- /dev/null +++ b/SOURCES/0001-ostree-prepare-root-print-st_dev-and-st_ino-as-64-bi.patch @@ -0,0 +1,30 @@ +From dec9eab2030a212b3713379af9d74c625ecce137 Mon Sep 17 00:00:00 2001 +From: Jonathan Lebon +Date: Thu, 15 Oct 2020 12:05:34 -0400 +Subject: [PATCH] ostree-prepare-root: print st_dev and st_ino as 64-bit ints + +This matches what systemd does and should work fine on all platforms. + +Possibly resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1888436 +--- + src/switchroot/ostree-prepare-root.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/switchroot/ostree-prepare-root.c b/src/switchroot/ostree-prepare-root.c +index 6351babb..6bc2c374 100644 +--- a/src/switchroot/ostree-prepare-root.c ++++ b/src/switchroot/ostree-prepare-root.c +@@ -152,8 +152,8 @@ resolve_deploy_path (const char * root_mountpoint) + "MESSAGE_ID=" SD_ID128_FORMAT_STR, + SD_ID128_FORMAT_VAL(OSTREE_PREPARE_ROOT_DEPLOYMENT_MSG), + "DEPLOYMENT_PATH=%s", resolved_path, +- "DEPLOYMENT_DEVICE=%u", stbuf.st_dev, +- "DEPLOYMENT_INODE=%u", stbuf.st_ino, ++ "DEPLOYMENT_DEVICE=%" PRIu64, (uint64_t) stbuf.st_dev, ++ "DEPLOYMENT_INODE=%" PRIu64, (uint64_t) stbuf.st_ino, + NULL); + #endif + return deploy_path; +-- +2.26.2 + 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..e2d625d 100644 --- a/SPECS/ostree.spec +++ b/SPECS/ostree.spec @@ -7,13 +7,14 @@ Summary: Tool for managing bootable, immutable filesystem trees Name: ostree -Version: 2020.3 -Release: 3%{?dist} +Version: 2020.7 +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 +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 @@ -164,6 +165,29 @@ find %{buildroot} -name '*.la' -delete %endif %changelog +* Tue Nov 3 15:04:48 UTC 2020 Colin Walters - 2020.7-1 +- Update to 2020.7 + Resolves: #1894062 + +* Wed Sep 09 2020 Colin Walters - 2020.5-4 +- Backport patches for https://bugzilla.redhat.com/show_bug.cgi?id=1875567 + +* Mon Aug 24 2020 Colin Walters - 2020.5-3 +- Backport + https://github.com/ostreedev/ostree/pull/2179/commits/06ed04a816141914adb9bd3e32392801fce5bc8e + Resolves: #1867601 + +* Tue Aug 18 2020 Colin Walters - 2020.5-2 +- Update to https://github.com/ostreedev/ostree/releases/tag/v2020.5 + Specifically to fix readonly-sysroot for e.g. RHEL Edge and + older RHCOS versions +- Related: #1861507 + +* 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