[Pbuilder-maint] pbuilder CVS update: pbuilder pbuilder.8
pbuilder-createbuildenv Makefile ChangeLog
pbuilder CVS Commit
pbuilder-maint at lists.alioth.debian.org
Sun Jan 29 21:19:21 UTC 2006
User: dancer
Date: 06/01/29 21:19:21
Modified: . pbuilder.8 pbuilder-createbuildenv Makefile
ChangeLog
Log:
implement hookdir for workaround of initscripts and cdebootstrap bug.
add G hooks for pbuilder create.
Revision Changes Path
1.49 +8 -0 pbuilder/pbuilder.8
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder.8?annotate=1.49&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder.8?rev=1.49&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.49&r2=1.48&cvsroot=
-----------------------------------
Index: pbuilder.8
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pbuilder.8,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- pbuilder.8 9 Oct 2005 05:51:31 -0000 1.48
+++ pbuilder.8 29 Jan 2006 21:19:21 -0000 1.49
@@ -329,6 +329,14 @@
.B execute
target.
+.B "G<digit><digit><whatever-else-you-want>"
+is executed just after debootstrap finishes,
+and configuration is loaded, and pbuilder starts mounting /proc and invoking
+.B "apt-get install"
+in
+.B create
+target.
+
\" End of hookdir description
1.49 +3 -0 pbuilder/pbuilder-createbuildenv
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-createbuildenv?annotate=1.49&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-createbuildenv?rev=1.49&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.49&r2=1.48&cvsroot=
-----------------------------------
Index: pbuilder-createbuildenv
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pbuilder-createbuildenv,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- pbuilder-createbuildenv 21 Dec 2005 11:57:29 -0000 1.48
+++ pbuilder-createbuildenv 29 Jan 2006 21:19:21 -0000 1.49
@@ -70,11 +70,14 @@
echo " -> debootstrap finished"
loadhooks
+
mkdir -p "$BUILDPLACE/tmp/buildd"
copy_local_configuration
installaptlines
+executehooks "G"
+
echo "Refreshing the base.tgz "
echo " -> upgrading packages"
mountproc
1.42 +3 -4 pbuilder/Makefile
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/Makefile?annotate=1.42&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/Makefile?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/Makefile.diff?r1=1.42&r2=1.41&cvsroot=
-----------------------------------
Index: Makefile
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/Makefile,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- Makefile 21 Dec 2005 11:57:29 -0000 1.41
+++ Makefile 29 Jan 2006 21:19:21 -0000 1.42
@@ -89,10 +89,9 @@
$(INSTALL_EXECUTABLE) examples/pbuilder-distribution.sh $(DESTDIR)/usr/share/doc/pbuilder/examples
# install workaround for initscripts -- 2005-12-21
- $(INSTALL_DIRECTORY) $(DESTDIR)/usr/share/doc/pbuilder/examples/344089
- $(INSTALL_EXECUTABLE) examples/E50-initscripts-2.86.ds1-7.workaround.sh $(DESTDIR)/usr/share/doc/pbuilder/examples/344089
-
-
+ $(INSTALL_DIRECTORY) $(DESTDIR)/usr/share/doc/pbuilder/examples/workaround
+ $(INSTALL_EXECUTABLE) examples/E50-initscripts-2.86.ds1-7.workaround.sh $(DESTDIR)/usr/share/doc/pbuilder/examples/workaround
+ $(INSTALL_EXECUTABLE) examples/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh $(DESTDIR)/usr/share/doc/pbuilder/examples/workaround
cd pbuildd; make install DESTDIR=$(DESTDIR)
cd Documentation; make install DESTDIR=$(DESTDIR)
1.365 +16 -1 pbuilder/ChangeLog
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/ChangeLog?annotate=1.365&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/ChangeLog?rev=1.365&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.365&r2=1.364&cvsroot=
-----------------------------------
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/ChangeLog,v
retrieving revision 1.364
retrieving revision 1.365
diff -u -r1.364 -r1.365
--- ChangeLog 24 Jan 2006 10:01:50 -0000 1.364
+++ ChangeLog 29 Jan 2006 21:19:21 -0000 1.365
@@ -1,3 +1,18 @@
+2006-01-30 Junichi Uekawa <dancer at debian.org>
+
+ * Makefile: install the script
+
+ * examples/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh: implement workaround.
+
+ * pbuilder.8: document G hook.
+
+ * pbuilder-createbuildenv: add G hook
+
+ * testsuite/run-test.sh: use the workaround dir for testing.
+
+ * Makefile: install workaround hooks to
+ /usr/share/doc/pbuilder/examples/workaround
+
2006-01-24 Junichi Uekawa <dancer at debian.org>
* examples/B92test-pkg: improve the script a bit; do not fail if
More information about the Pbuilder-maint
mailing list