[node-patches] Change in ovirt-node-iso[ovirt-3.6]: Adjusting the makefile for 3.6 branch

[tlitovsk at redhat.com]

Anatoly Litovsky has uploaded a new change for review.

Change subject: Adjusting the makefile for 3.6 branch
......................................................................

Adjusting the makefile for 3.6 branch

removing fedora support
fixing glusterfs to 3.7

Change-Id: I42181470fd770954ae1c46175bf227fdcd420cc4
Signed-off-by: Tolik Litovsky <tlitovsk at redhat.com>
---
M Makefile.am
1 file changed, 15 insertions(+), 31 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node-iso refs/changes/85/45785/1

diff --git a/Makefile.am b/Makefile.am
index 2593af7..1ac7d00 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,9 +22,6 @@
 EXTRA_RECIPE      = @EXTRA_RECIPE@
 PRODUCT_SHORT     ?= $(PRODUCT)
 PKG_FMT           = iso
-FEDORA            = @FEDORA@
-RHEL              = @RHEL@
-DISTRO            = @DISTRO@
 BUILD_TYPE        ?= STABLE
 CENTOS            = @CENTOS@
 ARCH              = $(shell rpm --eval '%{_arch}')
@@ -91,34 +88,21 @@
 
 repos.ks: kickstarts
 	( \
-      if [ -n "$(CENTOS)" ]; then \
-         CENTOS_REPO_LINE="repo --name=centos --mirrorlist=$(CENTOS_MIRROR)?release=$(CENTOS)&arch=${ARCH}&repo=os \n" ;\
-        UPDATES_REPO_LINE="repo --name=centos-updates --mirrorlist=$(CENTOS_MIRROR)?release=$(CENTOS)&arch=${ARCH}&repo=updates \n" ;\
-        EPEL_REPO_LINE="repo --name=epel --baseurl=http://dl.fedoraproject.org/pub/epel/$(CENTOS)/${ARCH} \n" ;\
-        OVIRT_REPO_LINE="repo --name=ovirt-repo --baseurl=$(OVIRT_BASE_URL)/el$(CENTOS)\n" ;\
-        GLUSTER_REPO_LINE="repo --name=ovirt-$(OVIRT_VERSION)-glusterfs-${ARCH}-epel --baseurl=http://download.gluster.org/pub/gluster/glusterfs/nightly/glusterfs/epel-$(CENTOS)-${ARCH}\n" ;\
-        printf "$${CENTOS_REPO_LINE}" > repos.ks ;\
-        printf "$${UPDATES_REPO_LINE}" >> repos.ks ;\
-        printf "$${EPEL_REPO_LINE}" >> repos.ks ;\
-        printf "$${OVIRT_REPO_LINE}" >> repos.ks ;\
-        printf "$${GLUSTER_REPO_LINE}" >> repos.ks ;\
-      elif [ -n "$(FEDORA)" ]; then \
-        OVIRT_REPO_LINE="repo --name=ovirt-stable-repo --baseurl=$(OVIRT_BASE_URL)/fc$(FEDORA)\n" ;\
-        FEDORA_REPO_LOC="repo --name=$${FEDORA_REPO} --mirrorlist=$(FEDORA_MIRROR)?repo=fedora-$(FEDORA)&arch=$(ARCH)\n" ;\
-        UPDATE_REPO_LINE="repo --name=$${FEDORA_REPO}-updates --mirrorlist=$(FEDORA_MIRROR)?repo=updates-released-f$(FEDORA)&arch=$(ARCH)\n" ;\
-        VIRT_PREVIEW_REPO_LINE="repo --name=$${FEDORA_REPO}-virt-preview --baseurl=https://fedorapeople.org/groups/virt/virt-preview/fedora-$(FEDORA)/$(ARCH)/\n" ;\
-        GLUSTER_REPO_LINE="repo --name=ovirt-$(OVIRT_VERSION)-glusterfs-${ARCH}-epel --baseurl=http://download.gluster.org/pub/gluster/glusterfs/nightly/glusterfs/fedora-$(FEDORA)-${ARCH}\n" ;\
-        printf "$${OVIRT_REPO_LINE}" > repos.ks ;\
-        printf "$${FEDORA_REPO_LOC}" >> repos.ks ;\
-        printf "$${UPDATE_REPO_LINE}" >> repos.ks ;\
-        printf "$${GLUSTER_REPO_LINE}" >> repos.ks ;\
-        printf "$${VIRT_PREVIEW_REPO_LINE}" >> repos.ks ;\
-        fi ;\
-        echo "# OVIRT_REPO_URL=$(OVIRT_REPO_URL)" >> $@ ;\
-        for repo in $(OVIRT_REPO_URL); do \
-          echo "repo --name=repo$${i} --baseurl=$${repo}" >> $@ ;\
-          i=$${i}_ ;\
-        done ;\
+      CENTOS_REPO_LINE="repo --name=centos --mirrorlist=$(CENTOS_MIRROR)?release=$(CENTOS)&arch=${ARCH}&repo=os \n" ;\
+      UPDATES_REPO_LINE="repo --name=centos-updates --mirrorlist=$(CENTOS_MIRROR)?release=$(CENTOS)&arch=${ARCH}&repo=updates \n" ;\
+      EPEL_REPO_LINE="repo --name=epel --baseurl=http://dl.fedoraproject.org/pub/epel/$(CENTOS)/${ARCH} \n" ;\
+      OVIRT_REPO_LINE="repo --name=ovirt-repo --baseurl=$(OVIRT_BASE_URL)/el$(CENTOS)\n" ;\
+      GLUSTER_REPO_LINE="repo --name=ovirt-$(OVIRT_VERSION)-glusterfs-${ARCH}-epel --baseurl=http://download.gluster.org/pub/gluster/3.7/LATEST/EPEL.repo/epel-$(CENTOS)-${ARCH}\n" ;\
+      printf "$${CENTOS_REPO_LINE}" > repos.ks ;\
+      printf "$${UPDATES_REPO_LINE}" >> repos.ks ;\
+      printf "$${EPEL_REPO_LINE}" >> repos.ks ;\
+      printf "$${OVIRT_REPO_LINE}" >> repos.ks ;\
+      printf "$${GLUSTER_REPO_LINE}" >> repos.ks ;\
+      echo "# OVIRT_REPO_URL=$(OVIRT_REPO_URL)" >> $@ ;\
+      for repo in $(OVIRT_REPO_URL); do \
+        echo "repo --name=repo$${i} --baseurl=$${repo}" >> $@ ;\
+        i=$${i}_ ;\
+      done ;\
     )
 
 version.ks: repos.ks $(EXTRA_RECEPIE)


-- 
To view, visit https://gerrit.ovirt.org/45785
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I42181470fd770954ae1c46175bf227fdcd420cc4
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node-iso
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Anatoly Litovsky <tlitovsk at redhat.com>