[node-patches] Change in ovirt-node[master]: spec: split sources in subpackages
dougsland at redhat.com
dougsland at redhat.com
Mon Mar 2 21:39:16 UTC 2015
Douglas Schilling Landgraf has uploaded a new change for review.
Change subject: spec: split sources in subpackages
......................................................................
spec: split sources in subpackages
To avoid a huge rpm with all files, we now will split by subpackages
allowing the node bits be installed on demand.
Change-Id: I5cf1d37ef28ca350780abd9c53cd437abc7e1460
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1191419
Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
---
M ovirt-node.spec.in
1 file changed, 274 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/95/38295/1
diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in
index e945892..990cffc 100644
--- a/ovirt-node.spec.in
+++ b/ovirt-node.spec.in
@@ -95,7 +95,6 @@
# for applying patches in %post
Requires(post): patch
%endif
-Requires: system-release
Requires: %{name}-selinux = %{version}-%{release}
Requires: %{name}-branding-ovirt = %{version}-%{release}
@@ -205,6 +204,18 @@
echo 'files /var/lib/puppet' >> /etc/rwtab
%endif
+#
+# oVirt Node plugin SNMP logic
+#
+%package plugin-snmp-logic
+Summary: SNMP logic for SNMP plugin
+Group: Applications/System
+BuildArch: noarch
+Requires: %{name}-core = %{version}-%{release}
+Requires: %{name}-core-logic = %{version}-%{release}
+
+%description plugin-snmp-logic
+This package provides the snmp logic for snmp plugin
%package plugin-snmp
Summary: SNMP plugin for %{product_family} image
@@ -212,6 +223,7 @@
Requires: net-snmp
Requires: net-snmp-utils
Requires: perl-libs
+Requires: %{name}-plugin-snmp-logic
%define snmp_root %{_datadir}/%{name}
@@ -231,10 +243,25 @@
rwuser root auth .1
EOF_snmpd
+#
+# oVirt Node plugin CIM logic
+#
+%package plugin-cim-logic
+Summary: CIM logic for the CIM plugin
+Group: Applications/System
+BuildArch: noarch
+Requires: %{name}-core = %{version}-%{release}
+Requires: %{name}-core-logic = %{version}-%{release}
+Requires: %{name}-legacy-core = %{version}-%{release}
+
+%description plugin-cim-logic
+This package provides a cim logic used in CIM plugin
+
%package plugin-cim
Summary: CIM plugin for %{product_family} image
Group: Applications/System
+Requires: %{name}-plugin-cim-logic
Requires: libvirt-cim
Requires: sblim-sfcb
@@ -433,6 +460,147 @@
%description branding-ovirt
This package contains the files to let Node appear in the oVirt look.
+#
+# oVirt Node Core
+#
+%package core
+Summary: oVirt Node core
+BuildArch: noarch
+BuildRequires: python-setuptools python-devel dracut
+BuildRequires: automake autoconf
+Requires: %{name}-core-logic = %{version}-%{release}
+Requires: %{name}-legacy-core = %{version}-%{release}
+Requires: ethtool
+Requires: augeas >= 0.3.5
+Requires: bridge-utils
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
+%if %{is_systemd}
+Requires: systemd-units
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires: python-IPy
+%endif
+Requires: iscsi-initiator-utils
+Requires: PyPAM
+Requires: python-urwid
+Requires: python-lockfile
+Requires: python-lxml
+Requires: cracklib-python
+Requires: dracut
+Requires: tuned
+Requires: openssh-server
+Requires: python-gudev
+Requires: nfs-utils
+Requires: system-release
+Requires: ntp
+Requires: udev >= 147-2.34
+%if ! 0%{?is_el6}
+Requires: python-augeas
+%endif
+%if %{is_el6}
+Requires: /bin/hostname
+%else
+Requires: hostname
+%endif
+%if %{is_min_f19}
+Requires: NetworkManager
+%endif
+%if 0%{?is_systemd}
+Requires: grub2
+%else
+Requires: grub
+# for applying patches in %post
+Requires(post): patch
+%endif
+Requires: %{name}-selinux = %{version}-%{release}
+Requires: %{name}-branding-ovirt = %{version}-%{release}
+
+#libvirt dependencies
+Requires: libvirt-python
+%if 0%{?rhel} >= 7 || 0%{?fedora} >= 18
+Requires: libvirt-daemon >= 1.0.2-1
+Requires: libvirt-daemon-config-nwfilter
+Requires: libvirt-daemon-driver-network
+Requires: libvirt-daemon-driver-nwfilter
+Requires: libvirt-daemon-driver-qemu
+%else
+%if 0%{?rhel}
+Requires: libvirt >= 0.10.2-18.el6_4.4
+%else
+Requires: libvirt >= 1.0.2-1
+%endif
+%endif
+
+%description core
+The core source of oVirt Node
+
+
+#
+# oVirt Node Core Logic
+#
+%package core-logic
+Summary: oVirt Node core logic
+BuildArch: noarch
+Requires: %{name}-core = %{version}-%{release}
+Requires: %{name}-legacy-core = %{version}-%{release}
+
+%description core-logic
+All the logic for configuring the Node
+
+
+#
+# oVirt Node cli tools
+#
+%package cli-tools
+Summary: oVirt Node Cli Tools
+BuildArch: noarch
+Requires: %{name}-core = %{version}-%{release}
+
+%description cli-tools
+Clients tools for oVirt Node
+
+
+#
+# oVirt Node Text User Interface (TUI) Installer
+#
+%package tui-installer
+Summary: oVirt Node TUI Installer
+BuildArch: noarch
+Requires: %{name}-core = %{version}-%{release}
+Requires: %{name}-core-logic = %{version}-%{release}
+Requires: %{name}-legacy-core = %{version}-%{release}
+
+%description tui-installer
+oVirt Node Text User Interface Installer
+
+
+#
+# oVirt Node Text User Interface (TUI) Setup
+#
+%package tui-setup
+Summary: oVirt Node TUI Setup
+BuildArch: noarch
+Requires: %{name}-core = %{version}-%{release}
+Requires: %{name}-core-logic = %{version}-%{release}
+Requires: %{name}-snmp-logic = %{version}-%{release}
+Requires: %{name}-cim-logic = %{version}-%{release}
+
+%description tui-setup
+oVirt Node Text User Interface Setup
+
+
+#
+# oVirt Node Legacy Core
+#
+%package legacy-core
+Summary: oVirt Node Legacy Core
+BuildArch: noarch
+Requires: %{name}-core = %{version}-%{release}
+Requires: %{name}-core-logic = %{version}-%{release}
+
+%description legacy-core
+oVirt Node Legacy code
%prep
@@ -641,6 +809,106 @@
%{_mandir}/man8/node-creator.8.gz
%{_sbindir}/node-creator
+%files legacy-core
+%{python_sitelib}/ovirt_config_setup/plugins.py*
+%{python_sitelib}/ovirt_config_setup/collectd.py*
+%{python_sitelib}/ovirt_config_setup/__init__.py*
+%{python_sitelib}/ovirtnode/network.py*
+%{python_sitelib}/ovirtnode/log.py*
+%{python_sitelib}/ovirtnode/install.py*
+%{python_sitelib}/ovirtnode/iscsi.py*
+%{python_sitelib}/ovirtnode/ovirtfunctions.py*
+%{python_sitelib}/ovirtnode/storage.py*
+%{python_sitelib}/ovirtnode/password.py*
+%{python_sitelib}/ovirtnode/__init__.py*
+
+%files tui-setup
+%{python_sitelib}/ovirt/node/setup/ipmi/ipmi_page.py*
+%{python_sitelib}/ovirt/node/setup/ipmi/__init__.py*
+%{python_sitelib}/ovirt/node/setup/core/network_page.py*
+%{python_sitelib}/ovirt/node/setup/core/support_page.py*
+%{python_sitelib}/ovirt/node/setup/core/security_page.py*
+%{python_sitelib}/ovirt/node/setup/core/ping.py*
+%{python_sitelib}/ovirt/node/setup/core/kdump_page.py*
+%{python_sitelib}/ovirt/node/setup/core/monitoring_page.py*
+%{python_sitelib}/ovirt/node/setup/core/diagnostics_page.py*
+%{python_sitelib}/ovirt/node/setup/core/performance_page.py*
+%{python_sitelib}/ovirt/node/setup/core/logging_page.py*
+%{python_sitelib}/ovirt/node/setup/core/keyboard_page.py*
+%{python_sitelib}/ovirt/node/setup/core/status_page.py*
+%{python_sitelib}/ovirt/node/setup/core/remote_storage_page.py*
+%{python_sitelib}/ovirt/node/setup/core/plugins_page.py*
+%{python_sitelib}/ovirt/node/setup/core/__init__.py*
+%{python_sitelib}/ovirt/node/setup/snmp/snmp_page.py*
+%{python_sitelib}/ovirt/node/setup/snmp/__init__.py*
+%{python_sitelib}/ovirt/node/setup/puppet/puppet_page.py*
+%{python_sitelib}/ovirt/node/setup/puppet/__init__.py*
+%{python_sitelib}/ovirt/node/setup/rhn/rhn_page.py*
+%{python_sitelib}/ovirt/node/setup/rhn/rhn_model.py*
+%{python_sitelib}/ovirt/node/setup/rhn/__init__.py*
+%{python_sitelib}/ovirt/node/setup/cim/cim_page.py*
+%{python_sitelib}/ovirt/node/setup/cim/__init__.py*
+%{python_sitelib}/ovirt/node/setup/__main__.py*
+%{python_sitelib}/ovirt/node/setup/__init__.py*
+
+
+%files tui-installer
+%{python_sitelib}/ovirt/node/installer/core/storage_vol_page.py*
+%{python_sitelib}/ovirt/node/installer/core/confirmation_page.py*
+%{python_sitelib}/ovirt/node/installer/core/progress_page.py*
+%{python_sitelib}/ovirt/node/installer/core/welcome_page.py*
+%{python_sitelib}/ovirt/node/installer/core/installation_device_page.py*
+%{python_sitelib}/ovirt/node/installer/core/password_page.py*
+%{python_sitelib}/ovirt/node/installer/core/boot_device_page.py*
+%{python_sitelib}/ovirt/node/installer/core/upgrade_page.py*
+%{python_sitelib}/ovirt/node/installer/core/keyboard_page.py*
+%{python_sitelib}/ovirt/node/installer/core/__init__.py*
+%{python_sitelib}/ovirt/node/installer/__main__.py*
+%{python_sitelib}/ovirt/node/installer/__init__.py*
+
+%files cli-tools
+%{python_sitelib}/ovirt/node/tools/features.py*
+%{python_sitelib}/ovirt/node/tools/registration.py*
+%{python_sitelib}/ovirt/node/tools/password.py*
+%{python_sitelib}/ovirt/node/tools/__init__.py*
+
+%files core
+%{python_sitelib}/ovirt/node/ui/__init__.py*
+%{python_sitelib}/ovirt/node/ui/urwid_builder.py*
+%{python_sitelib}/ovirt/node/ui/widgets.py*
+%{python_sitelib}/ovirt/node/plugins.py*
+%{python_sitelib}/ovirt/node/base.py*
+%{python_sitelib}/ovirt/node/log.py*
+%{python_sitelib}/ovirt/node/valid.py*
+%{python_sitelib}/ovirt/node/loader.py*
+%{python_sitelib}/ovirt/node/presets.py*
+%{python_sitelib}/ovirt/node/exceptions.py*
+%{python_sitelib}/ovirt/node/app.py*
+%{python_sitelib}/ovirt/node/__init__.py*
+%{python_sitelib}/ovirt/__init__.py*
+%{python_sitelib}/ovirt/node/utils/network.py*
+%{python_sitelib}/ovirt/node/utils/firewall.py*
+%{python_sitelib}/ovirt/node/utils/fs/mount.py*
+%{python_sitelib}/ovirt/node/utils/fs/__init__.py*
+%{python_sitelib}/ovirt/node/utils/security.py*
+%{python_sitelib}/ovirt/node/utils/virt.py*
+%{python_sitelib}/ovirt/node/utils/input.py*
+%{python_sitelib}/ovirt/node/utils/hooks.py*
+%{python_sitelib}/ovirt/node/utils/tuned.py*
+%{python_sitelib}/ovirt/node/utils/process.py*
+%{python_sitelib}/ovirt/node/utils/storage.py*
+%{python_sitelib}/ovirt/node/utils/system.py*
+%{python_sitelib}/ovirt/node/utils/expose.py*
+%{python_sitelib}/ovirt/node/utils/console.py*
+%{python_sitelib}/ovirt/node/utils/__init__.py*
+
+%files core-logic
+%{python_sitelib}/ovirt/node/config/network.py*
+%{python_sitelib}/ovirt/node/config/defaults.py*
+%{python_sitelib}/ovirt/node/config/tuned.py*
+%{python_sitelib}/ovirt/node/config/__init__.py*
+%{python_sitelib}/ovirt/node/config/migrate.py*
+
%files tools
%{_sbindir}/edit-node
@@ -660,14 +928,18 @@
%{app_root}/puppet-plugin/puppet-operatingsystem.rb.patch
%{_sysconfdir}/ovirt-config-boot.d/puppet_autoinstall.py*
+%files plugin-snmp-logic
+%{python_sitelib}/ovirt/node/setup/snmp/snmp_model.py*
+
%files plugin-snmp
%{python_sitelib}/ovirt_config_setup/snmp.py*
%{python_sitelib}/ovirt/node/setup/snmp/__init__.py*
-%{python_sitelib}/ovirt/node/setup/snmp/snmp_model.py*
%{python_sitelib}/ovirt/node/setup/snmp/snmp_page.py*
%{_sysconfdir}/ovirt-plugins.d/snmp.minimize
%{_sysconfdir}/ovirt-config-boot.d/snmp_autoinstall.py*
+%files plugin-cim-logic
+%{python_sitelib}/ovirt/node/setup/cim/cim_model.py*
%files plugin-cim
%{python_sitelib}/ovirt_config_setup/cim.py*
--
To view, visit https://gerrit.ovirt.org/38295
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5cf1d37ef28ca350780abd9c53cd437abc7e1460
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
More information about the node-patches
mailing list