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

mk-sbuild: Add a --debootstrap-opts argument for arbitrary options.

Browse Source
This commit is contained in:
Luke Faraone 2016-05-08 23:18:28 -06:00 committed by Adam Conrad
parent e903bf03d1
commit bae9b3817d
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -1,8 +1,12 @@
ubuntu-dev-tools (0.156) unstable; urgency=medium
[ Adam Conrad ]
* mk-sbuild: Remove references to the obsolete arm architecture, and
allow armhf and armel to be native on arm64 systems (LP: #1579619)
[ Luke Faraone ]
* mk-sbuild: Add a --debootstrap-opts argument for arbitrary options.
-- Adam Conrad <adconrad@ubuntu.com> Sun, 08 May 2016 23:06:34 -0600
ubuntu-dev-tools (0.155) unstable; urgency=medium

12
mk-sbuild
View File

@ -56,6 +56,7 @@ function usage()
echo " --debootstrap-mirror=URL Use URL as the debootstrap source"
echo " --debootstrap-include=list Comma separated list of packages to include"
echo " --debootstrap-exclude=list Comma separated list of packages to exclude"
echo " --debootstrap-opts=OPTS Extra options passed to debootstrap"
echo " --debootstrap-proxy=URL Use PROXY as apt proxy"
echo " --debootstrap-keyring=KEYRING"
echo " Use KEYRING to check signatures of retrieved Release files"
@ -82,6 +83,7 @@ function usage()
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)"
echo " DEBOOTSTRAP_OPTS Extra options passed to debootstrap (same as --debootstrap-opts)"
echo " DEBOOTSTRAP_PROXY Apt proxy (same as --debootstrap-proxy)"
echo " DEBOOTSTRAP_KEYRING GPG keyring (same as --debootstrap-keyring)"
echo " DEBOOTSTRAP_NO_CHECK_GPG Disable GPG verification (same as --debootstrap-no-check-gpg)"
@ -98,7 +100,7 @@ function usage()
if [ -z "$1" ]; then
usage
fi
OPTS=`getopt -o 'h' --long "help,debug,skip-updates,skip-proposed,eatmydata,arch:,name:,source-template:,debootstrap-mirror:,debootstrap-include:,debootstrap-exclude:,debootstrap-proxy:,debootstrap-no-check-gpg,debootstrap-keyring:,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-opts:,debootstrap-proxy:,debootstrap-no-check-gpg,debootstrap-keyring:,personality:,distro:,vg:,type:,target:" -- "$@"`
eval set -- "$OPTS"
VG=""
@ -158,6 +160,10 @@ while :; do
DEBOOTSTRAP_EXCLUDE="$2"
shift 2
;;
--debootstrap-opts)
DEBOOTSTRAP_OPTS="$2"
shift 2
;;
--debootstrap-proxy)
proxy="$2"
shift 2
@ -552,6 +558,10 @@ elif [ -n "$DEBOOTSTRAP_KEYRING" ]; then
debootstrap_opts="$debootstrap_opts --keyring=$DEBOOTSTRAP_KEYRING"
fi
if [ -n "$DEBOOTSTRAP_OPTS" ] ; then
debootstrap_opts="$debootstrap_opts $DEBOOTSTRAP_OPTS"
fi
# if http_proxy is set in the environment (even empty) set 'proxy' to it
[ "$proxy" = "_unset_" -a "${DEBOOTSTRAP_PROXY-xx}" != "xx" ] &&
proxy=${DEBOOTSTRAP_PROXY}