[Pbuilder-maint] pbuilder CVS update: pbuilder ChangeLog
debuild-pbuilder pbuilder-buildpackage-funcs pbuilder-modules
pbuilderrc pbuilderrc.5 pdebuild pdebuild-checkparams
pdebuild-internal pdebuild-uml-checkparams pdebuild.1
pbuilder CVS Commit
pbuilder-maint at lists.alioth.debian.org
Mon Nov 6 21:06:26 CET 2006
User: lool
Date: 06/11/06 21:06:26
Modified: . ChangeLog debuild-pbuilder
pbuilder-buildpackage-funcs pbuilder-modules
pbuilderrc pbuilderrc.5 pdebuild
pdebuild-checkparams pdebuild-internal
pdebuild-uml-checkparams pdebuild.1
Log:
* 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.
Revision Changes Path
1.418 +17 -1 pbuilder/ChangeLog
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/ChangeLog?annotate=1.418&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/ChangeLog?rev=1.418&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/ChangeLog.diff?r1=1.418&r2=1.417&cvsroot=
-----------------------------------
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/ChangeLog,v
retrieving revision 1.417
retrieving revision 1.418
diff -u -r1.417 -r1.418
--- ChangeLog 5 Nov 2006 21:46:46 -0000 1.417
+++ ChangeLog 6 Nov 2006 20:06:25 -0000 1.418
@@ -1,3 +1,19 @@
+2006-11-06 Loic Minier <lool at 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 at dooz.org>
* pdebuild-internal: install the passwd package before calling
1.3 +1 -1 pbuilder/debuild-pbuilder
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/debuild-pbuilder?annotate=1.3&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/debuild-pbuilder?rev=1.3&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/debuild-pbuilder.diff?r1=1.3&r2=1.2&cvsroot=
-----------------------------------
Index: debuild-pbuilder
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/debuild-pbuilder,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- debuild-pbuilder 30 Oct 2002 08:42:07 -0000 1.2
+++ debuild-pbuilder 6 Nov 2006 20:06:25 -0000 1.3
@@ -11,5 +11,5 @@
fi;
. /usr/lib/pbuilder/pbuilder-loadconfig
-"$PBUILDERROOTCMD" /usr/lib/pbuilder/pbuilder-satisfydepends
+"$PBUILDERROOTCMD" "$PBUILDERSATISFYDEPENDSCMD"
/usr/bin/debuild "$@"
1.32 +2 -2 pbuilder/pbuilder-buildpackage-funcs
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-buildpackage-funcs?annotate=1.32&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-buildpackage-funcs?rev=1.32&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-buildpackage-funcs.diff?r1=1.32&r2=1.31&cvsroot=
-----------------------------------
Index: pbuilder-buildpackage-funcs
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pbuilder-buildpackage-funcs,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- pbuilder-buildpackage-funcs 30 May 2006 23:45:45 -0000 1.31
+++ pbuilder-buildpackage-funcs 6 Nov 2006 20:06:25 -0000 1.32
@@ -37,7 +37,7 @@
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
1.103 +1 -0 pbuilder/pbuilder-modules
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-modules?annotate=1.103&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-modules?rev=1.103&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-modules.diff?r1=1.103&r2=1.102&cvsroot=
-----------------------------------
Index: pbuilder-modules
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pbuilder-modules,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- pbuilder-modules 30 Oct 2006 08:36:53 -0000 1.102
+++ pbuilder-modules 6 Nov 2006 20:06:25 -0000 1.103
@@ -78,6 +78,7 @@
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
1.44 +4 -0 pbuilder/pbuilderrc
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilderrc?annotate=1.44&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilderrc?rev=1.44&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilderrc.diff?r1=1.44&r2=1.43&cvsroot=
-----------------------------------
Index: pbuilderrc
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pbuilderrc,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- pbuilderrc 15 Aug 2006 13:14:25 -0000 1.43
+++ pbuilderrc 6 Nov 2006 20:06:25 -0000 1.44
@@ -34,6 +34,10 @@
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=""
1.58 +6 -0 pbuilder/pbuilderrc.5
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilderrc.5?annotate=1.58&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilderrc.5?rev=1.58&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilderrc.5.diff?r1=1.58&r2=1.57&cvsroot=
-----------------------------------
Index: pbuilderrc.5
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pbuilderrc.5,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- pbuilderrc.5 15 Aug 2006 13:14:25 -0000 1.57
+++ pbuilderrc.5 6 Nov 2006 20:06:25 -0000 1.58
@@ -213,6 +213,12 @@
.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,
1.33 +1 -1 pbuilder/pdebuild
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pdebuild?annotate=1.33&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pdebuild?rev=1.33&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pdebuild.diff?r1=1.33&r2=1.32&cvsroot=
-----------------------------------
Index: pdebuild
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pdebuild,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- pdebuild 30 May 2006 23:45:45 -0000 1.32
+++ pdebuild 6 Nov 2006 20:06:25 -0000 1.33
@@ -37,7 +37,7 @@
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"
1.10 +4 -0 pbuilder/pdebuild-checkparams
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pdebuild-checkparams?annotate=1.10&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pdebuild-checkparams?rev=1.10&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pdebuild-checkparams.diff?r1=1.10&r2=1.9&cvsroot=
-----------------------------------
Index: pdebuild-checkparams
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pdebuild-checkparams,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pdebuild-checkparams 10 Jun 2006 15:33:21 -0000 1.9
+++ pdebuild-checkparams 6 Nov 2006 20:06:25 -0000 1.10
@@ -69,6 +69,10 @@
PBUILDERROOTCMD="$2";
shift; shift;
;;
+ --pbuildersatisfydepends*)
+ PBUILDERSATISFYDEPENDSCMD="$2";
+ shift; shift;
+ ;;
--use-pdebuild-internal)
USE_PDEBUILD_INTERNAL=yes;
shift;
1.16 +6 -2 pbuilder/pdebuild-internal
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pdebuild-internal?annotate=1.16&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pdebuild-internal?rev=1.16&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pdebuild-internal.diff?r1=1.16&r2=1.15&cvsroot=
-----------------------------------
Index: pdebuild-internal
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pdebuild-internal,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pdebuild-internal 5 Nov 2006 21:46:46 -0000 1.15
+++ pdebuild-internal 6 Nov 2006 20:06:25 -0000 1.16
@@ -55,6 +55,10 @@
BUILDRESULTGID=$2
shift; shift;
;;
+ --pbuildersatisfydepends)
+ PBUILDERSATISFYDEPENDSCMD=$2
+ shift; shift;
+ ;;
--debug)
PBUILDER_DEBUGMODE=yes
set -x
@@ -71,7 +75,7 @@
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
1.6 +4 -0 pbuilder/pdebuild-uml-checkparams
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pdebuild-uml-checkparams?annotate=1.6&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pdebuild-uml-checkparams?rev=1.6&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pdebuild-uml-checkparams.diff?r1=1.6&r2=1.5&cvsroot=
-----------------------------------
Index: pdebuild-uml-checkparams
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pdebuild-uml-checkparams,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pdebuild-uml-checkparams 16 Sep 2006 08:01:39 -0000 1.5
+++ pdebuild-uml-checkparams 6 Nov 2006 20:06:25 -0000 1.6
@@ -53,6 +53,10 @@
PBUILDERROOTCMD="$2";
shift; shift;
;;
+ --pbuildersatisfydepends*)
+ PBUILDERSATISFYDEPENDSCMD="$2";
+ shift; shift;
+ ;;
--debsign-k)
DEBSIGN_KEYID="$2"
shift; shift;
1.27 +4 -0 pbuilder/pdebuild.1
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pdebuild.1?annotate=1.27&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pdebuild.1?rev=1.27&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pdebuild.1.diff?r1=1.27&r2=1.26&cvsroot=
-----------------------------------
Index: pdebuild.1
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pdebuild.1,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- pdebuild.1 30 May 2006 05:17:55 -0000 1.26
+++ pdebuild.1 6 Nov 2006 20:06:25 -0000 1.27
@@ -33,6 +33,10 @@
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.
More information about the Pbuilder-maint
mailing list