pool/libvirt
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spec file hackery

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=113
This commit is contained in:
James Fehlig 2011-04-05 22:31:12 +00:00 committed by Git OBS Bridge
parent 331f9906ac
commit 701f14656c
2 changed files with 89 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
libvirt.spec
View File

@ -337,7 +337,7 @@ Patch102: xen-pv-cdrom.patch
Patch103: xend-disk-order.patch Patch103: xend-disk-order.patch
# Our patches # Our patches
Patch200: libvirtd-defaults.patch Patch200: libvirtd-defaults.patch
Patch201: use-libvirt-guests-on-suse.patch Patch201: use-init-script-redhat.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -459,15 +459,18 @@ Authors:
%if ! %{with_qemu} %if ! %{with_qemu}
%define _without_qemu --without-qemu %define _without_qemu --without-qemu
%endif %endif
%if ! %{with_lxc}
%define _without_lxc --without-lxc
%endif
%if ! %{with_openvz} %if ! %{with_openvz}
%define _without_openvz --without-openvz %define _without_openvz --without-openvz
%endif %endif
%if ! %{with_lxc}
%define _without_lxc --without-lxc
%endif
%if ! %{with_vbox} %if ! %{with_vbox}
%define _without_vbox --without-vbox %define _without_vbox --without-vbox
%endif %endif
%if ! %{with_xenapi}
%define _without_xenapi --without-xenapi
%endif
%if ! %{with_uml} %if ! %{with_uml}
%define _without_uml --without-uml %define _without_uml --without-uml
%endif %endif
@ -477,9 +480,30 @@ Authors:
%if ! %{with_esx} %if ! %{with_esx}
%define _without_esx --without-esx %define _without_esx --without-esx
%endif %endif
%if ! %{with_vmware}
%define _without_vmware --without-vmware
%endif
%if ! %{with_libxl} %if ! %{with_libxl}
%define _without_libxl --without-libxl %define _without_libxl --without-libxl
%endif %endif
%if ! %{with_libvirtd}
%define _without_libvirtd --without-libvirtd
%endif
%if ! %{with_storage_fs}
%define _without_storage_fs --without-storage-fs
%endif
%if ! %{with_storage_lvm}
%define _without_storage_lvm --without-storage-lvm
%endif
%if ! %{with_storage_iscsi}
%define _without_storage_iscsi --without-storage-iscsi
%endif
%if ! %{with_storage_disk}
%define _without_storage_disk --without-storage-disk
%endif
%if ! %{with_storage_mpath}
%define _without_storage_mpath --without-storage-mpath
%endif
%if ! %{with_numactl} %if ! %{with_numactl}
%define _without_numactl --without-numactl %define _without_numactl --without-numactl
%endif %endif
@ -528,19 +552,26 @@ export CFLAGS="$RPM_OPT_FLAGS"
%configure --disable-static --with-pic \ %configure --disable-static --with-pic \
%{?_without_xen} \ %{?_without_xen} \
%{?_without_qemu} \ %{?_without_qemu} \
%{?_without_lxc} \
%{?_without_openvz} \ %{?_without_openvz} \
%{?_without_lxc} \
%{?_without_vbox} \ %{?_without_vbox} \
%{?_without_xenapi} \
%{?_without_uml} \ %{?_without_uml} \
%{?_without_phyp} \ %{?_without_phyp} \
%{?_without_esx} \ %{?_without_esx} \
%{?_without_vmware} \
%{?_without_libxl} \ %{?_without_libxl} \
%{?_without_libvirtd} \
%{?_without_storage_fs} \
%{?_without_storage_lvm} \
%{?_without_storage_iscsi} \
%{?_without_storage_disk} \
%{?_without_storage_mpath} \
%{?_without_numactl} \ %{?_without_numactl} \
%{?_without_selinux} \ %{?_without_selinux} \
%{?_without_apparmor} \ %{?_without_apparmor} \
%{?_without_capng} \ %{?_without_capng} \
%{?_without_netcf} \ %{?_without_netcf} \
%{?_without_network} \
%{?_without_hal} \ %{?_without_hal} \
%{?_without_udev} \ %{?_without_udev} \
%{?_without_yajl} \ %{?_without_yajl} \
@ -552,6 +583,7 @@ export CFLAGS="$RPM_OPT_FLAGS"
%{?_without_libpcap} \ %{?_without_libpcap} \
--libexecdir=%{_libdir}/%{name} \ --libexecdir=%{_libdir}/%{name} \
--with-remote-pid-file=%{_localstatedir}/run/libvirtd.pid \ --with-remote-pid-file=%{_localstatedir}/run/libvirtd.pid \
--with-init-script=redhat \
ac_cv_path_MODPROBE=/sbin/modprobe \ ac_cv_path_MODPROBE=/sbin/modprobe \
ac_cv_path_UDEVADM=/sbin/udevadm \ ac_cv_path_UDEVADM=/sbin/udevadm \
ac_cv_path_SHOWMOUNT=/usr/sbin/showmount ac_cv_path_SHOWMOUNT=/usr/sbin/showmount
@ -567,7 +599,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/libvirt
rm $RPM_BUILD_ROOT%{_libdir}/*.*a $RPM_BUILD_ROOT%{py_sitedir}/*.*a rm $RPM_BUILD_ROOT%{_libdir}/*.*a $RPM_BUILD_ROOT%{py_sitedir}/*.*a
%find_lang %{name} %find_lang %{name}
%if %{with_network} %if %{with_network}
install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/lib/libvirt/dnsmasq/ install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt/dnsmasq/
install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/ install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/
cp $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml \ cp $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml \
$RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml
@ -593,15 +625,10 @@ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.qemu
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.uml rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.uml
%endif %endif
%if ! %{with_python} %if ! %{with_python}
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-python-%{version} rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-python
%endif
%if %{client_only}
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version}
%endif %endif
%if ! %{with_libvirtd} %if ! %{with_libvirtd}
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/nwfilter rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/nwfilter
mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version}/html \
$RPM_BUILD_ROOT%{_datadir}/doc/libvirt-devel-%{version}/
%endif %endif
ln_dupes() ln_dupes()
@ -622,9 +649,11 @@ ln_dupes()
) )
# init scripts # init scripts
mkdir -p $RPM_BUILD_ROOT/etc/init.d mkdir -p $RPM_BUILD_ROOT/etc/init.d
install %SOURCE1 $RPM_BUILD_ROOT/etc/init.d/libvirtd %if %{with_libvirtd}
ln -s /etc/init.d/libvirtd $RPM_BUILD_ROOT/usr/sbin/rclibvirtd install %SOURCE1 $RPM_BUILD_ROOT%{_sysconfdir}/init.d/libvirtd
ln -s /etc/init.d/libvirt-guests $RPM_BUILD_ROOT/usr/sbin/rclibvirt-guests ln -s /etc/init.d/libvirtd $RPM_BUILD_ROOT%{_sbindir}/rclibvirtd
%endif
ln -s /etc/init.d/libvirt-guests $RPM_BUILD_ROOT%{_sbindir}/rclibvirt-guests
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -632,10 +661,9 @@ rm -rf $RPM_BUILD_ROOT
%post %post
/sbin/ldconfig /sbin/ldconfig
%if %{with_libvirtd} %if %{with_libvirtd}
%if 0%{?sles_version} %if %{with_network}
%{fillup_and_insserv -f -y libvirtd} # Install the default network if one doesn't exist
%endif if test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml
if test $? != 0 && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml
then then
UUID=`/usr/bin/uuidgen` UUID=`/usr/bin/uuidgen`
sed -e "s,</name>,</name>\n <uuid>$UUID</uuid>," \ sed -e "s,</name>,</name>\n <uuid>$UUID</uuid>," \
@ -643,6 +671,12 @@ then
> %{_sysconfdir}/libvirt/qemu/networks/default.xml > %{_sysconfdir}/libvirt/qemu/networks/default.xml
fi fi
%endif %endif
%if 0%{?sles_version}
%{fillup_and_insserv -y libvirtd}
%else
%{fillup_only -n libvirtd}
%endif
%endif
%{fillup_only -n libvirt-guests} %{fillup_only -n libvirt-guests}
%preun %preun
@ -671,16 +705,18 @@ fi
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/
%dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/dnsmasq/
%dir %{_datadir}/libvirt/networks/ %dir %{_datadir}/libvirt/networks/
%{_datadir}/libvirt/networks/default.xml %{_datadir}/libvirt/networks/default.xml
%endif %endif
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/
%{_sysconfdir}/libvirt/nwfilter/*.xml %{_sysconfdir}/libvirt/nwfilter/*.xml
%{_localstatedir}/adm/fillup-templates/sysconfig.libvirtd
%config /etc/init.d/libvirtd %config /etc/init.d/libvirtd
%{_sbindir}/rclibvirtd %{_sbindir}/rclibvirtd
%config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/
%dir %{_localstatedir}/lib/libvirt/ %dir %{_localstatedir}/lib/libvirt/
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/images/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/images/
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/boot/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/boot/
@ -717,10 +753,9 @@ fi
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/
#%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/libxl/ #%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/libxl/
%endif %endif
%if 0%{with_storage_disk} %if %{with_storage_disk}
%{_libdir}/%{name}/libvirt_parthelper %{_libdir}/%{name}/libvirt_parthelper
%endif %endif
%{_libdir}/%{name}/libvirt_iohelper
%doc %{_mandir}/man8/libvirtd.8* %doc %{_mandir}/man8/libvirtd.8*
%endif %endif
@ -735,10 +770,12 @@ fi
%{_bindir}/virsh %{_bindir}/virsh
%{_bindir}/virt-xml-validate %{_bindir}/virt-xml-validate
%{_bindir}/virt-pki-validate %{_bindir}/virt-pki-validate
%dir %{_libdir}/%{name}
%{_libdir}/lib*.so.* %{_libdir}/lib*.so.*
%{_localstatedir}/adm/fillup-templates/sysconfig.libvirt-guests %{_localstatedir}/adm/fillup-templates/sysconfig.libvirt-guests
%config /etc/init.d/libvirt-guests %config /etc/init.d/libvirt-guests
%{_sbindir}/rclibvirt-guests %{_sbindir}/rclibvirt-guests
%{_libdir}/%{name}/libvirt_iohelper
%dir %{_datadir}/libvirt/ %dir %{_datadir}/libvirt/
%dir %{_datadir}/libvirt/schemas/ %dir %{_datadir}/libvirt/schemas/

48
use-libvirt-guests-on-suse.patch → use-init-script-redhat.patch
View File

@ -2,11 +2,9 @@ Index: libvirt-0.9.0/tools/Makefile.am
=================================================================== ===================================================================
--- libvirt-0.9.0.orig/tools/Makefile.am --- libvirt-0.9.0.orig/tools/Makefile.am
+++ libvirt-0.9.0/tools/Makefile.am +++ libvirt-0.9.0/tools/Makefile.am
@@ -129,18 +129,18 @@ install-data-local: install-init @@ -131,16 +131,17 @@ uninstall-local: uninstall-init
uninstall-local: uninstall-init if LIBVIRT_INIT_SCRIPT_RED_HAT
-if LIBVIRT_INIT_SCRIPT_RED_HAT
install-init: libvirt-guests.init install-init: libvirt-guests.init
- mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d - mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d
+ mkdir -p $(DESTDIR)$(sysconfdir)/init.d + mkdir -p $(DESTDIR)$(sysconfdir)/init.d
@ -14,32 +12,20 @@ Index: libvirt-0.9.0/tools/Makefile.am
- $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirt-guests - $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirt-guests
- mkdir -p $(DESTDIR)$(sysconfdir)/sysconfig - mkdir -p $(DESTDIR)$(sysconfdir)/sysconfig
+ $(DESTDIR)$(sysconfdir)/init.d/libvirt-guests + $(DESTDIR)$(sysconfdir)/init.d/libvirt-guests
+ mkdir -p $(DESTDIR)/var/adm/fillup-templates + mkdir -p $(DESTDIR)$(localstatedir)/adm/fillup-templates
$(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \ $(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \
- $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests - $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
+ $(DESTDIR)/var/adm/fillup-templates/sysconfig.libvirt-guests + $(DESTDIR)$(localstatedir)/adm/fillup-templates/sysconfig.libvirt-guests
uninstall-init: uninstall-init:
- rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirt-guests \ - rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirt-guests \
- $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests - $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
+ rm -f $(DESTDIR)$(sysconfdir)/init.d/libvirt-guests \ + rm -f $(DESTDIR)$(sysconfdir)/init.d/libvirt-guests \
+ $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests \ + $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests \
+ $(DESTDIR)/var/adm/fillup-templates/sysconfig.libvirt-guests + $(DESTDIR)$(localstatedir)/adm/fillup-templates/sysconfig.libvirt-guests
BUILT_SOURCES += libvirt-guests.init BUILT_SOURCES += libvirt-guests.init
@@ -155,11 +155,6 @@ libvirt-guests.init: libvirt-guests.init
< $< > $@-t && \
chmod a+x $@-t && \
mv $@-t $@
-else
-install-init:
-uninstall-init:
-libvirt-guests.init:
-endif # LIBVIRT_INIT_SCRIPT_RED_HAT
CLEANFILES = $(bin_SCRIPTS)
Index: libvirt-0.9.0/tools/libvirt-guests.sysconf Index: libvirt-0.9.0/tools/libvirt-guests.sysconf
=================================================================== ===================================================================
--- libvirt-0.9.0.orig/tools/libvirt-guests.sysconf --- libvirt-0.9.0.orig/tools/libvirt-guests.sysconf
@ -228,3 +214,27 @@ Index: libvirt-0.9.0/tools/libvirt-guests.init.sh
esac esac
-exit $RETVAL -exit $RETVAL
+rc_exit +rc_exit
Index: libvirt-0.9.0/daemon/Makefile.am
===================================================================
--- libvirt-0.9.0.orig/daemon/Makefile.am
+++ libvirt-0.9.0/daemon/Makefile.am
@@ -280,16 +280,12 @@ install-logrotate: $(LOGROTATE_CONFS)
if LIBVIRT_INIT_SCRIPT_RED_HAT
install-init: libvirtd.init
- mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d
- $(INSTALL_SCRIPT) libvirtd.init \
- $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd
- mkdir -p $(DESTDIR)$(sysconfdir)/sysconfig
+ mkdir -p $(DESTDIR)$(localstatedir)/adm/fillup-templates
$(INSTALL_DATA) $(srcdir)/libvirtd.sysconf \
- $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd
+ $(DESTDIR)$(localstatedir)/adm/fillup-templates/sysconfig.libvirtd
uninstall-init:
- rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd \
- $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd
+ rm -f $(DESTDIR)$(localstatedir)/adm/fillup-templates/sysconfig.libvirtd
BUILT_SOURCES += libvirtd.init