Sandro Bonazzola has posted comments on this change. Change subject: add support mirror overrides and 7.1 rhel ......................................................................
Patch Set 2: Code-Review-1 (6 comments) https://gerrit.ovirt.org/#/c/39534/2/ovirt-release-master/autogen.sh File ovirt-release-master/autogen.sh: Line 1: #!/bin/sh Line 2: # Run this to generate configure and Makefile Line 3: Any reason for having such script instead of just run autoreconf? Line 4: srcdir=`dirname $0` Line 5: test -z "$srcdir" && srcdir=. Line 6: Line 7: THEDIR=`pwd` https://gerrit.ovirt.org/#/c/39534/2/ovirt-release-master/configure.ac File ovirt-release-master/configure.ac: Line 1: dnl Line 2: dnl ovirt-release -- repo files for oVirt projects Line 3: dnl Copyright (C) 2015 Red Hat, Inc. 2014-2015 Line 4: dnl Line 5: dnl This library is free software; you can redistribute it and/or Line 6: dnl modify it under the terms of the GNU Lesser General Public Line 7: dnl License as published by the Free Software Foundation; either Line 33: OVIRT_SLOT="master" Line 34: AC_SUBST([OVIRT_SLOT]) Line 35: Line 36: DIST="$( rpm --eval "%dist" | cut -c2- )" Line 37: AC_SUBST([DIST]) we must not rely on dist here. The RPM is designed to be distribution agnostic, following the model of the rdo-release rpm. Line 38: Line 39: AC_ARG_WITH([ovirt-version],[AC_HELP_STRING([--with-ovirt-version], Line 40: [Specify ovirt-version. Defaults to 3.6.0-1])], Line 41: [OVIRT_VERSION="$withval"], Line 39: AC_ARG_WITH([ovirt-version],[AC_HELP_STRING([--with-ovirt-version], Line 40: [Specify ovirt-version. Defaults to 3.6.0-1])], Line 41: [OVIRT_VERSION="$withval"], Line 42: [OVIRT_VERSION="3.6.0-1"]) Line 43: AC_SUBST([OVIRT_VERSION]) Version is 3.6.0, 3.6.0-1 is version and release. Line 44: Line 45: AC_ARG_WITH([ovirt-yum-repo],[AC_HELP_STRING([--with-ovirt-yum-repo], Line 46: [Specify yum repo, defaults to: http://resources.ovirt.org/])], Line 47: [OVIRT_YUM_REPO="$withval"], Line 65: [OVIRT_YUM_REPO="$withval"], Line 66: [OVIRT_YUM_REPO="http://resources.ovirt.org";]) Line 67: AC_SUBST([OVIRT_YUM_REPO]) Line 68: Line 69: PACKAGE_NAME=ovirt-release package name is ovirt-release-master. We need to allow side by side install of ovirt-release35 and ovirt-release-master for allowing upgrade with rollback from 3.5 to master Line 70: PRODUCT_NAME=oVirt\ Packages\ Repository Line 71: Line 72: AC_CONFIG_FILES([Makefile Line 73: ovirt-el6-deps.repo https://gerrit.ovirt.org/#/c/39534/2/ovirt-release-master/ovirt-release-master.spec.in File ovirt-release-master/ovirt-release-master.spec.in: Line 74: install -m 644 "%{_datadir}/%{package_name}/ovirt-el6-deps.repo" "%{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-dependencies.repo" Line 75: elif [ "${DISTVER/.*/}" == "el7" ] ; then Line 76: # On CentOS 7 ${DISTVER} is "el7.centos" Line 77: install -m 644 "%{_datadir}/%{package_name}/ovirt-el7-deps.repo" "%{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-dependencies.repo" Line 78: elif [ "${DISTVER/.*/}" == "el7_1" ] ; then this is matched by previous if Line 79: # On CentOS 7.1 ${DISTVER} is "el7_1.centos" Line 80: install -m 644 "%{_datadir}/%{package_name}/ovirt-el7-deps.repo" "%{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-dependencies.repo" Line 81: elif [ "${DISTVER}" == "fc20" ]; then Line 82: install -m 644 "%{_datadir}/%{package_name}/ovirt-f20-deps.repo" "%{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-dependencies.repo" -- To view, visit https://gerrit.ovirt.org/39534 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0453fb472d80a190278a0ffbae4371ad724b4c46 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-release Gerrit-Branch: master Gerrit-Owner: Max Kovgan <[email protected]> Gerrit-Reviewer: Barak Korren <[email protected]> Gerrit-Reviewer: David Caro <[email protected]> Gerrit-Reviewer: Eyal Edri <[email protected]> Gerrit-Reviewer: Sandro Bonazzola <[email protected]> Gerrit-Reviewer: [email protected] Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
