pyplnet

[build.git] / build.common

diff --git a/build.common b/build.common
index fe74e12..c0c73de 100644 (file)
--- a/build.common
+++ b/build.common
@@ -7,8 +7,8 @@
 # Copyright (C) 2007 The Trustees of Princeton University
 # Thierry Parmentelat <thierry.parmentelat@inria.fr> INRIA
 #
-# supported distros f12 f14 f16 f18 f20 
-# and debians/ubuntus to a lesser extent
+# supported distros fedoras, and debians/ubuntus to a lesser extent
+# centos's and scientific linux's have been used too quite a while ago
 #
 # for locating pkgs.py
 export PATH=.:$PATH
@@ -23,7 +23,6 @@ function pl_getDistro() {
        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  ;;
@@ -66,7 +65,7 @@ function pl_getReleaseName () {
        [Ss]L*)
            releasename=sl$release
            ;;
-       squeeze|wheezy|jessie|oneiric|precise|quantal|raring|saucy|trusty|utopic)
+       wheezy|jessie|precise|trusty|utopic|vivid|wily|xenial)
            releasename=$distro
            ;;
        *)
@@ -199,15 +198,15 @@ function pl_root_makedevs() {
     done
 }
 
-function mkfedora_usage() {
+function pl_root_mkfedora_usage() {
     echo "Usage: pl_root_mkfedora [OPTION]... basedir pldistro pkgsfile(s)"
-    echo "     -l url          Fedora mirror location."
-    echo "                      Defaults are searched in <pldistro>.mirrors"
+#    echo "    -l url          Fedora mirror location."
+#    echo "                      Defaults are searched in <pldistro>.mirrors"
     echo "     -v              Be verbose"
     echo "     -h              This message"
-    echo " target selection (defaults based on current build VM context)"
-    echo "     -r release      Fedora release number (default: $releasever)"
-    echo "     -a arch         Fedora architecture (default: $basearch)"
+#    echo " target selection (defaults based on current build VM context)"
+#    echo "    -r release      Fedora release number (default: $releasever)"
+#    echo "    -a arch         Fedora architecture (default: $basearch)"
     exit 1
 }
 
@@ -231,17 +230,17 @@ function pl_root_mkfedora () {
     while getopts "vh" opt ; do
        case $opt in
            v) verbose=1; set -x ;;
-           h|*) mkfedora_usage ;;
+           h|*) pl_root_mkfedora_usage ;;
        esac
     done
 
     shift $(($OPTIND - 1))
-    [[ "$#" -lt 3 ]] && mkfedora_usage
+    [[ "$#" -lt 3 ]] && pl_root_mkfedora_usage
     vroot=$1 ; shift
     pldistro=$1 ; shift
     pkgsfile="$@"
     vroot=$(cd $vroot && pwd -P)
-    [ -d $vroot ] || mkfedora_usage
+    [ -d $vroot ] || pl_root_mkfedora_usage
 
 
     # parse pkgsfile and add to local vars
@@ -388,6 +387,7 @@ fi
     yum_options="$yum_options -y"
     yum_options="$yum_options -c $yum_conf"
     yum_options="$yum_options --installroot=$vroot"
+    yum_options="$yum_options --releasever=$releasever"
 
     # glibc must be specified explicitly for the correct arch to be
     # chosen.
@@ -751,15 +751,3 @@ function yumconf_exclude () {
 $yumexclude_line" $repo
 }
 
-########################################
-# workaround for broken lxc-enter-namespace
-# 1st version was relying on virsh net-dhcp-leases
-# however this was too fragile, would not work for fedora14 containers
-function guest_ipv4() {
-    lxc=$1; shift
-
-    mac=$(virsh -c lxc:/// domiflist $lxc | egrep 'network|bridge' | awk '{print $5;}')
-    # sanity check
-    [ -z "$mac" ] && return 0
-    arp -en | grep "$mac" | awk '{print $1;}'
-}