Darryl L. Pierce
2008-Dec-01 16:32 UTC
[Ovirt-devel] [PATCH appliance] $dist-updates-newkey is now only used when the platform is Fedora 9.
On all other platforms, it's simply $dist-updates.
This patch requires the releated patch for node-image.
Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
Makefile.am | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 268d67e..cbe8918 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -72,7 +72,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))"
;\
OVIRT_DISTRO=$(FEDORA) ;\
- UPDATE_REPO_LINE="repo --name=$${FEDORA_REPO}-updates-newkey $(if
$(FEDORA_URL),--baseurl=$(FEDORA_URL)/updates/$(FEDORA)/$(ARCH).newkey,--mirrorlist=$(FEDORA_MIRROR)?repo=updates-released-f$(FEDORA).newkey&arch=$(ARCH))"
;\
+ if [ "$FEDORA_REPO" == "f9" ]; then \
+ UPDATE_REPO_LINE="repo --name=$${FEDORA_REPO}-updates-newkey
$(if
$(FEDORA_URL),--baseurl=$(FEDORA_URL)/updates/$(FEDORA)/$(ARCH).newkey,--mirrorlist=$(FEDORA_MIRROR)?repo=updates-released-f$(FEDORA).newkey&arch=$(ARCH))"
;\
+ else
+ 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))"
;\
+ fi ; \
fi ;\
echo "repo --name=$${FEDORA_REPO} $${FEDORA_REPO_LOC}" > $@
;\
echo "repo --name=ovirt-org
--baseurl=$(OVIRT_URL)/$${OVIRT_DISTRO}/$(ARCH)" >> $@ ;\
--
1.6.0.4