From c97dda34dececca3cc6bf1f15b5f63d027043072 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 16 Sep 2015 20:27:52 +0200
Subject: [PATCH] qemu: enabled x86_64 for build and as target.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---
 config/qemu/qemu               | 10 ++++++++--
 config/rootfiles/packages/qemu |  3 +++
 lfs/qemu                       |  8 ++++----
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/config/qemu/qemu b/config/qemu/qemu
index 64b458a3a4..834eb9c8e1 100644
--- a/config/qemu/qemu
+++ b/config/qemu/qemu
@@ -2,9 +2,15 @@
 #
 # QEMU wrapper to enable kvm as default like old qemu-kvm...
 #
+if [ $(uname -m) = "x86_64" ]; then
+QEMU_SYSTEM=qemu-system-x86_64
+else
+QEMU_SYSTEM=qemu-system-i386
+fi
+
 if [[ $* == *" -no-kvm"* ]]; then
-	qemu-system-i386 $*
+	$QEMU_SYSTEM $*
 else
-	qemu-system-i386 -enable-kvm $*
+	$QEMU_SYSTEM -enable-kvm $*
 fi
 exit ${?}
diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu
index 9896139ce2..a554b362e3 100644
--- a/config/rootfiles/packages/qemu
+++ b/config/rootfiles/packages/qemu
@@ -1,6 +1,7 @@
 #etc/qemu
 etc/qemu/target-x86_64.conf
 usr/bin/qemu
+usr/bin/qemu-arm
 usr/bin/qemu-ga
 usr/bin/qemu-i386
 usr/bin/qemu-img
@@ -8,6 +9,8 @@ usr/bin/qemu-io
 usr/bin/qemu-nbd
 usr/bin/qemu-system-arm
 usr/bin/qemu-system-i386
+usr/bin/qemu-system-x86_64
+usr/bin/qemu-x86_64
 usr/libexec/qemu-bridge-helper
 #usr/share/doc/qemu
 #usr/share/doc/qemu/qemu-doc.html
diff --git a/lfs/qemu b/lfs/qemu
index 8512568b60..f07e92708c 100644
--- a/lfs/qemu
+++ b/lfs/qemu
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2009  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2015  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -31,9 +31,9 @@ DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-SUP_ARCH   = i586
+SUP_ARCH   = i586 x86_64
 PROG       = qemu
-PAK_VER    = 15
+PAK_VER    = 16
 
 DEPS       = "sdl"
 
@@ -80,7 +80,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
 		--enable-kvm --disable-attr \
-		--target-list="i386-linux-user i386-softmmu arm-softmmu" \
+		--target-list="i386-linux-user x86_64-linux-user arm-linux-user i386-softmmu x86_64-softmmu arm-softmmu" \
 		--extra-cflags="$(CFLAGS)"
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-- 
2.39.2