Compare commits
6 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
ef89c28371 | ||
|
410c32a92d | ||
|
14ed987212 | ||
|
dc3282ddcc | ||
|
5131ed5eb7 | ||
|
d3437922b3 |
0
.cvsignore → .gitignore
vendored
0
.cvsignore → .gitignore
vendored
21
Makefile
21
Makefile
@ -1,21 +0,0 @@
|
||||
# Makefile for source rpm: qemu
|
||||
# $Id$
|
||||
NAME := qemu
|
||||
SPECFILE = $(firstword $(wildcard *.spec))
|
||||
|
||||
define find-makefile-common
|
||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
||||
|
||||
ifeq ($(MAKEFILE_COMMON),)
|
||||
# attept a checkout
|
||||
define checkout-makefile-common
|
||||
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
||||
endif
|
||||
|
||||
include $(MAKEFILE_COMMON)
|
@ -1,11 +0,0 @@
|
||||
--- qemu-0.7.0/Makefile.target.orig 2005-04-27 21:52:05.000000000 +0100
|
||||
+++ qemu-0.7.0/Makefile.target 2005-04-30 11:01:41.000000000 +0100
|
||||
@@ -463,7 +463,7 @@
|
||||
|
||||
install: all
|
||||
ifneq ($(PROGS),)
|
||||
- $(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)"
|
||||
+ $(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)"
|
||||
endif
|
||||
|
||||
ifneq ($(wildcard .depend),)
|
10
qemu-0.9.1-alpha-int.patch
Normal file
10
qemu-0.9.1-alpha-int.patch
Normal file
@ -0,0 +1,10 @@
|
||||
--- qemu-0.9.1/target-alpha/exec.h.BAD 2008-12-31 23:17:10.000000000 -0600
|
||||
+++ qemu-0.9.1/target-alpha/exec.h 2008-12-31 23:17:48.000000000 -0600
|
||||
@@ -24,6 +24,7 @@
|
||||
#include "config.h"
|
||||
|
||||
#include "dyngen-exec.h"
|
||||
+#include <stdint.h>
|
||||
|
||||
#define TARGET_LONG_BITS 64
|
||||
|
12
qemu-0.9.1-build.patch
Normal file
12
qemu-0.9.1-build.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -urNp qemu-0.9.1.orig/Makefile.target qemu-0.9.1/Makefile.target
|
||||
--- qemu-0.9.1.orig/Makefile.target 2009-01-11 23:01:20.000000000 +0530
|
||||
+++ qemu-0.9.1/Makefile.target 2009-01-11 23:02:16.000000000 +0530
|
||||
@@ -632,7 +632,7 @@ clean:
|
||||
|
||||
install: all
|
||||
ifneq ($(PROGS),)
|
||||
- $(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)"
|
||||
+ $(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)"
|
||||
endif
|
||||
|
||||
ifneq ($(wildcard .depend),)
|
11
qemu-0.9.1-dirent.patch
Normal file
11
qemu-0.9.1-dirent.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- qemu-0.9.1/linux-user/syscall.c.BAD 2008-12-31 20:20:00.000000000 -0600
|
||||
+++ qemu-0.9.1/linux-user/syscall.c 2008-12-31 20:20:27.000000000 -0600
|
||||
@@ -66,7 +66,7 @@
|
||||
#include <linux/cdrom.h>
|
||||
#include <linux/hdreg.h>
|
||||
#include <linux/soundcard.h>
|
||||
-#include <linux/dirent.h>
|
||||
+#include <dirent.h>
|
||||
#include <linux/kd.h>
|
||||
|
||||
#include "qemu.h"
|
25
qemu-0.9.1-sparc-configure.patch
Normal file
25
qemu-0.9.1-sparc-configure.patch
Normal file
@ -0,0 +1,25 @@
|
||||
--- qemu-0.9.1/configure.BAD 2008-12-31 20:49:19.000000000 -0600
|
||||
+++ qemu-0.9.1/configure 2008-12-31 20:51:45.000000000 -0600
|
||||
@@ -307,6 +307,8 @@
|
||||
target_cpu="sparc"; cpu="sparc" ;;
|
||||
v8plus|v8plusa) SP_CFLAGS="-m32 -mcpu=ultrasparc -D__sparc_${sparc_cpu}__"; SP_LDFLAGS="-m32"
|
||||
target_cpu="sparc"; cpu="sparc" ;;
|
||||
+ v932) SP_CFLAGS="-m32 -mcpu=ultrasparc -D__sparc_v9__"; SP_LDFLAGS="-m32"
|
||||
+ target_cpu="sparc"; cpu="sparc" ;;
|
||||
v9) SP_CFLAGS="-m64 -mcpu=ultrasparc -D__sparc_${sparc_cpu}__"; SP_LDFLAGS="-m64"
|
||||
target_cpu="sparc64"; cpu="sparc64" ;;
|
||||
*) echo "undefined SPARC architecture. Exiting";exit 1;;
|
||||
@@ -337,11 +339,11 @@
|
||||
|
||||
#
|
||||
# If cpu ~= sparc and sparc_cpu hasn't been defined, plug in the right
|
||||
-# ARCH_CFLAGS/ARCH_LDFLAGS (assume sparc_v8plus for 32-bit and sparc_v9 for 64-bit)
|
||||
+# ARCH_CFLAGS/ARCH_LDFLAGS (assume sparc_v9 for 32-bit and sparc_v9 for 64-bit)
|
||||
#
|
||||
case $cpu in
|
||||
sparc) if test -z "$sparc_cpu" ; then
|
||||
- ARCH_CFLAGS="-m32 -mcpu=ultrasparc -D__sparc_v8plus__"
|
||||
+ ARCH_CFLAGS="-m32 -mcpu=ultrasparc -D__sparc_v9__"
|
||||
ARCH_LDFLAGS="-m32"
|
||||
else
|
||||
ARCH_CFLAGS="${SP_CFLAGS}"
|
28
qemu.spec
28
qemu.spec
@ -8,25 +8,28 @@
|
||||
Summary: QEMU is a FAST! processor emulator
|
||||
Name: qemu
|
||||
Version: 0.9.1
|
||||
Release: 10%{?dist}
|
||||
Release: 12%{?dist}
|
||||
License: GPLv2+ and LGPLv2+
|
||||
Group: Development/Tools
|
||||
URL: http://www.qemu.org/
|
||||
Source0: http://www.qemu.org/%{name}-%{version}.tar.gz
|
||||
Source1: qemu.init
|
||||
Patch0: qemu-0.7.0-build.patch
|
||||
Patch0: qemu-0.9.1-build.patch
|
||||
# Change default NIC to rtl8139 to get link-state detection
|
||||
Patch3: qemu-0.9.1-nic-defaults.patch
|
||||
Patch4: qemu-%{version}-block-rw-range-check.patch
|
||||
# Upstream SVN changeset #4338
|
||||
Patch5: qemu-%{version}-pty-rawmode.patch
|
||||
Patch6: qemu-0.9.1-alpha-int.patch
|
||||
Patch7: qemu-0.9.1-dirent.patch
|
||||
Patch8: qemu-0.9.1-sparc-configure.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildRequires: SDL-devel compat-gcc-%{gccver} zlib-devel which texi2html gnutls-devel
|
||||
Requires(post): /sbin/chkconfig
|
||||
Requires(preun): /sbin/service /sbin/chkconfig
|
||||
Requires(postun): /sbin/service
|
||||
Requires: %{name}-img = %{version}-%{release}
|
||||
ExclusiveArch: %{ix86} x86_64 ppc alpha sparc armv4l
|
||||
ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 sparc64 armv4l
|
||||
|
||||
%description
|
||||
QEMU is a generic and open source processor emulator which achieves a good
|
||||
@ -57,6 +60,9 @@ This package provides the command line tool for manipulating disk images.
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
|
||||
%build
|
||||
# FIXME: add --extra-cflags="$RPM_OPT_FLAGS" when we drop gcc34
|
||||
@ -64,7 +70,15 @@ This package provides the command line tool for manipulating disk images.
|
||||
--prefix=%{_prefix} \
|
||||
--interp-prefix=%{_prefix}/qemu-%%M \
|
||||
--cc=gcc%{gccver} \
|
||||
--enable-alsa \
|
||||
%ifnarch sparcv9
|
||||
--enable-alsa \
|
||||
%endif
|
||||
%ifarch sparcv9
|
||||
--sparc_cpu=v932 \
|
||||
%endif
|
||||
%ifarch sparc64
|
||||
--sparc_cpu=v9 \
|
||||
%endif
|
||||
--extra-ldflags="-Wl,--build-id"
|
||||
make %{?_smp_mflags} VL_LDFLAGS="-Wl,--build-id"
|
||||
|
||||
@ -145,6 +159,12 @@ fi
|
||||
%{_mandir}/man1/qemu-img.1*
|
||||
|
||||
%changelog
|
||||
* Sun Jan 11 2009 Debarshi Ray <rishi@fedoraproject.org> - 0.9.1-12
|
||||
- Updated build patch. Closes Red Hat Bugzilla bug #465041.
|
||||
|
||||
* Wed Dec 31 2008 Dennis Gilmore <dennis@ausil.us> - 0.9.1-11
|
||||
- add sparcv9 and sparc64 support
|
||||
|
||||
* Fri Jul 25 2008 Bill Nottingham <notting@redhat.com>
|
||||
- Fix qemu-img summary (#456344)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user