[node-patches] Change in ovirt-node-iso[ovirt-3.6]: allowing back rhel based builds

[tlitovsk at redhat.com]

Anatoly Litovsky has uploaded a new change for review.

Change subject: allowing back rhel based builds
......................................................................

allowing back rhel based builds

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


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

diff --git a/Makefile.am b/Makefile.am
index 7b2f676..dd97a7d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -88,16 +88,18 @@
 
 repos.ks: kickstarts
 	( \
-      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/3.7/LATEST/EPEL.repo/epel-$(CENTOS)/${ARCH}\n repo --name=ovirt-$(OVIRT_VERSION)-glusterfs-noarch-epel --baseurl=http://download.gluster.org/pub/gluster/glusterfs/3.7/LATEST/EPEL.repo/epel-$(CENTOS)/noarch \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 ;\
+      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/3.7/LATEST/EPEL.repo/epel-$(CENTOS)/${ARCH}\n repo --name=ovirt-$(OVIRT_VERSION)-glusterfs-noarch-epel --baseurl=http://download.gluster.org/pub/gluster/glusterfs/3.7/LATEST/EPEL.repo/epel-$(CENTOS)/noarch \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 ;\
+      fi; \
       echo "# OVIRT_REPO_URL=$(OVIRT_REPO_URL)" >> $@ ;\
       for repo in $(OVIRT_REPO_URL); do \
         echo "repo --name=repo$${i} --baseurl=$${repo}" >> $@ ;\


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

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