diff options
| -rw-r--r-- | debian/changelog | 11 | ||||
| -rwxr-xr-x | pbuilder-createbuildenv | 3 | ||||
| -rw-r--r-- | pbuilder-runhooks | 12 | ||||
| -rw-r--r-- | pbuilder.1 | 10 |
4 files changed, 33 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 5f5f8e1..731599c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +pbuilder (0.7.0.20011012) unstable; urgency=low + + * support custom debootstrap scripts, requested by amon@vnl.com + (closes: #114691) + * changed hook handler. hopefully it should work if the directory is + not called a hookdir ... + * changed "hooks" variable in pbuilder-runhooks, to not to have + a starting "/". It should be unnecessary + + -- Junichi Uekawa <dancer@debian.org> Fri, 12 Oct 2001 13:08:39 +0900 + pbuilder (0.7) unstable; urgency=low * fixing manpage section diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv index 94d8352..8da12dc 100755 --- a/pbuilder-createbuildenv +++ b/pbuilder-createbuildenv @@ -19,12 +19,13 @@ if [ ! -d "$BUILDPLACE" ]; then exit 1 fi echo " -> running debootstrap" -if ! ( cd "$BUILDPLACE" && debootstrap "$DISTRIBUTION" . "$MIRRORSITE" ) ; then +if ! ( cd "$BUILDPLACE" && debootstrap "$DISTRIBUTION" . "$MIRRORSITE" "$DEBOOTSTRAPSCRIPT" ) ; then echo "pbuilder: debootstrap failed" >&2 exit 1 fi echo " -> debootstrap finished" +DEBOOTSTRAPSCRIPT="" if [ -n "$HOOKDIR" ]; then loadhooks fi diff --git a/pbuilder-runhooks b/pbuilder-runhooks index 910d469..6786381 100644 --- a/pbuilder-runhooks +++ b/pbuilder-runhooks @@ -18,6 +18,9 @@ # # HISTORY: # $Log$ +# Revision 1.8 2001/10/12 15:54:32 dancer +# diff +# # Revision 1.7 2001/09/27 11:04:54 dancer # removing comment # @@ -50,7 +53,7 @@ # #========================================================================== -hooks=/tmp/hooks +hooks=tmp/hooks #========================================================================== # Set up fresh chroot'd hooks tmp script directory @@ -61,7 +64,12 @@ function loadhooks () { rm -rf "$BUILDPLACE/$hooks" fi if [ -d "$HOOKDIR" ]; then - cp -a "$HOOKDIR" "$BUILDPLACE/tmp/" + mkdir -p "$BUILDPLACE/tmp/hooks" + cp -a "$HOOKDIR/*" "$BUILDPLACE/$hooks" + fi + if [ -f "$BUILDPLACE/$hooks/$DISTRIBUTION" ]; then + DEBOOTSTRAPSCRIPT=/"$hooks/$DISTRIBUTION" + echo " -> Applying user distribution dist build script $DEBOOTSTRAPSCRIPT" fi } @@ -141,6 +141,16 @@ does not invoke the hooks if is empty, so if you want to avoid running hooks, run pbuilder with .B "--hookdir """"" +.PP +If there is a distribution hook, for example, if +there was a file +.B "sid" +inside the hook directory, and the script was creating the +chroot for +.B "sid" +distribution, pbuilder will call debootstrap with that +as the 4th parameter in the chroot creation process. +This allows for use of custom debootstrap hook script. .SH "FILES" .TP .I "/etc/pbuilderrc" |