function pl_getDistro() {
if [ -f "/etc/redhat-release" ] ; then
distro=$(awk ' { print $1 } ' /etc/redhat-release)
+ case $distro in Red*) distro="Redhat" ; esac
else
echo "build.common.pl_getDistro-unknown"
exit 1
# returns something like 8, 10, or 5.3
function pl_getRelease() {
if [ -f "/etc/redhat-release" ] ; then
- release=$(awk ' { if ($1=="Fedora" && $2=="Core") print $4 ; if (($1=="Fedora" && $2!="Core")||$1=="CentOS") print $3 } ' /etc/redhat-release)
+ release=$(awk ' { if ($1=="Fedora" && $2=="Core") print $4 ; if (($1=="Fedora" && $2!="Core")||$1=="CentOS") print $3 ; if ($1=="Red") print $6 } ' /etc/redhat-release)
else
echo "build.common.pl_getRelease-unknown"
exit 1
[Ff]edora*)
releasename=f$release
;;
+ [Re]edhat*)
+ releasename=rhel6
+ ;;
[Cc]entOS*)
old_IFS="$IFS"
IFS="."
pkgsfile=$1; shift
pkgspath=""
- # if config dir is missing but a .svnpath exists
- if [[ -f "$builddir/config.${pldistro}.svnpath" && ! -d "$builddir/config.${pldistro}" ]] ; then
- echo 1>&2 "Invoking make to extract remote config.${pldistro}"
- make 1>&2 --silent --no-print-directory -C $builddir stage1=true config.${pldistro}
+ # if config dir is missing but a .svnpath or a .gitpath exists, use it to extract the config dir
+ configdir="$builddir/config.${pldistro}"
+ if [ ! -d $configdir ] ; then
+ if [ -f "${configdir}.svnpath" -o -f "${configdir}.gitpath" ] ; then
+ echo 1>&2 "Invoking make to extract remote config.${pldistro}"
+ make 1>&2 --silent --no-print-directory -C $builddir stage1=true config.${pldistro}
+ fi
fi
# locate it
paths="$builddir/config.$pldistro/$pkgsfile $builddir/config.planetlab/$pkgsfile"
repo=$1; shift
kexclude_line="$1" ; shift
- sed -i -e "/baseurl=.*$/i\\
+ sed -i -e "/#baseurl=.*$/i\\
$kexclude_line" $repo
}