Alan Pevec
2008-Oct-23 23:43 UTC
[Ovirt-devel] [PATCH ovirt-node-image] get back semantics of ovirt_* RPM macros
previous commit removed ovirt_cache_dir, ovirt_local_repo and
ovirt_url RPM macros, which broke autobuild: ovirt_local_repo was used
to point to a local repository produced by autobuild
FIXME ideally this would be a configure option e.g.
./configure --with-local-repo=XXXX
Signed-off-by: Alan Pevec <apevec at redhat.com>
---
Makefile.am | 7 ++-----
ovirt-node-image.spec.in | 5 ++++-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 37e52c6..5b5bc3a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,6 +16,8 @@
# also available at http://www.gnu.org/copyleft/gpl.html.
OVIRT_CACHE_DIR ?= $(HOME)/ovirt-cache
+OVIRT_LOCAL_REPO ?= $(OVIRT_CACHE_DIR)/ovirt
+OVIRT_URL ?= http://ovirt.org/repos/ovirt
EXTRA_DIST = \
.gitignore \
@@ -42,16 +44,11 @@ GIT_RELEASE = $$(date --utc +%Y%m%d%H%M%S)git$(git_head)
RPMDIR = $$(rpm --eval '%{_rpmdir}')
RPM_FLAGS = --define "ovirt_cache_dir $(OVIRT_CACHE_DIR)"
RPM_FLAGS += $(if $(_ovirt_dev),--define "extra_release
.$(GIT_RELEASE)")
-# FEDORA_URL env var can be set to the root of a fedora mirror
-RPM_FLAGS += $(if $(FEDORA_URL),--define "fedora_url $(FEDORA_URL)")
-# OVIRT_URL env var can be set to the root of an ovirt.org mirror
-RPM_FLAGS += $(if $(OVIRT_URL),--define "ovirt_url $(OVIRT_URL)")
FEDORA=$(shell rpm --eval '%{fedora}')
ARCH=$(shell rpm --eval '%{_arch}')
FEDORA_MIRROR=http://mirrors.fedoraproject.org/mirrorlist
CUR_RAWHIDE=10
-OVIRT_URL=http://ovirt.org/repos/ovirt
repos.ks:
( \
diff --git a/ovirt-node-image.spec.in b/ovirt-node-image.spec.in
index 6fb968f..79ce2c3 100644
--- a/ovirt-node-image.spec.in
+++ b/ovirt-node-image.spec.in
@@ -33,7 +33,10 @@ The PXE boot image for oVirt Node network boot from oVirt
Server.
./configure
%build
-make ovirt-node-image.iso
+make %{?ovirt_cache_dir: OVIRT_CACHE_DIR=%{ovirt_cache_dir}} \
+ %{?ovirt_local_repo: OVIRT_LOCAL_REPO=%{ovirt_local_repo}} \
+ %{?ovirt_url: OVIRT_URL=%{ovirt_url}} \
+ ovirt-node-image.iso
sudo su - -c "cd $(pwd) && ./ovirt-pxe %{name}.iso"
sudo su - -c "cd $(pwd) && chown -R $USER ."
--
1.5.5.1