Anatoly Litovsky has uploaded a new change for review. Change subject: Enabling build system to build from online packages only on master ......................................................................
Enabling build system to build from online packages only on master Adding script to download recepies Fixing the makefiles to link to correct repos. Fixing glusterfs repo Signed-off-by: Tolik Litovsky <[email protected]> Change-Id: I7ef5d95156355306a68f67b8f71fe74f8b1dee59 Signed-off-by: Tolik Litovsky <[email protected]> --- M Makefile.am M configure.ac A recepie-downloader.sh.in 3 files changed, 37 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-node-iso refs/changes/35/39335/1 diff --git a/Makefile.am b/Makefile.am index 614719c..cdc1cbb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,6 +31,7 @@ RELEASE := $(shell rpm -q --qf "%{RELEASE}\n" --define "BUILD_NUMBER $(BUILD_NUMBER)" --specfile ./ovirt-node-iso.spec | head -n1) RECIPE_DIR = @RECIPES@ OVIRT_VERSION = @PACKAGE_VERSION@ +REPO_SUFIX = @REPO_SUFIX@ OVIRT_CACHE_DIR ?= $(HOME)/ovirt-caches @@ -55,7 +56,7 @@ # then check PATH NODE_CREATOR = $(shell ( test -e $(RECIPE_DIR)/node-creator && echo "$(RECIPE_DIR)/node-creator" ) || ( test -e node-creator && echo "./node-creator" ) || which node-creator 2>/dev/null) FEDORA_MIRROR = http://mirrors.fedoraproject.org/mirrorlist -OVIRT_BASE_URL = http://resources.ovirt.org/pub/ovirt-$(OVIRT_VERSION)/rpm +OVIRT_BASE_URL = http://resources.ovirt.org/pub/ovirt-$(REPO_SUFIX)/rpm CENTOS_MIRROR = http://mirrorlist.centos.org/ # For Release: 0..., set _ovirt_dev=1 so that we get extra_release.GIT- @@ -94,7 +95,7 @@ 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/LATEST/EPEL.repo/epel-$(CENTOS)/${ARCH}\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 ;\ diff --git a/configure.ac b/configure.ac index 50a232a..77de4a2 100644 --- a/configure.ac +++ b/configure.ac @@ -1,23 +1,31 @@ -AC_INIT([ovirt-node], [3.5], [[email protected]]) +AC_INIT([ovirt-node], [3.6], [[email protected]]) AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability tar-pax]) AC_SUBST([FEDORA],[[`rpm --eval '%{fedora}'|sed 's/[^0-9]//g'`]]) AC_SUBST([RHEL], [[`rpm --eval '%{rhel}'|sed 's/[^0-9]//g'`]]) AC_SUBST([CENTOS], [[`rpm --eval '%{centos}'|sed 's/[^0-9]//g'`]]) AC_SUBST([DISTRO]) +AC_SUBST([DISTRO_SHORT]) AC_SUBST([PACKAGE_NAME]) AC_SUBST([PRODUCT_NAME]) +AC_SUBST([REPO_SUFIX]) +REPO_SUFIX="master-snapshot" if test "$FEDORA"; then DISTRO=ovirt$FEDORA + DISTRO_SHORT=fc$FEDORA fi if test "$RHEL"; then DISTRO=rhevh$RHEL + DISTRO_SHORT=el$RHEL fi if test "$CENTOS"; then DISTRO=centos$CENTOS + DISTRO_SHORT=el$CENTOS fi + + AC_ARG_WITH([recipe], [AC_HELP_STRING([--with-recipe], [Specify a recipe directory. Defaults to /usr/share/ovirt-node-recipe])], @@ -46,5 +54,6 @@ AC_CONFIG_FILES([Makefile - ovirt-node-iso.spec]) + ovirt-node-iso.spec + recepie-downloader.sh]) AC_OUTPUT diff --git a/recepie-downloader.sh.in b/recepie-downloader.sh.in new file mode 100644 index 0000000..4a24109 --- /dev/null +++ b/recepie-downloader.sh.in @@ -0,0 +1,23 @@ +#!/bin/bash -xe + +DISTRO_SHORT=@DISTRO_SHORT@ +OVIRT_REPO_SUFIX=@REPO_SUFIX@ + +case $1 in + "install") + sudo yum-config-manager --add-repo "http://resources.ovirt.org/pub/ovirt-$OVIRT_REPO_SUFIX/rpm/$DISTRO_SHORT"; + sudo yum install ovirt-node-recipe -y --nogpgcheck + ;; + "remove") + sudo yum erase ovirt-node-recipe -y + ;; + "remove-repo") + sudo rm -rf /etc/yum.repos.d/resources.ovirt.org*.repo + ;; + *) + echo "Usage is :" + echo " install - will create the repo and install recepies" + echo " remove - will remove the recepies" + echo " remove-repo - will remove the ovirt repos from /etc/yum.repos.d" + ;; +esac -- To view, visit https://gerrit.ovirt.org/39335 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7ef5d95156355306a68f67b8f71fe74f8b1dee59 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
