[Ovirt-devel] [PATCH node-image] Removed updates conditions for F9.

[Darryl L. Pierce]

Since, as of 0.96, F9 support is legacy, we'll no longer need this
conditional check when building.

Also 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 02fe136..cb084e6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -75,11 +75,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)" >> $@ ;\
@@ -139,4 +135,4 @@ publish: rpms
 	createrepo $(OVIRT_CACHE_DIR)/ovirt
 
 .PHONY: rpms publish $(NVR).$(PKG_FMT).$(SUM) $(NVR).$(PKG_FMT) \
-  $(PACKAGE).$(PKG_FMT) keys
+  $(PACKAGE).$(PKG_FMT) keys repos.ks
-- 
1.6.0.4