Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-11-04 16:04:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable the proposed pocket by default

Browse Source
This commit is contained in:
Stefano Rivera 2012-11-06 11:45:24 +02:00
parent 18c8eaddb4
commit 143027d9fc
2 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/mk-sbuild.1
View File

@ -32,6 +32,10 @@ Turn on script debugging.
Do not include the \fB\-updates\fR pocket in the installed
\fBsources.list\fR.
.TP
.B \-\-skip\-proposed
Do not include the \fB\-proposed\fR pocket in the installed
\fBsources.list\fR.
.TP
.B \-\-source\-template\fR=\fIFILE
Use \fIFILE\fR as the \fBsources.list\fR template (defaults to
\fI$HOME\fB/.mk\-sbuild.sources\fR).
@ -81,6 +85,10 @@ Lines to append to schroot entries.
Do not include the \fB\-updates\fR pocket (same as
\fB\-\-skip\-updates\fR)
.TP
.B SKIP_PROPOSED
Do not include the \fB\-proposed\fR pocket (same as
\fB\-\-skip\-proposed\fR)
.TP
.B DEBOOTSTRAP_MIRROR
Mirror location (same as \fB\-\-debootstrap-mirror\fR)
.TP

30
mk-sbuild
View File

@ -49,6 +49,7 @@ function usage()
echo " --vg=VG use LVM snapshots, with group VG"
echo " --debug Turn on script debugging"
echo " --skip-updates Do not include -updates pocket in sources.list"
echo " --skip-proposed Do not include -proposed pocket in sources.list"
echo " --source-template=FILE Use FILE as the sources.list template"
echo " --debootstrap-mirror=URL Use URL as the debootstrap source"
echo " --debootstrap-include=list Comma separated list of packages to include"
@ -71,6 +72,7 @@ function usage()
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 " SKIP_UPDATES Enable --skip-updates"
echo " SKIP_PROPOSED Enable --skip-proposed"
echo " DEBOOTSTRAP_MIRROR Mirror location (same as --debootstrap-mirror)"
echo " DEBOOTSTRAP_INCLUDE Included packages (same as --debootstrap-include)"
echo " DEBOOTSTRAP_EXCLUDE Excluded packages (same as --debootstrap-exclude)"
@ -88,7 +90,7 @@ function usage()
if [ -z "$1" ]; then
usage
fi
OPTS=`getopt -o 'h' --long "help,debug,skip-updates,eatmydata,arch:,name:,source-template:,debootstrap-mirror:,debootstrap-include:,debootstrap-exclude:,debootstrap-proxy:,personality:,distro:,vg:,type:,target:" -- "$@"`
OPTS=`getopt -o 'h' --long "help,debug,skip-updates,skip-proposed,eatmydata,arch:,name:,source-template:,debootstrap-mirror:,debootstrap-include:,debootstrap-exclude:,debootstrap-proxy:,personality:,distro:,vg:,type:,target:" -- "$@"`
eval set -- "$OPTS"
VG=""
@ -119,6 +121,10 @@ while :; do
SKIP_UPDATES="1"
shift
;;
--skip-proposed)
SKIP_PROPOSED="1"
shift
;;
--name)
name="$2"
shift 2
@ -426,6 +432,9 @@ ubuntu)
if [ -z "$COMPONENTS" ]; then
COMPONENTS="main restricted universe multiverse"
fi
if [ -z "$SOURCES_PROPOSED_SUITE" ]; then
SOURCES_PROPOSED_SUITE="RELEASE-proposed"
fi
if [ -z "$SOURCES_SECURITY_SUITE" ]; then
SOURCES_SECURITY_SUITE="RELEASE-security"
fi
@ -475,6 +484,9 @@ debian)
if [ -z "$COMPONENTS" ]; then
COMPONENTS="main non-free contrib"
fi
if [ -z "$SOURCES_PROPOSED_SUITE" ]; then
SOURCES_PROPOSED_SUITE="RELEASE-proposed-updates"
fi
# Debian only performs security updates
SKIP_UPDATES=1
if [ -z "$SOURCES_SECURITY_SUITE" ]; then
@ -487,9 +499,10 @@ debian)
TARGET_MIRROR="$DEBOOTSTRAP_MIRROR"
TARGET_SOURCES_SECURITY_URL="$SOURCES_SECURITY_URL"
fi
# Unstable (aka "sid") does not have a security repository
if [ "$RELEASE" = 'unstable' ] || [ "$RELEASE" = 'sid' ]; then
# Unstable and Experimental do not have security or proposed repositories
if [ "$RELEASE" = 'unstable' ] || [ "$RELEASE" = 'sid' ] || [ "$RELEASE" = 'experimental' ]; then
SKIP_SECURITY=1
SKIP_PROPOSED=1
fi
# Keep the chroot as minimal as possible
BUILD_PKGS="--no-install-recommends $BUILD_PKGS"
@ -635,6 +648,17 @@ EOM
if [ -n "$TARGET_ARCH" ]; then
cat >> "$TEMP_SOURCES" <<EOM
deb [arch=$TARGET_ARCH] $TARGET_MIRROR RELEASE-updates $COMPONENTS
EOM
fi
fi
if [ -z "$SKIP_PROPOSED" ]; then
cat >> "$TEMP_SOURCES" <<EOM
deb ${MIRROR_ARCHS}${DEBOOTSTRAP_MIRROR} $SOURCES_PROPOSED_SUITE ${COMPONENTS}
deb-src ${DEBOOTSTRAP_MIRROR} $SOURCES_PROPOSED_SUITE ${COMPONENTS}
EOM
if [ -n "$TARGET_ARCH" ]; then
cat >> "$TEMP_SOURCES" <<EOM
deb [arch=$TARGET_ARCH] $TARGET_MIRROR RELEASE-proposed $COMPONENTS
EOM
fi
fi