[Pbuilder-maint] pbuilder CVS update: pbuilder pbuilderrc.5
pbuilderrc pbuilder.8 pbuilder-buildpackage ChangeLog
pbuilder CVS Commit
pbuilder-maint at lists.alioth.debian.org
Fri Mar 17 22:17:17 UTC 2006
User: dancer
Date: 06/03/17 22:17:17
Modified: . pbuilderrc.5 pbuilderrc pbuilder.8
pbuilder-buildpackage ChangeLog
Log:
+2006-03-18 Junichi Uekawa <dancer at debian.org>
+
+ * pbuilder.8: update documentation of --pkgname-logfile
+
+ * pbuilder-buildpackage: allow chown, and add support for PKGNAME_LOGFILE_EXTENTION.
+
+ * pbuilderrc (PKGNAME_LOGFILE_EXTENTION): add
+
+ * pbuilderrc.5: document
+
Revision Changes Path
1.53 +4 -0 pbuilder/pbuilderrc.5
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilderrc.5?annotate=1.53&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilderrc.5?rev=1.53&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilderrc.5.diff?r1=1.53&r2=1.52&cvsroot=
-----------------------------------
Index: pbuilderrc.5
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pbuilderrc.5,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- pbuilderrc.5 22 Feb 2006 15:23:34 -0000 1.52
+++ pbuilderrc.5 17 Mar 2006 22:17:16 -0000 1.53
@@ -321,6 +321,10 @@
and
.B "debootstrap"
+.TP
+.BI "PKGNAME_LOGFILE_EXTENTION=" ".build"
+The extention of filename used in pkgname-logfile option.
+
.SH "AUTHOR"
Initial coding, and main maintenance is done by
Junichi Uekawa <dancer at debian.org>.
1.41 +3 -0 pbuilder/pbuilderrc
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilderrc?annotate=1.41&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilderrc?rev=1.41&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilderrc.diff?r1=1.41&r2=1.40&cvsroot=
-----------------------------------
Index: pbuilderrc
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pbuilderrc,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- pbuilderrc 17 Mar 2006 00:18:48 -0000 1.40
+++ pbuilderrc 17 Mar 2006 22:17:16 -0000 1.41
@@ -61,3 +61,6 @@
# The name of debootstrap command.
DEBOOTSTRAP="cdebootstrap"
+
+# default file extention for pkgname-logfile
+PKGNAME_LOGFILE_EXTENTION="_$(dpkg --print-architecture).build"
1.51 +6 -1 pbuilder/pbuilder.8
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder.8?annotate=1.51&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder.8?rev=1.51&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder.8.diff?r1=1.51&r2=1.50&cvsroot=
-----------------------------------
Index: pbuilder.8
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pbuilder.8,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- pbuilder.8 22 Feb 2006 15:23:34 -0000 1.50
+++ pbuilder.8 17 Mar 2006 22:17:16 -0000 1.51
@@ -365,7 +365,12 @@
Automatically creates a logfile that is named by the .dsc file name,
only really applicable for
.B build
-target
+target.
+
+The file extention is specified by
+.B "PKGNAME_LOGFILE_EXTENTION"
+in
+.B "pbuilderrc"
.TP
.BI "\-\-aptconfdir [" "APT configuration directory to use" "]"
1.122 +15 -13 pbuilder/pbuilder-buildpackage
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-buildpackage?annotate=1.122&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-buildpackage?rev=1.122&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-buildpackage.diff?r1=1.122&r2=1.121&cvsroot=
-----------------------------------
Index: pbuilder-buildpackage
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pbuilder-buildpackage,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- pbuilder-buildpackage 17 Mar 2006 00:18:48 -0000 1.121
+++ pbuilder-buildpackage 17 Mar 2006 22:17:16 -0000 1.122
@@ -24,7 +24,6 @@
. /usr/lib/pbuilder/pbuilder-runhooks
. /usr/lib/pbuilder/pbuilder-buildpackage-funcs
-
PACKAGENAME="$1"
if [ ! -f "$PACKAGENAME" ]; then
echo "Command line parameter [$PACKAGENAME] is not a valid .dsc file name" >&2
@@ -43,6 +42,11 @@
BUILDUSERNAME=root
fi
+
+# created files should have these UID/GIDs outside of chroot.
+BUILDRESULTUID="${BUILDRESULTUID:-${SUDO_UID:-0}}"
+BUILDRESULTGID="${BUILDRESULTGID:-${SUDO_GID:-0}}"
+
export HOME="/tmp/buildd"
showbuildbanner '$Id$'
@@ -58,7 +62,7 @@
if [ -z "${PBUILDER_BUILD_LOGFILE}" ]; then
if [ "${USE_PKGNAME_LOGFILE}" = "yes" ]; then
- PBUILDER_BUILD_LOGFILE="${BUILDRESULT}/"$(basename "${PACKAGENAME}" .dsc)
+ PBUILDER_BUILD_LOGFILE="${BUILDRESULT}/"$(basename "${PACKAGENAME}" .dsc)"${PKGNAME_LOGFILE_EXTENTION}"
exec > "${PBUILDER_BUILD_LOGFILE}"
exec 2>&1
PBUILDER_BUILD_LOGFILE=$(readlink -f "${PBUILDER_BUILD_LOGFILE}")
@@ -68,6 +72,13 @@
fi
fi
+# make logfile have the permissions, logfiles should already be created in all cases
+if [ -f "${PBUILDER_BUILD_LOGFILE}" ]; then
+ chown "${BUILDRESULTUID}:${BUILDRESULTGID}" "${PBUILDER_BUILD_LOGFILE}"
+ chgrp "${BUILDRESULTGID}" "${PBUILDER_BUILD_LOGFILE}"
+fi
+
+
recover_aptcache
echo "Installing the build-deps"
executehooks "D"
@@ -138,9 +149,6 @@
trap cleanbuildplace exit
umountproc
-# FIXME: this should be included in pbuilder-checkparams, really.
-BUILDRESULTUID="${BUILDRESULTUID:-${SUDO_UID:-0}}"
-BUILDRESULTGID="${BUILDRESULTGID:-${SUDO_GID:-0}}"
if [ -d "${BUILDRESULT}" ]; then
chown "${BUILDRESULTUID}:${BUILDRESULTGID}" "${BUILDPLACE}"/tmp/buildd/*
@@ -150,10 +158,4 @@
echo "E: BUILDRESULT=[$BUILDRESULT] is not a directory." >&2
fi
-# chown/chgrp -- FIXME: this should be higher up, doesn't chmod/chown on failure cases.
-if [ -f "${PBUILDER_BUILD_LOGFILE}" ]; then
- chown "${BUILDRESULTUID}:${BUILDRESULTGID}" "${PBUILDER_BUILD_LOGFILE}"
- chgrp "${BUILDRESULTGID}" "${PBUILDER_BUILD_LOGFILE}"
-fi
-
echobacktime
1.372 +11 -1 pbuilder/ChangeLog
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/ChangeLog?annotate=1.372&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/ChangeLog?rev=1.372&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/ChangeLog.diff?r1=1.372&r2=1.371&cvsroot=
-----------------------------------
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/ChangeLog,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -r1.371 -r1.372
--- ChangeLog 17 Mar 2006 00:18:48 -0000 1.371
+++ ChangeLog 17 Mar 2006 22:17:16 -0000 1.372
@@ -1,3 +1,13 @@
+2006-03-18 Junichi Uekawa <dancer at debian.org>
+
+ * pbuilder.8: update documentation of --pkgname-logfile
+
+ * pbuilder-buildpackage: allow chown, and add support for PKGNAME_LOGFILE_EXTENTION.
+
+ * pbuilderrc (PKGNAME_LOGFILE_EXTENTION): add
+
+ * pbuilderrc.5: document
+
2006-03-17 Junichi Uekawa <dancer at debian.org>
* pbuilder-buildpackage (BUILDRESULTGID): chown/chgrp buildresult logfiles
More information about the Pbuilder-maint
mailing list