From patchwork Mon Dec 10 23:44:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 205090 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id A60692C0322 for ; Tue, 11 Dec 2012 10:50:19 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 6B401A014C; Mon, 10 Dec 2012 23:50: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 z4ingwTgnkLx; Mon, 10 Dec 2012 23:50:12 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 8FD07A016A; Mon, 10 Dec 2012 23:48:08 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 2970D8F74B for ; Mon, 10 Dec 2012 23:46:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B2F3B8AA3A for ; Mon, 10 Dec 2012 23:46:49 +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 bacSbnysp0DA for ; Mon, 10 Dec 2012 23:46:36 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-we0-f171.google.com (mail-we0-f171.google.com [74.125.82.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id 7ED3889D86 for ; Mon, 10 Dec 2012 23:45:53 +0000 (UTC) Received: by mail-we0-f171.google.com with SMTP id u3so1789665wey.16 for ; Mon, 10 Dec 2012 15:45:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=2jccWCzLiOxhMbLSMFonoyf/sUTPXLTdq7+WsI1YcLQ=; b=Pk8P+n91WImXzLSGqYYmyFNUMBO0scU+wjkGJwAYY7q4sQBFyXEpnpbDdoSNAOnLZB cERn7ejPLyv8Zzi2+WUt6rYP00sHI5h3/2Oz/fqic2ZuyKwnsS6mHVA3Fe3OMLk8jArB 4RSDgD+khskPOU3Laptv5oIlQEO8LbcCNlTgDmIGRrdJfpXUpZ6uXOgX8o9j2JJ8MWqE tEc+9QyqnVNtacAqFbZw5S+5n14oug9DwE+aXsku59ZoPkcdvHrJ4QnGjB1yi7qeKGYE 5Elxm9glhazxoYzdWMukjq2a+eQGv3NrEmb39emPdo5K5I8GCYMn1Vd8HlVi7EKv54bi ok8w== Received: by 10.180.86.233 with SMTP id s9mr13700403wiz.8.1355183153273; Mon, 10 Dec 2012 15:45:53 -0800 (PST) Received: from localhost.localdomain (ARennes-256-1-41-119.w90-32.abo.wanadoo.fr. [90.32.24.119]) by mx.google.com with ESMTPS id bz12sm13895257wib.5.2012.12.10.15.45.52 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 10 Dec 2012 15:45:52 -0800 (PST) From: "Yann E. MORIN" To: buildroot@busybox.net Date: Tue, 11 Dec 2012 00:44:54 +0100 Message-Id: <1355183112-10735-35-git-send-email-yann.morin.1998@free.fr> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1355183112-10735-1-git-send-email-yann.morin.1998@free.fr> References: <1355183112-10735-1-git-send-email-yann.morin.1998@free.fr> Cc: "Yann E. MORIN" Subject: [Buildroot] [PATCH 34/52] package/qemu: add support for capabilities X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 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-bounces@busybox.net Signed-off-by: "Yann E. MORIN" --- package/qemu/Config.in | 7 +++++++ package/qemu/qemu.mk | 11 ++++++++++- 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/package/qemu/Config.in b/package/qemu/Config.in index 0c4aa0a..1ef6c25 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -124,6 +124,13 @@ config BR2_PACKAGE_QEMU_UUID comment "UUID support requires util-linux (for libuuid)" depends on !BR2_PACKAGE_UTIL_LINUX +config BR2_PACKAGE_QEMU_CAP + bool "Enable capabilities" + select BR2_PACKAGE_LIBCAP + select BR2_PACKAGE_LIBCAP_NG + help + Say 'y' here if you want QEMU to support capabilities. + config BR2_PACKAGE_QEMU_BLOBS bool "Install binary blobs" default y diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 54cbefc..a69ca9d 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -156,6 +156,16 @@ else QEMU_OPTS += --disable-uuid endif +# There's no configure flag to disable use of libcap +# so we must use an environment variable +ifeq ($(BR2_PACKAGE_QEMU_CAP),y) +QEMU_OPTS += --enable-cap-ng +QEMU_DEPENDENCIES += libcap libcap-ng +else +QEMU_OPTS += --disable-cap-ng +QEMU_VARS += cap=no +endif + ifeq ($(BR2_PACKAGE_QEMU_BLOBS),) QEMU_OPTS += --disable-blobs endif @@ -248,7 +258,6 @@ define QEMU_CONFIGURE_CMDS --disable-guest-base \ --disable-vde \ --disable-linux-aio \ - --disable-cap-ng \ --disable-docs \ --disable-spice \ --disable-rbd \