X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fschroot%2Ffiles%2Fsetup-dchroot;h=99f0919ac488bca0fd62215df607a847de080d33;hb=e7e96c295e300e312b5a1f67b2472701958117bb;hp=24a1857a71c03e7c8bb6008db33701b189ddeb24;hpb=faae8324a9f4f9aebf94ea891a769e5b73496587;p=mirror%2Fdsa-puppet.git

diff --git a/modules/schroot/files/setup-dchroot b/modules/schroot/files/setup-dchroot
index 24a1857a7..99f0919ac 100755
--- a/modules/schroot/files/setup-dchroot
+++ b/modules/schroot/files/setup-dchroot
@@ -77,6 +77,7 @@ genschrootconf() {
     local arch="$1"; shift
     local target="$1"; shift
     local extra="${1:-}"; shift || true
+    local aliases=""
 
     if [ -n "$extra" ]; then
         local suite="${suite}-${extra}"
@@ -88,10 +89,20 @@ genschrootconf() {
         local name="${suite}_${arch}-dchroot"
     fi
 
+    local fullname="$name"
+    case "$arch" in
+        kfreebsd-*)
+            aliases="$name"
+            # FreeBSD only allows relatively short paths to mountpoints
+            # therefore saving a few charakters making the chroot dir fit
+            name=${name/kfreebsd-amd64/k-a}
+            name=${name/kfreebsd-i386/k-i}
+        ;;
+    esac
 
 cat << EOF
 [${name}]
-description=[${name}] Debian $suite chroot for $arch
+description=[${fullname}] Debian $suite chroot for $arch
 type=file
 file=$target
 EOF
@@ -103,10 +114,17 @@ EOF
     echo "profile=$personality"
 
     if [ "$THISARCH" = "$arch" ] && [ -z "$buildd" ]; then
-        echo "aliases=$suite"
+        if [ -z "$aliases" ] ; then
+            aliases="$suite"
+        else
+            aliases="$aliases,$suite"
+        fi
+    fi
+    if [ -n "$aliases" ] ; then
+        echo "aliases=$aliases"
     fi
     case "$arch" in
-        armel|armhf|i386|powerpc|s390|sparc)
+        armel|armhf|i386|mips|mipsel|powerpc|s390|sparc)
             echo "personality=linux32"
             ;;
     esac
@@ -116,17 +134,23 @@ EOF
         sid)
             genschrootconf "experimental" "$arch" "$target"
             ;;
-        #experimental|jessie)
         experimental)
             :
             ;;
         *)
             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" "lts"
-                [ -n "$buildd" ] && genschrootconf "$suite" "$arch" "$target" "proposed-updates"
-                [ -n "$buildd" ] && genschrootconf "$suite" "$arch" "$target" "security"
+                if [ -n "$buildd" ] ; then
+                    genschrootconf "$suite" "$arch" "$target" "backports-sloppy"
+                    genschrootconf "$suite" "$arch" "$target" "proposed-updates"
+                    genschrootconf "$suite" "$arch" "$target" "security"
+                    case "$arch" in
+                        kfreebsd-*)
+                            genschrootconf "$suite" "$arch" "$target" "kfreebsd"
+                            genschrootconf "$suite" "$arch" "$target" "kfreebsd-security"
+                            ;;
+                    esac
+                fi
             fi
     esac
     return 0
@@ -159,8 +183,9 @@ keyring=/usr/share/keyrings/debian-archive-keyring.gpg
 personality="dsa"
 sbuildnames=""
 ubuntu=""
-groupuser="Debian,guest"
+groupuser="Debian,guest,d-i"
 grouproot=""
+include="apt,fakeroot"
 users=""
 usersroot=""
 bare=""
@@ -171,7 +196,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)
@@ -192,8 +217,8 @@ do
             bare="1"
             groupuser=""
             grouproot=""
-            users="buildd"
-            usersroot="buildd"
+            users="buildd,buildd2"
+            usersroot="buildd,buildd2"
             personality="buildd"
             suffix="sbuild"
             ;;
@@ -210,6 +235,9 @@ do
             usage
             exit 0
             ;;
+        I)
+            include="$include,$OPTARG"
+            ;;
         K)
             keep="4"
             ;;
@@ -255,7 +283,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)."
 
@@ -265,6 +303,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
@@ -290,10 +339,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"
@@ -312,7 +361,7 @@ esac
 
 
 chroot "$rootdir" apt-get update
-chroot "$rootdir" apt-get install -y --force-yes --no-install-recommends policyrcd-script-zg2
+chroot "$rootdir" apt-get install -y --no-install-recommends policyrcd-script-zg2
 cat > "$rootdir/usr/local/sbin/policy-rc.d" << 'EOF'
 #!/bin/sh
 
@@ -331,9 +380,19 @@ while true; do
 done
 EOF
 chmod +x "$rootdir/usr/local/sbin/policy-rc.d"
-[ -z "$bare" ] && [ -z "$ubuntu" ] && chroot "$rootdir" apt-get install -y --force-yes --no-install-recommends locales-all
-chroot "$rootdir" apt-get install -y --force-yes --no-install-recommends build-essential
-[ -z "$bare" ] && chroot "$rootdir" apt-get install -y --force-yes --no-install-recommends zsh less vim fakeroot devscripts gdb
+[ -z "$bare" ] && [ -z "$ubuntu" ] && chroot "$rootdir" apt-get install -y --no-install-recommends locales-all
+chroot "$rootdir" apt-get install -y --no-install-recommends build-essential
+[ -z "$bare" ] && chroot "$rootdir" apt-get install -y --no-install-recommends zsh less vim fakeroot devscripts gdb
+if [ -n "$buildd" ] ; then
+    case "$suite" in
+      wheezy|jessie|stretch)
+        chroot "$rootdir" apt-get install -y --no-install-recommends apt-transport-https
+        ;;
+      *)
+        # Nothing to do, https support is part of the apt package
+        ;;
+    esac
+fi
 rm -f "$rootdir/etc/apt/sources.list" "$rootdir/etc/apt/sources.list.d/*"
 chroot "$rootdir" apt-get clean
 umount "$rootdir/dev" 2>/dev/null || true
@@ -343,9 +402,10 @@ tartmp=$(tempfile --directory "$basedir" --suffix=".tar.gz")
 cleanup+=("rm -f $tartmp")
 (
   cd "$rootdir"
+  chmod 0755 "$rootdir"
   tar caf "$tartmp" .
   if ! [ -z "$keep" ]; then
-    savelog -l -c 4 "$target"
+    savelog -l -c 2 "$target"
   fi
   mv "$tartmp" "$target"
 )