diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rwxr-xr-x | pbuilder-buildpackage | 2 | ||||
| -rw-r--r-- | pbuilder.8 | 9 |
4 files changed, 17 insertions, 5 deletions
@@ -1,3 +1,10 @@ +2003-04-19 Junichi Uekawa <dancer@debian.org> + + * pbuilder-buildpackage (PACKAGENAME): moved around D hook location + so that D hook is called before satisfying build-deps. + + * pbuilder.8: minor improvements on the documentation wording. + 2003-04-17 Junichi Uekawa <dancer@debian.org> * Documentation/pbuilder-doc.xml (PBUILDER_UML_IMAGE): update and document diff --git a/debian/changelog b/debian/changelog index aeb5ab8..4c0fe2b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ pbuilder (0.73) UNRELEASED; urgency=low * versioned dependency on rootstrap 0.3.9-1 which handles newer user-mode-linux. + * Fix ordering of running D hooks; D hooks should be ran before + checking build-dependency. Apparently broken since 0.67 - -- Junichi Uekawa <dancer@debian.org> Tue, 15 Apr 2003 19:20:11 +0900 + -- Junichi Uekawa <dancer@debian.org> Sat, 19 Apr 2003 10:47:58 +0900 pbuilder (0.72) unstable; urgency=low diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage index c05bfe9..4443cc8 100755 --- a/pbuilder-buildpackage +++ b/pbuilder-buildpackage @@ -66,6 +66,7 @@ fi recover_aptcache echo "Installing the build-deps" trap saveaptcache_umountproc_cleanbuildplace exit +executehooks "D" checkbuilddep "$PACKAGENAME" save_aptcache trap umountproc_cleanbuildplace exit @@ -73,7 +74,6 @@ createbuilduser echo "Copying source file" copydsc "$PACKAGENAME" "$BUILDPLACE/tmp/buildd" -executehooks "D" echo "Extracting source" if ! $CHROOTEXEC /bin/bash -c "( cd tmp/buildd; chown $BUILDUSERNAME:$BUILDUSERNAME ../buildd *; $SUTOUSER /usr/bin/dpkg-source -x $(basename $PACKAGENAME) )"; then @@ -243,7 +243,7 @@ This allows for use of custom debootstrap hook script. is for .B build target. -It is executed before build starts, after +It is executed before build starts; after unpacking the build system, and unpacking the source, and satisfying the build-dependency. @@ -252,13 +252,16 @@ is executed after build system finishes building, successfully, before copying back the build result. .B "C<digit><digit><whatever-else-you-want>" -is executed after build fails, before cleanup. +is executed after build failure, before cleanup. .B "D<digit><digit><whatever-else-you-want>" is executed before unpacking the source inside the chroot, after setting up the chroot environment. Create $TMP, and $TMPDIR if necessary. -This can be used for calling apt-get update. + +This is called before build-dependency is satisfied. +Also useful for calling +.B "apt-get update" .B "E<digit><digit><whatever-else-you-want>" is executed after pbuilder update and pbuilder create |