From patchwork Sun Aug 12 23:54:09 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: 176823 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id F0B3C2C0087 for ; Mon, 13 Aug 2012 10:00:43 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 55C5724CCB; Mon, 13 Aug 2012 00:00:41 +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 z-WLg7DlwkNU; Mon, 13 Aug 2012 00:00:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id A09F624B91; Mon, 13 Aug 2012 00:00:37 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id C94528F79A for ; Sun, 12 Aug 2012 23:54:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C59B72066B for ; Sun, 12 Aug 2012 23:54:33 +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 ZjFny6dgZD4m for ; Sun, 12 Aug 2012 23:54:33 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from smtp.smtpout.orange.fr (smtp10.smtpout.orange.fr [80.12.242.132]) by silver.osuosl.org (Postfix) with ESMTP id 360EF247A5 for ; Sun, 12 Aug 2012 23:54:33 +0000 (UTC) Received: from treguer.bzh.lan ([90.32.165.248]) by mwinf5d33 with ME id lzuQ1j0055MspoA03zuXJe; Mon, 13 Aug 2012 01:54:32 +0200 From: "Yann E. MORIN" To: buildroot@busybox.net Date: Mon, 13 Aug 2012 01:54:09 +0200 Message-Id: <1344815664-28138-21-git-send-email-yann.morin.1998@free.fr> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1344815664-28138-1-git-send-email-yann.morin.1998@free.fr> References: <1344815664-28138-1-git-send-email-yann.morin.1998@free.fr> Cc: Thomas Petazzoni , "Yann E. MORIN" Subject: [Buildroot] [PATCH 21/36] 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 ea85e5f..8cdcd08 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -118,6 +118,13 @@ config BR2_PACKAGE_QEMU_UUID help Say 'y' here to have QEMU support UUIDs for VMs. +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 3806fa7..17459ba 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -88,6 +88,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 @@ -185,7 +195,6 @@ define QEMU_CONFIGURE_CMDS --disable-guest-base \ --disable-vde \ --disable-linux-aio \ - --disable-cap-ng \ --disable-docs \ --disable-spice \ --disable-rbd \