rpms/kvm/F-8 kvm.spec, 1.28, 1.29 sources, 1.15, 1.16 kvm-19-defaults.patch, 1.1, NONE kvm-35-ldflags.patch, 1.1, NONE kvm-rtl8139-checksum.patch, 1.1, NONE kvm-rtl8139-mmio-regions.patch, 1.1, NONE qemu-0.9.0-vnc-authentication.patch, 1.2, NONE qemu-atapi-hsm.patch, 1.1, NONE
Bill Nottingham (notting)
fedora-extras-commits at redhat.com
Mon Feb 18 18:41:12 UTC 2008
Author: notting
Update of /cvs/extras/rpms/kvm/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24704
Modified Files:
kvm.spec sources
Removed Files:
kvm-19-defaults.patch kvm-35-ldflags.patch
kvm-rtl8139-checksum.patch kvm-rtl8139-mmio-regions.patch
qemu-0.9.0-vnc-authentication.patch qemu-atapi-hsm.patch
Log Message:
sync F8 with rawhide (for new kernel)
Index: kvm.spec
===================================================================
RCS file: /cvs/extras/rpms/kvm/F-8/kvm.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- kvm.spec 15 Oct 2007 18:00:47 -0000 1.28
+++ kvm.spec 18 Feb 2008 18:40:35 -0000 1.29
@@ -1,30 +1,23 @@
Summary: Kernel-based Virtual Machine
Name: kvm
-Version: 36
-Release: 7%{?dist}
-License: GPLv2+, LGPLv2+
+Version: 60
+Release: 1%{?dist}
+License: GPLv2+ and LGPLv2+
Group: Development/Tools
-URL: http://kvm.sf.net
-Source0: http://download.sourceforge.net/sourceforge/kvm/kvm-%{version}.tar.gz
-Source1: kvm.modules
-Patch0: kvm-19-defaults.patch
-Patch1: kvm-35-ldflags.patch
-Patch2: kvm-bootmenu.patch
+URL: http://%{name}.sf.net
+Source0: http://download.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Source1: %{name}.modules
+Patch1: %{name}-bootmenu.patch
# patches from upstream qemu
-Patch101: kvm-rtl8139-mmio-regions.patch
-Patch102: qemu-atapi-hsm.patch
-Patch103: qemu-0.9.0-vnc-authentication.patch
-Patch104: kvm-rtl8139-checksum.patch
-Patch105: kvm-36-pxeboot.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: SDL-devel
+BuildRequires: SDL-devel
# to build the bios
BuildRequires: dev86
+BuildRequires: iasl
BuildRequires: %{_includedir}/gnu/stubs-32.h
# qemu doesn't build with gcc 4.x
-BuildRequires: compat-gcc-34
-BuildRequires: zlib-devel
-BuildRequires: e2fsprogs-devel
+BuildRequires: compat-gcc-34
+BuildRequires: zlib-devel
# TLS / x509 auth in VNC server
BuildRequires: gnutls-devel
# for the docs
@@ -34,37 +27,28 @@
Requires: initscripts >= 8.08-1
%description
-KVM (for Kernel-based Virtual Machine) is a full virtualization solution
-for Linux on x86 hardware.
+KVM (for Kernel-based Virtual Machine) is a full virtualization solution
+for Linux on x86 hardware.
-Using KVM, one can run multiple virtual machines running unmodified Linux
-or Windows images. Each virtual machine has private virtualized hardware:
+Using KVM, one can run multiple virtual machines running unmodified Linux
+or Windows images. Each virtual machine has private virtualized hardware:
a network card, disk, graphics adapter, etc.
%prep
%setup -q
-%patch0 -p1 -b .defaults
-%patch1 -p1 -b .ldflags
-%patch2 -p1
-
-%patch101 -p1
-%patch102 -p0
-%patch103 -p1 -b .vnc
-%patch104 -p1
-%patch105 -p1
+%patch1 -p1
%build
-LDFLAGS=-Wl,--build-id ./configure --with-patched-kernel --qemu-cc=gcc34 --kerneldir=$(pwd)/kernel --prefix=%{_prefix}
# we need to install the data bits in a different path
-sed -i 's/CONFIG_QEMU_SHAREDIR \"\/usr\/share\/qemu\"/CONFIG_QEMU_SHAREDIR \"\/usr\/share\/kvm\"/' qemu/config-host.h
-sed -i 's/datadir=\/usr\/share\/qemu/datadir=\/usr\/share\/kvm/' qemu/config-host.mak
+sed -i 's/datasuffix=\"\/share\/qemu\"/datasuffix=\"\/share\/kvm\"/' qemu/configure
+./configure --with-patched-kernel --qemu-cc=gcc34 --kerneldir=$(pwd)/kernel --prefix=%{_prefix} --qemu-ldflags="-Wl,--build-id" --enable-alsa
# 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
# manual keeping up of what is in the kvm tree.
sed -i 's/CFLAGS =/CFLAGS +=/' user/Makefile
echo "CFLAGS=$RPM_OPT_FLAGS" >> user/config.mak
-make %{?_smp_mflags}
+make %{?_smp_mflags}
# build the bios, and fix it's makefile
sed -i 's/gcc -m32/gcc/' bios/Makefile
@@ -82,6 +66,14 @@
# no shared lib, static libs
rm -fr $RPM_BUILD_ROOT/%{_includedir} $RPM_BUILD_ROOT/%{_libdir}
+# make install gives it bogus execute permissiions
+chmod -x $RPM_BUILD_ROOT/%{_mandir}/man1/qemu-kvm.1*
+
+# 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}/ppc_rom.bin
+rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}/video.x
+
mv $RPM_BUILD_ROOT/%{_bindir}/qemu* $RPM_BUILD_ROOT/%{_bindir}/qemu-kvm
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules
@@ -94,11 +86,47 @@
%files
%defattr(-,root,root,-)
%{_bindir}/qemu-kvm
-%{_mandir}/man*/*
-%{_datadir}/kvm
-%{_sysconfdir}/sysconfig/modules/kvm.modules
+%{_mandir}/man1/qemu-kvm.1*
+%{_datadir}/%{name}
+%{_sysconfdir}/sysconfig/modules/%{name}.modules
%changelog
+* Thu Jan 31 2008 Jeremy Katz <katzj at redhat.com>
+- We don't need e2fsprogs-devel to build anymore (#331871)
+
+* Thu Jan 24 2008 Daniel P. Berrange <berrange at redhat.com> - 60-1.fc9
+- Updated to kvm-60
+- Fix license tag to keep rpmlint quiet
+- Remove unused PPC, Sparc and PPC Video BIOS
+
+* Tue Jan 15 2008 Bill Nottingham <notting at redhat.com>: - 59-1
+- add upstream patch to fix VMs that no longer boot (#427317)
+- update to kvm-59
+
+* Thu Dec 27 2007 Jeremy Katz <katzj at redhat.com> - 58-2
+- Fix up defaults patch to apply
+
+* Thu Dec 27 2007 Jeremy Katz <katzj at redhat.com> - 58-1
+- Update to kvm-58
+
+* Thu Dec 13 2007 Jeremy Katz <katzj at redhat.com> - 56-1
+- Update to kvm-56
+
+* Tue Dec 4 2007 Jeremy Katz <katzj at redhat.com> - 55-1
+- Update to kvm-55
+
+* Mon Dec 3 2007 Jeremy Katz <katzj at redhat.com> - 54-1
+- update to kvm-54
+
+* Tue Nov 20 2007 Jeremy Katz <katzj at redhat.com> - 53-1
+- update to kvm-53
+
+* Wed Nov 7 2007 Jeremy Katz <katzj at redhat.com> - 51-1
+- update to kvm-51
+
+* Tue Nov 6 2007 Jeremy Katz <katzj at redhat.com> - 50-1
+- update to kvm-50, drop all the patches that have gone upstream
+
* Mon Oct 15 2007 Daniel P. Berrange <berrange at redhat.com> - 36-7.fc8
- Fixed PXE boot when KVM is enabled (rhbz #331191)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kvm/F-8/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 4 Sep 2007 19:00:54 -0000 1.15
+++ sources 18 Feb 2008 18:40:35 -0000 1.16
@@ -1 +1 @@
-0fdbc4a6228f3876166fc0d6f01bb668 kvm-36.tar.gz
+79d92d57ad3b6057a717b25bb20ee72c kvm-60.tar.gz
--- kvm-19-defaults.patch DELETED ---
--- kvm-35-ldflags.patch DELETED ---
--- kvm-rtl8139-checksum.patch DELETED ---
--- kvm-rtl8139-mmio-regions.patch DELETED ---
--- qemu-0.9.0-vnc-authentication.patch DELETED ---
--- qemu-atapi-hsm.patch DELETED ---
More information about the fedora-extras-commits
mailing list