From patchwork Sun Dec 16 17:01:40 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: 206717 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 848BA2C007B for ; Mon, 17 Dec 2012 04:03:14 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 98C6CA014D; Sun, 16 Dec 2012 17:03:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lBLsb+qufYJd; Sun, 16 Dec 2012 17:03:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 32538A0122; Sun, 16 Dec 2012 17:02:37 +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 C36E98F74B for ; Sun, 16 Dec 2012 17:02:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4A0CA80C10 for ; Sun, 16 Dec 2012 17:02:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XABBz8sxZ6LR for ; Sun, 16 Dec 2012 17:02:22 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id 4240680C0E for ; Sun, 16 Dec 2012 17:02:22 +0000 (UTC) Received: by mail-wi0-f171.google.com with SMTP id hn14so1458641wib.10 for ; Sun, 16 Dec 2012 09:02:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:in-reply-to:references; bh=afv0l41UqEkKwVP2ZVjKOKNtnN4FZSdgzEL51Yj7byg=; b=XZmgXyxCZQ2YDFubbQ8YW89QGecTK8AIZpNhyCqiLUkda/aHbheMEhiJV5usvsYF0z eHQTcdNx0nzxNv7F4yNzBemqqv92zzxk7zgXoYm42tAzEdPBsQh4DJrNy65vcLCGbv3q eZDGIQA/a3lCdEiHMd//gzLJEEPN6x87kXHzWzvWFwBWSCJ5kyIuW2/JM/ZXxshrp0tT mGNBkkt1KysO4n8zTXiiE/Y51IMrXjfJl/kGOwiqFUbKQJOyW3tH/bgNwd0ZN+FbctFd /Tdnn6CUc5iV0gOh56IQ+Ncfqkj8GemSGvfISgPdnxjwosVG5TtvoMFZAlEQyAoNlI2Y Hxyw== X-Received: by 10.180.24.70 with SMTP id s6mr11579814wif.22.1355677340607; Sun, 16 Dec 2012 09:02:20 -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 w5sm7363031wif.11.2012.12.16.09.02.18 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 16 Dec 2012 09:02:19 -0800 (PST) From: "Yann E. MORIN" To: buildroot@busybox.net Date: Sun, 16 Dec 2012 18:01:40 +0100 Message-Id: X-Mailer: git-send-email 1.7.2.5 In-Reply-To: References: In-Reply-To: References: Cc: "Yann E. MORIN" Subject: [Buildroot] [PATCH 11/27] 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 41e71da..d64d476 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 \