From patchwork Sun Nov 12 21:06:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcus Folkesson X-Patchwork-Id: 837275 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="kbKcU0s9"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yZmXk3P3Wz9sPs for ; Mon, 13 Nov 2017 08:06:30 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 1F74E884D8; Sun, 12 Nov 2017 21:06:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GGfcZJx4+wah; Sun, 12 Nov 2017 21:06:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id DB59088327; Sun, 12 Nov 2017 21:06:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 9FA8C1CEBF0 for ; Sun, 12 Nov 2017 21:06:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 9AC0188327 for ; Sun, 12 Nov 2017 21:06:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eJn1NcOwWdun for ; Sun, 12 Nov 2017 21:06:17 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf0-f66.google.com (mail-lf0-f66.google.com [209.85.215.66]) by hemlock.osuosl.org (Postfix) with ESMTPS id 31F7E882F7 for ; Sun, 12 Nov 2017 21:06:17 +0000 (UTC) Received: by mail-lf0-f66.google.com with SMTP id e143so16196890lfg.12 for ; Sun, 12 Nov 2017 13:06:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=e3clvqhjaKvLutgu+VOfXLfJCvPTnJsuJNBvD6tB5gc=; b=kbKcU0s9HdXulNXE2/817rVL5y8GHvC6wMziXwXO+C0zxKl55xc32LCk6KYiOykY55 sHRQtP7UR9E8CFKUQsL90mj2pPKKLZb8FxQjw29uZ4iwCBqA/NdIrfQIDs2qB5ayzaY9 qmkUIYObAoref4ALAvBl3/UOa2W5SZgHuOpefh2ouMU78yCRGJtgpW/WufD+HEcFG0cQ hSSKLWXpIS84lu7AoB2bfUr6IOff+l4PgJItsFoQSfMo1tz5mB8bnFj7Ld3pDnmWcL/B 0q4ZES9T811+JdCYhPWVR7W1UYHtKcpZOYaRLVi2KOJ2sHeNCtb+qap/yxZI2Cf5qJCN Ci5Q== 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=e3clvqhjaKvLutgu+VOfXLfJCvPTnJsuJNBvD6tB5gc=; b=hjhbmxK4RlxZGIrYi+OjFmUqAJFHKzt+RfoUQExqpFFdmRdFFRiOtuzBovztA10Pt9 9MbDVypXvCmtEydB6B6eVP1W4tjJtAZQQF2VeG9xddXIe1wXT0u8WI/HV9XUejr3FKLj 2AjjjySxwZrI8Q8MeEurcDfm8QvMwjpYUU3tqeDUlI/S4vZREgsqBHC1ovNmvx5aUq0N t376Ppvm6Yr35vW9CparTH855et8a47f5YvZIm35xlBSQ4eudeoFRFgtl+JP75GrU3qV DwdjwHEiCRZlwlePMMtZeuL8DJj3ZbK+gzQEKhxCQhcWJvg5IY/ixi+EGeazpmkFK/n0 9KTA== X-Gm-Message-State: AJaThX7SlrihLU/KRW9GtdKuxg64OvEoLmV8EHhsnZTQ2HFEOnfB7yFL XOH1FpQy2+W7Xg+oN3cgZ0BFQw== X-Google-Smtp-Source: AGs4zMZ2PvYO5H4mlzTiRwJe4bT6k4RRJ0g1Ec/X/9dWQe4oVs9qJm4HLqzvoMpXkKTas8m3gUU9fQ== X-Received: by 10.25.79.14 with SMTP id d14mr653794lfb.174.1510520775176; Sun, 12 Nov 2017 13:06:15 -0800 (PST) Received: from localhost.localdomain (scandic863.host.songnetworks.se. [212.214.188.230]) by smtp.gmail.com with ESMTPSA id 62sm1422883lfw.31.2017.11.12.13.06.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 12 Nov 2017 13:06:12 -0800 (PST) From: Marcus Folkesson To: buildroot@buildroot.org, bernd.kuhls@t-online.de Date: Sun, 12 Nov 2017 22:06:09 +0100 Message-Id: <20171112210609.12275-1-marcus.folkesson@gmail.com> X-Mailer: git-send-email 2.13.1 Subject: [Buildroot] [PATCH v8] libostree: new package 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@gmail.com MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" OSTree is an upgrade system for Linux-based operating systems Signed-off-by: Marcus Folkesson --- v8: - fix typo in comment v7: Fix comments from Bernd Kuhls: - add "comment"-section in Config.in - add hash of the license file v6: - Rearrange logic for curl and libsoup check v5: Fix comments from Bernd Kuhls: - use tarball provided by upstream - propagate dependencies - set optional dependencies - depend on !musl v4: - bump version to 2017.12 v3: - move with the package within Config.in to match the chronological order (the former name was just 'ostree') v2: - add e2fsprogs as dependency DEVELOPERS | 3 ++ package/Config.in | 1 + package/libostree/Config.in | 26 ++++++++++++++++++ package/libostree/libostree.hash | 3 ++ package/libostree/libostree.mk | 59 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 92 insertions(+) create mode 100644 package/libostree/Config.in create mode 100644 package/libostree/libostree.hash create mode 100644 package/libostree/libostree.mk diff --git a/DEVELOPERS b/DEVELOPERS index ddd675ea3a..1652c05c10 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1002,6 +1002,9 @@ F: package/turbolua/ N: Marcin Nowakowski F: package/libkcapi/ +N: Marcus Folkesson +F: package/libostree/ + N: Marek Belisko F: package/libatasmart/ F: package/polkit/ diff --git a/package/Config.in b/package/Config.in index fe5ccc434e..0a9582addf 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1916,6 +1916,7 @@ menu "System tools" source "package/keyutils/Config.in" source "package/kmod/Config.in" source "package/kvmtool/Config.in" + source "package/libostree/Config.in" source "package/lxc/Config.in" source "package/monit/Config.in" source "package/ncdu/Config.in" diff --git a/package/libostree/Config.in b/package/libostree/Config.in new file mode 100644 index 0000000000..2edd8664a4 --- /dev/null +++ b/package/libostree/Config.in @@ -0,0 +1,26 @@ +config BR2_PACKAGE_LIBOSTREE + bool "libostree" + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpgme + depends on !BR2_STATIC_LIBS # libfuse + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_USE_MMU # e2fsprogs, libfuse,libglib2, libgpgme + + # doesn't build with musl due to lack of TEMP_FAILURE_RETRY() + depends on !BR2_TOOLCHAIN_USES_MUSL + + select BR2_PACKAGE_E2FSPROGS + select BR2_PACKAGE_LIBFUSE + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBGPGME + select BR2_PACKAGE_XZ + help + OSTree is an upgrade system for Linux-based operating systems. + + https://ostree.readthedocs.io/en/latest/ + +comment "libostree needs a uClibc or glibc toolchain w/ threads, dynamic library, wchar" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ + || !BR2_USE_WCHAR || BR2_TOOLCHAIN_USES_MUSL + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS + depends on BR2_USE_MMU diff --git a/package/libostree/libostree.hash b/package/libostree/libostree.hash new file mode 100644 index 0000000000..7acc04e3e8 --- /dev/null +++ b/package/libostree/libostree.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 fc409f04c9fd440b83b4fa324f3b912cbf61145389378d44254b8b191c9fef08 libostree-2017.12.tar.xz +sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk new file mode 100644 index 0000000000..0d8bc9bccd --- /dev/null +++ b/package/libostree/libostree.mk @@ -0,0 +1,59 @@ +################################################################################ +# +# libostree +# +################################################################################ + +LIBOSTREE_VERSION = 2017.12 +LIBOSTREE_SOURCE = libostree-$(LIBOSTREE_VERSION).tar.xz +LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOSTREE_VERSION) + +LIBOSTREE_LICENSE = GPLv2 +LIBOSTREE_LICENSE_FILES = COPYING +LIBOSTREE_DEPENDENCIES = e2fsprogs host-pkgconf libfuse libglib2 libgpgme xz + +LIBOSTREE_CONF_OPTS += --with-gpgme-prefix=$(STAGING_DIR)/usr + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +LIBOSTREE_CONF_OPTS += --with-openssl +LIBOSTREE_DEPENDENCIES += openssl +else +LIBOSTREE_CONF_OPTS += --without-openssl +endif + +ifeq ($(BR2_PACKAGE_AVAHI),y) +LIBOSTREE_CONF_OPTS += --with-avahi +LIBOSTREE_DEPENDENCIES += avahi +else +LIBOSTREE_CONF_OPTS += --without-avahi +endif + +#cURL depends on libsoup +ifeq ($(BR2_PACKAGE_LIBSOUP),y) +LIBOSTREE_CONF_OPTS += --with-libsoup +LIBOSTREE_DEPENDENCIES += libsoup +ifeq ($(BR2_PACKAGE_LIBCURL),y) +LIBOSTREE_CONF_OPTS += --with-curl +LIBOSTREE_DEPENDENCIES += libcurl +else +LIBOSTREE_CONF_OPTS += --without-curl +endif +else +LIBOSTREE_CONF_OPTS += --without-libsoup --without-curl +endif + +ifeq ($(BR2_PACKAGE_LIBARCHIVE),y) +LIBOSTREE_CONF_OPTS += --with-libarchive +LIBOSTREE_DEPENDENCIES += libarchive +else +LIBOSTREE_CONF_OPTS += --without-libarchive +endif + +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +LIBOSTREE_CONF_OPTS += --with-selinux +LIBOSTREE_DEPENDENCIES += libselinux +else +LIBOSTREE_CONF_OPTS += --without-selinux +endif + +$(eval $(autotools-package))