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@redhat.com --- 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)