Ovirt devel - Dec 2008 - [PATCH appliance] Removed build conditions to support the F9 newkey repos.

NOTE: This patch depends on the complimentary patch for node-image.

Since, with 0.96, F9 is not longer a target, we don't need this build
conditional.

Added repos.ks to the list of .PHONY targets.

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 Makefile.am |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 6153e62..52fe026 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -72,11 +72,7 @@ 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) ;\
-		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 ; \
+		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 ;\
 	    echo "repo --name=$${FEDORA_REPO} $${FEDORA_REPO_LOC}" > $@
;\
 	    echo "repo --name=ovirt-org
--baseurl=$(OVIRT_URL)/$${OVIRT_DISTRO}/$(ARCH)" >> $@ ;\
@@ -150,4 +146,4 @@ publish: rpms
 	rsync -aq $(shell rpm --eval '%{_srcrpmdir}')/
$(OVIRT_CACHE_DIR)/ovirt/src/
 	createrepo $(OVIRT_CACHE_DIR)/ovirt
 
-.PHONY: rpms publish $(NVR).$(PKG_FMT).$(SUM) $(NVR).$(PKG_FMT) keys
+.PHONY: rpms publish $(NVR).$(PKG_FMT).$(SUM) $(NVR).$(PKG_FMT) keys repos.ks
-- 
1.6.0.4

"Darryl L. Pierce" <dpierce at redhat.com> wrote:
> NOTE: This patch depends on the complimentary patch for node-image.
>
> Since, with 0.96, F9 is not longer a target, we don't need this build
> conditional.
>
> Added repos.ks to the list of .PHONY targets.
Hi Darryl,

I confirm that this gets me past a build failure due
to unresolved dependency on rubygem(activesupport) on F10.

That's because my repos.ks didn't mention f10.
With this change, repos.ks can no longer get out of date, so

ACK