Change in vdsm[ovirt-3.5]: build: expose rhev_build to make rpm

ybronhei at redhat.com ybronhei at redhat.com
Sun Nov 30 06:58:37 UTC 2014


Hello Federico Simoncelli, Dan Kenigsberg,

I'd like you to do a code review.  Please visit

    http://gerrit.ovirt.org/35712

to review the following change.

Change subject: build: expose rhev_build to make rpm
......................................................................

build: expose rhev_build to make rpm

Change-Id: I615ca4843cb74969a482f24c07e74534f009ca48
Signed-off-by: Federico Simoncelli <fsimonce at redhat.com>
Reviewed-on: http://gerrit.ovirt.org/35695
Reviewed-by: Dan Kenigsberg <danken at redhat.com>
---
M Makefile.am
M configure.ac
M vdsm.spec.in
3 files changed, 7 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/12/35712/1

diff --git a/Makefile.am b/Makefile.am
index 838c53d..0349232 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,6 +54,10 @@
 WITH_HOOKS = --define="with_hooks 1"
 endif
 
+if RHEV
+RHEV_BUILD = --define="rhev_build 1"
+endif
+
 PEP8_BLACKLIST = \
 	config.py \
 	constants.py \
@@ -107,7 +111,7 @@
 
 rpm: dist
 	rpmbuild -ta $(if $(BUILDID),--define="extra_release .$(BUILDID)") \
-				$(WITH_HOOKS) $(DIST_ARCHIVES)
+				$(WITH_HOOKS) $(RHEV_BUILD) $(DIST_ARCHIVES)
 
 dist-hook: gen-VERSION gen-ChangeLog
 .PHONY: gen-VERSION gen-ChangeLog
diff --git a/configure.ac b/configure.ac
index d919dee..a70b3d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,6 +54,7 @@
     [enable_hooks="no"]
 )
 AM_CONDITIONAL([HOOKS], [test "${enable_hooks}" = "yes"])
+AM_CONDITIONAL([RHEV], [test "${enable_rhev}" = "yes"])
 
 AC_ARG_ENABLE(
     [chown_hack],
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 12f269b..4c20a8d 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -15,9 +15,6 @@
 # Fedora official build
 %global fedora_koji_build 0
 
-# RHEV official 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.
@@ -150,7 +147,7 @@
 Requires: %{name}-xmlrpc = %{version}-%{release}
 Requires: %{name}-jsonrpc = %{version}-%{release}
 
-%if %{rhev_build}
+%if 0%{?rhev_build}
 Requires: mom >= 0.4.1-4
 %else
 Requires: mom >= 0.4.3


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I615ca4843cb74969a482f24c07e74534f009ca48
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Yaniv Bronhaim <ybronhei at redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken at redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce at redhat.com>


More information about the vdsm-patches mailing list