From patchwork Sat Jul 21 18:32:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcus Folkesson X-Patchwork-Id: 947410 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.138; helo=whitealder.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="WXHRRhUF"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41XxFZ4j32z9s2P for ; Sun, 22 Jul 2018 04:32:49 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7177381FDA; Sat, 21 Jul 2018 18:32:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5ccBtROKTKUw; Sat, 21 Jul 2018 18:32:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 27C3481FAA; Sat, 21 Jul 2018 18:32:45 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 8383D1C1283 for ; Sat, 21 Jul 2018 18:32:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 806A481FAA for ; Sat, 21 Jul 2018 18:32:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id y5iGCNh1s0VN for ; Sat, 21 Jul 2018 18:32:43 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) by whitealder.osuosl.org (Postfix) with ESMTPS id 837DE81F0F for ; Sat, 21 Jul 2018 18:32:43 +0000 (UTC) Received: by mail-lf1-f43.google.com with SMTP id y200-v6so3832715lfd.7 for ; Sat, 21 Jul 2018 11:32:43 -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=qDJ1k+Dsz6aCto6od7BD4shKiREYib2ID5Cdzi3eVlc=; b=WXHRRhUF0mVVWXOYS3wVKi/PQXOG44oyrjBB6KkXbtPEv44m24PfI8l8znD49qC9gj tVsQHID/+75Vl5a8gRNt9829ePk79g4sBUwGYY0mUH/7+O37O9XCyGCn6YyiP6ZJYpU6 gS97eRGFPo/m8ydB3wmY1bcFHe2wRnQkRzkKA+njWrGZ7SebpgDc0hOPJ6ZEVkY55vjm 59HChZQsORnK4nGKNfdMGglC78SklsXEeOyy5T1nhdsMaXyqkhRclhnKb2hgeGPo85Fa XDnFFLm2xu0C9rCiBDELCplDQ/WmB2ic6RopnpQ0rumiBwcliG7VMg8WcTOn52fastpa N4UQ== 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=qDJ1k+Dsz6aCto6od7BD4shKiREYib2ID5Cdzi3eVlc=; b=MNfOx7lbOB2rRLp9/I/naANXO0Mnecc3Yn7dIViwlPf/8WpDaucEut95Q4llhptM4f 285opMcgmcM5rd0D4m+GS95AzgeUxMSq0VrrevIfM4b3eOrCifOM0VUjQash7ptla5fC sDU9etO3kFfMYGUjys65efFjH/5qRRSMlq3DnDmQyjY4qC+YEVJUvLGxLDYa7REFTMTP ArCR9F+Zz7xEHzw23bu7GKJWdhbTsADy8Ib1cVOzlDjOmvcK8qXu6/T5Qcdsx/3CY1Cp lbDjqqb8Bop59bC1LccM62xjVLkycjNgWnzecJZmKl2sc+4jbq2VA2Nw25gX3jmPwqaM GB6Q== X-Gm-Message-State: AOUpUlGEMan2HM1CNVmIMq1xBknYj4+TGpps4CXq34/rZqSHErAY7x2F RBdOxMS4mwTEkmwaG/xtGZMuU2Ch X-Google-Smtp-Source: AAOMgpehN3e8A8lI8mfF40ca6KOYp9g7LihmLFwDfgq20I/qiX3lbFnuWj/A12gGT1igJCQw4scLMQ== X-Received: by 2002:a19:4d0a:: with SMTP id a10-v6mr3712052lfb.5.1532197961336; Sat, 21 Jul 2018 11:32:41 -0700 (PDT) Received: from localhost.localdomain (c-2ec2cfda-74736162.cust.telenor.se. [46.194.207.218]) by smtp.gmail.com with ESMTPSA id u8-v6sm966148ljh.52.2018.07.21.11.32.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Jul 2018 11:32:40 -0700 (PDT) From: Marcus Folkesson To: buildroot@buildroot.org Date: Sat, 21 Jul 2018 20:32:34 +0200 Message-Id: <20180721183234.15393-1-marcus.folkesson@gmail.com> X-Mailer: git-send-email 2.18.0 Subject: [Buildroot] [PATCH] libostree: bump to version 2018.7 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" Signed-off-by: Marcus Folkesson --- ...-repo-Fix-32-bit-format-string-error.patch | 35 --------------- ...-soup-to-build-process-when-configur.patch | 45 ------------------- package/libostree/libostree.hash | 2 +- package/libostree/libostree.mk | 4 +- 4 files changed, 2 insertions(+), 84 deletions(-) delete mode 100644 package/libostree/0001-lib-repo-Fix-32-bit-format-string-error.patch delete mode 100644 package/libostree/0002-build-add-ostree-soup-to-build-process-when-configur.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 deleted file mode 100644 index d74afcd412..0000000000 --- a/package/libostree/0001-lib-repo-Fix-32-bit-format-string-error.patch +++ /dev/null @@ -1,35 +0,0 @@ -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 - -Signed-off-by: Marcus Folkesson ---- - 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/0002-build-add-ostree-soup-to-build-process-when-configur.patch b/package/libostree/0002-build-add-ostree-soup-to-build-process-when-configur.patch deleted file mode 100644 index b89bd743a1..0000000000 --- a/package/libostree/0002-build-add-ostree-soup-to-build-process-when-configur.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 1cd86d4978ad32405b41f864e11ac21a2474c2f3 Mon Sep 17 00:00:00 2001 -From: Marcus Folkesson -Date: Tue, 3 Jul 2018 10:02:46 +0200 -Subject: [PATCH] build: add ostree-soup-* to build process when configured - with avahi - -Avoid getting these link errors: - ./.libs/libostree-1.so: undefined reference to `soup_uri_set_path' - ./.libs/libostree-1.so: undefined reference to `soup_uri_new' - ./.libs/libostree-1.so: undefined reference to `soup_uri_free' - ./.libs/libostree-1.so: undefined reference to `soup_uri_set_scheme' - ./.libs/libostree-1.so: undefined reference to `soup_uri_to_string' - ./.libs/libostree-1.so: undefined reference to `soup_uri_set_host' - ./.libs/libostree-1.so: undefined reference to `soup_uri_set_port' - collect2: error: ld returned 1 exit status - -Reproduce with: - ./configure --with-avahi --without-soup - -Signed-off-by: Marcus Folkesson ---- - Makefile-libostree.am | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/Makefile-libostree.am b/Makefile-libostree.am -index 01a209d1..dbc9ebb8 100644 ---- a/Makefile-libostree.am -+++ b/Makefile-libostree.am -@@ -238,6 +238,13 @@ if USE_LIBSOUP - libostree_1_la_SOURCES += src/libostree/ostree-fetcher-soup.c - libostree_1_la_CFLAGS += $(OT_INTERNAL_SOUP_CFLAGS) - libostree_1_la_LIBADD += $(OT_INTERNAL_SOUP_LIBS) -+else -+if USE_AVAHI -+libostree_1_la_SOURCES += src/libostree/ostree-soup-uri.h \ -+ src/libostree/ostree-soup-uri.c \ -+ src/libostree/ostree-soup-form.c \ -+ $(NULL) -+endif - endif - endif - --- -2.18.0 - diff --git a/package/libostree/libostree.hash b/package/libostree/libostree.hash index c694a90e22..2d501ccf93 100644 --- a/package/libostree/libostree.hash +++ b/package/libostree/libostree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8dd49a1ab94924e351ff9cfd8ea2bf725770400900f4875ad2cc95712c6cc905 libostree-2018.6.tar.xz +sha256 483e359fd934f3fb1abde2cd8ff9c5bccb97e2a37d52ed8bedfa9ab1290883d9 libostree-2018.7.tar.xz sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk index 69e84343e9..24eda0d1db 100644 --- a/package/libostree/libostree.mk +++ b/package/libostree/libostree.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOSTREE_VERSION = 2018.6 +LIBOSTREE_VERSION = 2018.7 LIBOSTREE_SOURCE = libostree-$(LIBOSTREE_VERSION).tar.xz LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOSTREE_VERSION) @@ -12,8 +12,6 @@ LIBOSTREE_LICENSE = LGPL-2.0+ LIBOSTREE_LICENSE_FILES = COPYING LIBOSTREE_DEPENDENCIES = e2fsprogs host-bison host-pkgconf libfuse libglib2 libgpgme xz LIBOSTREE_INSTALL_STAGING = YES -# For 0002-build-add-ostree-soup-to-build-process-when-configur.patch -LIBOSTREE_AUTORECONF = YES LIBOSTREE_CONF_OPTS += \ --with-gpgme-prefix=$(STAGING_DIR)/usr \