From patchwork Wed Oct 24 21:25:48 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: 193978 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 6C1912C008F for ; Thu, 25 Oct 2012 08:30:15 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1DDA38C97B; Wed, 24 Oct 2012 21:30:13 +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 ZOLCQTI-nMaG; Wed, 24 Oct 2012 21:29:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id DD7378C9D7; Wed, 24 Oct 2012 21:28:58 +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 2D0238F74A for ; Wed, 24 Oct 2012 21:26:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B5C3C8C8CA for ; Wed, 24 Oct 2012 21:26:55 +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 Y7yTyXHch7aq for ; Wed, 24 Oct 2012 21:26:45 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f41.google.com (mail-wg0-f41.google.com [74.125.82.41]) by whitealder.osuosl.org (Postfix) with ESMTPS id 798B58C8D4 for ; Wed, 24 Oct 2012 21:26:42 +0000 (UTC) Received: by mail-wg0-f41.google.com with SMTP id ds1so2850707wgb.4 for ; Wed, 24 Oct 2012 14:26:40 -0700 (PDT) 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=7AbWqalw8tUVrtzdQ4cpR89qSnJMeD+l9fRXFjKBmAI=; b=kWiLx8fOWv6ubi5qFBFTKecazqkfOCpZYWDNvbdZp+DLwGAkb0KgSTVRpaJCP+v0gH NzJBIcfL+qPqKVtr09uGWp8bEWsxqs8eNTMULFiVH/csximIO7iXC45Sp2/ggiHSOBKi lpXoFsQfETw6h3SIhIHsH7gPSA8bAbGhJZD4gKK+D8FwUMxUl9bR5QyFGhSp4qx3KsFD 1exjWX3BLjQWv0YRmY+ThVw1/WvesLLzab95rCFUxiGYqkB4gd4IdBGmiu67GbaljcYS KYiwGtPWTCpwhWtUghEOM2K9k5lHv6p2fEf9iKzsci1NhP+qYcHE+hpwp35O0t1jblh1 p7AA== Received: by 10.180.19.71 with SMTP id c7mr5369784wie.2.1351114000738; Wed, 24 Oct 2012 14:26:40 -0700 (PDT) Received: from localhost.localdomain (ARennes-256-1-66-54.w90-32.abo.wanadoo.fr. [90.32.145.54]) by mx.google.com with ESMTPS id hb6sm6371161wib.7.2012.10.24.14.26.40 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 24 Oct 2012 14:26:40 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@busybox.net Date: Wed, 24 Oct 2012 23:25:48 +0200 Message-Id: <1351113973-17237-23-git-send-email-yann.morin.1998@free.fr> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1351113973-17237-1-git-send-email-yann.morin.1998@free.fr> References: <1351113973-17237-1-git-send-email-yann.morin.1998@free.fr> Cc: bjornar.ness@gmail.com, "Yann E. MORIN" Subject: [Buildroot] [PATCH 22/47] package/qemu: add basic target selection 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 | 33 +++++++++++++++++++++++++++++++++ package/qemu/qemu.mk | 21 ++++++++++++++++++--- 2 files changed, 51 insertions(+), 3 deletions(-) diff --git a/package/qemu/Config.in b/package/qemu/Config.in index bd37b34..c8623bf 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -25,3 +25,36 @@ config BR2_PACKAGE_QEMU server and embedded PowerPC, and S390 guests. http://qemu.org/ + +if BR2_PACKAGE_QEMU + +comment "Emulators selection" + +# We need at least one to be selected +config BR2_PACKAGE_QEMU_EMUL_SET + bool + +config BR2_PACKAGE_QEMU_FORCE_SYSTEM + bool + default n if BR2_PACKAGE_QEMU_EMUL_SET + default y if ! BR2_PACKAGE_QEMU_EMUL_SET + select BR2_PACKAGE_QEMU_SYSTEM + +config BR2_PACKAGE_QEMU_SYSTEM + bool "Enable all systems emulation" + help + Say 'y' to build all system emulators/virtualisers that QEMU supports. + +config BR2_PACKAGE_QEMU_LINUX_USER + bool "Enable all Linux user-land emulation" + select BR2_PACKAGE_QEMU_EMUL_SET + help + Say 'y' to build all Linux user-land emulators that QEMU supports. + +config BR2_PACKAGE_QEMU_BSD_USER + bool "Enable all BSD user-land emulation" + select BR2_PACKAGE_QEMU_EMUL_SET + help + Say 'y' to build all BSD user-land emulators that QEMU supports. + +endif # BR2_PACKAGE_QEMU diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 83d8227..14d0505 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -25,6 +25,24 @@ QEMU_VARS = PYTHON=$(HOST_DIR)/usr/bin/python \ PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \ +ifeq ($(BR2_PACKAGE_QEMU_SYSTEM),y) +QEMU_OPTS += --enable-system +else +QEMU_OPTS += --disable-system +endif + +ifeq ($(BR2_PACKAGE_QEMU_LINUX_USER),y) +QEMU_OPTS += --enable-linux-user +else +QEMU_OPTS += --disable-linux-user +endif + +ifeq ($(BR2_PACKAGE_QEMU_BSD_USER),y) +QEMU_OPTS += --enable-bsd-user +else +QEMU_OPTS += --disable-bsd-user +endif + # Note: although QEMU uses a ./configure script, it is not compatible with # the traditional autotools options (eg. --target et al.), so we can # not use the autotools-package infrastructure. So we have to use the @@ -45,9 +63,6 @@ define QEMU_CONFIGURE_CMDS --enable-nptl \ --enable-attr \ --enable-vhost-net \ - --enable-system \ - --enable-linux-user \ - --disable-bsd-user \ --disable-xen \ --disable-slirp \ --disable-sdl \