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

[Ovirt-devel] [PATCH ovirt-appliance] use rawhide repos for Fedora 10



for experimental builds, until it gets released

Signed-off-by: Alan Pevec <apevec redhat com>
---
 ovirt-appliance.ks      |    2 ++
 ovirt-appliance.spec.in |   36 ++++++++++++++++++++++++++----------
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/ovirt-appliance.ks b/ovirt-appliance.ks
index 82e6a57..b344e47 100644
--- a/ovirt-appliance.ks
+++ b/ovirt-appliance.ks
@@ -33,6 +33,8 @@ ovirt-recipe
 lokkit
 
 %post
+# cleanup rpmdb to allow non-matching host and chroot RPM versions
+rm -f /var/lib/rpm/__db*
   exec > /root/kickstart-post.log 2>&1
 
   # the code to contact the host we are running on and make it configure itself
diff --git a/ovirt-appliance.spec.in b/ovirt-appliance.spec.in
index f08e0f6..d96e7bf 100644
--- a/ovirt-appliance.spec.in
+++ b/ovirt-appliance.spec.in
@@ -40,22 +40,38 @@ The oVirt Appliance image and scripts to install on a Fedora Host
 %setup -q
 
 %build
-if [ -n "%{?fedora_url}" ]; then
-   cat > repos.ks << EOF
-repo --name=f%{fedora} --baseurl=%{fedora_url}/releases/%{fedora}/Everything/%{_arch}/os
-repo --name=f%{fedora}-updates --baseurl=%{fedora_url}/updates/%{fedora}/%{_arch} --excludepkgs=%{bad_pkgs}
-repo --name=f%{fedora}-updates-newkey --baseurl=%{fedora_url}/updates/%{fedora}/%{_arch}.newkey --excludepkgs=%{bad_pkgs}
+%if 0%{?fedora} == 010
+ # XXX current rawhide
+ %if "%{?fedora_url}" == ""
+cat > repos.ks << EOF
+repo --name=rawhide --mirrorlist=%{fedora_mirror}?repo=rawhide&arch=%{_arch}
+EOF
+ %else
+cat > repos.ks << EOF
+repo --name=rawhide --baseurl=%{fedora_url}/development/%{_arch}/os
 EOF
-else
-  cat > repos.ks << EOF
+ %endif
+cat >> repos.ks << EOF
+repo --name=ovirt-org --baseurl=%{ovirt_url}/development/%{_arch}
+EOF
+%else
+ %if "%{?fedora_url}" == ""
+cat > repos.ks << EOF
 repo --name=f%{fedora} --mirrorlist=%{fedora_mirror}?repo=fedora-%{fedora}&arch=%{_arch}
-repo --name=f%{fedora}-updates --mirrorlist=%{fedora_mirror}?repo=updates-released-f%{fedora}&arch=%{_arch} --excludepkgs=%{bad_pkgs}
 repo --name=f%{fedora}-updates-newkey --mirrorlist=%{fedora_mirror}?repo=updates-released-f%{fedora}.newkey&arch=%{_arch} --excludepkgs=%{bad_pkgs}
 EOF
-fi
-
+ %else
+cat > repos.ks << EOF
+repo --name=f%{fedora} --baseurl=%{fedora_url}/releases/%{fedora}/Everything/%{_arch}/os
+repo --name=f%{fedora}-updates-newkey --baseurl=%{fedora_url}/updates/%{fedora}/%{_arch}.newkey --excludepkgs=%{bad_pkgs}
+EOF
+ %endif
 cat >> repos.ks << EOF
 repo --name=ovirt-org --baseurl=%{ovirt_url}/%{fedora}/%{_arch}
+EOF
+%endif
+
+cat >> repos.ks << EOF
 repo --name=ovirt-local --baseurl=%{ovirt_local_repo}
 repo --name=thincrust-org --baseurl=%{thincrust_url}/noarch
 
-- 
1.5.5.1


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