Merge remote-tracking branch 'ms/dhcp-rfc2136-broken-down' into next

[ipfire-2.x.git] / lfs / qemu

diff --git a/lfs/qemu b/lfs/qemu
index 10e6edb957406a2a056b761a6639a70421f6244d..a15dccdbe9c8e7458cfc08dbb9b1ae64009ee332 100644 (file)
--- 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        #
@@ -24,15 +24,16 @@
 
 include Config
 
-VER        = 0.10.2
+VER        = 2.4.0
 
 THISAPP    = qemu-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+SUP_ARCH   = i586 x86_64
 PROG       = qemu
-PAK_VER    = 6
+PAK_VER    = 17
 
 DEPS       = "sdl"
 
@@ -44,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 85a323cdf620687f39c5328f450a547d
+$(DL_FILE)_MD5 = 186ee8194140a484a455f8e3c74589f4
 
 install : $(TARGET)
 
@@ -76,18 +77,24 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       
-       # Apply a number of patches mainly for gcc 4
-#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-enforce-16byte-stack-boundary.patch
-#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gcc4.patch
-#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gcc4-hacks.patch
-#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gcc4-opts.patch
-       
-       cd $(DIR_APP) && ./configure --prefix=/usr \
-               --disable-gfx-check --target-list="i386-linux-user i386-softmmu ppc-softmmu ppc-linux-user"
-               
+       @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 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
+
+       # install wrapper for old kvm parameter handling
+       install -m 755 $(DIR_SRC)/config/qemu/qemu /usr/bin/qemu
+
+       # disable PaX MPROTECT and RANDMMAP
+       paxctl -m -r /usr/bin/qemu-system-arm
+       paxctl -m -r /usr/bin/qemu-system-i386
+       paxctl -m -r /usr/bin/qemu-system-x86_64
+       paxctl -m -r /usr/bin/qemu-arm
+       paxctl -m -r /usr/bin/qemu-i386
+       paxctl -m -r /usr/bin/qemu-x86_64
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)