Attachment 310688 Details for Bug 453631 – specfile changes to build kvm onia64

[patch] specfile changes to build kvm onia64

kvm.spec.patch (text/plain), 4.45 KB, created by Doug Chapman on 2008-07-01 16:26:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Doug Chapman

Created: 2008-07-01 16:26:50 UTC

Size: 4.45 KB

patch

obsolete

>*** kvm.spec.noia64	2008-06-30 16:06:15.000000000 -0400
>--- kvm.spec	2008-07-01 12:26:22.000000000 -0400
>***************
>*** 1,31 ****
>  Summary: Kernel-based Virtual Machine
>  Name: kvm
>  Version: 70
>! Release: 2%{?dist}
>  License: GPLv2+ and LGPLv2+
>  Group: Development/Tools
>  URL: http://%{name}.sf.net
>  Source0: http://download.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
>  Source1: %{name}.modules
>  Patch0: kvm-63-defaults.patch
>  Patch1: %{name}-bootmenu.patch
>  Patch2: %{name}-62-block-rw-range-check.patch
>  Patch3: %{name}-62-e1000-default.patch
>  # patches from upstream qemu
>  BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>  BuildRequires: SDL-devel
>  # to build the bios
>  BuildRequires: dev86
>  BuildRequires: iasl
>  BuildRequires: %{_includedir}/gnu/stubs-32.h
>  BuildRequires: zlib-devel
>  # TLS / x509 auth in VNC server
>  BuildRequires: gnutls-devel
>  # for the docs
>  BuildRequires: texi2html
>  BuildRequires: rsync
>! # kvm kernel side is only x86/x86_64 as that's where the hardware is
>! ExclusiveArch: %{ix86} x86_64
>  Requires: initscripts >= 8.08-1
>  
>  %description
>--- 1,40 ----
>  Summary: Kernel-based Virtual Machine
>  Name: kvm
>  Version: 70
>! Release: 3%{?dist}
>  License: GPLv2+ and LGPLv2+
>  Group: Development/Tools
>  URL: http://%{name}.sf.net
>  Source0: http://download.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
>  Source1: %{name}.modules
>+ %ifarch ia64
>+ # ia64 guest firmware image from: hg clone http://xenbits.xensource.com/ext/efi-vfirmware.hg
>+ Source2: xenia64-gfw.bin
>+ %endif
>  Patch0: kvm-63-defaults.patch
>  Patch1: %{name}-bootmenu.patch
>  Patch2: %{name}-62-block-rw-range-check.patch
>  Patch3: %{name}-62-e1000-default.patch
>+ Patch4: %{name}-70-ia64.patch
>  # patches from upstream qemu
>  BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>  BuildRequires: SDL-devel
>  # to build the bios
>+ %ifarch %{ix86} x86_64
>  BuildRequires: dev86
>  BuildRequires: iasl
>  BuildRequires: %{_includedir}/gnu/stubs-32.h
>+ %endif
>+ %ifarch ia64
>+ BuildRequires: compat-gcc-34
>+ %endif
>  BuildRequires: zlib-devel
>  # TLS / x509 auth in VNC server
>  BuildRequires: gnutls-devel
>  # for the docs
>  BuildRequires: texi2html
>  BuildRequires: rsync
>! ExclusiveArch: %{ix86} x86_64 ia64
>  Requires: initscripts >= 8.08-1
>  
>  %description
>*************** a network card, disk, graphics adapter, 
>*** 42,52 ****
>--- 51,66 ----
>  %patch1 -p1
>  %patch2 -p1
>  #patch3 -p1
>+ %patch4 -p1 -b .ia64
>  
>  %build
>  # we need to install the data bits in a different path
>  sed -i 's/datasuffix=\"\/share\/qemu\"/datasuffix=\"\/share\/kvm\"/' qemu/configure
>+ %ifarch ia64
>+ ./configure --with-patched-kernel --qemu-cc=gcc34 --kerneldir=$(pwd)/kernel --prefix=%{_prefix} --qemu-ldflags="-Wl,--build-id" --enable-alsa --disable-cpu-emulation
>+ %else
>  ./configure --with-patched-kernel --kerneldir=$(pwd)/kernel --prefix=%{_prefix} --qemu-ldflags="-Wl,--build-id" --enable-alsa
>+ %endif
>  
>  # we can't use RPM_OPT_FLAGS for the same reasons as qemu (#208026) for the
>  # qemu bits.  so let's set it for the other pieces.  this requires some
>*************** echo "CFLAGS=$RPM_OPT_FLAGS" >> user/con
>*** 56,67 ****
>--- 70,87 ----
>  make %{?_smp_mflags}
>  
>  # build the bios, and fix it's makefile
>+ %ifarch %{ix86} x86_64
>  sed -i 's/gcc -m32/gcc/' bios/Makefile
>  make bios
>+ %endif
>  
>  %install
>  rm -rf $RPM_BUILD_ROOT
>+ %ifarch ia64
>+ (cd qemu; make DESTDIR=$RPM_BUILD_ROOT install)
>+ %else
>  make DESTDIR=$RPM_BUILD_ROOT install
>+ %endif
>  
>  # we have to have our own copies of the bios/keymaps due to incompat with
>  # qemu 0.9.  include the man page
>*************** chmod -x $RPM_BUILD_ROOT/%{_mandir}/man1
>*** 76,85 ****
>--- 96,113 ----
>  
>  # We're only build x86, so kill other BIOS to save disk space
>  rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}/openbios-sparc32
>+ rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}/openbios-sparc64
>  rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}/ppc_rom.bin
>  rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}/video.x
>  
>+ %ifarch %{ix86} x86_64
>  mv $RPM_BUILD_ROOT/%{_bindir}/qemu-system-x86_64 $RPM_BUILD_ROOT/%{_bindir}/qemu-kvm
>+ %endif
>+ %ifarch ia64
>+ rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}/bios.bin
>+ install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/%{name}/Flash.fd
>+ mv qemu/ia64-softmmu/qemu-system-ia64 $RPM_BUILD_ROOT/%{_bindir}/qemu-kvm
>+ %endif
>  
>  mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules
>  install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/kvm.modules

Actions: View | Diff

Attachments on bug 453631: 310688 | 310689 | 310690