From patchwork Sun Nov 12 20:59:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcus Folkesson X-Patchwork-Id: 837271 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="i0h/DjsU"; 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 3yZmNt4Gnyz9sPs for ; Mon, 13 Nov 2017 07:59:42 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 56430824FC; Sun, 12 Nov 2017 20:59:38 +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 POhOlkfJRz1z; Sun, 12 Nov 2017 20:59:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 3B00B8260B; Sun, 12 Nov 2017 20:59:34 +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 981D91C3EBC for ; Sun, 12 Nov 2017 20:59:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 92D11880E6 for ; Sun, 12 Nov 2017 20:59:32 +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 HBdVEhTZ36bW for ; Sun, 12 Nov 2017 20:59:31 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf0-f68.google.com (mail-lf0-f68.google.com [209.85.215.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id 5C18A827C0 for ; Sun, 12 Nov 2017 20:59:31 +0000 (UTC) Received: by mail-lf0-f68.google.com with SMTP id f134so7878595lfg.8 for ; Sun, 12 Nov 2017 12:59:31 -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=YF6h0y4yCtuzFReXbRpE994YBjIYD388MBB06F7pW3E=; b=i0h/DjsUBVjWCKWO8iYDzD0MoQMapdPs8dzdrAF4Am2vxE14ZCN1VBquOWMjhPGu2m LHv1ecxiYULujKNjB4hFzf00eQl4IxGc+DmsgxvaFvr0oMZXtzAo9nW8xgxI5zptCbS9 vq40fjEgxJr0CK92O7z0Fdmn11M8SiHPjH2MGys9xj9KALZV9xcOaxaXpOGhDuiCai1R OQtgM0iLU0x4/vYCUR+Bo8vPaBi4pYB1+57jMD1wLOaBPlwmGLQDro1Ykdvx9rRbS8sQ tDuCMAd1aPYstHs3+eKWN66izfae4XPoIa/LSo84Ej0EX1pZ945AOmW9ME5sGbrMObDO zu8g== 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=YF6h0y4yCtuzFReXbRpE994YBjIYD388MBB06F7pW3E=; b=MU/8bFDxv9a+Qk2R8pPEEkuui9cGG2sgIaMFqMY99jA+v9CrQViXn5P59nyqMW89PT LmRevoMRDLe9SvbEMTg3j7VEX8GWEuqJ8LVJJSNHw5rz5Lc7PUMvvuKLY43JWN7pPY7l j0npGcnKHixwCTYy36NtBasDeABQMoZluJl+Ri+sECnGoE90lDxuszMKrij3PJcxWU/h se8NlX3joyW3AVX17Ey9bFH5684WXgDOrCv3eqlj7iLtoYdhxsmnvuUXqhN1oz0goS2U KJxG2tFnElJN5S7U2Dr8Z91UXUpJ8aWEVj4PsrISy0kmscwLqVUOFubA6oqoQAeu49cx 3o/A== X-Gm-Message-State: AJaThX7sXpJoksZ2FEOPNwaQhChCRSnaZiZQFkcsQCw/nFw4uIFs52OF NdWgo22riaWfwbmkIzd3HtzUVg== X-Google-Smtp-Source: AGs4zMbUzKOOuBbk0y0tTS4JLLXazSz8/UsFrSed0juEW8U17bg9anIGF9AyVJqIDDxXEZyFAIIfkg== X-Received: by 10.25.103.82 with SMTP id e18mr2179015lfj.56.1510520369292; Sun, 12 Nov 2017 12:59:29 -0800 (PST) Received: from localhost.localdomain (scandic863.host.songnetworks.se. [212.214.188.230]) by smtp.gmail.com with ESMTPSA id a73sm2822947ljf.6.2017.11.12.12.59.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 12 Nov 2017 12:59:28 -0800 (PST) From: Marcus Folkesson To: buildroot@buildroot.org, bernd.kuhls@t-online.de Date: Sun, 12 Nov 2017 21:59:13 +0100 Message-Id: <20171112205913.11579-1-marcus.folkesson@gmail.com> X-Mailer: git-send-email 2.13.1 Subject: [Buildroot] [PATCH v7] 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 --- 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..528824542c --- /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))