Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-03-25 01:41:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

mk-sbuild: allow specifying the schroot profile.

Browse Source
This commit is contained in:
Marc Deslauriers 2013-05-06 09:47:36 -04:00
parent b809e2deb0
commit bcdc6abbf8
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
ubuntu-dev-tools (0.149) UNRELEASED; urgency=low
* mk-sbuild: allow specifying the schroot profile.
-- Marc Deslauriers <marc.deslauriers@ubuntu.com> Mon, 06 May 2013 09:43:02 -0400
ubuntu-dev-tools (0.148) unstable; urgency=low ubuntu-dev-tools (0.148) unstable; urgency=low
* Upload to unstable after the Debian 7.0 release. * Upload to unstable after the Debian 7.0 release.

3
doc/mk-sbuild.1
View File

@ -81,6 +81,9 @@ Size of snapshot LVs (defaults to 4G).
.B SCHROOT_CONF_SUFFIX .B SCHROOT_CONF_SUFFIX
Lines to append to schroot entries. Lines to append to schroot entries.
.TP .TP
.B SCHROOT_PROFILE
Profile to use with schroot. (defaults to sbuild)
.TP
.B SKIP_UPDATES .B SKIP_UPDATES
Do not include the \fB\-updates\fR pocket (same as Do not include the \fB\-updates\fR pocket (same as
\fB\-\-skip\-updates\fR) \fB\-\-skip\-updates\fR)

7
mk-sbuild
View File

@ -1,12 +1,13 @@
#!/bin/bash #!/bin/bash
# #
# Copyright 2006-2011 (C) Canonical Ltd. # Copyright 2006-2013 (C) Canonical Ltd.
# Authors: # Authors:
# Kees Cook <kees@ubuntu.com> # Kees Cook <kees@ubuntu.com>
# Emmet Hikory <persia@ubuntu.com> # Emmet Hikory <persia@ubuntu.com>
# Scott Moser <smoser@ubuntu.com> # Scott Moser <smoser@ubuntu.com>
# Stefano Rivera <stefanor@ubuntu.com> # Stefano Rivera <stefanor@ubuntu.com>
# Steve Langasek <steve.langasek@ubuntu.com> # Steve Langasek <steve.langasek@ubuntu.com>
# Marc Deslauriers <marc.deslauriers@ubuntu.com>
# #
# ################################################################## # ##################################################################
# #
@ -38,6 +39,7 @@ SNAPSHOT_SIZE="4G"
SOURCE_CHROOTS_DIR="/var/lib/schroot/chroots" SOURCE_CHROOTS_DIR="/var/lib/schroot/chroots"
SOURCE_CHROOTS_TGZ="/var/lib/schroot/tarballs" SOURCE_CHROOTS_TGZ="/var/lib/schroot/tarballs"
CHROOT_SNAPSHOT_DIR="/var/lib/schroot/snapshots" CHROOT_SNAPSHOT_DIR="/var/lib/schroot/snapshots"
SCHROOT_PROFILE="sbuild"
function usage() function usage()
{ {
@ -71,6 +73,7 @@ function usage()
echo " SOURCE_CHROOTS_TGZ Directory to store file source chroots" echo " SOURCE_CHROOTS_TGZ Directory to store file source chroots"
echo " CHROOT_SNAPSHOT_DIR Directory to mount open btrfs snaphshot chroots (default ${CHROOT_SNAPSHOT_DIR})" echo " CHROOT_SNAPSHOT_DIR Directory to mount open btrfs snaphshot chroots (default ${CHROOT_SNAPSHOT_DIR})"
echo " SCHROOT_CONF_SUFFIX Lines to append to schroot.conf entries" echo " SCHROOT_CONF_SUFFIX Lines to append to schroot.conf entries"
echo " SCHROOT_PROFILE Profile to use with schroot (default ${SCHROOT_PROFILE})"
echo " SKIP_UPDATES Enable --skip-updates" echo " SKIP_UPDATES Enable --skip-updates"
echo " SKIP_PROPOSED Enable --skip-proposed" echo " SKIP_PROPOSED Enable --skip-proposed"
echo " DEBOOTSTRAP_MIRROR Mirror location (same as --debootstrap-mirror)" echo " DEBOOTSTRAP_MIRROR Mirror location (same as --debootstrap-mirror)"
@ -712,7 +715,7 @@ root-groups=$ADMIN_GROUPS
#source-root-users=$ADMIN_GROUPS #source-root-users=$ADMIN_GROUPS
#source-root-groups=$ADMIN_GROUPS #source-root-groups=$ADMIN_GROUPS
type=SCHROOT_TYPE type=SCHROOT_TYPE
profile=sbuild profile=$SCHROOT_PROFILE
EOM EOM
if [ $EATMYDATA -eq 1 ]; then if [ $EATMYDATA -eq 1 ]; then
cat >> "$TEMP_SCHROOTCONF" <<EOM cat >> "$TEMP_SCHROOTCONF" <<EOM