# Copyright (C) 2007 The Trustees of Princeton University
# Thierry Parmentelat <thierry.parmentelat@inria.fr> INRIA
#
-# supported distros f8, f10, f12, f14, f16, centos5, sl6
+# supported distros f12 f14 f16 f18 f20
+# and debians/ubuntus to a lesser extent
#
# for locating pkgs.py
export PATH=.:$PATH
if [ -f "/etc/redhat-release" ] ; then
distro=$(awk ' { print $1 } ' /etc/redhat-release)
case $distro in Scientific*) distro="SL" ; esac
- else
- echo "build.common.pl_getDistro-unknown"
- exit 1
+ elif [ -f /etc/lsb-release ] ; then
+ . /etc/lsb-release
+ distro=$DISTRIB_CODENAME
+ elif [ -f /etc/debian_version ] ; then
+ case $(cat /etc/debian_version) in
+ 6.*) distro=squeeze ;;
+ 7.*) distro=wheezy ;;
+ # might be that I'm getting 'jessie'sid' just because it's still testing..
+ 8.*|jessie*) distro=jessie ;;
+ *) distro=unknown.debian.in.build.common ;;
+ esac
fi
+ [ -z "$distro" ] && { echo "build.common.pl_getDistro-unknown"; exit 1; }
echo "$distro"
return 0
}
[Ss]L*)
releasename=sl$release
;;
+ squeeze|wheezy|jessie|oneiric|precise|quantal|raring|saucy|trusty)
+ releasename=$distro
+ ;;
*)
releasename="unknown-name-for-${pl_DISTRO}-please-edit-build.common"
echo 1>&2 "build.common: WARNING - releasename not set for distro=$distro"
type -p pkgs.py >& /dev/null || export PATH=$builddir:$PATH
# parse it
- pl_parsePkgs $keyword $fcdistro $pldistro $yumexclude_file || \
+ pkgs.py -a $pl_DISTRO_ARCH -f $fcdistro -d $pldistro $keyword $yumexclude_file || \
{ echo pl_yumexclude failed with fcdistro=$fcdistro and pldistro=$pldistro; return 1 ; }
}
# parse pkgsfile and add to local vars
fcdistro=${pl_DISTRO_NAME}
- pkgs_packages=$(pl_parsePkgs package $fcdistro $pldistro $pkgsfile)
- pkgs_groups=$(pl_parsePkgs group $fcdistro $pldistro $pkgsfile)
+ pkgs_packages=$(pkgs.py -a $pl_DISTRO_ARCH -f $fcdistro -d $pldistro package $pkgsfile)
+ pkgs_groups=$(pkgs.py -a $pl_DISTRO_ARCH -f $fcdistro -d $pldistro group $pkgsfile)
# what can get trashed to save space
- pkgs_junk=$(pl_parsePkgs junk $fcdistro $pldistro $pkgsfile)
+ pkgs_junk=$(pkgs.py -a $pl_DISTRO_ARCH -f $fcdistro -d $pldistro junk $pkgsfile)
# but not this
- pkgs_precious=$(pl_parsePkgs precious $fcdistro $pldistro $pkgsfile)
+ pkgs_precious=$(pkgs.py -a $pl_DISTRO_ARCH -f $fcdistro -d $pldistro precious $pkgsfile)
# formerly related to mkfedora -k : packages to take from our own build
# and thus need be excluded frem the stock repos
# locate builddir by looking for pkgs.py
builddir=$(dirname $(type -p pkgs.py))
SUBST_NODEYUMEXCLUDE=$(pl_nodeyumexclude $fcdistro $pldistro $builddir)
- pkgs_yumexclude=$(pl_parsePkgs yumexclude $fcdistro $pldistro $pkgsfile | sed -e s,@NODEYUMEXCLUDE@,"$SUBST_NODEYUMEXCLUDE",)
+ pkgs_yumexclude=$(pkgs.py -a $pl_DISTRO_ARCH -f $fcdistro -d $pldistro yumexclude $pkgsfile | sed -e s,@NODEYUMEXCLUDE@,"$SUBST_NODEYUMEXCLUDE",)
# get mirrors if not specified with -l
if [ -z "$mirrors" ] ; then
mirrorsfile=$(pl_locateDistroFile ../build/ $pldistro "$pldistro.mirrors")
- mirrors=$(pl_parsePkgs mirror $fcdistro $pldistro $mirrorsfile)
+ # do not sort mirrors, keep order from input
+ mirrors=$(pkgs.py -u -a $pl_DISTRO_ARCH -f $fcdistro -d $pldistro mirror $mirrorsfile)
fi
yumexclude_line=""
########## .pkgs format
# Usage: pl_parsePkgs keyword [-a arch] fcdistro pldistro pkgs-file[..s]
# pkgs.py should be found in PATH, like this file build.common
+# only usage should be for pl_getPackages and pl_getGroups,
+# which in turn are usednow be in {node,slice}image/build.sh
function pl_parsePkgs () {
target_arch=$pl_DISTRO_ARCH
keyword=$1;shift
# usage: pl_getPackages [-a arch] fcdistro pldistro pkg-file[..s]
function pl_getPackages() { pl_parsePkgs package "$@" ; }
function pl_getGroups() { pl_parsePkgs group "$@" ; }
+function pl_getPips() { pl_parsePkgs pip "$@" ; }
+function pl_getGems() { pl_parsePkgs gem "$@" ; }
-##############################
-### temporary - only for checking the new python version
-# for a given keyword like 'package' :
-# we support fcdistro-dependant format, for tokens (pkgname) without whitespace
-# you can e.g. use
-# package: pkg1 .. pkgn
-# package+f8: pkg1 .. pkgn
-# package-f8: pkg1 .. pkgn
-#
-# values can contain @arch@, @fcdistro@ or @pldistro@ that are replaced with the current values
-#
-# the reason for the -a option is for when we build the build vm itself; in this case
-# pl_DISTRO_ARCH is the one we obtain from the root context, and that's wrong
-# specify -sa arch AFTER keyword, so as to keep pl_getPackages and pl_getGroups simple
-#
-function pl_parsePkgs_old () {
-
- target_arch=$pl_DISTRO_ARCH
- keyword=$1;shift
- [ "$1" == "-a" ] && { shift; target_arch="$1"; shift; }
- fcdistro=$1; shift
- pldistro=$1; shift
- # remaining arguments are paths to the pkgs files
-
- # grab regular descriptions
- all=$(grep -v '^#' "$@" | grep --regexp="^${keyword}:" | sed -e "s,${keyword}:,,")
- # grab additions
- add=$(grep -v '^#' "$@" | grep --regexp="^${keyword}+${fcdistro}:" | sed -e "s,${keyword}+${fcdistro}:,,")
- # grab exclusions
- sub=$(grep -v '^#' "$@" | grep --regexp="^${keyword}-${fcdistro}:" | sed -e "s,${keyword}-${fcdistro}:,,")
-
- for rpm in $all $add; do
- for exclude in $sub; do
- [ "$rpm" = "$exclude" ] && continue 2
- done
- echo "${rpm} " | sed -e "s,@arch@,${target_arch},g" -e "s,@fcdistro@,$fcdistro,g" -e "s,@pldistro@,$pldistro,g"
- done
- return 0
-}
##############################
# locates a pldistro-dependant file
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}
+ # we set PLDISTROTAGS here to /dev/null because when dealing with remote distros
+ # at a very early stage (like searching for devel.pkgs even before the build VM is created)
+ # then make screams because it cannot find a mandatory include file
+ # OTOH this mechanism here is not intended to depend on tags specifically
+ make 1>&2 --no-print-directory -C $builddir stage1=true config.${pldistro} PLDISTROTAGS=/dev/null
fi
fi
# locate it
git://git.onelab.eu / build.git / blobdiff