From patchwork Thu Nov 2 11:27:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcus Folkesson X-Patchwork-Id: 833310 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.136; helo=silver.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="L7ji0yAI"; 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 3ySN9c2YX2z9t2M for ; Thu, 2 Nov 2017 22:27:47 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 6C08C2FAD7; Thu, 2 Nov 2017 11:27:43 +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 uhz07UxPipWA; Thu, 2 Nov 2017 11:27:42 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id D3C422C9EF; Thu, 2 Nov 2017 11:27:41 +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 9E4D31C00E9 for ; Thu, 2 Nov 2017 11:27:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 8BF1D8848E for ; Thu, 2 Nov 2017 11:27:39 +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 tG6ADrrMF63l for ; Thu, 2 Nov 2017 11:27:38 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com [209.85.215.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id 3AEB583001 for ; Thu, 2 Nov 2017 11:27:38 +0000 (UTC) Received: by mail-lf0-f65.google.com with SMTP id b190so6043482lfg.9 for ; Thu, 02 Nov 2017 04:27:38 -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=SYs5pp4x8Yw+1+B5O+yZSp+DLCPLT0nPBJ+cQgytoB4=; b=L7ji0yAIqMWdtyNdHUXMuQIKs2++H9hIEzDUlfsoK86pnh/Xvl95yy1GCdaI9Jwyis 1lsmNVJUMHes3pvEKHauikK2NV/IDK2f8ko8Fsa/uOLPqSVv8aS/PLeG+oTaxMjFsCiJ 7AhtNppB/Y2fq/g1yPfYdm1J5Wj42TNXZv/bcUf2vvVM2lhH4BO2TuR6NDsU45fpI5kx ClpeKP70m1iw/UU28vO25ZeO6XMSGdNBx9yc/IRqguSXqbPnk9cH73uj0mizuSMPFqK+ kUhAK9w5nuHruyCGIr1n2NVi2oDXXIocPn064yuiQkHeSzqRPHpTlrDIQ9lsCdmvA7s7 02oA== 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=SYs5pp4x8Yw+1+B5O+yZSp+DLCPLT0nPBJ+cQgytoB4=; b=cUO9tMhgnM+FNwBN7hI5ymzTmt4yRAtOmR0uhV5DrS9pNIqnBeqcz16YJ9xES53xCD OYdq2G69u39OKiiVoqsCcufSacxX+5oAB0QtiQ9Vo7XM3x/h0IfQ/ANvDI5oJ2wuzORs 3THo7IgpGx9r0XFre1vS89IHyooUfnxu8UQ8MNRtrhOlwkhoyC4BOnZg9U83dj/+aqUW 1xP/AYU5RAS6kl+zt/mFKfe3OADCe3vWb3OPpl1yKJR6sUyXZ1HfcvQ2VLX4IkoMQ4bC beNp1J0erPKAKyUysnmuK2EvxQmfX6GgFiW4ULOEm9rAcavJ/Xro90sr9/FfXSeWpzOp W5DQ== X-Gm-Message-State: AJaThX6jwHN81xAhJVX+TCGe6O7Cblr+vzxvFriveZjV7tZoFupsgHEl 4gQfiMIOHpIy/2vOHmLcsQmc1jYu X-Google-Smtp-Source: ABhQp+QH/bqXa1ZpowFngaHgr2hXPbhALSv+ZB+OHa5R9qYCeEPkoqNGwS1fXRCNhy6kBJRUfqv7Fg== X-Received: by 10.25.229.17 with SMTP id c17mr1074657lfh.42.1509622056020; Thu, 02 Nov 2017 04:27:36 -0700 (PDT) Received: from localhost.localdomain (c-5eea375d-74736162.cust.telenor.se. [94.234.55.93]) by smtp.gmail.com with ESMTPSA id q28sm507634lfb.15.2017.11.02.04.27.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Nov 2017 04:27:34 -0700 (PDT) From: Marcus Folkesson To: buildroot@buildroot.org, bernd.kuhls@t-online.de Date: Thu, 2 Nov 2017 12:27:22 +0100 Message-Id: <20171102112722.19414-1-marcus.folkesson@gmail.com> X-Mailer: git-send-email 2.13.1 Subject: [Buildroot] [PATCH v6] 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 --- 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 | 20 ++++++++++++++ package/libostree/libostree.hash | 1 + package/libostree/libostree.mk | 59 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 84 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 632d87a829..c10a62e4f8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -985,6 +985,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 dbfb288d53..c7bec5152b 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..d4a802a6b6 --- /dev/null +++ b/package/libostree/Config.in @@ -0,0 +1,20 @@ +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/ diff --git a/package/libostree/libostree.hash b/package/libostree/libostree.hash new file mode 100644 index 0000000000..b8bdd974c4 --- /dev/null +++ b/package/libostree/libostree.hash @@ -0,0 +1 @@ +sha256 fc409f04c9fd440b83b4fa324f3b912cbf61145389378d44254b8b191c9fef08 libostree-2017.12.tar.xz 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))