[vdsm/f20] Build vdsm 4.16.10 - ovirt 3.5
Yaniv Bronhaim
bronhaim at fedoraproject.org
Mon Dec 29 06:45:29 UTC 2014
commit f8d9aab45191be7d67f0ab7a9da81fdf116a217a
Author: Yaniv Bronhaim <ybronhei at redhat.com>
Date: Mon Dec 29 08:45:20 2014 +0200
Build vdsm 4.16.10 - ovirt 3.5
sources | 2 +-
vdsm.spec | 87 ++++++++++++++++++++++++++++++++++++++++---------------------
2 files changed, 58 insertions(+), 31 deletions(-)
---
diff --git a/sources b/sources
index aa9f92c..a7bf884 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d2e7b4ad6e78980b8aa3da6afd4ca71a vdsm-4.16.7.tar.gz
+179114e8e977a94897e083f8b4a22556 vdsm-4.16.10.tar.gz
diff --git a/vdsm.spec b/vdsm.spec
index fb73578..b76f5f9 100644
--- a/vdsm.spec
+++ b/vdsm.spec
@@ -21,11 +21,19 @@
%global fedora_koji_build 1
%global with_hooks 1
+# RHEV build - overridable using rpmbuild --define "rhev_build 1"
+%{!?rhev_build: %global rhev_build 0}
+
# Default to skipping autoreconf. Distros can change just this one line
# (or provide a command-line override) if they backport any patches that
# touch configure.ac or Makefile.am.
%{!?enable_autotools:%define enable_autotools 1}
+# Skips check since rhel default repos lack pep8 and pyflakes
+%if ! 0%{?rhel}
+%global with_check 1
+%endif
+
# Required paths
%if 0%{?fedora} >= 18
%global _polkitdir %{_datadir}/polkit-1/rules.d
@@ -41,10 +49,6 @@
%global with_vhostmd 1
%endif
-%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
-%global with_chcon_hack 1
-%endif
-
%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
%global with_systemd 1
%endif
@@ -54,6 +58,10 @@
%global with_tmpfiles_macro 1
%endif
+%if 0%{?fedora} || 0%{?rhel} >= 7
+%global with_chown_hack 1
+%endif
+
%if 0%{?rhel} == 6
%global _udevrulesdir /lib/udev/rules.d/
%global _udevexecdir /lib/udev/
@@ -63,8 +71,8 @@
%endif
Name: %{vdsm_name}
-Version: 4.16.7
-Release: 1.gitdb83943%{?dist}%{?extra_release}
+Version: 4.16.10
+Release: 0%{?dist}%{?extra_release}
Summary: Virtual Desktop Server Manager
Group: Applications/System
@@ -83,6 +91,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if !%{fedora_koji_build}
ExclusiveArch: x86_64 ppc64
+%else
+%global with_check 0
%endif
BuildRequires: gcc
@@ -101,16 +111,19 @@ BuildRequires: python-inotify
BuildRequires: python-pthreading
BuildRequires: python-cpopen >= 1.3
BuildRequires: python-ioprocess >= 0.12
+BuildRequires: qemu-img
BuildRequires: rpm-python
BuildRequires: libnl
BuildRequires: libselinux-python
BuildRequires: libvirt-python
BuildRequires: genisoimage
BuildRequires: openssl
+BuildRequires: policycoreutils-python
BuildRequires: m2crypto
%if 0%{?rhel} == 6
BuildRequires: python-argparse
BuildRequires: python-ordereddict
+BuildRequires: python-simplejson >= 2.0.9
%endif
# Autotools BuildRequires
@@ -121,7 +134,7 @@ BuildRequires: gettext-devel
BuildRequires: libtool
%endif
-%if !0%{?rhel}
+%if 0%{?with_check}
BuildRequires: pyflakes
BuildRequires: python-pep8
%endif
@@ -152,7 +165,13 @@ Requires: libguestfs-tools-c
Requires: libnl
Requires: %{name}-xmlrpc = %{version}-%{release}
Requires: %{name}-jsonrpc = %{version}-%{release}
-Requires: mom >= 0.4.1
+
+%if 0%{?rhev_build}
+Requires: mom >= 0.4.1-4
+%else
+Requires: mom >= 0.4.3
+%endif
+
# Numactl is not available on s390[x] and ARM
%ifnarch s390 s390x %{arm}
Requires: numactl
@@ -200,7 +219,7 @@ Requires: fence-agents-all
Requires: lvm2
Requires: python
Requires: policycoreutils-python
-Requires: selinux-policy-targeted
+Requires: selinux-policy-targeted >= 3.12.1-153.el7_0.13
%else
Requires: python
Requires: device-mapper-multipath >= 0.4.9-52
@@ -209,8 +228,8 @@ Requires: fence-agents
Requires: kernel >= 2.6.32-279.9.1
Requires: initscripts >= 9.03.31-2.el6_3.1
Requires: policycoreutils >= 2.0.83-19.30
-Requires: policycoreutils-python >= 2.0.83-19.30
-Requires: selinux-policy-targeted >= 3.7.19-195.el6_4.13
+Requires: policycoreutils-python >= 2.0.83-19.47.el6_6.1
+Requires: selinux-policy-targeted >= 3.7.19-260.el6_6.1
Requires: lvm2 >= 2.02.100-5
Requires: logrotate < 3.8.0
%endif
@@ -317,6 +336,7 @@ Requires: %{name}-yajsonrpc = %{version}-%{release}
Obsoletes: vdsm-api < 4.16
%if 0%{?rhel} == 6
Requires: python-ordereddict
+Requires: python-simplejson >= 2.0.9
%endif
%description jsonrpc
@@ -657,7 +677,7 @@ sed -i '/ su /d' vdsm/vdsm-logrotate.conf.in
%if 0%{?enable_autotools}
autoreconf -if
%endif
-%configure %{?with_hooks:--enable-hooks} %{?with_chcon_hack:--enable-chcon-hack}
+%configure %{?with_hooks:--enable-hooks} %{?with_chown_hack:--enable-chown-hack}
make
# Setting software_version and software_revision in dsaversion.py
baserelease=`echo "%{release}" | sed 's/\([0-9]\+\(\.[0-9]\+\)\?\).*/\1/'`
@@ -684,11 +704,6 @@ install -Dm 0755 init/sysvinit/respawn \
install -Dm 0644 vdsm/storage/vdsm-lvm.rules \
%{buildroot}%{_udevrulesdir}/12-vdsm-lvm.rules
-%if 0%{?with_chcon_hack}
-install -Dm 0755 vdsm/storage/vdsm-chcon \
- %{buildroot}%{_udevexecdir}/vdsm-chcon
-%endif
-
install -Dm 0644 vdsm/limits.conf \
%{buildroot}/etc/security/limits.d/99-vdsm.conf
@@ -738,10 +753,9 @@ install -Dm 0755 vdsm/virt/libvirt-hook.sh \
%endif
%check
-# Disabling the nose tests until they'll all succeed in koji.
-# make check is failing on F-18+ due to pep8 issues. See RHBZ # 837014
-# make check NOSE_EXCLUDE=".*"
-#make check
+%if 0%{?with_check}
+make check
+%endif
%clean
rm -rf %{buildroot}
@@ -756,11 +770,19 @@ export LC_ALL=C
/usr/sbin/usermod -a -G %{qemu_group},%{snlk_group} %{vdsm_user}
/usr/sbin/usermod -a -G %{cdrom_group} %{qemu_user}
+# We keep the previous rpm version number in a file for managing upgrade flow
+# in vdsmd_init_script upgraded_version_check task
+if [ "$1" -gt 1 ]; then
+ rpm -q %{vdsm_name} > "%{_localstatedir}/lib/%{vdsm_name}/upgraded_version"
+fi
+
%post
%{_bindir}/vdsm-tool configure --module sanlock --force >/dev/null
-%{_bindir}/vdsm-tool sebool-config || :
-# set the vdsm "secret" password for libvirt
-%{_bindir}/vdsm-tool set-saslpasswd
+# update the vdsm "secret" password for libvirt
+if [ -f /etc/pki/vdsm/keys/libvirt_password ]; then
+ /usr/sbin/saslpasswd2 -p -a libvirt vdsm at ovirt < \
+ /etc/pki/vdsm/keys/libvirt_password
+fi
# After vdsm install we should create the logs files.
# In the install session we create it but since we use
@@ -823,8 +845,6 @@ then
/bin/sed -i '/# VDSM section begin/,/# VDSM section end/d' \
/etc/sysctl.conf
- %{_bindir}/vdsm-tool sebool-unconfig || :
-
%{_bindir}/vdsm-tool remove-saslpasswd
if /sbin/initctl status libvirtd >/dev/null 2>/dev/null ; then
@@ -996,10 +1016,12 @@ exit 0
%{_datadir}/%{vdsm_name}/virt/migration.py*
%{_datadir}/%{vdsm_name}/virt/vmchannels.py*
%{_datadir}/%{vdsm_name}/virt/vmstatus.py*
+%{_datadir}/%{vdsm_name}/virt/vmtune.py*
%{_datadir}/%{vdsm_name}/virt/vm.py*
%{_datadir}/%{vdsm_name}/virt/vmexitreason.py*
%{_datadir}/%{vdsm_name}/virt/vmpowerdown.py*
%{_datadir}/%{vdsm_name}/virt/sampling.py*
+%{_datadir}/%{vdsm_name}/virt/utils.py*
%{_datadir}/%{vdsm_name}/tool
%config(noreplace) %{_sysconfdir}/%{vdsm_name}/vdsm.conf
@@ -1026,6 +1048,7 @@ exit 0
%{_datadir}/%{vdsm_name}/logUtils.py*
%{_datadir}/%{vdsm_name}/dsaversion.py*
%{_libexecdir}/%{vdsm_name}/curl-img-wrap
+%{_libexecdir}/%{vdsm_name}/fc-scan
%{_libexecdir}/%{vdsm_name}/persist-vdsm-hooks
%{_libexecdir}/%{vdsm_name}/unpersist-vdsm-hook
%{_libexecdir}/%{vdsm_name}/ovirt_functions.sh
@@ -1167,9 +1190,6 @@ exit 0
%endif
%{python_sitelib}/sos/plugins/vdsm.py*
%{_udevrulesdir}/12-vdsm-lvm.rules
-%if 0%{?with_chcon_hack}
-%{_udevexecdir}/vdsm-chcon
-%endif
/etc/security/limits.d/99-vdsm.conf
%{_mandir}/man8/vdsmd.8*
%if 0%{?rhel}
@@ -1190,6 +1210,7 @@ exit 0
%dir %{_sysconfdir}/pki/%{vdsm_name}/certs
%dir %{_sysconfdir}/pki/%{vdsm_name}/libvirt-spice
%config(noreplace) %{_sysconfdir}/pki/%{vdsm_name}/keys/libvirt_password
+%{_localstatedir}/lib/%{vdsm_name}/bonding-defaults.json
%dir %{_localstatedir}/lib/%{vdsm_name}
%dir %{_localstatedir}/lib/%{vdsm_name}/netconfback
%dir %{_localstatedir}/lib/%{vdsm_name}/persistence
@@ -1231,6 +1252,7 @@ exit 0
%{python_sitelib}/%{vdsm_name}/tool/load_needed_modules.py*
%endif
%{python_sitelib}/%{vdsm_name}/tool/dummybr.py*
+%{python_sitelib}/%{vdsm_name}/tool/dump_bonding_defaults.py*
%{python_sitelib}/%{vdsm_name}/tool/nwfilter.py*
%{python_sitelib}/%{vdsm_name}/tool/configurator.py*
%{python_sitelib}/%{vdsm_name}/tool/configurators/__init__*
@@ -1238,9 +1260,9 @@ exit 0
%{python_sitelib}/%{vdsm_name}/tool/configurators/certificates.py*
%{python_sitelib}/%{vdsm_name}/tool/configurators/libvirt.py*
%{python_sitelib}/%{vdsm_name}/tool/configurators/sanlock.py*
+%{python_sitelib}/%{vdsm_name}/tool/configurators/sebool.py*
%{python_sitelib}/%{vdsm_name}/tool/passwd.py*
%{python_sitelib}/%{vdsm_name}/tool/restore_nets.py*
-%{python_sitelib}/%{vdsm_name}/tool/seboolsetup.py*
%{python_sitelib}/%{vdsm_name}/tool/service.py*
%{python_sitelib}/%{vdsm_name}/tool/transient.py*
%{python_sitelib}/%{vdsm_name}/tool/unified_persistence.py*
@@ -1301,6 +1323,8 @@ exit 0
%{_libexecdir}/%{vdsm_name}/hooks/after_nic_hotunplug/openstacknet_utils.py*
%{_libexecdir}/%{vdsm_name}/hooks/before_device_create/50_openstacknet
%{_libexecdir}/%{vdsm_name}/hooks/before_device_create/openstacknet_utils.py*
+%{_libexecdir}/%{vdsm_name}/hooks/before_device_migrate_destination/50_openstacknet
+%{_libexecdir}/%{vdsm_name}/hooks/before_device_migrate_destination/openstacknet_utils.py*
%{_libexecdir}/%{vdsm_name}/hooks/before_nic_hotplug/50_openstacknet
%{_libexecdir}/%{vdsm_name}/hooks/before_nic_hotplug/openstacknet_utils.py*
@@ -1548,6 +1572,9 @@ exit 0
%endif
%changelog
+* Thu Dec 25 2014 Yaniv Bronhaim <ybronhei at redhat.com> - 4.16.10
+* vdsm tag 4.16.10 - ovirt 3.5 build
+
* Wed Oct 8 2014 Yaniv Bronhaim <ybronhei at redhat.com> - 4.16.7
- vdsm tag 4.16.7
More information about the scm-commits
mailing list