X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fschroot%2Ffiles%2Fsetup-dchroot;h=cfc47bfd06143fea21fb1542ffe2ae6e20e0eaff;hb=abc70c5593cfc1cdb6656fee93cd4b1660bb731e;hp=6169920bcb3a3f687ff60d78be530d4e54a3fe9d;hpb=10ebe5a2c6a606cd9ad14c0506a02021e1a7184c;p=dsa-puppet.git

diff --git a/modules/schroot/files/setup-dchroot b/modules/schroot/files/setup-dchroot
index 6169920b..cfc47bfd 100755
--- a/modules/schroot/files/setup-dchroot
+++ b/modules/schroot/files/setup-dchroot
@@ -106,7 +106,7 @@ EOF
         echo "aliases=$suite"
     fi
     case "$arch" in
-        armel|armhf|i386|powerpc|s390|sparc)
+        armel|armhf|i386|mips|mipsel|powerpc|s390|sparc)
             echo "personality=linux32"
             ;;
     esac
@@ -123,9 +123,11 @@ EOF
             if [ -z "$extra" ] && [ -z "$ubuntu" ]; then
                 genschrootconf "$suite" "$arch" "$target" "backports"
                 [ -n "$buildd" ] && genschrootconf "$suite" "$arch" "$target" "backports-sloppy"
+                [ -n "$buildd" ] && genschrootconf "$suite" "$arch" "$target" "kfreebsd"
                 [ -n "$buildd" ] && genschrootconf "$suite" "$arch" "$target" "lts"
                 [ -n "$buildd" ] && genschrootconf "$suite" "$arch" "$target" "proposed-updates"
                 [ -n "$buildd" ] && genschrootconf "$suite" "$arch" "$target" "security"
+                [ -n "$buildd" ] && genschrootconf "$suite" "$arch" "$target" "kfreebsd-security"
             fi
     esac
     return 0
@@ -160,6 +162,7 @@ sbuildnames=""
 ubuntu=""
 groupuser="Debian,guest,d-i"
 grouproot=""
+include="apt,fakeroot"
 users=""
 usersroot=""
 bare=""
@@ -170,7 +173,7 @@ cleanup+=(":")
 trap do_cleanup EXIT
 buildd=""
 
-while getopts "a:b:Bcd:Dfg:hKk:m:o:O:p:r:sS:u" OPTION
+while getopts "a:b:Bcd:Dfg:hI:Kk:m:o:O:p:r:sS:u" OPTION
 do
     case $OPTION in
         a)
@@ -191,8 +194,8 @@ do
             bare="1"
             groupuser=""
             grouproot=""
-            users="buildd"
-            usersroot="buildd"
+            users="buildd,buildd2"
+            usersroot="buildd,buildd2"
             personality="buildd"
             suffix="sbuild"
             ;;
@@ -209,6 +212,9 @@ do
             usage
             exit 0
             ;;
+        I)
+            include="$include,$OPTARG"
+            ;;
         K)
             keep="4"
             ;;
@@ -254,7 +260,17 @@ fi
 suite="$1"; shift
 tuple="${suite}_${arch}"
 
-builddir=${builddir:-$basedir}
+if [ -z "${builddir:-}" ]; then
+  builddir=${builddir:-$basedir}
+  for u in schroot-unpack unpack; do
+    # if one of these directories exists and is on a different filesystem, prefer it.
+    candidate="$builddir/$u"
+    if [ -e "$candidate" ] &&
+       [ "$(stat -f --printf '%i\n' "$builddir" )" != "$(stat -f --printf '%i\n' "$candidate")" ]; then
+      builddir="$candidate"
+    fi
+  done
+fi
 [ -d "$basedir" ] || die "Error: $basedir does not exist (or is not a directory)."
 [ -d "$builddir" ] || die "Error: $builddir does not exist (or is not a directory)."
 
@@ -264,6 +280,17 @@ target="$basedir/$tuple.tar.gz"
 schrootconfig="/etc/schroot/chroot.d/${tuple}-$suffix"
 ! [ -e "$schrootconfig" ] || [ -n "$force" ] || die "Error: $schrootconfig already exists."
 
+suite_alias="$suite"
+case "$arch" in
+    kfreebsd-*)
+        case "$suite" in
+            jessie)
+                suite_alias="$suite-kfreebsd"
+                ;;
+        esac
+        ;;
+esac
+
 
 #
 # let's go
@@ -289,10 +316,10 @@ fi
 set -x
 debootstrap \
     --keyring "$keyring" \
-    --include="apt" \
+    --include="$include" \
     --variant=buildd \
     --arch="$arch" \
-    "$suite" "$rootdir" "$mirror" "$script"
+    "$suite_alias" "$rootdir" "$mirror" "$script"
 echo "$tuple" > "$rootdir/etc/debian_chroot"
 echo "force-unsafe-io" > "$rootdir/etc/dpkg/dpkg.cfg.d/force-unsafe-io"
 echo "force-confnew" > "$rootdir/etc/dpkg/dpkg.cfg.d/force-confnew"