aboutsummaryrefslogtreecommitdiff
path: root/pbuilder-createbuildenv
diff options
context:
space:
mode:
authordancer <dancer>2005-06-03 12:07:39 +0000
committerdancer <dancer>2005-06-03 12:07:39 +0000
commite342d18928b393c8d3d5c73324d7b5e49fc6ea74 (patch)
tree6066281270d49d66b77a057c1c37f119eee09b4b /pbuilder-createbuildenv
parenta8a89c869fe7d948479ee58bb7a793a34723cec0 (diff)
downloadpbuilder-e342d18928b393c8d3d5c73324d7b5e49fc6ea74.tar
pbuilder-e342d18928b393c8d3d5c73324d7b5e49fc6ea74.tar.gz
change to use experimental,
and apply patch; and apply my own patch.
Diffstat (limited to 'pbuilder-createbuildenv')
-rwxr-xr-xpbuilder-createbuildenv8
1 files changed, 4 insertions, 4 deletions
diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv
index a5d1f16..c474984 100755
--- a/pbuilder-createbuildenv
+++ b/pbuilder-createbuildenv
@@ -1,7 +1,7 @@
#! /bin/bash
# Creating the build environment with debootstrap.
# pbuilder -- personal Debian package builder
-# Copyright (C) 2001-2003 Junichi Uekawa
+# Copyright (C) 2001-2003,2005 Junichi Uekawa
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -53,6 +53,7 @@ if [ -n "$HOOKDIR" ]; then
echo " -> Applying user distribution dist build script $DEBOOTSTRAPSCRIPT"
fi
fi
+
if ! ( cd "$BUILDPLACE" && debootstrap "${DEBOOTSTRAPOPTS[@]}" "$DISTRIBUTION" . "$MIRRORSITE" "$DEBOOTSTRAPSCRIPT" ) ; then
echo "pbuilder: debootstrap failed" >&2
exit 1
@@ -63,7 +64,6 @@ loadhooks
mkdir -p "$BUILDPLACE/tmp/buildd"
-
copy_local_configuration
installaptlines
@@ -76,8 +76,8 @@ if [ -n "$REMOVEPACKAGES" ]; then
$CHROOTEXEC /usr/bin/dpkg --purge $REMOVEPACKAGES
fi
recover_aptcache
-$CHROOTEXEC /usr/bin/apt-get -y dist-upgrade
-$CHROOTEXEC /usr/bin/apt-get -y install build-essential dpkg-dev apt $EXTRAPACKAGES
+$CHROOTEXEC /usr/bin/apt-get -y --force-yes dist-upgrade
+$CHROOTEXEC /usr/bin/apt-get -y --force-yes install build-essential dpkg-dev apt $EXTRAPACKAGES
save_aptcache
$CHROOTEXEC /usr/bin/apt-get clean