pbulk-0.20:

- run checksum stage of a build with the privileged user, as DISTDIR
  might not be writeable
- create the actual package as privileged user as well
- pre-create work.log when using user-destdir
- in pre-build, only wait if the meta subdirectory exists. bulklog itself
  can often be a mount point.

3 files changed, 12 insertions, 7 deletions

diff --git a/pkgtools/pbulk/Makefile b/pkgtools/pbulk/Makefile
index d8f3ab8a668..d73e6f4fa28 100644
--- a/pkgtools/pbulk/Makefile
+++ b/pkgtools/pbulk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2008/01/16 14:20:08 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2008/01/17 17:47:09 joerg Exp $
 
-DISTNAME=	pbulk-0.19
+DISTNAME=	pbulk-0.20
 CATEGORIES=	pkgtools
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/pkgtools/pbulk/files/pbulk/scripts/pkg-build b/pkgtools/pbulk/files/pbulk/scripts/pkg-build
index 0508f31fae4..2b7ca32b7e2 100755
--- a/pkgtools/pbulk/files/pbulk/scripts/pkg-build
+++ b/pkgtools/pbulk/files/pbulk/scripts/pkg-build
@@ -1,5 +1,5 @@
 #!@SH@
-# $NetBSD: pkg-build,v 1.8 2008/01/16 14:20:09 joerg Exp $
+# $NetBSD: pkg-build,v 1.9 2008/01/17 17:47:09 joerg Exp $
 #
 # Copyright (c) 2007, 2008 Joerg Sonnenberger <joerg@NetBSD.org>.
 # All rights reserved.
@@ -102,6 +102,11 @@ set -e
 mkdir -p ${bulklog}/${pkgname}
 rm -f ${bulklog}/${pkgname}/*
 
+if [ "$use_destdir" = "user-destdir" ]; then
+	touch ${bulklog}/${pkgname}/work.log
+	chown ${unprivileged_user} ${bulklog}/${pkgname}/work.log
+fi
+
 # Go to target directory
 cd ${pkgsrc}/${pkgdir}
 # Clean build area, just in case
@@ -111,11 +116,11 @@ if [ ! -z "$dependencies" ]; then
 	PKG_PATH=${packages}/All ${pkg_add} $dependencies > ${bulklog}/${pkgname}/depends.log 2>&1
 fi
 # Build package, create a separate log file for each major phase
-run_make ${run_build} checksum  > ${bulklog}/${pkgname}/checksum.log 2>&1 || cleanup
+run_make run_direct checksum  > ${bulklog}/${pkgname}/checksum.log 2>&1 || cleanup
 run_make ${run_build} configure  > ${bulklog}/${pkgname}/configure.log 2>&1 || cleanup
 run_make ${run_build} all  > ${bulklog}/${pkgname}/build.log 2>&1 || cleanup
 run_make ${run_install} install  > ${bulklog}/${pkgname}/install.log 2>&1 || cleanup
-run_make ${run_install} package  > ${bulklog}/${pkgname}/package.log 2>&1 || cleanup
+run_make run_direct package  > ${bulklog}/${pkgname}/package.log 2>&1 || cleanup
 
 # When using DESTDIR build, add the package once to test install rules.
 if [ "$use_destdir" != "no" ]; then
diff --git a/pkgtools/pbulk/files/pbulk/scripts/pre-build b/pkgtools/pbulk/files/pbulk/scripts/pre-build
index eca0700d773..5d06f895807 100755
--- a/pkgtools/pbulk/files/pbulk/scripts/pre-build
+++ b/pkgtools/pbulk/files/pbulk/scripts/pre-build
@@ -1,5 +1,5 @@
 #!@SH@
-# $NetBSD: pre-build,v 1.5 2007/10/15 07:26:34 rillig Exp $
+# $NetBSD: pre-build,v 1.6 2008/01/17 17:47:09 joerg Exp $
 #
 # Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
 # All rights reserved.
@@ -34,7 +34,7 @@
 
 set -e
 
-if [ -d "${bulklog}" ]; then
+if [ -d "${bulklog}/meta" ]; then
 	echo "Warning: All log files of the previous pbulk run will be"
 	echo "removed in 5 seconds. If you want to abort, press Ctrl-C."
 	sleep 5