aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordancer <dancer>2002-09-06 03:48:21 +0000
committerdancer <dancer>2002-09-06 03:48:21 +0000
commit225851674c4a10b07e82ef718ecaee2dd57d1ec7 (patch)
treeb6180f19b58a4f30782b85d19ba71881284e9e74
parent6b71b46c1d2bba352ab86d70b97abad2ba849ce4 (diff)
downloadpbuilder-225851674c4a10b07e82ef718ecaee2dd57d1ec7.tar
pbuilder-225851674c4a10b07e82ef718ecaee2dd57d1ec7.tar.gz
+2002-09-06 Junichi Uekawa <dancer@debian.org>
+ + * pbuider-loadconfig: create from checkparams. a module to load config files only. + + * debuild-pbuilder: add debuild wrapper script. + + * debuild-pbuilder.1: add manpage + + * pbuilder-buildpackage (BUILD_PID): use "trap" a bit, so that error checking can be done at all.
-rw-r--r--ChangeLog10
-rw-r--r--Makefile2
-rw-r--r--debian/changelog3
-rw-r--r--debuild-pbuilder5
-rw-r--r--debuild-pbuilder.116
-rw-r--r--pbuider-loadconfig26
-rwxr-xr-xpbuilder-buildpackage7
-rwxr-xr-xpbuilder-checkparams8
8 files changed, 66 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index df98a16..e55ef8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-09-06 Junichi Uekawa <dancer@debian.org>
+
+ * pbuider-loadconfig: create from checkparams. a module to load config files only.
+
+ * debuild-pbuilder: add debuild wrapper script.
+
+ * debuild-pbuilder.1: add manpage
+
+ * pbuilder-buildpackage (BUILD_PID): use "trap" a bit, so that error checking can be done at all.
+
2002-08-27 Junichi Uekawa <dancer@debian.org>
* pbuilder-buildpackage (BUILD_PID): race condition with
diff --git a/Makefile b/Makefile
index 644fc35..d5a0517 100644
--- a/Makefile
+++ b/Makefile
@@ -18,11 +18,13 @@ install:
$(INSTALL_EXECUTABLE) pbuilder-buildpackage $(DESTDIR)/usr/lib/pbuilder/
$(INSTALL_EXECUTABLE) pbuilder-createbuildenv $(DESTDIR)/usr/lib/pbuilder/
$(INSTALL_EXECUTABLE) pbuilder-updatebuildenv $(DESTDIR)/usr/lib/pbuilder/
+ $(INSTALL_EXECUTABLE) pbuilder-loadconfig $(DESTDIR)/usr/lib/pbuilder/
$(INSTALL_EXECUTABLE) pbuilder-runhooks $(DESTDIR)/usr/lib/pbuilder/
$(INSTALL_EXECUTABLE) pbuilder-checkparams $(DESTDIR)/usr/lib/pbuilder/
$(INSTALL_EXECUTABLE) pbuilder-modules $(DESTDIR)/usr/lib/pbuilder/
$(INSTALL_EXECUTABLE) pbuilder $(DESTDIR)/usr/sbin
$(INSTALL_EXECUTABLE) pdebuild $(DESTDIR)/usr/bin
+ $(INSTALL_EXECUTABLE) debuild-pbuilder $(DESTDIR)/usr/bin
$(INSTALL_EXECUTABLE) pbuilder-satisfydepends $(DESTDIR)/usr/lib/pbuilder/
$(INSTALL_FILE) pbuilderrc $(DESTDIR)/etc
$(INSTALL_FILE) pbuilderrc $(DESTDIR)/usr/share/pbuilder
diff --git a/debian/changelog b/debian/changelog
index 286da8b..14d61be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
-pbuilder (0.35.0.20020820) unstable; urgency=low
+pbuilder (0.35.0.20020906) unstable; urgency=low
* not released yet!
* add option to --timeout.
+ * debuild wrapper script is added, which satisfies build-dependencies before calling debuild.
-- Junichi Uekawa <dancer@debian.org> Tue, 20 Aug 2002 17:00:47 +0900
diff --git a/debuild-pbuilder b/debuild-pbuilder
new file mode 100644
index 0000000..9abf748
--- /dev/null
+++ b/debuild-pbuilder
@@ -0,0 +1,5 @@
+#!/bin/bash
+set -e
+. /usr/lib/pbuilder/pbuilder-loadconfig
+"$PBUILDERROOTCMD" /usr/lib/pbuilder/pbuilder-satisfydepends
+/usr/bin/debuild "$@"
diff --git a/debuild-pbuilder.1 b/debuild-pbuilder.1
new file mode 100644
index 0000000..ee5867f
--- /dev/null
+++ b/debuild-pbuilder.1
@@ -0,0 +1,16 @@
+.TH "debuild-pbuilder" 1 "2002 Sep 6" "Debian" "pbuilder"
+.SH NAME
+debuild-pbuilder \- A "debuild" wrapper to satisfy build-dependency before debuild
+.SH SYNOPSIS
+.BI "debuild-pbuilder
+.SH DESCRIPTION
+A wrapper to "debuild" program that
+does Build-Dependency satisfaction.
+
+.SH OPTIONS
+
+See debuild manpage for details.
+
+.SH "SEE ALSO"
+.RI "debuild (" 1 ")"
+
diff --git a/pbuider-loadconfig b/pbuider-loadconfig
new file mode 100644
index 0000000..a998548
--- /dev/null
+++ b/pbuider-loadconfig
@@ -0,0 +1,26 @@
+#! /bin/bash
+# this is sourced from pbuilder packages to process the optional parameters.
+# pbuilder -- personal Debian package builder
+# Copyright (C) 2001,2002 Junichi Uekawa
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+for RCFILE in /usr/share/pbuilder/pbuilderrc /etc/pbuilderrc ${HOME}/.pbuilderrc; do
+ if [ -f "$RCFILE" ]; then
+ . "$RCFILE"
+ else
+ echo "W: $RCFILE does not exist"
+ fi
+done
diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage
index af2c2c2..845723e 100755
--- a/pbuilder-buildpackage
+++ b/pbuilder-buildpackage
@@ -142,17 +142,19 @@ else
fi
if ! wait ${BUILD_PID}; then
+ trap umountproc_cleanbuildplace exit
eval ${KILL_WAIT_PID}
echo "pbuilder: Failed autobuilding of package" >&2
executehooks "C"
- umountproc_cleanbuildplace
exit 1;
else
eval ${KILL_WAIT_PID}
# build was successful
fi
+trap umountproc_cleanbuildplace exit
executehooks "B"
+trap cleanbuildplace exit
umountproc
if [ -n "$BUILDRESULT" ]; then
@@ -164,6 +166,5 @@ if [ -n "$BUILDRESULT" ]; then
fi
fi
-cleanbuildplace
-
echobacktime
+
diff --git a/pbuilder-checkparams b/pbuilder-checkparams
index 7075e55..41daf86 100755
--- a/pbuilder-checkparams
+++ b/pbuilder-checkparams
@@ -17,13 +17,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-for RCFILE in /usr/share/pbuilder/pbuilderrc /etc/pbuilderrc ${HOME}/.pbuilderrc; do
- if [ -f "$RCFILE" ]; then
- . "$RCFILE"
- else
- echo "W: $RCFILE does not exist"
- fi
-done
+. /usr/lib/pbuilder/pbuilder-loadconfig
. /usr/lib/pbuilder/pbuilder-modules