webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-16 22:13:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

qemu: enabled x86_64 for build and as target.

Browse Source 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Arne Fitzenreiter
2015-09-16 20:27:52 +02:00
parent 253983268e
commit c97dda34de
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
config/qemu/qemu
View File

@@ -2,9 +2,15 @@
#
# QEMU wrapper to enable kvm as default like old qemu-kvm...
#
if [[ $* == *" -no-kvm"* ]]; then
qemu-system-i386 $*
if [ $(uname -m) = "x86_64" ]; then
QEMU_SYSTEM=qemu-system-x86_64
else
qemu-system-i386 -enable-kvm $*
QEMU_SYSTEM=qemu-system-i386
fi
if [[ $* == *" -no-kvm"* ]]; then
$QEMU_SYSTEM $*
else
$QEMU_SYSTEM -enable-kvm $*
fi
exit ${?}

3
config/rootfiles/packages/qemu
View File

@@ -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

8
lfs/qemu
View File

@@ -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