Darryl L. Pierce
2010-Mar-24 14:29 UTC
[Ovirt-devel] [PATCH] Disables virt-preview and add ovirt.org yum repo.
Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
recipe/Makefile.am | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/recipe/Makefile.am b/recipe/Makefile.am
index 0bd139f..6c97ed0 100644
--- a/recipe/Makefile.am
+++ b/recipe/Makefile.am
@@ -3,6 +3,7 @@ CUR_RAWHIDE = 14
CUR_DEVEL = 13
CUR_PREVIEW = 12
PREVIEW_URL ?=
http://jforbes.fedorapeople.org/virt-preview/f$(CUR_PREVIEW)/$(ARCH)
+OVIRT_REPO_URL = http://ovirt.org/repos/ovirt/$(CUR_PREVIEW)/$(ARCH)
FEDORA = $(shell rpm --eval '%{fedora}')
ARCH = $(shell rpm --eval '%{_arch}')
@@ -36,10 +37,11 @@ repos.ks:
FEDORA_REPO=f$(FEDORA) ;\
FEDORA_REPO_LOC="$(if
$(FEDORA_URL),--baseurl=$(FEDORA_URL)/releases/$(FEDORA)/Everything/${ARCH}/os,--mirrorlist=$(FEDORA_MIRROR)?repo=fedora-$(FEDORA)&arch=$(ARCH))"
;\
UPDATE_REPO_LINE="repo --name=$${FEDORA_REPO}-updates $(if
$(FEDORA_URL),--baseurl=$(FEDORA_URL)/updates/$(FEDORA)/${ARCH},--mirrorlist=$(FEDORA_MIRROR)?repo=updates-released-f$(FEDORA)&arch=$(ARCH))\n"
;\
- if [ 0$(FEDORA) == 0$(CUR_PREVIEW) ]; then \
+ if [ 0$(FEDORA)remove == 0$(CUR_PREVIEW)me ]; then \
UPDATE_REPO_LINE="$${UPDATE_REPO_LINE}repo --name=preview
--baseurl=$(PREVIEW_URL)\n" ;\
fi ;\
fi ;\
+ UPDATE_REPO_LINE="$${UPDATE_REPO_LINE}repo --name=ovirt
--baseurl=$(OVIRT_REPO_URL)\n" ;\
echo "repo --name=$${FEDORA_REPO} $${FEDORA_REPO_LOC}" >
repos.ks ;\
printf "$${UPDATE_REPO_LINE}" >> repos.ks ;\
)
--
1.6.6.1
Mike Burns
2010-Mar-24 14:38 UTC
[Ovirt-devel] [PATCH] Disables virt-preview and add ovirt.org yum repo.
On Wed, 2010-03-24 at 10:29 -0400, Darryl L. Pierce wrote:> Signed-off-by: Darryl L. Pierce <dpierce at redhat.com> > --- > recipe/Makefile.am | 4 +++- > 1 files changed, 3 insertions(+), 1 deletions(-) > > diff --git a/recipe/Makefile.am b/recipe/Makefile.am > index 0bd139f..6c97ed0 100644 > --- a/recipe/Makefile.am > +++ b/recipe/Makefile.am > @@ -3,6 +3,7 @@ CUR_RAWHIDE = 14 > CUR_DEVEL = 13 > CUR_PREVIEW = 12 > PREVIEW_URL ?= http://jforbes.fedorapeople.org/virt-preview/f$(CUR_PREVIEW)/$(ARCH) > +OVIRT_REPO_URL = http://ovirt.org/repos/ovirt/$(CUR_PREVIEW)/$(ARCH) > > FEDORA = $(shell rpm --eval '%{fedora}') > ARCH = $(shell rpm --eval '%{_arch}') > @@ -36,10 +37,11 @@ repos.ks: > FEDORA_REPO=f$(FEDORA) ;\ > FEDORA_REPO_LOC="$(if $(FEDORA_URL),--baseurl=$(FEDORA_URL)/releases/$(FEDORA)/Everything/${ARCH}/os,--mirrorlist=$(FEDORA_MIRROR)?repo=fedora-$(FEDORA)&arch=$(ARCH))" ;\ > UPDATE_REPO_LINE="repo --name=$${FEDORA_REPO}-updates $(if $(FEDORA_URL),--baseurl=$(FEDORA_URL)/updates/$(FEDORA)/${ARCH},--mirrorlist=$(FEDORA_MIRROR)?repo=updates-released-f$(FEDORA)&arch=$(ARCH))\n" ;\ > - if [ 0$(FEDORA) == 0$(CUR_PREVIEW) ]; then \ > + if [ 0$(FEDORA)remove == 0$(CUR_PREVIEW)me ]; then \ > UPDATE_REPO_LINE="$${UPDATE_REPO_LINE}repo --name=preview --baseurl=$(PREVIEW_URL)\n" ;\ > fi ;\ > fi ;\ > + UPDATE_REPO_LINE="$${UPDATE_REPO_LINE}repo --name=ovirt --baseurl=$(OVIRT_REPO_URL)\n" ;\ > echo "repo --name=$${FEDORA_REPO} $${FEDORA_REPO_LOC}" > repos.ks ;\ > printf "$${UPDATE_REPO_LINE}" >> repos.ks ;\ > )Ack