From patchwork Mon Dec 19 15:26:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 707131 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tj4Wy48vJz9sDG for ; Tue, 20 Dec 2016 02:26:38 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ifPaQUfP"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id BB42C843A8; Mon, 19 Dec 2016 15:26:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YuA9xzgvbmLL; Mon, 19 Dec 2016 15:26:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0957384AAB; Mon, 19 Dec 2016 15:26:32 +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 5003A1BFEBB for ; Mon, 19 Dec 2016 15:26:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 4C36188C3D for ; Mon, 19 Dec 2016 15:26:30 +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 AOBpz4ru-eFA for ; Mon, 19 Dec 2016 15:26:27 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wj0-f194.google.com (mail-wj0-f194.google.com [209.85.210.194]) by hemlock.osuosl.org (Postfix) with ESMTPS id 833C788BA2 for ; Mon, 19 Dec 2016 15:26:27 +0000 (UTC) Received: by mail-wj0-f194.google.com with SMTP id he10so24103930wjc.2 for ; Mon, 19 Dec 2016 07:26:27 -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=9zbMfLRliY70HSKC9nViPZVcp1WladaxqSP418GKo84=; b=ifPaQUfPgMCzdu8ZZqitECGEhQz4QBzjWretNNMjeGkb9LbpqOeh7JfMiZEoKMVvwq ihsH/VXR+Z/jTFAJqrdbiCi+XhBJ5EhbFwUurFXB4+FZ4mpyMWIfaA5UHq7NLMgD1mQm qKW9uTvZmCRkSeAoTmbcShZ4NTszHLc08LeICDFiod/khUcz3u4sHKtpMXNrbZu5L6QW AQATOZU+ALNsLcmx8L8mKuGil34XJ4roeupTKgZdcHCDvfpebqp9+6++V2KxY3yURAD5 Hy/tvw0DgWmGN/bJxfpzK6LssDp81GqfwJNwGSmy+0BOjNYLO7NZpmjay4+SVi65n9YS B2yg== 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=9zbMfLRliY70HSKC9nViPZVcp1WladaxqSP418GKo84=; b=B03dhilfXLA5dpXYPilWETChhBsftuh7eDjndfZxvys02yuQlgwJyiSFQWzRX+oSiI vzYupXy/5ak9w9W36N9VYW9gHod1bWnMs6E6CaoIh9edS7qTnIVkHrvkrwX1JUiwiPIS sAabUsrkI4bWNoTLrhku6Vp10Tgx+K4H90uAnw75+pECm5dtNyZs+CZxA1Un6HoHRSpS N9CBOKaUw1M4MUz7/G8/oFFzm6JDGDXZ6HFOr1eN4lsDhjCBTe4apseOMIdZlj1CVr9H 6M0Lrk2i3rM/P4jNJ7ONEvzpiwN+SxPttCyeBBrXjbjCESC8a15pU4YnExYgyWZgDGpi g/rA== X-Gm-Message-State: AKaTC00TDGLgPnfWmrXemmR/1RIZnGqRx5wb/ZXHH3EZIl+39Hk0Mwp1nG4mDacqMSnhzw== X-Received: by 10.194.191.161 with SMTP id gz1mr14325741wjc.22.1482161185938; Mon, 19 Dec 2016 07:26:25 -0800 (PST) Received: from r-x-uffo8396.rd.francetelecom.fr (ARennes-654-1-115-187.w2-13.abo.wanadoo.fr. [2.13.98.187]) by smtp.gmail.com with ESMTPSA id kp5sm21144762wjb.8.2016.12.19.07.26.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 19 Dec 2016 07:26:24 -0800 (PST) From: Fabrice Fontaine X-Google-Original-From: Fabrice Fontaine To: buildroot@buildroot.org Date: Mon, 19 Dec 2016 16:26:18 +0100 Message-Id: <1482161178-20667-1-git-send-email-fabrice.fontaine@orange.com> X-Mailer: git-send-email 2.7.4 Cc: Fabrice Fontaine Subject: [Buildroot] [PATCH v2,1/1] lxc: add dependency on gnutls 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" lxc can use gnutls for various checksumming so add a dependency on it if package is selected Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Thomas Petazzoni): - Get upstream patch that add --enable-gnutls option package/lxc/lxc.hash | 1 + package/lxc/lxc.mk | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash index 7b34e88..8fb4dc0 100644 --- a/package/lxc/lxc.hash +++ b/package/lxc/lxc.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 7c292cd0055dac1a0e6fbb6a7740fd12b6ffb204603c198faf37c11c9d6dcd7a lxc-2.0.6.tar.gz +sha256 e8ca30fb1e8d6dbafb5cccc04b3fd1784c35bc8ccf79112036e5166924b6b01d 64fa248372c90c9d98fc9d67f80327d865c11a48.patch diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index e9e925f..34a8556 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -9,10 +9,24 @@ LXC_SITE = https://linuxcontainers.org/downloads/lxc LXC_LICENSE = LGPLv2.1+ LXC_LICENSE_FILES = COPYING LXC_DEPENDENCIES = libcap host-pkgconf +# we're patching configure.ac +LXC_AUTORECONF = YES + +# This patch adds --enable-gnutls option +LXC_PATCH = \ + https://github.com/lxc/lxc/commit/64fa248372c90c9d98fc9d67f80327d865c11a48.patch + LXC_CONF_OPTS = --disable-apparmor --with-distro=buildroot \ --disable-python --disable-werror \ $(if $(BR2_PACKAGE_BASH),,--disable-bash) +ifeq ($(BR2_PACKAGE_GNUTLS),y) +LXC_CONF_OPTS += --enable-gnutls +LXC_DEPENDENCIES += gnutls +else +LXC_CONF_OPTS += --disable-gnutls +endif + ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) LXC_CONF_OPTS += --enable-seccomp LXC_DEPENDENCIES += libseccomp