Hello all,<br><br>Below you will find a patch created by myself and Ryan Bradetich for proposal/evaluation/submission. The patch adds 2 new features and one small proposed fix to pbuilder-0.155<br><br>1) Cross-compiling support:
<br> An arch parameter has been added to pbuilder (pbuilder-checkparams and pbuilder-satisfydepends) to allow a user to specify the architecture a package is being built for. The arch parameter is used in pbuilder-satisfydepends to allow the installation of the correct build-dependencies for cross-compiling. Specifically, the packages that have been dpkg-cross'ed. The dependencies are now checked in the following order: cross->normal->provides This change does not determine if a package 'should' be dpkg-cross'ed to work, just for the existance of it. We allow the package to fail during build if the appropriate packages were not dpkg-cross'ed.
<br> We have been very successful using this as a method to get pbuilder to cross-compile for our powerpc target. Now if only the packages themselves would work as nicely during cross-compile ^_^<br><br>2) Pre-build command execution:
<br> This is a small feature addition. The feature allows any command to be run immediately before dpkg-buildpackage. This allows slightly different functionality from a hook. In our particular case, it allows the use of tools such as Rational Clearaudit which is a shell that records file-access during the session, for metric purposes. However, we feel the command may be used more generically. Just yesterday we found that this provides us a way to use pbuilder to generate gcc cross-compilers directly from the source packages. Normally one would have to unpack the sources and set the debian/target file to the appropriate architecture and then build. With this patch we can execute "export GCC_TARGET; debian/rules control;" from pbuilder parameters and not have to mess with the debian/target file.
<br> The appropriate lines are in pbuilder-buildpackage and pbuilder-checkparams. One note would be that we left the ';' out after the $PRE_BUILDPKG variables in pbuilder-buildpackage intentionally. Users can still add the ';' in the parameter, however this implementation allows the dpkg-buildpackage lines to be passed as arguments to the user specified command. (namely, our audit shell)
<br><br>3) LOGNAME warnings:<br> Our proposed solution is the addition of "export LOGNAME=$BUILDUSERNAME;" to the 3 lines in pbuilder-buildpackage, seen below. BUILDUSERNAME appears to always be set to either root or the build user, so it appears to be a safe command. This eliminates all the warnings that LOGNAME is not set.
<br><br>The whole patch set has been in use by us for several weeks for use in building packages for i386 and powerpc. If you have any points of discussion or questions, I would be happy to field them. <br><br>Have a day,
<br><br>Eugene T. Bordenkircher<br><br>pbuilder_arch_prebuild.patch<br>--------------------<br><br><span style="font-family: courier new,monospace;">diff -Naur pbuilder-0.155ubuntu3.orig/pbuilder-buildpackage pbuilder-0.155ubuntu3
/pbuilder-buildpackage</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">--- pbuilder-0.155ubuntu3.orig/pbuilder-buildpackage 2006-06-17 03:28:03.000000000 -0700</span>
<br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+++ pbuilder-0.155ubuntu3/pbuilder-buildpackage 2007-04-23 11:27:34.000000000 -0700</span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;">@@ -106,7 +106,7 @@</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> echo "pbuilder: Failed chowning to $BUILDUSERNAME:$BUILDUSERNAME" >&2
</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> exit 1;</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
fi</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">-if echo "( cd tmp/buildd; /usr/bin/dpkg-source -x $(basename $PACKAGENAME) )" | $CHROOTEXEC $SUTOUSER ; then
</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+if echo "( export LOGNAME=$BUILDUSERNAME; cd tmp/buildd; /usr/bin/dpkg-source -x $(basename $PACKAGENAME) )" | $CHROOTEXEC $SUTOUSER ; then
</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> : # success</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
else</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> echo "pbuilder: Failed extracting the source" >&2 </span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;">@@ -118,9 +118,9 @@</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> executehooks "A"</span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;"> </span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> if [ -z "$DEBEMAIL" ]; then</span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;">- DPKG_COMMANDLINE="cd tmp/buildd/*/; dpkg-buildpackage -us -uc $DEBBUILDOPTS"</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
+ DPKG_COMMANDLINE="export LOGNAME=$BUILDUSERNAME; cd tmp/buildd/*/; $PRE_BUILDPKG dpkg-buildpackage -us -uc $DEBBUILDOPTS"</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
else</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">- DPKG_COMMANDLINE="cd tmp/buildd/*/; dpkg-buildpackage -us -uc \"-m$DEBEMAIL\" $DEBBUILDOPTS"
</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+ DPKG_COMMANDLINE="export LOGNAME=$BUILDUSERNAME; cd tmp/buildd/*/; $PRE_BUILDPKG dpkg-buildpackage -us -uc \"-m$DEBEMAIL\" $DEBBUILDOPTS"
</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> fi</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> </span>
<br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> (</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">diff -Naur pbuilder-0.155ubuntu3.orig
/pbuilder-buildpackage-funcs pbuilder-0.155ubuntu3/pbuilder-buildpackage-funcs</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">--- pbuilder-0.155ubuntu3.orig/pbuilder-buildpackage-funcs 2006-06-17 03:28:
04.000000000 -0700</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+++ pbuilder-0.155ubuntu3/pbuilder-buildpackage-funcs 2007-04-23 12:53:29.000000000 -0700</span>
<br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">@@ -37,7 +37,8 @@</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> yes) BUILDOPT="--binary-arch";;
</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> *) ;;</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> esac
</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">- if /usr/lib/pbuilder/pbuilder-satisfydepends --control "$1" --internal-chrootexec "${CHROOTEXEC}" "${BUILDOPT}" ; then
</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+ if /usr/lib/pbuilder/pbuilder-satisfydepends --control "$1" --internal-chrootexec "${CHROOTEXEC}" "${BUILDOPT}" ${ARCH:+--arch "${ARCH}"}; then
</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> :</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> else
</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> # If asked to preserve the build place, and pbuilder-satisfydepends</span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;">diff -Naur pbuilder-0.155ubuntu3.orig/pbuilder-checkparams pbuilder-0.155ubuntu3/pbuilder-checkparams</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
--- pbuilder-0.155ubuntu3.orig/pbuilder-checkparams 2006-06-17 03:28:03.000000000 -0700</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+++ pbuilder-0.155ubuntu3/pbuilder-checkparams 2007-04-23 13:10:
45.000000000 -0700</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">@@ -32,6 +32,8 @@</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
PBUILDER_BUILD_LOGFILE=</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> USE_PKGNAME_LOGFILE=""</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
PRESERVE_BUILDPLACE="no"</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+ARCH=""</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
+PRE_BUILDPKG=""</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> unset EXTRA_CONFIGFILE || true</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
PBUILDER_DEBUGMODE=</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> SAVE_AFTER_LOGIN=</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
@@ -189,6 +191,17 @@</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> SAVE_AFTER_LOGIN=yes;</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
shift;</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> ;;</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
+ --arch)</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+ # Specify the arch for Cross-Compiling.</span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;">+ ARCH="$2"</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+ shift; shift;</span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;">+ ;;</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+ --pre-build)</span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;">+ # Specify the command to get run immediately </span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+ # before dpkg-buildpackage
</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+ PRE_BUILDPKG="$2"</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
+ shift; shift;</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+ ;;</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
## internal options.</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> --internal-chrootexec)</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
# specify custom chrootexec function -- this is internal debugging function</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">diff -Naur pbuilder-0.155ubuntu3.orig
/pbuilder-modules pbuilder-0.155ubuntu3/pbuilder-modules</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">--- pbuilder-0.155ubuntu3.orig/pbuilder-modules 2006-06-17 03:28:
03.000000000 -0700</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+++ pbuilder-0.155ubuntu3/pbuilder-modules 2007-04-23 12:49:44.000000000 -0700</span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;">@@ -75,6 +75,8 @@</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> --debootstrapopts [debootstrap options]</span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;"> --save-after-login/--save-after-exec</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> --debootstrap [debootstrap|cdebootstrap]
</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+ --arch [cross-compile architecture]</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
+ --pre-build [command(s) to run immediately before dpkg-buildpackage]</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> </span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;"> pdebuild-specific pbuilder-options:</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> --pbuilderroot [command to obtain root privilege for pbuilder]
</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">diff -Naur pbuilder-0.155ubuntu3.orig/pbuilder-satisfydepends pbuilder-0.155ubuntu3/pbuilder-satisfydepends</span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;">--- pbuilder-0.155ubuntu3.orig/pbuilder-satisfydepends 2006-06-17 03:28:02.000000000 -0700</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
+++ pbuilder-0.155ubuntu3/pbuilder-satisfydepends 2007-04-23 13:51:58.000000000 -0700</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">@@ -86,7 +86,6 @@</span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;"> function checkbuilddep_internal () {</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> # Use this function to fulfill the dependency (almost)
</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> </span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">- local ARCH=$(dpkg-architecture -qDEB_HOST_ARCH)
</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> local INSTALLPKG</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
local INSTALLPKGLIST</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> local INSTALLPKGMULTI</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
@@ -125,37 +124,46 @@</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> continue;</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
fi</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> fi</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
- echo " -> Trying ${CURRENTREALPKGNAME}"</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> </span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
- if $CHROOTEXEC /usr/bin/apt-get -s install ${INSTALLPKGLIST} ${CURRENTREALPKGNAME} >& /dev/null; then</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">- SATISFIED="yes"
</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">- INSTALLPKGLIST="${INSTALLPKGLIST} ${CURRENTREALPKGNAME}"</span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;">- else</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">- echo " -> Cannot install ${CURRENTREALPKGNAME}; apt errors follow:"
</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">- if $CHROOTEXEC /usr/bin/apt-get -s install ${INSTALLPKGLIST} "${CURRENTREALPKGNAME}"; then</span>
<br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">- :</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">- fi
</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">- # package could not be found. -- looking for alternative.</span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;">- PROVIDED=""</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">- checkbuilddep_provides "${CURRENTREALPKGNAME}"
</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">- if [ -n "$PROVIDED" ]; then</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
- # something provides this package</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">- echo " -> Considering $PROVIDED to satisfy the dependency "
</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">- if $CHROOTEXEC /usr/bin/apt-get -s install ${INSTALLPKGLIST} ${PROVIDED} >& /dev/null; then</span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;">- SATISFIED="yes";</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">- INSTALLPKGLIST="${INSTALLPKGLIST} ${PROVIDED}"
</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">- else</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
- # show the error for diagnostic purposes</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">- echo " -> Cannot install $PROVIDED; apt errors follow:"
</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">- if $CHROOTEXEC /usr/bin/apt-get -s install ${INSTALLPKGLIST} ${PROVIDED}; then</span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;">- :</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">- fi</span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;">+ if [ "${ARCH}" != "${HOST_ARCH}" ]; then</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
+ echo " -> Trying ${CURRENTREALPKGNAME}-${ARCH}-cross"</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+ if $CHROOTEXEC /usr/bin/apt-get -s install ${INSTALLPKGLIST} ${CURRENTREALPKGNAME}-${ARCH}-cross >& /dev/null; then
</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+ SATISFIED="yes"</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
+ INSTALLPKGLIST="${INSTALLPKGLIST} ${CURRENTREALPKGNAME}-${ARCH}-cross"</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+ break;</span>
<br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+ fi</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+ fi
</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+ </span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+ echo " -> Trying ${CURRENTREALPKGNAME}"
</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+ if $CHROOTEXEC /usr/bin/apt-get -s install ${INSTALLPKGLIST} ${CURRENTREALPKGNAME} >& /dev/null; then
</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+ SATISFIED="yes"</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
+ INSTALLPKGLIST="${INSTALLPKGLIST} ${CURRENTREALPKGNAME}"</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+ break;</span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;">+ fi</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+</span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;">+ echo " -> Cannot install ${CURRENTREALPKGNAME}; apt errors follow:"</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
+ if $CHROOTEXEC /usr/bin/apt-get -s install ${INSTALLPKGLIST} "${CURRENTREALPKGNAME}"; then</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+ :
</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+ fi</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
+</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+ # package could not be found. -- looking for alternative.</span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;">+ PROVIDED=""</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+ checkbuilddep_provides "${CURRENTREALPKGNAME}"
</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+ if [ -n "$PROVIDED" ]; then</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
+ # something provides this package</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+ echo " -> Considering $PROVIDED to satisfy the dependency "
</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+ if $CHROOTEXEC /usr/bin/apt-get -s install ${INSTALLPKGLIST} ${PROVIDED} >& /dev/null; then</span>
<br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+ SATISFIED="yes";</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
+ INSTALLPKGLIST="${INSTALLPKGLIST} ${PROVIDED}"</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+ break;</span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;">+ else</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+ # show the error for diagnostic purposes
</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+ echo " -> Cannot install $PROVIDED; apt errors follow:"</span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;">+ if $CHROOTEXEC /usr/bin/apt-get -s install ${INSTALLPKGLIST} ${PROVIDED}; then</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
+ :</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> fi</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
- fi</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">- fi</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
- if [ "$SATISFIED" = "yes" ]; then</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">- break;</span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;">- fi</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+ fi</span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;">+ fi</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> done;</span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;"> if [ "$SATISFIED" = "no" ]; then</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> echo "E: Could not satisfy build-dependency." >&2
</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">@@ -230,6 +238,7 @@</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
Copyright 2002-2006 Junichi Uekawa <<a href="mailto:dancer@debian.org">dancer@debian.org</a>></span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> </span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;"> --help: give help</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+--arch: specify the architecture to build for (cross-compile)
</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> --control: specify control file (debian/control, *.dsc)</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
--chroot: operate inside chroot</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> --binary-all: include binary-all</span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;">@@ -241,7 +250,8 @@</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> EOF</span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;"> }</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> </span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
-</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+ARCH=$(dpkg-architecture -qDEB_HOST_ARCH)</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
+HOST_ARCH=$(dpkg-architecture -qDEB_HOST_ARCH)</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> DEBIAN_CONTROL=debian/control</span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;"> CHROOTEXEC=""</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> BD_REGEXP="build-(depends|depends-indep)"
</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">@@ -252,6 +262,10 @@</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> while [ -n "$1" ]; do</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
case "$1" in</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+ --arch|-a)</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
+ ARCH="$2"</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">+ shift; shift</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
+ ;;</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> --control|-c)</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
DEBIAN_CONTROL="$2"</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> shift; shift</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
@@ -293,5 +307,4 @@</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> esac</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">
done</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> </span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">-</span>
<br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> checkbuilddep_internal</span><br>