From patchwork Wed Nov 28 23:54:23 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: 202593 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 595C42C0082 for ; Thu, 29 Nov 2012 10:57:40 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 06CAAA0286; Wed, 28 Nov 2012 23:57: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 5i2hGnswuEGR; Wed, 28 Nov 2012 23:57:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id CA1C7A025E; Wed, 28 Nov 2012 23:56:21 +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 7B09B8F74A for ; Wed, 28 Nov 2012 23:55:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5A9A18A9FD for ; Wed, 28 Nov 2012 23:55:38 +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 A35wCsY4SGSS for ; Wed, 28 Nov 2012 23:55:33 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f53.google.com (mail-wg0-f53.google.com [74.125.82.53]) by whitealder.osuosl.org (Postfix) with ESMTPS id 7A0C08AA44 for ; Wed, 28 Nov 2012 23:55:30 +0000 (UTC) Received: by mail-wg0-f53.google.com with SMTP id e12so4689621wge.10 for ; Wed, 28 Nov 2012 15:55:30 -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=1jwDxPH9hDDDm/s1LDlGq+17uMWQhZUNHV671tP/fMM=; b=CzsHoKkRxpCdYZDbL3WaVz9LTdpjY9Fd7O8Sbn2zcE4B++zCSf6UyYFa0ln/f0x1ZR hOAgHWJjG58Bq/xKm3YNJpQJYQkMXTwiNB7k8SpPg4HEPiFdaFCYW5z1psoqsdDTipDm Dsi9Y+24W1ijPSJGnDyqeeTmFBQtf1qMRobZYvhfn25ebMmnp661zDuN9u4COakx0hAZ 8FxMiTkwhIPSv9rnS4O8o6gk+7ipcfB3PpTIwmgGN0O1eOWW1/iBbiZBCsbmtFt5bghi ljBrX8gvIgg6RiUlt8FIcYj80xA/8OlwFE5TG/qf81JqgKV40b2iVjEr6l9TkbLVwT5h xsFA== Received: by 10.216.29.138 with SMTP id i10mr6503289wea.36.1354146930306; Wed, 28 Nov 2012 15:55:30 -0800 (PST) Received: from localhost.localdomain (ARennes-256-1-141-45.w90-32.abo.wanadoo.fr. [90.32.252.45]) by mx.google.com with ESMTPS id i6sm9076156wix.5.2012.11.28.15.55.29 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 28 Nov 2012 15:55:29 -0800 (PST) From: "Yann E. MORIN" To: buildroot@busybox.net Date: Thu, 29 Nov 2012 00:54:23 +0100 Message-Id: <1354146890-27380-25-git-send-email-yann.morin.1998@free.fr> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1354146890-27380-1-git-send-email-yann.morin.1998@free.fr> References: <1354146890-27380-1-git-send-email-yann.morin.1998@free.fr> Cc: "Yann E. MORIN" Subject: [Buildroot] [PATCH 24/51] package/qemu: fix host-qemu variable names 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 With the upcoming introduction of qemu-on-target, we need to properly separate the variables used for the host qemu, from the variables used for the target qemu. Signed-off-by: "Yann E. MORIN" --- package/qemu/qemu.mk | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 36d855e..64be5c7 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -13,7 +13,10 @@ QEMU_LICENSE_FILES = COPYING COPYING.LIB # the non-(L)GPL license texts are specified in the affected # individual source files. -QEMU_DEPENDENCIES = host-pkgconf zlib libglib2 +#------------------------------------------------------------- +# Host-qemu + +HOST_QEMU_DEPENDENCIES = host-pkgconf zlib libglib2 # BR ARCH qemu # ------- ---- @@ -44,20 +47,20 @@ QEMU_DEPENDENCIES = host-pkgconf zlib libglib2 # sh64 not supported # sparc sparc -QEMU_ARCH = $(ARCH) -ifeq ($(QEMU_ARCH),i486) - QEMU_ARCH = i386 +HOST_QEMU_ARCH = $(ARCH) +ifeq ($(HOST_QEMU_ARCH),i486) + HOST_QEMU_ARCH = i386 endif -ifeq ($(QEMU_ARCH),i586) - QEMU_ARCH = i386 +ifeq ($(HOST_QEMU_ARCH),i586) + HOST_QEMU_ARCH = i386 endif -ifeq ($(QEMU_ARCH),i686) - QEMU_ARCH = i386 +ifeq ($(HOST_QEMU_ARCH),i686) + HOST_QEMU_ARCH = i386 endif -ifeq ($(QEMU_ARCH),powerpc) - QEMU_ARCH = ppc +ifeq ($(HOST_QEMU_ARCH),powerpc) + HOST_QEMU_ARCH = ppc endif -HOST_QEMU_TARGETS=$(QEMU_ARCH)-linux-user +HOST_QEMU_TARGETS=$(HOST_QEMU_ARCH)-linux-user define HOST_QEMU_CONFIGURE_CMDS (cd $(@D); $(HOST_CONFIGURE_OPTS) ./configure \