pool/qemu
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 202641 from home:a_faerber:branches:Virtualization

Browse Source 
Fix ppc build (k0da) and clean up firmware refactoring

OBS-URL: https://build.opensuse.org/request/show/202641
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=165
This commit is contained in:
Andreas Färber 2013-10-08 18:29:33 +00:00 committed by Git OBS Bridge
parent 3d7dfd153a
commit 02f7384425
43 changed files with 166 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
0001-XXX-dont-dump-core-on-sigabort.patc.patch
View File

@ -4,8 +4,8 @@ Date: Mon, 21 Nov 2011 23:50:36 +0100
Subject: [PATCH] XXX dont dump core on sigabort
---
linux-user/signal.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
linux-user/signal.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/linux-user/signal.c b/linux-user/signal.c
index 23d65da..c6f9968 100644

8
0002-XXX-work-around-SA_RESTART-race-wit.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] XXX work around SA_RESTART race with boehm-gc (ARM only)
[AF: CPUState -> CPUArchState, adapt to reindentation]
---
linux-user/main.c | 25 +++++++++-----
linux-user/qemu.h | 3 ++
linux-user/signal.c | 22 ++++++++++++
linux-user/syscall.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++++-
linux-user/main.c | 25 +++++++++------
linux-user/qemu.h | 3 ++
linux-user/signal.c | 22 +++++++++++++
linux-user/syscall.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++-
4 files changed, 130 insertions(+), 10 deletions(-)
diff --git a/linux-user/main.c b/linux-user/main.c

4
0003-qemu-0.9.0.cvs-binfmt.patch.patch
View File

@ -10,8 +10,8 @@ Fixes binfmt_misc setup script:
Signed-off-by: Ulrich Hecht <uli@suse.de>
---
scripts/qemu-binfmt-conf.sh | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 deletions(-)
scripts/qemu-binfmt-conf.sh | 37 ++++++++++++++++++++-----------------
1 file changed, 20 insertions(+), 17 deletions(-)
diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
index 0da2618..dc652f0 100644

6
0004-qemu-cvs-alsa_bitfield.patch.patch
View File

@ -8,9 +8,9 @@ Implements TYPE_INTBITFIELD partially. (required for ALSA support)
Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Ulrich Hecht <uli@suse.de>
---
include/exec/user/thunk.h | 3 +++
thunk.c | 21 +++++++++++++++++++++
2 files changed, 24 insertions(+), 0 deletions(-)
include/exec/user/thunk.h | 3 +++
thunk.c | 21 +++++++++++++++++++++
2 files changed, 24 insertions(+)
diff --git a/include/exec/user/thunk.h b/include/exec/user/thunk.h
index 87025c3..6c35e64 100644

2
0005-qemu-cvs-alsa_ioctl.patch.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: Ulrich Hecht <uli@suse.de>
linux-user/syscall_defs.h | 2 +
linux-user/syscall_types.h | 5 +
linux-user/syscall_types_alsa.h | 1336 +++++++++++++++++++++++++++++
6 files changed, 3555 insertions(+), 0 deletions(-)
6 files changed, 3555 insertions(+)
create mode 100644 linux-user/ioctls_alsa.h
create mode 100644 linux-user/ioctls_alsa_structs.h
create mode 100644 linux-user/syscall_types_alsa.h

4
0006-qemu-cvs-alsa_mmap.patch.patch
View File

@ -8,8 +8,8 @@ Hack to prevent ALSA from using mmap() interface to simplify emulation.
Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Ulrich Hecht <uli@suse.de>
---
linux-user/mmap.c | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
linux-user/mmap.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index a249f0c..34a5615 100644

4
0007-qemu-cvs-gettimeofday.patch.patch
View File

@ -5,8 +5,8 @@ Subject: [PATCH] qemu-cvs-gettimeofday
No clue what this is for.
---
linux-user/syscall.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
linux-user/syscall.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 23954c1..709c167 100644

4
0008-qemu-cvs-ioctl_debug.patch.patch
View File

@ -8,8 +8,8 @@ Extends unsupported ioctl debug output.
Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Ulrich Hecht <uli@suse.de>
---
linux-user/syscall.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
linux-user/syscall.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 709c167..7453ff5 100644

4
0009-qemu-cvs-ioctl_nodirection.patch.patch
View File

@ -11,8 +11,8 @@ IOC_RW.
Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Ulrich Hecht <uli@suse.de>
---
linux-user/syscall.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
linux-user/syscall.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 7453ff5..18ec182 100644

8
0010-block-vmdk-Support-creation-of-SCSI.patch
View File

@ -11,10 +11,10 @@ Signed-off-by: Ulrich Hecht <uli@suse.de>
[AF: Rebased onto upstream VMDK SCSI support]
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
block.c | 6 +++++-
block/vmdk.c | 9 ++++++++-
include/block/block_int.h | 2 ++
qemu-img.c | 8 +++++++-
block.c | 6 +++++-
block/vmdk.c | 9 ++++++++-
include/block/block_int.h | 2 ++
qemu-img.c | 8 +++++++-
4 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/block.c b/block.c

8
0011-linux-user-add-binfmt-wrapper-for-a.patch
View File

@ -27,10 +27,10 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
[AF: Rebased onto new Makefile infrastructure]
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
Makefile.target | 12 ++++++++++++
linux-user/Makefile.objs | 2 ++
linux-user/binfmt.c | 42 ++++++++++++++++++++++++++++++++++++++++++
scripts/qemu-binfmt-conf.sh | 34 +++++++++++++++++-----------------
Makefile.target | 12 ++++++++++++
linux-user/Makefile.objs | 2 ++
linux-user/binfmt.c | 42 ++++++++++++++++++++++++++++++++++++++++++
scripts/qemu-binfmt-conf.sh | 34 +++++++++++++++++-----------------
4 files changed, 73 insertions(+), 17 deletions(-)
create mode 100644 linux-user/binfmt.c

4
0012-linux-user-Ignore-timer_create-sysc.patch
View File

@ -8,8 +8,8 @@ about it breaks some %check tests in OBS, so better ignore it silently.
Signed-off-by: Alexander Graf <agraf@suse.de>
---
linux-user/syscall.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
linux-user/syscall.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 18ec182..eda4455 100644

4
0013-linux-user-be-silent-about-capget-f.patch
View File

@ -9,8 +9,8 @@ implementation and go on with life :)
Signed-off-by: Alexander Graf <agraf@suse.de>
---
linux-user/syscall.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
linux-user/syscall.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index eda4455..628fe66 100644

4
0014-PPC-KVM-Disable-mmu-notifier-check..patch
View File

@ -9,8 +9,8 @@ check for MMU notifiers that on 970 can not be implemented properly.
So disable the check for mmu notifiers on PowerPC guests, making
KVM guests work there, even if possibly racy in some odd circumstances.
---
exec.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
exec.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/exec.c b/exec.c
index 3ca9381..e4d92d7 100644

6
0015-linux-user-fix-segfault-deadlock.pa.patch
View File

@ -21,9 +21,9 @@ Reported-by: Fabio Erculiani <lxnay@sabayon.org>
Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
include/exec/spinlock.h | 10 ++++++++++
user-exec.c | 4 ++++
2 files changed, 14 insertions(+), 0 deletions(-)
include/exec/spinlock.h | 10 ++++++++++
user-exec.c | 4 ++++
2 files changed, 14 insertions(+)
diff --git a/include/exec/spinlock.h b/include/exec/spinlock.h
index a72edda..e460e12 100644

4
0016-linux-user-binfmt-support-host-bina.patch
View File

@ -8,8 +8,8 @@ trying to run, let's just use that instead as it will be a lot faster.
Signed-off-by: Alexander Graf <agraf@suse.de>
---
linux-user/binfmt.c | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
linux-user/binfmt.c | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/linux-user/binfmt.c b/linux-user/binfmt.c
index cd1f513..87dc4c6 100644

4
0017-linux-user-arm-no-tb_flush-on-reset.patch
View File

@ -10,8 +10,8 @@ tb_flush on reset.
So something in our thread creation is broken. But for now, let's revert the
change to at least get a working build again.
---
target-arm/cpu.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
target-arm/cpu.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/target-arm/cpu.c b/target-arm/cpu.c
index 5a7566b..40bddc3 100644

10
0018-linux-user-Ignore-broken-loop-ioctl.patch
View File

@ -11,11 +11,11 @@ So let's silently ignore that bogus ioctl.
Signed-off-by: Alexander Graf <agraf@suse.de>
---
linux-user/ioctls.h | 1 +
linux-user/linux_loop.h | 1 +
linux-user/syscall.c | 7 +++++++
linux-user/syscall_defs.h | 1 +
4 files changed, 10 insertions(+), 0 deletions(-)
linux-user/ioctls.h | 1 +
linux-user/linux_loop.h | 1 +
linux-user/syscall.c | 7 +++++++
linux-user/syscall_defs.h | 1 +
4 files changed, 10 insertions(+)
diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
index 28dc0b2..da4f12c 100644

6
0019-linux-user-lock-tcg.patch.patch
View File

@ -13,9 +13,9 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
[AF: Rebased onto exec.c/translate-all.c split for 1.4]
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
linux-user/mmap.c | 3 +++
tcg/tcg.c | 36 ++++++++++++++++++++++++++++++++++--
tcg/tcg.h | 6 ++++++
linux-user/mmap.c | 3 +++
tcg/tcg.c | 36 ++++++++++++++++++++++++++++++++++--
tcg/tcg.h | 6 ++++++
3 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/linux-user/mmap.c b/linux-user/mmap.c

4
0020-linux-user-Run-multi-threaded-code-.patch
View File

@ -15,8 +15,8 @@ This gets Java 1.7 working for me again on my test box.
Signed-off-by: Alexander Graf <agraf@suse.de>
---
linux-user/syscall.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
linux-user/syscall.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 38ca7af..8aef3e8 100644

4
0021-linux-user-lock-tb-flushing-too.pat.patch
View File

@ -10,8 +10,8 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
[AF: Rebased onto exec.c/translate-all.c split for 1.4]
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
translate-all.c | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
translate-all.c | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/translate-all.c b/translate-all.c
index 3b5fc7c..165a63e 100644

4
0022-linux-user-Fake-proc-cpuinfo.patch.patch
View File

@ -18,8 +18,8 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
[AF: Rebased for v1.6]
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
linux-user/syscall.c | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
linux-user/syscall.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 8aef3e8..429ab3a 100644

6
0023-linux-user-implement-FS_IOC_GETFLAG.patch
View File

@ -11,9 +11,9 @@ v1 -> v2:
- use TYPE_LONG instead of TYPE_INT
---
linux-user/ioctls.h | 1 +
linux-user/syscall_defs.h | 2 ++
2 files changed, 3 insertions(+), 0 deletions(-)
linux-user/ioctls.h | 1 +
linux-user/syscall_defs.h | 2 ++
2 files changed, 3 insertions(+)
diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
index da4f12c..17b67af 100644

6
0024-linux-user-implement-FS_IOC_SETFLAG.patch
View File

@ -11,9 +11,9 @@ v1 -> v2
- use TYPE_LONG instead of TYPE_INT
---
linux-user/ioctls.h | 1 +
linux-user/syscall_defs.h | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
linux-user/ioctls.h | 1 +
linux-user/syscall_defs.h | 1 +
2 files changed, 2 insertions(+)
diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
index 17b67af..a77b72c 100644

4
0025-linux-user-XXX-disable-fiemap.patch.patch
View File

@ -5,8 +5,8 @@ Subject: [PATCH] linux-user: XXX disable fiemap
agraf: fiemap breaks in libarchive. Disable it for now.
---
linux-user/syscall.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
linux-user/syscall.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 429ab3a..5c42bc9 100644

10
0026-slirp-nooutgoing.patch.patch
View File

@ -5,11 +5,11 @@ Subject: [PATCH] slirp: -nooutgoing
TBD (from SUSE Studio team)
---
qemu-options.hx | 10 ++++++++++
slirp/socket.c | 8 ++++++++
slirp/tcp_subr.c | 13 +++++++++++++
vl.c | 9 +++++++++
4 files changed, 40 insertions(+), 0 deletions(-)
qemu-options.hx | 10 ++++++++++
slirp/socket.c | 8 ++++++++
slirp/tcp_subr.c | 13 +++++++++++++
vl.c | 9 +++++++++
4 files changed, 40 insertions(+)
diff --git a/qemu-options.hx b/qemu-options.hx
index d15338e..e8097ac 100644

4
0027-vnc-password-file-and-incoming-conn.patch
View File

@ -5,8 +5,8 @@ Subject: [PATCH] vnc: password-file= and incoming-connections=
TBD (from SUSE Studio team)
---
ui/vnc.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 71 insertions(+), 0 deletions(-)
ui/vnc.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 71 insertions(+)
diff --git a/ui/vnc.c b/ui/vnc.c
index 5601cc3..d5796e6 100644

8
0028-linux-user-add-more-blk-ioctls.patc.patch
View File

@ -7,10 +7,10 @@ Implement a few more ioctls that operate on block devices.
Signed-off-by: Alexander Graf <agraf@suse.de>
---
linux-user/ioctls.h | 18 ++++++++++++++++++
linux-user/syscall_defs.h | 6 ++++++
linux-user/syscall_types.h | 3 +++
3 files changed, 27 insertions(+), 0 deletions(-)
linux-user/ioctls.h | 18 ++++++++++++++++++
linux-user/syscall_defs.h | 6 ++++++
linux-user/syscall_types.h | 3 +++
3 files changed, 27 insertions(+)
diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
index a77b72c..4c6d2ee 100644

4
0029-linux-user-use-target_ulong.patch.patch
View File

@ -12,8 +12,8 @@ Pass syscall arguments as ulong always.
Signed-off-by: Alexander Graf <agraf@suse.de>
---
linux-user/qemu.h | 8 ++++----
linux-user/syscall.c | 8 ++++----
linux-user/qemu.h | 8 ++++----
linux-user/syscall.c | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/linux-user/qemu.h b/linux-user/qemu.h

6
0030-Add-support-for-DictZip-enabled-gzi.patch
View File

@ -27,9 +27,9 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Tim Hardeck <thardeck@suse.de>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
block/Makefile.objs | 1 +
block/dictzip.c | 596 +++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 597 insertions(+), 0 deletions(-)
block/Makefile.objs | 1 +
block/dictzip.c | 596 ++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 597 insertions(+)
create mode 100644 block/dictzip.c
diff --git a/block/Makefile.objs b/block/Makefile.objs

6
0031-Add-tar-container-format.patch.patch
View File

@ -28,9 +28,9 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Tim Hardeck <thardeck@suse.de>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
block/Makefile.objs | 1 +
block/tar.c | 386 +++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 387 insertions(+), 0 deletions(-)
block/Makefile.objs | 1 +
block/tar.c | 386 ++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 387 insertions(+)
create mode 100644 block/tar.c
diff --git a/block/Makefile.objs b/block/Makefile.objs

4
0032-Legacy-Patch-kvm-qemu-preXX-dictzip.patch
View File

@ -4,8 +4,8 @@ Date: Wed, 12 Dec 2012 19:11:30 +0100
Subject: [PATCH] Legacy Patch kvm-qemu-preXX-dictzip3.patch
---
block/tar.c | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
block/tar.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/block/tar.c b/block/tar.c
index 87bf552..bf24c98 100644

4
0033-Legacy-Patch-kvm-qemu-preXX-report-.patch
View File

@ -4,8 +4,8 @@ Date: Wed, 12 Dec 2012 19:11:31 +0100
Subject: [PATCH] Legacy Patch kvm-qemu-preXX-report-default-mac-used.patch
---
net/net.c | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
net/net.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/net/net.c b/net/net.c
index c0d61bf..adc389f 100644

4
0034-console-add-question-mark-escape-op.patch
View File

@ -12,8 +12,8 @@ outputting guest serial consoles to the graphical console emulator.
Signed-off-by: Alexander Graf <agraf@suse.de>
---
ui/console.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
ui/console.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ui/console.c b/ui/console.c
index e3e8297..8784cd0 100644

4
0035-Make-char-muxer-more-robust-wrt-sma.patch
View File

@ -18,8 +18,8 @@ it polls again after a while to check if the guest is now receiving input.
This patch fixes input when using -nographic on s390 for me.
---
qemu-char.c | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
qemu-char.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/qemu-char.c b/qemu-char.c
index 1be1cf6..ad7c8fd 100644

4
0036-linux-user-lseek-explicitly-cast-no.patch
View File

@ -12,8 +12,8 @@ absolute positioned which we need to maintain as unsigned.
Signed-off-by: Alexander Graf <agraf@suse.de>
---
linux-user/syscall.c | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
linux-user/syscall.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index ab30b58..4136873 100644

4
0037-virtfs-proxy-helper-Provide-__u64-f.patch
View File

@ -8,8 +8,8 @@ Fixes the build on SLE 11 SP2.
[AF: Extend to ppc64]
---
fsdev/virtfs-proxy-helper.c | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
fsdev/virtfs-proxy-helper.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c
index 713a7b2..b8da77d 100644

11
build_and_copy_vgabios_bin.patch → 0039-roms-Build-vgabios.bin.patch.patch
View File

@ -1,9 +1,14 @@
From 2bf9e17dc9b16ed6094ba923479b5dc38f549141 Mon Sep 17 00:00:00 2001
From: Bruce Rogers <brogers@suse.com>
Date: Wed, 2 Oct 2013 17:51:46 +0200
Subject: [PATCH] roms: Build vgabios.bin
---
roms/Makefile | 2 ++
roms/Makefile | 2 ++
1 file changed, 2 insertions(+)
Index: b/roms/Makefile
===================================================================
diff --git a/roms/Makefile b/roms/Makefile
index 7a228ae..bbf21a9 100644
--- a/roms/Makefile
+++ b/roms/Makefile
@@ -50,6 +50,8 @@ seavgabios-%: config.vga.%

27
0040-configure-Enable-PIE-for-ppc-and-pp.patch Normal file
View File

@ -0,0 +1,27 @@
From 0f48ef2d13e261e7dbb05e8ac74d719ce9158f5a Mon Sep 17 00:00:00 2001
From: Dinar Valeev <k0da@opensuse.org>
Date: Wed, 2 Oct 2013 17:56:03 +0200
Subject: [PATCH] configure: Enable PIE for ppc and ppc64 hosts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Dinar Valeev <dvaleev@suse.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure
index 18fa608..0a4b22e 100755
--- a/configure
+++ b/configure
@@ -1251,7 +1251,7 @@ fi
if test "$pie" = ""; then
case "$cpu-$targetos" in
- i386-Linux|x86_64-Linux|i386-OpenBSD|x86_64-OpenBSD)
+ i386-Linux|x86_64-Linux|ppc*-Linux|i386-OpenBSD|x86_64-OpenBSD)
;;
*)
pie="no"

4
qemu-linux-user.spec
View File

@ -63,6 +63,8 @@ Patch0035: 0035-Make-char-muxer-more-robust-wrt-sma.patch
Patch0036: 0036-linux-user-lseek-explicitly-cast-no.patch
Patch0037: 0037-virtfs-proxy-helper-Provide-__u64-f.patch
Patch0038: 0038-gdbstub-Fix-gdb_register_coprocesso.patch
Patch0039: 0039-roms-Build-vgabios.bin.patch.patch
Patch0040: 0040-configure-Enable-PIE-for-ppc-and-pp.patch
# Please do not add patches manually here, run update_git.sh.
# this is to make lint happy
Source300: rpmlintrc
@ -153,6 +155,8 @@ run cross-architecture builds.
%patch0036 -p1
%patch0037 -p1
%patch0038 -p1
%patch0039 -p1
%patch0040 -p1
%build
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \

18
qemu.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Tue Oct 8 17:05:02 UTC 2013 - afaerber@suse.de
- Undo workaround for sasl - fixed in Factory
-------------------------------------------------------------------
Wed Oct 2 15:52:42 UTC 2013 - afaerber@suse.de
- Work around Factory sasl breakage by allowing build w/o vnc-sasl
- Move build_and_copy_vgabios_bin.patch to Git patch queue
* Clearly mark in-.spec patch queue as for roms/ipxe/ only
- Synchronized qemu.spec.in from qemu.spec:
* Added ipxe-build-Avoid-strict-aliasing-warning.patch
* Modified SeaBIOS summary
* Added Conflicts for firmware subpackages
* Dropped %dir
- Add patch enabling PIE support for ppc/ppc64 (k0da)
-------------------------------------------------------------------
Fri Sep 13 11:14:45 UTC 2013 - brogers@suse.com

10
qemu.spec
View File

@ -70,12 +70,15 @@ Patch0035: 0035-Make-char-muxer-more-robust-wrt-sma.patch
Patch0036: 0036-linux-user-lseek-explicitly-cast-no.patch
Patch0037: 0037-virtfs-proxy-helper-Provide-__u64-f.patch
Patch0038: 0038-gdbstub-Fix-gdb_register_coprocesso.patch
Patch0039: 0039-roms-Build-vgabios.bin.patch.patch
Patch0040: 0040-configure-Enable-PIE-for-ppc-and-pp.patch
# Please do not add patches manually here, run update_git.sh.
# roms/ipxe patches
Patch1000: ipxe-build-Work-around-bug-in-gcc-4.8.patch
Patch1001: ipxe-zbin-Fix-size-used-for-memset-in-al.patch
Patch1002: build_and_copy_vgabios_bin.patch
Patch1003: ipxe-build-Avoid-strict-aliasing-warning.patch
Patch1002: ipxe-build-Avoid-strict-aliasing-warning.patch
# end roms/ipxe patches
# this is to make lint happy
Source300: rpmlintrc
@ -296,11 +299,12 @@ This sub-package contains the guest agent.
%patch0036 -p1
%patch0037 -p1
%patch0038 -p1
%patch0039 -p1
%patch0040 -p1
%patch1000 -p1
%patch1001 -p1
%patch1002 -p1
%patch1003 -p1
%if %{build_x86_fw_from_source}
# as a safeguard, delete the firmware files that we intend to build

11
qemu.spec.in
View File

@ -35,9 +35,11 @@ Source: %name-1.6.0.tar.bz2
PATCH_FILES
# Please do not add patches manually here, run update_git.sh.
# roms/ipxe patches
Patch1000: ipxe-build-Work-around-bug-in-gcc-4.8.patch
Patch1001: ipxe-zbin-Fix-size-used-for-memset-in-al.patch
Patch1002: build_and_copy_vgabios_bin.patch
Patch1002: ipxe-build-Avoid-strict-aliasing-warning.patch
# end roms/ipxe patches
# this is to make lint happy
Source300: rpmlintrc
@ -140,11 +142,12 @@ This sub-package contains translations.
%endif
%package seabios
Summary: x86 BIOS for QEMU
Summary: X86 BIOS for QEMU
Group: System/Emulators/PC
Version: 1.7.2.2
Release: 0
BuildArch: noarch
Conflicts: qemu < 1.6.0
%description seabios
SeaBIOS is an open source implementation of a 16bit x86 BIOS. SeaBIOS
@ -156,6 +159,7 @@ Group: System/Emulators/PC
Version: 0.6c
Release: 0
BuildArch: noarch
Conflicts: qemu < 1.6.0
%description vgabios
VGABIOS provides the video ROM BIOSes for the following variants of VGA
@ -168,6 +172,7 @@ Group: System/Emulators/PC
Version: 8
Release: 0
BuildArch: noarch
Conflicts: qemu < 1.6.0
%description sgabios
The Google Serial Graphics Adapter BIOS or SGABIOS provides a means for legacy
@ -180,6 +185,7 @@ Group: System/Emulators/PC
Version: 1.0.0
Release: 0
BuildArch: noarch
Conflicts: qemu < 1.6.0
%description ipxe
Preboot Execution Environment (PXE) ROM support for various emulated network
@ -316,7 +322,6 @@ rm -rf ${RPM_BUILD_ROOT}
%doc COPYING COPYING.LIB Changelog README VERSION qemu-doc.html qemu-tech.html
%_bindir/qemu-system-*
%doc %_mandir/man1/qemu.1.gz
%dir %_datadir/%name
%_datadir/%name
%exclude %_datadir/%name/bios.bin
%exclude %_datadir/%name/acpi-dsdt.aml