x/anvil
Code Issues Proposed changes

Merge "Add detection of epel6/7 in sourced common file"

Browse Source
This commit is contained in:
Jenkins 2015-03-06 17:00:22 +00:00 committed by Gerrit Code Review
commit ecfa346ca9
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
smithy
View File

@ -270,11 +270,13 @@ get_os_info()
OSDIST=`cat /etc/redhat-release | sed -e 's/release.*$//g;s/\s//g'`
PSUEDONAME=`cat /etc/redhat-release | sed s/.*\(// | sed s/\)//`
RELEASE=`cat /etc/redhat-release | sed s/.*release\ // | sed s/\ .*//`
MAJOR_RELEASE=`cat /etc/redhat-release | sed s/.*release\ // | sed s/\ .*// | cut -f1 -d"."`
elif [ -f /etc/debian_version ] ; then
PKG="deb"
OSDIST=`cat /etc/lsb-release | grep '^DISTRIB_ID' | awk -F= '{ print $2 }'`
PSUEDONAME=`cat /etc/lsb-release | grep '^DISTRIB_CODENAME' | awk -F= '{ print $2 }'`
RELEASE=`cat /etc/lsb-release | grep '^DISTRIB_RELEASE' | awk -F= '{ print $2 }'`
MAJOR_RELEASE=`cat /etc/lsb-release | grep '^DISTRIB_RELEASE' | awk -F= '{ print $2 }' | cut -f1 -d"."`
OSNAME="$OSDIST $RELEASE ($PSUEDONAME)"
fi
fi

6
tools/bootstrap/CommonRedHat
View File

@ -1,7 +1,11 @@
# -*- sh -*-
STEPS="selinux epel repos rpm_packages virtualenv"
EPEL_RPM_URL="http://mirrors.kernel.org/fedora-epel/6/i386/epel-release-6-8.noarch.rpm"
REPO_DIR=/etc/yum.repos.d/
if [ "$MAJOR_RELEASE" = "6" ]; then
EPEL_RPM_URL="http://mirrors.kernel.org/fedora-epel/6/i386/epel-release-6-8.noarch.rpm"
elif [ "$MAJOR_RELEASE" = "7" ]; then
EPEL_RPM_URL="http://mirrors.kernel.org/fedora-epel/7/x86_64/e/epel-release-7-5.noarch.rpm"
fi
## Uncomment the following to allow for additional dependencies to be found
## using the packages built by redhat in there RDO repository. Or add other repo