[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [Ovirt-devel] [PATCH ovirt-appliance] use fedora_url for fedora_tree_url



Perry N. Myers wrote:
This is fine, but shouldn't this patch be done in conjunction with removing references to FEDORA_TREE_URL in the Makefiles?

Perry

committed with FEDORA_TREE_URL removal
>From 82aed8b257332831297beba9e3fc1569d0ae4f69 Mon Sep 17 00:00:00 2001
From: Alan Pevec <apevec redhat com>
Date: Sun, 7 Sep 2008 12:56:35 +0200
Subject: [PATCH ovirt-appliance] use fedora_url in fedora_tree_url

Signed-off-by: Alan Pevec <apevec redhat com>
---
 Makefile             |    5 -----
 ovirt-appliance.spec |    3 +++
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index c51b04d..a743d29 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
 # FEDORA_URL env var can be set to the root of a fedora mirror
 # OVIRT_URL env var can be set to the root of an ovirt.org mirror
 # SKIP_COMPRESS_IMAGE env var an be set to 1 to skip qcow compression
-# FEDORA_TREE_URL env var can be set to the URL of a Fedora mirror
 # that contains the install tree
 pkg_name = ovirt-appliance
 
@@ -12,10 +11,6 @@ ifdef SKIP_COMPRESS_IMAGE
 RPM_FLAGS += --define "skip_compress_image 1"
 endif
 
-ifdef FEDORA_TREE_URL
-RPM_FLAGS += --define "fedora_tree_url $(FEDORA_TREE_URL)"
-endif
-
 ifdef FEDORA_URL
 RPM_FLAGS += --define "fedora_url $(FEDORA_URL)"
 endif
diff --git a/ovirt-appliance.spec b/ovirt-appliance.spec
index 4b65b57..bbc0e77 100644
--- a/ovirt-appliance.spec
+++ b/ovirt-appliance.spec
@@ -1,5 +1,8 @@
 %{!?ovirt_cache_dir: %define ovirt_cache_dir /var/tmp/ovirt-cache}
 %{!?ovirt_url: %define ovirt_url http://ovirt.org/repos/ovirt}
+%if %{fedora_url}
+%define fedora_tree_url %{fedora_url}/releases/%{fedora}/Fedora/%{_arch}/os
+%endif
 %{!?fedora_tree_url: %define fedora_tree_url http://download.fedoraproject.org/pub/fedora/linux/releases/%{fedora}/Fedora/%{_arch}/os}
 %define fedora_mirror http://mirrors.fedoraproject.org/mirrorlist
 
-- 
1.5.5.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]