From patchwork Sun Dec 9 16:35:06 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: 204736 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 3E7302C01FA for ; Mon, 10 Dec 2012 03:40:40 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 18A74A0203; Sun, 9 Dec 2012 16:40:39 +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 dPVLHEHCP69w; Sun, 9 Dec 2012 16:40:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id D9982A0180; Sun, 9 Dec 2012 16:37:10 +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 25C3A8F74B for ; Sun, 9 Dec 2012 16:36:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1164581BA8 for ; Sun, 9 Dec 2012 16:36:12 +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 SeklpV6cR0S1 for ; Sun, 9 Dec 2012 16:36:11 +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 14F6C81B94 for ; Sun, 9 Dec 2012 16:36:10 +0000 (UTC) Received: by mail-we0-f171.google.com with SMTP id u3so1081279wey.16 for ; Sun, 09 Dec 2012 08:36:10 -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=xpfKY9mP7m0eBJhk/69lGbSA18D7JLoXg7CzS233acM=; b=hVmhrOTSXXdrFmZ0lkoziB9Gkhlbs811wJOki9hgQFmbSnGqRwD9IOBClUDkwXebAf EOc0FV4TkQ7My0HULbxaLiIVZwyslA6m6gV7B8dUgwS/zwBsOtFqauZ3aIcztyUGtYRn vX8z4DdO8xWjZT7jAkrWn6YhHOrMdnwcbVYgCIMSwXTDZEl0DYFXZF3EXDr42KgNEPQu OQCk3a4m8drK229ByFF5RWOA8Lc/Xk+E0cnRQjWO+2+SKin50i6ycEPtZDq7FPddbwnA wzqYjvBbWnlBw9LVQtUJ6M3Zo+z++PUJbhgAVbwjiYrat2qvReE8CNsK4jnsXQLW3eUk RHlg== Received: by 10.216.28.199 with SMTP id g49mr3919385wea.177.1355070970575; Sun, 09 Dec 2012 08:36:10 -0800 (PST) Received: from localhost.localdomain (ARennes-256-1-76-30.w90-32.abo.wanadoo.fr. [90.32.155.30]) by mx.google.com with ESMTPS id fv2sm6587947wib.4.2012.12.09.08.36.09 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 09 Dec 2012 08:36:09 -0800 (PST) From: "Yann E. MORIN" To: buildroot@busybox.net Date: Sun, 9 Dec 2012 17:35:06 +0100 Message-Id: <1355070924-8009-34-git-send-email-yann.morin.1998@free.fr> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1355070924-8009-1-git-send-email-yann.morin.1998@free.fr> References: <1355070924-8009-1-git-send-email-yann.morin.1998@free.fr> Cc: "Yann E. MORIN" Subject: [Buildroot] [PATCH 33/51] 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 6daaf98..4045e85 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -126,6 +126,13 @@ config BR2_PACKAGE_QEMU_UUID comment "UUID support requires libuuid (from util-linux)" depends on !BR2_PACKAGE_UTIL_LINUX_LIBUUID +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 29e01d4..12c08e7 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 \