From patchwork Fri Sep 8 14:00:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcus Folkesson X-Patchwork-Id: 811611 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="rWKIMoRO"; 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 3xpf9v2pTCz9s7G for ; Sat, 9 Sep 2017 00:01:07 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 7B07E8A1A7; Fri, 8 Sep 2017 14:01:02 +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 fOBBVOgvb38y; Fri, 8 Sep 2017 14:01:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id F0E0F8A03A; Fri, 8 Sep 2017 14:01:00 +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 4D3551C1627 for ; Fri, 8 Sep 2017 14:00:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 46EE98A03A for ; Fri, 8 Sep 2017 14:00:59 +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 2NmTwSQ68KKV for ; Fri, 8 Sep 2017 14:00:58 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf0-f45.google.com (mail-lf0-f45.google.com [209.85.215.45]) by hemlock.osuosl.org (Postfix) with ESMTPS id A3BB18A025 for ; Fri, 8 Sep 2017 14:00:57 +0000 (UTC) Received: by mail-lf0-f45.google.com with SMTP id 80so5879491lfy.4 for ; Fri, 08 Sep 2017 07:00:57 -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=r2T5ZIxHDZ9DiICt+KZBj3/zSfF86exzOPGixcu1fTA=; b=rWKIMoROjwKhn6f13euBQfIZ7nXwj6lyhZRlKPcxiIO6TnlQkNHFB0T2eP6YQmbrXd 1PSk0OocqNywNHorxnG1TxYt0fdZZiLA6R+i/GfgBIZVB5hig+SUgxy+7pTEwgIr8YdL PbN5KL69o6Tg++z0sdsqCFHiThIpsGmnWyxs2cqB2VcTVjUAWQLBfsALAO9erkgm4oos txejTt5RfFqCpg69jzAELVpFi5Ich0NpXmJ/P0rv5EHCjGrS5dYNY0xDEmr7y52WHCzq pAYxje8ZYgMQuJO5W9u7DD7HPkCf5UuDQ0M+cvD9aBwH4pqsLunRm/g6ZoomsC3/y6cB Zxfg== 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=r2T5ZIxHDZ9DiICt+KZBj3/zSfF86exzOPGixcu1fTA=; b=PHdFyDVIbWjvbtTcLzdj/w3rybk7nRWGgQTySpba0/b7O8Q0lE/Cq9hkA0nv+xc2ls QAimPYfwWtNSQFFlQDRpDU5oYzmJZacfwzcQaABiAhXr++WT8yS0wcQO5+XwR+wGb2yK HGDlCWzX88jKW2k0Rjli3d1DAR4hT3Q25Gz+f3QrRVZlpjnJ5b7cQ7CzjFGBuvaNbwpY o2CWarSN5zkr3HqHkKUQz6QTjxVtiObu2FVLMZoY7G1ODfH8ffixqln3Y//VDQNf9PFC Kh0mnGV4n/h7u9BnUyhhTmZFjlkqCD2SnIELfSDU8UD9jG457tseKInMVKCqW4eJgb99 xqsg== X-Gm-Message-State: AHPjjUilzxMfTKuzHQCdahIUdAJ8Ro+HofIwF0nNgEibCVyN3yGbtbVH Frunup1tihqmyH05 X-Google-Smtp-Source: AOwi7QCC11HuAzhkkH7XIytRjrXdmK4ofvJ2hYzvJALK8FO5fPlfIOyRCJ5RlSYTqRv3btZDhdxR4A== X-Received: by 10.25.22.37 with SMTP id m37mr986039lfi.185.1504879255686; Fri, 08 Sep 2017 07:00:55 -0700 (PDT) Received: from localhost.localdomain (c-2ec25650-74736162.cust.telenor.se. [46.194.86.80]) by smtp.gmail.com with ESMTPSA id f1sm340667ljf.9.2017.09.08.07.00.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Sep 2017 07:00:54 -0700 (PDT) From: Marcus Folkesson To: buildroot@buildroot.org Date: Fri, 8 Sep 2017 16:00:45 +0200 Message-Id: <20170908140045.1763-1-marcus.folkesson@gmail.com> X-Mailer: git-send-email 2.13.1 Cc: Marcus Folkesson Subject: [Buildroot] [PATCH v3] libostree: new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 --- 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 + ...Use-autoreconf-from-the-build-environment.patch | 42 ++++++++++++++++++++++ package/libostree/Config.in | 12 +++++++ package/libostree/libostree.mk | 22 ++++++++++++ 5 files changed, 80 insertions(+) create mode 100644 package/libostree/0001-Use-autoreconf-from-the-build-environment.patch create mode 100644 package/libostree/Config.in create mode 100644 package/libostree/libostree.mk diff --git a/DEVELOPERS b/DEVELOPERS index f3944e2748..a1cfd9e1bb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1100,6 +1100,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 a0868d92ee..6b4967fef9 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1877,6 +1877,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/0001-Use-autoreconf-from-the-build-environment.patch b/package/libostree/0001-Use-autoreconf-from-the-build-environment.patch new file mode 100644 index 0000000000..36d9b3f15e --- /dev/null +++ b/package/libostree/0001-Use-autoreconf-from-the-build-environment.patch @@ -0,0 +1,42 @@ +From e4b940cc02776edee63c5a706746dc237862151d Mon Sep 17 00:00:00 2001 +From: Marcus Folkesson +Date: Wed, 30 Aug 2017 19:20:35 +0200 +Subject: [PATCH] Use autoreconf from the build environment + +OSTree workarounds a bug in automake in their autogen.sh file. +Use the script but do not call autoreconf from it. + +Signed-off-by: Marcus Folkesson +--- + autogen.sh | 11 ----------- + 1 file changed, 11 deletions(-) + +diff --git a/autogen.sh b/autogen.sh +index 17f6abf4..0dfbb15a 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -6,12 +6,6 @@ test -n "$srcdir" || srcdir=. + olddir=`pwd` + cd $srcdir + +-AUTORECONF=`which autoreconf` +-if test -z $AUTORECONF; then +- echo "*** No autoreconf found, please install it ***" +- exit 1 +-fi +- + set -e + + mkdir -p m4 +@@ -37,8 +31,3 @@ sed -e 's,$(libbsdiff_srcpath),bsdiff,g' < bsdiff/Makefile-bsdiff.am >bsdiff/Mak + + # FIXME - figure out how to get aclocal to find this by default + ln -sf ../libglnx/libglnx.m4 buildutil/libglnx.m4 +- +-autoreconf --force --install --verbose +- +-cd $olddir +-test -n "$NOCONFIGURE" || "$srcdir/configure" "$@" +-- +2.13.1 + diff --git a/package/libostree/Config.in b/package/libostree/Config.in new file mode 100644 index 0000000000..520e76ce6a --- /dev/null +++ b/package/libostree/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_LIBOSTREE + bool "libostree" + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_PKGCONF + select BR2_PACKAGE_XZ + select BR2_PACKAGE_E2FSPROGS + select BR2_PACKAGE_LIBFUSE + select BR2_PACKAGE_LIBGPGME + help + OSTree is an upgrade system for Linux-based operating systems. + + https://ostree.readthedocs.io/en/latest/ diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk new file mode 100644 index 0000000000..75ee53f01c --- /dev/null +++ b/package/libostree/libostree.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# libostree +# +################################################################################ + +LIBOSTREE_VERSION = v2017.10 +LIBOSTREE_SITE = https://github.com/ostreedev/ostree.git +LIBOSTREE_SITE_METHOD = git +LIBOSTREE_GIT_SUBMODULES = yes +LIBOSTREE_LICENSE = GPLv2 +LIBOSTREE_LICENSE_FILES = COPYING +LIBOSTREE_AUTORECONF = YES +LIBOSTREE_DEPENDENCIES = libgpgme libglib2 xz libfuse pkgconf e2fsprogs + +# Use their special autogen.sh script to workaround automake bug with subdir-objects and computed paths +define LIBOSTREE_RUN_AUTOGEN + cd $(@D) && PATH=$(BR_PATH) ./autogen.sh +endef +LIBOSTREE_PRE_CONFIGURE_HOOKS += LIBOSTREE_RUN_AUTOGEN + +$(eval $(autotools-package))