Changes - j0ke.net Open Build Service

Changes of Revision 2

[-] [+]	Added	libvirt.spec
@@ -0,0 +1,598 @@ +# -- rpm-spec -- + +%define with_xen 1 +%define with_xen_proxy 1 +%define with_qemu 1 + +# Xen is available only on i386 x86_64 ia64 +%ifnarch i386 i686 x86_64 ia64 +%define with_xen 0 +%endif + +%if ! %{with_xen} +%define with_xen_proxy 0 +%endif + +%if "%{fedora}" +%ifarch ppc64 +%define with_qemu 0 +%endif +%endif + +#%if 0%{fedora} >= 8 +#%define with_xen_proxy 0 +#%endif + +Summary: Library providing a simple API virtualization +Name: libvirt +Version: 0.4.4 +Release: 3%{?dist}%{?extra_release} +License: LGPLv2+ +Group: Development/Libraries +Source: libvirt-%{version}.tar.gz +Patch1: %{name}-%{version}-boot-cdrom.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-root +URL: http://libvirt.org/ +BuildRequires: python python-devel +Requires: libxml2 +Requires: readline +Requires: ncurses +Requires: dnsmasq +Requires: bridge-utils +Requires: iptables +# So remote clients can access libvirt over SSH tunnel +# (client invokes 'nc' against the UNIX socket on the server) +Requires: nc +Requires: cyrus-sasl +# Not technically required, but makes 'out-of-box' config +# work correctly & doesn't have onerous dependencies +Requires: cyrus-sasl-md5 +# For mount/umount in FS driver +BuildRequires: util-linux +%if %{with_qemu} +# From QEMU RPMs +Requires: qemu-img +%else +%if %{with_xen} +# From Xen RPMs +Requires: /usr/sbin/qcow-create +%endif +%endif +# For LVM drivers +Requires: lvm2 +# For ISCSI driver +Requires: iscsi-initiator-utils +# For disk driver +Requires: parted +%if %{with_xen} +BuildRequires: xen-devel +%endif +BuildRequires: libxml2-devel +BuildRequires: readline-devel +BuildRequires: ncurses-devel +BuildRequires: gettext +BuildRequires: gnutls-devel +BuildRequires: avahi-devel +BuildRequires: libselinux-devel +BuildRequires: dnsmasq +BuildRequires: bridge-utils +%if %{with_qemu} +BuildRequires: qemu +%endif +BuildRequires: cyrus-sasl-devel +# For mount/umount in FS driver +BuildRequires: util-linux +%if %{with_qemu} +# From QEMU RPMs +BuildRequires: qemu-img +%else +%if %{with_xen} +# From Xen RPMs +BuildRequires: /usr/sbin/qcow-create +%endif +%endif +# For LVM drivers +BuildRequires: lvm2 +# For ISCSI driver +BuildRequires: iscsi-initiator-utils +# For disk driver +BuildRequires: parted-devel +Obsoletes: libvir + +# Fedora build root suckage +BuildRequires: gawk + +%description +Libvirt is a C toolkit to interact with the virtualization capabilities +of recent versions of Linux (and other OSes). + +%package devel +Summary: Libraries, includes, etc. to compile with the libvirt library +Group: Development/Libraries +Requires: libvirt = %{version} +Requires: pkgconfig +%if %{with_xen} +Requires: xen-devel +%endif +Obsoletes: libvir-devel + +%description devel +Includes and documentations for the C library providing an API to use +the virtualization capabilities of recent versions of Linux (and other OSes). + +%package python +Summary: Python bindings for the libvirt library +Group: Development/Libraries +Requires: libvirt = %{version} +Obsoletes: libvir-python + +%description python +The libvirt-python package contains a module that permits applications +written in the Python programming language to use the interface +supplied by the libvirt library to use the virtualization capabilities +of recent versions of Linux (and other OSes). + +%prep +%setup -q +%patch1 -p1 + +%build +%if ! %{with_xen} +%define _without_xen --without-xen +%endif + +%if ! %{with_qemu} +%define _without_qemu --without-qemu +%endif + +%configure %{?_without_xen} \ + %{?_without_qemu} \ + --with-init-script=redhat \ + --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \ + --with-remote-file=%{_localstatedir}/run/libvirtd.pid +make + +%install +rm -fr %{buildroot} + +%makeinstall +(cd docs/examples ; make clean ; rm -rf .deps Makefile Makefile.in) +(cd docs/examples/python ; rm -f Makefile Makefile.in) +rm -f $RPM_BUILD_ROOT%{_libdir}/.la +rm -f $RPM_BUILD_ROOT%{_libdir}/.a +rm -f $RPM_BUILD_ROOT%{_libdir}/python/site-packages/.la +rm -f $RPM_BUILD_ROOT%{_libdir}/python/site-packages/.a +install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/run/libvirt/ +# Default dir for disk images defined in SELinux policy +install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt/images/ +# Default dir for kernel+initrd images defnied in SELinux policy +install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt/boot/ + +# We don't want to install /etc/libvirt/qemu/networks in the main %files list +# because if the admin wants to delete the default network completely, we don't +# want to end up re-incarnating it on every RPM upgrade. +install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/ +cp $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml \ + $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml +rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml +rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml +# Strip auto-generated UUID - we need it generated per-install +sed -i -e "/<uuid>/d" $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml +%find_lang %{name} + +%clean +rm -fr %{buildroot} + +%post +/sbin/ldconfig + +# We want to install the default network for initial RPM installs +# or on the first upgrade from a non-network aware libvirt only. +# We check this by looking to see if the daemon is already installed +/sbin/chkconfig --list libvirtd 1>/dev/null 2>&1 +if [ $? != 0 ] +then + UUID=`/usr/bin/uuidgen` + sed -e "s,</name>,</name>\n <uuid>$UUID</uuid>," \ + < %{_datadir}/libvirt/networks/default.xml \ + > %{_sysconfdir}/libvirt/qemu/networks/default.xml + ln -s ../default.xml %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
[-] [+]	Added	libvirt-0.4.4-boot-cdrom.patch ^
@@ -0,0 +1,99 @@ +diff -rupN libvirt-0.4.4.orig/src/qemu_conf.c libvirt-0.4.4.new/src/qemu_conf.c +--- libvirt-0.4.4.orig/src/qemu_conf.c 2008-06-19 14:15:02.000000000 +0100 ++++ libvirt-0.4.4.new/src/qemu_conf.c 2008-07-08 12:24:07.000000000 +0100 +@@ -2616,7 +2616,8 @@ int qemudBuildCommandLine(virConnectPtr + disk->src, qemudBusIdToName(disk->bus, 1), + media ? media : "", + idx, +- bootable ? ",boot=on" : ""); ++ bootable && disk->device == QEMUD_DISK_DISK ++ ? ",boot=on" : ""); + + ADD_ARG_LIT("-drive"); + ADD_ARG_LIT(opt); +diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args +--- libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args 1970-01-01 01:00:00.000000000 +0100 ++++ libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args 2008-07-08 12:25:59.000000000 +0100 +@@ -0,0 +1 @@ ++/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot d -drive file=/dev/HostVG/QEMUGuest1,if=ide,index=0 -drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,index=2 -net none -serial none -parallel none -usb +\ No newline at end of file +diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml +--- libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml 1970-01-01 01:00:00.000000000 +0100 ++++ libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml 2008-07-08 12:20:42.000000000 +0100 +@@ -0,0 +1,26 @@ ++<domain type='qemu'> ++ <name>QEMUGuest1</name> ++ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> ++ <memory>219200</memory> ++ <currentMemory>219200</currentMemory> ++ <vcpu>1</vcpu> ++ <os> ++ <type arch='i686' machine='pc'>hvm</type> ++ <boot dev='cdrom'/> ++ </os> ++ <clock offset='utc'/> ++ <on_poweroff>destroy</on_poweroff> ++ <on_reboot>restart</on_reboot> ++ <on_crash>destroy</on_crash> ++ <devices> ++ <emulator>/usr/bin/qemu</emulator> ++ <disk type='block' device='disk'> ++ <source dev='/dev/HostVG/QEMUGuest1'/> ++ <target dev='hda' bus='ide'/> ++ </disk> ++ <disk type='block' device='cdrom'> ++ <source dev='/dev/HostVG/QEMUGuest2'/> ++ <target dev='hdc' bus='ide'/> ++ </disk> ++ </devices> ++</domain> +diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args +--- libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args 1970-01-01 01:00:00.000000000 +0100 ++++ libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args 2008-07-08 12:13:15.000000000 +0100 +@@ -0,0 +1 @@ ++/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,index=0,boot=on -drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,index=2 -net none -serial none -parallel none -usb +\ No newline at end of file +diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml +--- libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml 1970-01-01 01:00:00.000000000 +0100 ++++ libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml 2008-07-08 12:12:41.000000000 +0100 +@@ -0,0 +1,26 @@ ++<domain type='qemu'> ++ <name>QEMUGuest1</name> ++ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> ++ <memory>219200</memory> ++ <currentMemory>219200</currentMemory> ++ <vcpu>1</vcpu> ++ <os> ++ <type arch='i686' machine='pc'>hvm</type> ++ <boot dev='hd'/> ++ </os> ++ <clock offset='utc'/> ++ <on_poweroff>destroy</on_poweroff> ++ <on_reboot>restart</on_reboot> ++ <on_crash>destroy</on_crash> ++ <devices> ++ <emulator>/usr/bin/qemu</emulator> ++ <disk type='block' device='disk'> ++ <source dev='/dev/HostVG/QEMUGuest1'/> ++ <target dev='hda' bus='ide'/> ++ </disk> ++ <disk type='block' device='cdrom'> ++ <source dev='/dev/HostVG/QEMUGuest2'/> ++ <target dev='hdc' bus='ide'/> ++ </disk> ++ </devices> ++</domain> +diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvtest.c libvirt-0.4.4.new/tests/qemuxml2argvtest.c +--- libvirt-0.4.4.orig/tests/qemuxml2argvtest.c 2008-06-02 10:16:46.000000000 +0100 ++++ libvirt-0.4.4.new/tests/qemuxml2argvtest.c 2008-07-08 12:21:53.000000000 +0100 +@@ -158,6 +158,10 @@ mymain(int argc, char **argv) + QEMUD_CMD_FLAG_DRIVE_BOOT); + DO_TEST("disk-xenvbd", QEMUD_CMD_FLAG_DRIVE \| + QEMUD_CMD_FLAG_DRIVE_BOOT); ++ DO_TEST("disk-drive-boot-disk", QEMUD_CMD_FLAG_DRIVE \| ++ QEMUD_CMD_FLAG_DRIVE_BOOT); ++ DO_TEST("disk-drive-boot-cdrom", QEMUD_CMD_FLAG_DRIVE \| ++ QEMUD_CMD_FLAG_DRIVE_BOOT); + DO_TEST("graphics-vnc", 0); + DO_TEST("graphics-sdl", 0); + DO_TEST("input-usbmouse", 0);
	Added	libvirt-0.4.4.tar.gz ^