Change in vdsm[master]: attempt to make vdsm noarch

[Dan Kenigsberg]

Dan Kenigsberg has uploaded a new change for review.

Change subject: attempt to make vdsm noarch
......................................................................

attempt to make vdsm noarch

I'd like to have a completely architecture-independent binary package. The
only remaining bit that I can think of is the old "safelease" utility,
which is dropped in this patch. I should be moved to a tiny helper
package.

However, this patch is not enough - when built on an x86_64 host, rpm
still recognizes vdsm.rpm and vdsm-python.rpm as x86_64 instead of
noarch. Dropping all mentions of x86_64 from the spec did not help,
either.

Change-Id: Ib858accfd9ff8c71c86ddc9e7a8628bb8630753e
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com&gt;
---
M vdsm.spec.in
M vdsm/storage/protect/Makefile.am
2 files changed, 9 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/78/30678/1

diff --git a/vdsm.spec.in b/vdsm.spec.in
index f104ad9..91b13bd 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -83,9 +83,9 @@
 BuildRequires: genisoimage
 BuildRequires: openssl
 BuildRequires: m2crypto
-%ifarch x86_64
-BuildRequires: python-dmidecode
-%endif
+#%ifarch x86_64
+#BuildRequires: python-dmidecode
+#%endif
 %if 0%{?rhel} == 6
 BuildRequires: python-argparse
 BuildRequires: python-ordereddict
@@ -133,10 +133,10 @@
 Requires: mom >= 0.4.1
 Requires: numactl
 
-%ifarch x86_64
-Requires: python-dmidecode
-Requires: dmidecode
-%endif
+#%ifarch x86_64
+#Requires: python-dmidecode
+#Requires: dmidecode
+#%endif
 
 %if 0%{?rhel} >= 7 || 0%{?fedora} >= 18
 Requires: libvirt-daemon >= 1.0.2-1
@@ -169,7 +169,6 @@
 %if 0%{?rhel}
 Requires: python-ethtool >= 0.6-3
 %if 0%{?rhel} >= 7
-ExclusiveArch:  x86_64
 Requires: device-mapper-multipath
 Requires: e2fsprogs
 Requires: fence-agents-all
@@ -1034,7 +1033,6 @@
 %{_datadir}/%{vdsm_name}/storage/volume.py*
 %{_datadir}/%{vdsm_name}/storage/imageRepository/__init__.py*
 %{_datadir}/%{vdsm_name}/storage/imageRepository/formatConverter.py*
-%{_libexecdir}/%{vdsm_name}/safelease
 %{_libexecdir}/%{vdsm_name}/spmprotect.sh
 %{_libexecdir}/%{vdsm_name}/spmstop.sh
 %dir %{_libexecdir}/%{vdsm_name}/hooks
diff --git a/vdsm/storage/protect/Makefile.am b/vdsm/storage/protect/Makefile.am
index feb40a9..1e9eb7c 100644
--- a/vdsm/storage/protect/Makefile.am
+++ b/vdsm/storage/protect/Makefile.am
@@ -6,11 +6,7 @@
 # LICENSE_GPL_v2 which accompany this distribution.
 #
 
-vdsmexec_PROGRAMS = safelease
-
 dist_vdsmexec_SCRIPTS = \
 	spmprotect.sh  \
-	spmstop.sh
-
-safelease_SOURCES = \
-	safelease.c
+	spmstop.sh \
+	$(NULL)


-- 
To view, visit http://gerrit.ovirt.org/30678
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib858accfd9ff8c71c86ddc9e7a8628bb8630753e
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: attempt to make vdsm noarch
......................................................................


Patch Set 2:

Build Failed 

http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/10436/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/11221/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_install-rpm-sanity-fc20_created/... : FAILURE

http://jenkins.ovirt.org/job/vdsm_master_install-rpm-sanity-fc19_created/... : FAILURE

http://jenkins.ovirt.org/job/vdsm_master_install-rpm-sanity-el6_created/159/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/11378/ : SUCCESS

-- 
To view, visit http://gerrit.ovirt.org/30678
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ib858accfd9ff8c71c86ddc9e7a8628bb8630753e
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

Michal Skrivanek has posted comments on this change.

Change subject: attempt to make vdsm noarch
......................................................................


Patch Set 2:

looks ok, we need a Requires: on the new safelease rpm (once it exists)

-- 
To view, visit http://gerrit.ovirt.org/30678
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ib858accfd9ff8c71c86ddc9e7a8628bb8630753e
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: attempt to make vdsm noarch
......................................................................


Patch Set 3:

Build Failed 

http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/10456/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/11241/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_install-rpm-sanity-fc20_created/... : FAILURE

http://jenkins.ovirt.org/job/vdsm_master_install-rpm-sanity-fc19_created/... : FAILURE

http://jenkins.ovirt.org/job/vdsm_master_install-rpm-sanity-el6_created/165/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/11398/ : SUCCESS

-- 
To view, visit http://gerrit.ovirt.org/30678
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ib858accfd9ff8c71c86ddc9e7a8628bb8630753e
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com&gt;
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: attempt to make vdsm noarch
......................................................................


Patch Set 3: Code-Review-1

(1 comment)

http://gerrit.ovirt.org/#/c/30678/3/vdsm.spec.in
File vdsm.spec.in:

Line 133: Requires: %{name}-xmlrpc = %{version}-%{release}
Line 134: Requires: %{name}-jsonrpc = %{version}-%{release}
Line 135: Requires: mom >= 0.4.1
Line 136: Requires: numactl
Line 137: Requires: vdsm-safelease
Until this package exists, nothing should depend on this patch
Line 138: 
Line 139: %ifarch x86_64
Line 140: Requires: python-dmidecode
Line 141: Requires: dmidecode


-- 
To view, visit http://gerrit.ovirt.org/30678
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ib858accfd9ff8c71c86ddc9e7a8628bb8630753e
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com&gt;
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes

Yaniv Bronhaim has posted comments on this change.

Change subject: attempt to make vdsm noarch
......................................................................


Patch Set 3:

(1 comment)

http://gerrit.ovirt.org/#/c/30678/3/vdsm.spec.in
File vdsm.spec.in:

Line 133: Requires: %{name}-xmlrpc = %{version}-%{release}
Line 134: Requires: %{name}-jsonrpc = %{version}-%{release}
Line 135: Requires: mom >= 0.4.1
Line 136: Requires: numactl
Line 137: Requires: vdsm-safelease
>  Until this package exists, nothing should depend on this patch
you confused me ..
Line 138: 
Line 139: %ifarch x86_64
Line 140: Requires: python-dmidecode
Line 141: Requires: dmidecode


-- 
To view, visit http://gerrit.ovirt.org/30678
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ib858accfd9ff8c71c86ddc9e7a8628bb8630753e
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com&gt;
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes

[Dan Kenigsberg]

Dan Kenigsberg has abandoned this change.

Change subject: attempt to make vdsm noarch
......................................................................


Abandoned

taken care of in https://gerrit.ovirt.org/40738

-- 
To view, visit https://gerrit.ovirt.org/30678
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: abandon
Gerrit-Change-Id: Ib858accfd9ff8c71c86ddc9e7a8628bb8630753e
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com&gt;
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org

automation(a)ovirt.org has posted comments on this change.

Change subject: attempt to make vdsm noarch
......................................................................


Patch Set 3:

* Update tracker::IGNORE, no Bug-Url found

-- 
To view, visit https://gerrit.ovirt.org/30678
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ib858accfd9ff8c71c86ddc9e7a8628bb8630753e
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com&gt;
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No