diff options
| -rw-r--r-- | ChangeLog | 25 | ||||
| -rw-r--r-- | debian/changelog | 12 | ||||
| -rwxr-xr-x | pbuilder | 5 | ||||
| -rwxr-xr-x | pbuilder-checkparams | 6 | ||||
| -rw-r--r-- | pbuilder-modules | 8 | ||||
| -rw-r--r-- | pbuilder.1 | 22 | ||||
| -rwxr-xr-x | pbuilderrc | 5 | ||||
| -rw-r--r-- | pbuilderrc.5 | 10 |
8 files changed, 84 insertions, 9 deletions
@@ -1,3 +1,28 @@ +2002-02-02 Junichi Uekawa <dancer@debian.org> + + * pbuilder: remove the unnecessary test -z thing, + so that duplicate help message will not appear. + + * pbuilderrc.5: APTCONFDIR documentation + + * pbuilder.1: document --aptconfdir + added some more comments on "update" option and "--distribution" + more notes are added to --buildresult. + + * pbuilder-modules: when aptconfdir is set, + just dump the files inside there to /etc/apt inside chroot. + + * pbuilder-checkparams: added --aptconfdir + + * pbuilderrc (APTCONFDIR): new variable. + + * pbuilder-modules: installing apt-lines will use arbitrary dir to copy the template from. + +2002-02-01 Junichi Uekawa <dancer@debian.org> + + * pbuilder-checkparams: --othermirror option parser had a typo. + pointed by kov@debian.org + 2002-01-31 Junichi Uekawa <dancer@debian.org> * debian/TODO: updated documentation in TODO. diff --git a/debian/changelog b/debian/changelog index f3e4f35..590ff61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +pbuilder (0.20) unstable; urgency=low + + * "Really addressing some bugs", not yet released + * --othermirror option fixed. Thanks go to kov@debian.org for + pointing that out (closes: #131726). + * --aptconfdir option. It is now possible to specify + --aptconfdir /etc/apt to use the system confis. + (closes: #116115) + * some minor fixes. + + -- Junichi Uekawa <dancer@debian.org> Sat, 2 Feb 2002 00:14:39 +0900 + pbuilder (0.19) unstable; urgency=low * "I know that the debootstrap version in sid doesn't work. @@ -5,11 +5,6 @@ set -e -test -z "$1" && ( - . /usr/lib/pbuilder/pbuilder-modules - showhelp -) - # export this so that programs know which command line # operation is currently done export PBCURRENTCOMMANDLINEOPERATION="$1" diff --git a/pbuilder-checkparams b/pbuilder-checkparams index 058b91a..a36247c 100755 --- a/pbuilder-checkparams +++ b/pbuilder-checkparams @@ -34,7 +34,7 @@ while [ -n "$1" ]; do shift; shift; ;; --othermirror) - OTHERMIRROR="$3"; + OTHERMIRROR="$2"; shift; shift; ;; --http-proxy) @@ -86,6 +86,10 @@ while [ -n "$1" ]; do exec 2>&1 shift; shift; ;; + --aptconfdir) + APTCONFDIR="$2"; + shift; shift; + ;; --help) showhelp ;; diff --git a/pbuilder-modules b/pbuilder-modules index b838665..ca507bb 100644 --- a/pbuilder-modules +++ b/pbuilder-modules @@ -43,6 +43,7 @@ pbuilder options --debemail [mail address] --debbuildopts [dpkg-buildpackage options] --logfile [filename to output log] + --aptconfdir [overriding apt config dir] pdebuild options --pbuilderroot [command to obtain root privilate for pbuilder] @@ -94,7 +95,7 @@ function umountproc_cleanbuildplace () { } function installaptlines (){ - echo Installing apt-lines + echo " -> Installing apt-lines" rm -f "$BUILDPLACE"/etc/apt/sources.list if [ -z "$DISTRIBUTION" ]; then echo "Distribution not specified, please specify" >&2 @@ -115,7 +116,10 @@ deb $NONUSMIRRORSITE $DISTRIBUTION/non-US main contrib non-free #deb-src $NONUSMIRRORSITE $DISTRIBUTION/non-US main contrib non-free EOF fi - + if [ -n "$APTCONFDIR" ]; then + echo " -> Copy " "$APTCONFDIR"/* " to chroot" + cp -a "$APTCONFDIR/"* "$BUILDPLACE"/etc/apt + fi } function extractbuildplace () { @@ -28,6 +28,11 @@ for the specified distribution. Updates the .B "base.tgz" for the specified distribution. +Also, by specifying the +.B "--distribution" +option, it is possible to switch the distribution. +Specify a dummy distribution value +even for custom apt config files. .TP .B "build" @@ -76,6 +81,13 @@ a temporary work directory. Specifies the location the build result gets into after building. The deb files and other files that have resulted from build is copied there. +Note that the default value is not the current directory, +or +.B ".." +but somewhere else entirely. This is to avoid +overwriting already existing deb files with +the newly generated ones. + .TP .BI "--mirror [" "mirror location" "]" Specifies the url of Debian mirror to be @@ -200,6 +212,16 @@ The messages generated during execution will be written to the file, instead of messages coming to the standard output. +.TP +.BI "--aptconfdir [" "APT configuration directory to use" "]" +Uses the apt configuration file found in the specified directory +as the chroot configuration. +.B "/etc/apt" +is one example, so that the same configuration can be used inside the +chroot. + +This option overrides other options, and may cause some inconsistency +problems. .SH "FILES" .TP @@ -33,4 +33,7 @@ BUILDSOURCEROOTCMD="fakeroot" PBUILDERROOTCMD="sudo" #default is to not to build source-packages. Passed on to dpkg-buildpackage -DEBBUILDOPTS="-b"
\ No newline at end of file +DEBBUILDOPTS="-b" + +#APT configuration files directory +APTCONFDIR="" diff --git a/pbuilderrc.5 b/pbuilderrc.5 index 3f56fa6..41ca924 100644 --- a/pbuilderrc.5 +++ b/pbuilderrc.5 @@ -156,6 +156,16 @@ This option is used on invocation of in .B "pdebuild" + +.TP +.BI "APTCONFDIR=" "/etc/apt" +Configures where the apt configuration files are copied from. +By default, this value is empty, +allowing the usual configuration options +to take effect. +Setting this variable overrides other options. + + .SH "FILES" .I "/etc/pbuilderrc" .SH "SEE ALSO" |