Backport https://github.com/ostreedev/ostree/pull/2219

For https://bugzilla.redhat.com/show_bug.cgi?id=1888436.

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 <jonathan@jlebon.com>
+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
+

ostree.spec

@@ -8,11 +8,13 @@
 Summary: Tool for managing bootable, immutable filesystem trees
 Name: ostree
 Version: 2020.7
-Release: 2%{?dist}
+Release: 3%{?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
+
 BuildRequires: git
 # We always run autogen.sh
 BuildRequires: autoconf automake libtool
@@ -167,6 +169,10 @@ find %{buildroot} -name '*.la' -delete
 %endif
 
 %changelog
+* 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
+
 * Wed Oct 14 2020 Colin Walters <walters@verbum.org> - 2020.7-2
 - https://github.com/ostreedev/ostree/releases/tag/v2020.7