deepcrayon/buildroot
deepcrayon/buildroot
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

libostree: bump to version 2018.6

Browse source 
Also, add upstream patch for not fail builds on 32bit architectures.
The patch will be removed when bumping to v2018.7.

Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Marcus Folkesson 2018-06-26 11:09:41 +02:00 committed by Thomas Petazzoni
parent 24b658c002
commit 2c9c47c6b2
3 changed files with 37 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
package/libostree/0001-lib-repo-Fix-32-bit-format-string-error.patch Normal file
View file

@ -0,0 +1,35 @@
From 1174d9f5ba537562c67084caf0214544fbb14ffc Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 21 Jun 2018 14:17:28 +0000
Subject: [PATCH] lib/repo: Fix 32 bit format string error
Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
---
src/libostree/ostree-repo-commit.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c
index 37be748b..7e1d707b 100644
--- a/src/libostree/ostree-repo-commit.c
+++ b/src/libostree/ostree-repo-commit.c
@@ -903,7 +903,7 @@ write_content_object (OstreeRepo *self,
return glnx_throw (error, "min-free-space-percent '%u%%' would be exceeded, %s more required",
self->min_free_space_percent, formatted_required);
else
- return glnx_throw (error, "min-free-space-size %luMB would be exceeded, %s more required",
+ return glnx_throw (error, "min-free-space-size %" G_GUINT64_FORMAT "MB would be exceeded, %s more required",
self->min_free_space_mb, formatted_required);
}
/* This is the main bit that needs mutex protection */
@@ -1617,7 +1617,7 @@ ostree_repo_prepare_transaction (OstreeRepo *self,
return glnx_throw (error, "min-free-space-percent '%u%%' would be exceeded, %s available",
self->min_free_space_percent, formatted_free);
else
- return glnx_throw (error, "min-free-space-size %luMB would be exceeded, %s available",
+ return glnx_throw (error, "min-free-space-size %" G_GUINT64_FORMAT "MB would be exceeded, %s available",
self->min_free_space_mb, formatted_free);
}
g_mutex_unlock (&self->txn_lock);
--
2.18.0

2
package/libostree/libostree.hash
View file

@ -1,3 +1,3 @@
# Locally calculated
sha256 ad0f5a0e7a7f22f87c72b318b2cfdbe8cf908a1a469ec94eb72984bbb3690261 libostree-2018.5.tar.xz
sha256 8dd49a1ab94924e351ff9cfd8ea2bf725770400900f4875ad2cc95712c6cc905 libostree-2018.6.tar.xz
sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING

2
package/libostree/libostree.mk
View file

@ -4,7 +4,7 @@
#
################################################################################
LIBOSTREE_VERSION = 2018.5
LIBOSTREE_VERSION = 2018.6
LIBOSTREE_SOURCE = libostree-$(LIBOSTREE_VERSION).tar.xz
LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOSTREE_VERSION)