Browse Source

qemu: Updated (1.1.1-1 -> 2.5.0)

tc-work
Nagy Károly Gábriel 9 years ago
parent
commit
105ee46e4c
3 changed files with 8 additions and 47 deletions
  1. +0
    -37
      emulators/qemu/qemu-1.1.1-parallel-make.patch
  2. +5
    -5
      emulators/qemu/qemu.conf
  3. +3
    -5
      emulators/qemu/qemu.desc

+ 0
- 37
emulators/qemu/qemu-1.1.1-parallel-make.patch

@ -1,37 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../qemu/qemu-1.1.1-parallel-make.patch
# Copyright (C) 2012 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
Description: Fix compiling with more than one make job
Compiling virtfs-proxy-helper depends on then generated config-host.h
Following error occurs without this patch
--------------------------------------------------------------------------
In file included from ./qemu-common.h:5:0,
from fsdev/virtfs-proxy-helper.c:23:
./compiler.h:6:25: fatal error: config-host.h: No such file or directory
--------------------------------------------------------------------------
--- qemu-1.1.1/Makefile.orig 2012-07-22 22:21:26.953999658 +0200
+++ qemu-1.1.1/Makefile 2012-07-22 22:24:13.562030679 +0200
@@ -166,6 +166,7 @@
fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/virtio-9p-marshal.o oslib-posix.o $(trace-obj-y)
fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap
+fsdev/virtfs-proxy-helper.o: $(GENERATED_HEADERS)
qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx
$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GEN $@")

+ 5
- 5
emulators/qemu/qemu.conf

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../qemu/qemu.conf
# Copyright (C) 2006 - 2011 The OpenSDE Project
# Copyright (C) 2006 - 2016 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
@ -12,13 +12,13 @@
# GNU General Public License can be found in the file COPYING.
# --- SDE-COPYRIGHT-NOTE-END ---
# we have to explicitely set datadir to get firmware and keymap files
# installed at the right place and to avoid shared files with qemu-kvm
datadir="$datadir/$pkg"
var_remove_regex confopt ' ' '--host=.*'
if ! pkginstalled libsdl ; then
echo_warning "Disable graphical output support (libsdl not installed)"
var_append confopt ' ' "--disable-gfx-check"
fi
var_append GCC_WRAPPER_INSERT ' ' "-L$(pkgprefix libdir libx11)"
if pkginstalled libx11; then
var_append GCC_WRAPPER_INSERT ' ' "-L$(pkgprefix libdir libx11)"
fi

+ 3
- 5
emulators/qemu/qemu.desc

@ -1,9 +1,8 @@
[COPY] --- SDE-COPYRIGHT-NOTE-BEGIN ---
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY]
[COPY] Filename: package/.../qemu/qemu.desc
[COPY] Copyright (C) 2006 - 2012 The OpenSDE Project
[COPY] Copyright (C) 2006 - 2016 The OpenSDE Project
[COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
[COPY] Copyright (C) 1998 - 2003 Clifford Wolf
[COPY]
@ -30,8 +29,7 @@
[L] GPL
[S] Stable
[V] 1.1.1-1
[V] 2.5.0
[P] X -----5---9 207.000
[D] 2540499913 qemu-1.1.1-1.tar.bz2 http://qemu.org/download/
#[D] X qemu-r6511.tar.bz2 svn://svn.sv.gnu.org/qemu/trunk -r6511
[D] 346078723 qemu-2.5.0.tar.bz2 http://wiki.qemu.org/download/

Loading…
Cancel
Save