[Pbuilder-maint] pbuilder CVS update: pbuilder
pbuilder-updatebuildenv pbuilder-createbuildenv pbuilder ChangeLog
pbuilder CVS Commit
pbuilder-maint at lists.alioth.debian.org
Sun Feb 12 04:41:16 UTC 2006
User: dancer
Date: 06/02/12 04:41:16
Modified: . pbuilder-updatebuildenv pbuilder-createbuildenv
pbuilder ChangeLog
Log:
preliminary support for bind-mounted apt cache directory.
Revision Changes Path
1.42 +2 -2 pbuilder/pbuilder-updatebuildenv
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-updatebuildenv?annotate=1.42&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-updatebuildenv?rev=1.42&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-updatebuildenv.diff?r1=1.42&r2=1.41&cvsroot=
-----------------------------------
Index: pbuilder-updatebuildenv
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pbuilder-updatebuildenv,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- pbuilder-updatebuildenv 4 Dec 2005 05:16:40 -0000 1.41
+++ pbuilder-updatebuildenv 12 Feb 2006 04:41:15 -0000 1.42
@@ -63,12 +63,12 @@
fi
$TRAP umountproc_cleanbuildplace exit
-$CHROOTEXEC /usr/bin/apt-get clean || true
-
executehooks "E"
unloadhooks
umountproc
+$CHROOTEXEC /usr/bin/apt-get clean || true
+
$TRAP cleanbuildplace exit
if [ ! "${INTERNAL_BUILD_UML}" = "yes" ]; then
create_basetgz
1.50 +2 -2 pbuilder/pbuilder-createbuildenv
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-createbuildenv?annotate=1.50&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-createbuildenv?rev=1.50&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-createbuildenv.diff?r1=1.50&r2=1.49&cvsroot=
-----------------------------------
Index: pbuilder-createbuildenv
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pbuilder-createbuildenv,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- pbuilder-createbuildenv 29 Jan 2006 21:19:21 -0000 1.49
+++ pbuilder-createbuildenv 12 Feb 2006 04:41:15 -0000 1.50
@@ -90,12 +90,12 @@
$CHROOTEXEC /usr/bin/apt-get -y --force-yes dist-upgrade
$CHROOTEXEC /usr/bin/apt-get -y --force-yes install build-essential dpkg-dev apt $EXTRAPACKAGES
save_aptcache
-$CHROOTEXEC /usr/bin/apt-get clean
executehooks "E"
unloadhooks
-
umountproc
+$CHROOTEXEC /usr/bin/apt-get clean || true
+
$TRAP cleanbuildplace exit
# Internal_build_uml is set when --no-targz is set, this code is actually never called from pbuilder-user-mode-linux
1.36 +2 -3 pbuilder/pbuilder
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder?annotate=1.36&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder?rev=1.36&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder.diff?r1=1.36&r2=1.35&cvsroot=
-----------------------------------
Index: pbuilder
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pbuilder,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- pbuilder 11 Feb 2006 13:17:04 -0000 1.35
+++ pbuilder 12 Feb 2006 04:41:15 -0000 1.36
@@ -71,7 +71,6 @@
${CHROOTEXEC} bin/bash
save_aptcache
- ${CHROOTEXEC} /usr/bin/apt-get clean
trap umountproc_cleanbuildplace exit
@@ -84,6 +83,7 @@
unloadhooks
umountproc
trap cleanbuildplace exit
+ ${CHROOTEXEC} /usr/bin/apt-get clean || true
create_basetgz
fi
fi
@@ -114,8 +114,6 @@
${CHROOTEXEC} /run "$@"
save_aptcache
- ${CHROOTEXEC} /usr/bin/apt-get clean
-
trap umountproc_cleanbuildplace exit
# saving the place afterwards
@@ -127,6 +125,7 @@
unloadhooks
umountproc
trap cleanbuildplace exit
+ ${CHROOTEXEC} /usr/bin/apt-get clean || true
create_basetgz
fi
fi
1.367 +8 -1 pbuilder/ChangeLog
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/ChangeLog?annotate=1.367&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/ChangeLog?rev=1.367&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.367&r2=1.366&cvsroot=
-----------------------------------
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/ChangeLog,v
retrieving revision 1.366
retrieving revision 1.367
diff -u -r1.366 -r1.367
--- ChangeLog 11 Feb 2006 13:17:04 -0000 1.366
+++ ChangeLog 12 Feb 2006 04:41:15 -0000 1.367
@@ -1,3 +1,10 @@
+2006-02-12 Junichi Uekawa <dancer at debian.org>
+
+ * pbuilder-updatebuildenv:
+ * pbuilder-createbuildenv:
+ * pbuilder: move apt-get clean after umountproc, so that you can
+ probably bind-mount /var/cache/apt/archives
+
2006-02-11 Junichi Uekawa <dancer at debian.org>
* pbuilder-satisfydepends: quote echo INSTALLPKGMULTI
More information about the Pbuilder-maint
mailing list