From patchwork Tue Jun 26 09:09:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcus Folkesson X-Patchwork-Id: 934731 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="BnLwqvOz"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41FKxh0R97z9ryk for ; Tue, 26 Jun 2018 19:09:59 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 60B7C22786; Tue, 26 Jun 2018 09:09:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CSoh-p+AV169; Tue, 26 Jun 2018 09:09:57 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 41AA9227E4; Tue, 26 Jun 2018 09:09:57 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id BA1651BFC87 for ; Tue, 26 Jun 2018 09:09:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B6E2B22786 for ; Tue, 26 Jun 2018 09:09:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MNBFMlDEg6RN for ; Tue, 26 Jun 2018 09:09:53 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf0-f41.google.com (mail-lf0-f41.google.com [209.85.215.41]) by silver.osuosl.org (Postfix) with ESMTPS id 3D119227E4 for ; Tue, 26 Jun 2018 09:09:53 +0000 (UTC) Received: by mail-lf0-f41.google.com with SMTP id a4-v6so6124662lff.5 for ; Tue, 26 Jun 2018 02:09:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=WdEzZRSk6XEsFKmRbldJUKTUpgWMCD3NJNNavvLwXlM=; b=BnLwqvOzPJcnqoyDjxEQk5wPcRXaH3hM7E8UTfa1KYjmWXWDZeSPrR8YUh9oEP0Y1Z wY1WxpbRQKxjHDEdaaXIlh/9FfiBjqe8CClMb8ivxn8yvFqoB3V4kbrfK+8KQ0rzGoEa pmQvnYBh2ORbmyI1QmCWFSXa40u3rfziZ4u1GbX+l0pyPVqDdlDkAeJULCvXaSANGGWO ky5pbRePHC4id7Y5YBQcrtCl3Xz+J4ldHNtTVsq6HHrMqtI6F4rSrNFCdibLGljM8iVP EIhSoG6jFvepBUrLghE8BV4shEGj1UgEvQ05rrHkPXZD+Fvu3c8t7ZHvN5H3wbftrrl6 4b7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=WdEzZRSk6XEsFKmRbldJUKTUpgWMCD3NJNNavvLwXlM=; b=fL5/hH3LhxZ+UVy1M5jyR1E757UEFGG/pInOg+JfOaE9GhZYt4/Wj0EImsXfVuheiv W9JOTxR+0fCdXIP+k2NNvxyANsR8IDYs1pmUImOsd4FfZaPs0thtZeLlxb4s0cYoMo8t XCnjZKwQJXexi7WnSF4q164zxXmqulAMzkp+dCT5yXdCAdgEjXq9jZUVRYE5J3oo5UZM XWXkvBIBMxDfbfDS8jBdHdCrRyu6B5VKlhlBNpNSrCGJ+r/jm3umr+Jjy4QJ1hF9FID6 n29dsLKAC/bpsQq+aqWQFMPKSCjS0QgDpI+SsxTDGcQVhkVgKU55ddvxtd2UZU6uFopB eAAQ== X-Gm-Message-State: APt69E0MNd7f6WvBVXKha/RXfTv4rqe2gnYWqTChjrESgB0uMrLudDtV YnmBlWQd13msTHh+NkhRZ2nYhFy0 X-Google-Smtp-Source: AAOMgpey/25TV0IkTBjJPHu9hxJ7JlPkrgol1OUYRCVfO7OSP+C96HfqBMevFJj8RLz1uH0eXPRRqQ== X-Received: by 2002:a19:9710:: with SMTP id z16-v6mr661791lfd.17.1530004191049; Tue, 26 Jun 2018 02:09:51 -0700 (PDT) Received: from localhost.localdomain (c-2ec26030-74736162.cust.telenor.se. [46.194.96.48]) by smtp.gmail.com with ESMTPSA id y21-v6sm160021ljc.67.2018.06.26.02.09.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jun 2018 02:09:50 -0700 (PDT) From: Marcus Folkesson To: buildroot@buildroot.org Date: Tue, 26 Jun 2018 11:09:41 +0200 Message-Id: <20180626090941.4570-1-marcus.folkesson@gmail.com> X-Mailer: git-send-email 2.18.0 Subject: [Buildroot] [PATCH] libostree: bump to version 2018.6 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marcus Folkesson MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 --- ...-repo-Fix-32-bit-format-string-error.patch | 34 +++++++++++++++++++ package/libostree/libostree.hash | 2 +- package/libostree/libostree.mk | 2 +- 3 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 package/libostree/0001-lib-repo-Fix-32-bit-format-string-error.patch diff --git a/package/libostree/0001-lib-repo-Fix-32-bit-format-string-error.patch b/package/libostree/0001-lib-repo-Fix-32-bit-format-string-error.patch new file mode 100644 index 0000000000..8a2453df52 --- /dev/null +++ b/package/libostree/0001-lib-repo-Fix-32-bit-format-string-error.patch @@ -0,0 +1,34 @@ +From 1174d9f5ba537562c67084caf0214544fbb14ffc Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Thu, 21 Jun 2018 14:17:28 +0000 +Subject: [PATCH] lib/repo: Fix 32 bit format string error + +--- + 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 + diff --git a/package/libostree/libostree.hash b/package/libostree/libostree.hash index 9ee0c7bdb2..c694a90e22 100644 --- a/package/libostree/libostree.hash +++ b/package/libostree/libostree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ad0f5a0e7a7f22f87c72b318b2cfdbe8cf908a1a469ec94eb72984bbb3690261 libostree-2018.5.tar.xz +sha256 8dd49a1ab94924e351ff9cfd8ea2bf725770400900f4875ad2cc95712c6cc905 libostree-2018.6.tar.xz sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk index ddb230517b..bf5118413b 100644 --- a/package/libostree/libostree.mk +++ b/package/libostree/libostree.mk @@ -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)