This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via 40baf261430f9398b4dd0bbbbeadf8562731e9b0 (commit) via c97dda34dececca3cc6bf1f15b5f63d027043072 (commit) from 744a04ea798ca3718adb45206444c8a51e2a9680 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 40baf261430f9398b4dd0bbbbeadf8562731e9b0 Merge: c97dda3 744a04e Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Sep 16 20:28:53 2015 +0200

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

commit c97dda34dececca3cc6bf1f15b5f63d027043072 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Sep 16 20:27:52 2015 +0200

qemu: enabled x86_64 for build and as target.

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

-----------------------------------------------------------------------

Summary of changes: config/qemu/qemu | 10 ++++++++-- config/rootfiles/packages/qemu | 3 +++ lfs/qemu | 8 ++++---- 3 files changed, 15 insertions(+), 6 deletions(-)

Difference in files: diff --git a/config/qemu/qemu b/config/qemu/qemu index 64b458a..834eb9c 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 9896139..a554b36 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 8512568..f07e927 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

hooks/post-receive -- IPFire 2.x development tree