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

merge jamie's --personality option (LP: #199181), update debian changelog

Browse Source
This commit is contained in:
Kees Cook 2008-03-06 11:06:50 -08:00
commit 722eca388f
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -6,7 +6,11 @@ ubuntu-dev-tools (0.28) UNRELEASED; urgency=low
- Removed quotes around the path when using --aptconfdir, otherwise
pbuilder create fails
-- Siegfried-Angel Gevatter Pujals (RainCT) <rainct@ubuntu.com> Sun, 24 Feb 2008 19:52:06 +0100
[ Kees Cook ]
* mk-sbuild-lv: add --personality option from Jamie Strandboge (LP: #199181)
* check-symbols: rename temp files to avoid .so versioning confusion.
-- Kees Cook <kees@ubuntu.com> Thu, 06 Mar 2008 11:05:02 -0800
ubuntu-dev-tools (0.27) hardy; urgency=low

12
mk-sbuild-lv
View File

@ -20,7 +20,7 @@
# detect the chroot architecture:
# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=392992
#
# Version: 0.11
# Version: 0.12
set -e
@ -87,6 +87,7 @@ function usage()
echo "Options:"
echo " --arch=ARCH What architecture to select"
echo " --name=NAME Base name for the schroot (arch is appended)"
echo " --personality=PERSONALITY What personality to use"
echo " --debug Turn on script debugging"
echo " --source-template=FILE Use FILE as the sources.list template"
echo " --debootstrap-mirror=URL Use URL as the debootstrap source"
@ -97,7 +98,7 @@ function usage()
if [ -z "$1" ]; then
usage
fi
OPTS=`getopt -o '' --long "help,debug,arch:,name:,source-template:,debootstrap-mirror:" -- "$@"`
OPTS=`getopt -o '' --long "help,debug,arch:,name:,source-template:,debootstrap-mirror:,personality:" -- "$@"`
eval set -- "$OPTS"
name=""
@ -113,6 +114,10 @@ while :; do
arch_suffix="-$2"
shift 2
;;
--personality)
personality="$2"
shift 2
;;
--name)
name="$2"
shift 2
@ -223,6 +228,9 @@ run-setup-scripts=true
run-exec-scripts=true
EOM
fi
if [ ! -z "$personality" ]; then
echo "personality=$personality" >> "$TEMP_SCHROOTCONF"
fi
cat "$TEMP_SCHROOTCONF" | sed \
-e "s|CHROOT_NAME|$CHROOT_NAME|g" \
-e "s|CHROOT_PATH|$CHROOT_PATH|g" \