X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fschroot%2Ffiles%2Fsetup-dchroot;h=92b210f1372cb1b301234d16e7706711c6554df3;hb=111a5337b6d1142aee2aa6c72417c1dd5cb3406f;hp=800238316434c94497ac8d6b122d38af5cc99386;hpb=e8d6b1f683b7538b9e17602c5e3d1022f3722894;p=dsa-puppet.git diff --git a/modules/schroot/files/setup-dchroot b/modules/schroot/files/setup-dchroot index 80023831..92b210f1 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,6 +123,7 @@ 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" @@ -160,6 +161,7 @@ sbuildnames="" ubuntu="" groupuser="Debian,guest,d-i" grouproot="" +include="apt,fakeroot" users="" usersroot="" bare="" @@ -170,7 +172,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) @@ -209,6 +211,9 @@ do usage exit 0 ;; + I) + include="$include,$OPTARG" + ;; K) keep="4" ;; @@ -310,7 +315,7 @@ fi set -x debootstrap \ --keyring "$keyring" \ - --include="apt" \ + --include="$include" \ --variant=buildd \ --arch="$arch" \ "$suite_alias" "$rootdir" "$mirror" "$script"