Anatoly Litovsky has uploaded a new change for review. Change subject: removing fedora support ......................................................................
removing fedora support Change-Id: I9b3922c7f73570296699d8e3903399e8f3824be0 Signed-off-by: Tolik Litovsky <[email protected]> --- M Makefile.am 1 file changed, 15 insertions(+), 29 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-node-iso refs/changes/03/47503/1 diff --git a/Makefile.am b/Makefile.am index 2593af7..f1e1f09 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}') @@ -93,32 +90,21 @@ ( \ 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 ;\ + 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}";\ + 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}" >> $@ ;\ + i=$${i}_ ;\ + done ;\ ) version.ks: repos.ks $(EXTRA_RECEPIE) -- To view, visit https://gerrit.ovirt.org/47503 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9b3922c7f73570296699d8e3903399e8f3824be0 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-node-iso Gerrit-Branch: master Gerrit-Owner: Anatoly Litovsky <[email protected]> _______________________________________________ node-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/node-patches
