aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog16
-rw-r--r--debian/TODO2
-rw-r--r--debian/changelog5
-rw-r--r--debuild-pbuilder2
-rw-r--r--pbuilder-buildpackage-funcs2
-rw-r--r--pbuilder-modules1
-rwxr-xr-xpbuilderrc4
-rw-r--r--pbuilderrc.56
-rw-r--r--pdebuild2
-rw-r--r--pdebuild-checkparams4
-rw-r--r--pdebuild-internal6
-rw-r--r--pdebuild-uml-checkparams4
-rw-r--r--pdebuild.14
13 files changed, 51 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 9a3bdb5..4e436bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2006-11-06 Loic Minier <lool@dooz.org>
+
+ * debuild-pbuilder, pbuilder-buildpackage-funcs, pdebuild-internal:
+ use $PBUILDERSATISFYDEPENDSCMD instead of
+ /usr/lib/pbuilder/pbuilder-satisfydepends.
+ * pbuilderrc: set PBUILDERSATISFYDEPENDSCMD to
+ /usr/lib/pbuilder/pbuilder-satisfydepends by default.
+ * pbuilderrc.5: document PBUILDERSATISFYDEPENDSCMD.
+ * debian/TODO: alternatives implementation of pbuilder-satisfydepends
+ now possible.
+ * pdebuild-checkparams, pdebuild-uml-checkparams, pdebuild-internal:
+ add a new --pbuildersatisfydepends flag to override
+ PBUILDERSATISFYDEPENDSCMD
+ * pdebuild: pass --pbuildersatisfydepends to pdebuild-internal.
+ * pbuilder-modules, pdebuild.1: document --pbuildersatisfydepends.
+
2006-11-03 Loic Minier <lool@dooz.org>
* pdebuild-internal: install the passwd package before calling
diff --git a/debian/TODO b/debian/TODO
index 32c25ec..6aa0143 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -81,8 +81,6 @@ test
* Fix UML_EXTRAOPT to use arrays.
This should change semantics; and how do we pass this thing to inside UML?
-* Use other alternative implementations to pbuilder-satisfydepends.
-
elmo.txt is a memo of a discussion with James Troup.
$Id$
diff --git a/debian/changelog b/debian/changelog
index 1bb17ab..2a2eb9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,8 +14,11 @@ pbuilder (0.161) UNRELEASED; urgency=low
* Unmount selinux and bind mounts first.
* Fix usage of --pdebuild-internal: install passwd during groupadd/useradd
in pdebuild-internal.
+ * New PBUILDERSATISFYDEPENDSCMD config option and --pbuildersatisfydepends
+ override flag to set the command to run to satisfy build dependencies;
+ default to the /usr/lib/pbuilder/pbuilder-satisfydepends helper.
- -- Loic Minier <lool@dooz.org> Fri, 3 Nov 2006 18:43:49 +0100
+ -- Loic Minier <lool@dooz.org> Mon, 6 Nov 2006 19:38:36 +0100
pbuilder (0.160) unstable; urgency=low
diff --git a/debuild-pbuilder b/debuild-pbuilder
index 1efdb6b..64b58a0 100644
--- a/debuild-pbuilder
+++ b/debuild-pbuilder
@@ -11,5 +11,5 @@ if test ! -d ./debian; then
fi;
. /usr/lib/pbuilder/pbuilder-loadconfig
-"$PBUILDERROOTCMD" /usr/lib/pbuilder/pbuilder-satisfydepends
+"$PBUILDERROOTCMD" "$PBUILDERSATISFYDEPENDSCMD"
/usr/bin/debuild "$@"
diff --git a/pbuilder-buildpackage-funcs b/pbuilder-buildpackage-funcs
index 0676289..5b85408 100644
--- a/pbuilder-buildpackage-funcs
+++ b/pbuilder-buildpackage-funcs
@@ -37,7 +37,7 @@ function checkbuilddep () {
yes) BUILDOPT="--binary-arch";;
*) ;;
esac
- if /usr/lib/pbuilder/pbuilder-satisfydepends --control "$1" --internal-chrootexec "${CHROOTEXEC}" "${BUILDOPT}" ; then
+ if "$PBUILDERSATISFYDEPENDSCMD" --control "$1" --internal-chrootexec "${CHROOTEXEC}" "${BUILDOPT}" ; then
:
else
# If asked to preserve the build place, and pbuilder-satisfydepends
diff --git a/pbuilder-modules b/pbuilder-modules
index 188e55b..654d8c1 100644
--- a/pbuilder-modules
+++ b/pbuilder-modules
@@ -78,6 +78,7 @@ pbuilder-options:
pdebuild-specific pbuilder-options:
--pbuilderroot [command to obtain root privilege for pbuilder]
+ --pbuildersatisfydepends [command to satisfy build-dependencies]
--buildsourceroot [command to obtain root privilege for dpkg-buildpackage]
--use-pdebuild-internal
--auto-debsign
diff --git a/pbuilderrc b/pbuilderrc
index d09711c..71db7a3 100755
--- a/pbuilderrc
+++ b/pbuilderrc
@@ -34,6 +34,10 @@ DEBEMAIL=""
BUILDSOURCEROOTCMD="fakeroot"
PBUILDERROOTCMD="sudo"
+# command to satisfy build-dependencies; the default is an internal shell
+# implementation which is relatively slow
+PBUILDERSATISFYDEPENDSCMD="/usr/lib/pbuilder/pbuilder-satisfydepends"
+
#default is to build everything. Passed on to dpkg-buildpackage
#DEBBUILDOPTS="-b"
DEBBUILDOPTS=""
diff --git a/pbuilderrc.5 b/pbuilderrc.5
index 46a317f..4780ff4 100644
--- a/pbuilderrc.5
+++ b/pbuilderrc.5
@@ -213,6 +213,12 @@ in
.B "pdebuild"
.TP
+.BI "PBUILDERSATISFYDEPENDSCMD=" "/usr/lib/pbuilder/pbuilder-satisfydepends"
+
+This option is used by various parts of pbuilder to satisfy (i.e. install) the
+build-dependencies of a package.
+
+.TP
.BI "BUILDUSERID=" "1234"
The uid to be used inside chroot.
It should ideally not collide with user-id outside the chroot,
diff --git a/pdebuild b/pdebuild
index 472eb48..398a927 100644
--- a/pdebuild
+++ b/pdebuild
@@ -37,7 +37,7 @@ export BUILDRESULTUID=$(id -u)
export BUILDRESULTGID=$(id -g)
if [ "${USE_PDEBUILD_INTERNAL}" = 'yes' ]; then
- ${PBUILDERROOTCMD} ${PDEBUILD_PBUILDER} --execute "$@" ${EXTRA_CONFIGFILE[@]/#/--configfile } --bindmounts $(readlink -f ..) -- /usr/lib/pbuilder/pdebuild-internal ${PWD} --debbuildopts "${DEBBUILDOPTS}" --uid "${BUILDRESULTUID}" --gid "${BUILDRESULTGID}"
+ ${PBUILDERROOTCMD} ${PDEBUILD_PBUILDER} --execute "$@" ${EXTRA_CONFIGFILE[@]/#/--configfile } --bindmounts $(readlink -f ..) -- /usr/lib/pbuilder/pdebuild-internal ${PWD} --debbuildopts "${DEBBUILDOPTS}" --uid "${BUILDRESULTUID}" --gid "${BUILDRESULTGID}" --pbuildersatisfydepends "$PBUILDERSATISFYDEPENDSCMD"
else
if ! dpkg-checkbuilddeps -B ; then
echo "W: Unmet build-dependency in source"
diff --git a/pdebuild-checkparams b/pdebuild-checkparams
index feda18e..fb323eb 100644
--- a/pdebuild-checkparams
+++ b/pdebuild-checkparams
@@ -69,6 +69,10 @@ while [ -n "$1" ]; do
PBUILDERROOTCMD="$2";
shift; shift;
;;
+ --pbuildersatisfydepends*)
+ PBUILDERSATISFYDEPENDSCMD="$2";
+ shift; shift;
+ ;;
--use-pdebuild-internal)
USE_PDEBUILD_INTERNAL=yes;
shift;
diff --git a/pdebuild-internal b/pdebuild-internal
index 975b262..2f776ba 100644
--- a/pdebuild-internal
+++ b/pdebuild-internal
@@ -55,6 +55,10 @@ while [ -n "$1" ]; do
BUILDRESULTGID=$2
shift; shift;
;;
+ --pbuildersatisfydepends)
+ PBUILDERSATISFYDEPENDSCMD=$2
+ shift; shift;
+ ;;
--debug)
PBUILDER_DEBUGMODE=yes
set -x
@@ -71,7 +75,7 @@ while [ -n "$1" ]; do
done
export PBCURRENTCOMMANDLINEOPERATION="pdebuild"
-/usr/lib/pbuilder/pbuilder-satisfydepends
+"$PBUILDERSATISFYDEPENDSCMD"
apt-get install -y --force-yes fakeroot
# create the user similar to that used outside
diff --git a/pdebuild-uml-checkparams b/pdebuild-uml-checkparams
index 0b03803..19daf88 100644
--- a/pdebuild-uml-checkparams
+++ b/pdebuild-uml-checkparams
@@ -53,6 +53,10 @@ while [ -n "$1" ] ; do
PBUILDERROOTCMD="$2";
shift; shift;
;;
+ --pbuildersatisfydepends*)
+ PBUILDERSATISFYDEPENDSCMD="$2";
+ shift; shift;
+ ;;
--debsign-k)
DEBSIGN_KEYID="$2"
shift; shift;
diff --git a/pdebuild.1 b/pdebuild.1
index 7817276..c8a1115 100644
--- a/pdebuild.1
+++ b/pdebuild.1
@@ -33,6 +33,10 @@ The command used to gain root privilege for
invoking pbuilder.
.TP
+.BI "\-\-pbuildersatisfydepends [" "/usr/lib/pbuilder/pbuilder-satisfydepends" "]"
+The command used to satisfy (i.e. install) build-dependencies.
+
+.TP
.BI "\-\-auto\-debsign"
Invoke debsign at the end of pdebuild process.