diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | Documentation/pbuilder-doc.xml | 22 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | pbuilder-user-mode-linux | 4 |
5 files changed, 31 insertions, 14 deletions
@@ -1,3 +1,13 @@ +2003-04-10 Junichi Uekawa <dancer@debian.org> + + * Documentation/pbuilder-doc.xml (EXTRAPACKAGES): added id tags to + facilitate with wysidocbookxml + +2003-04-09 Junichi Uekawa <dancer@debian.org> + + * pbuilder-user-mode-linux (EXTRAOPT): Change to use new hostfs options + for user-mode-linux + 2003-04-08 Junichi Uekawa <dancer@debian.org> * Documentation/pbuilder-doc.xml: update documentation a bit. diff --git a/Documentation/pbuilder-doc.xml b/Documentation/pbuilder-doc.xml index ea58a1b..31ef0be 100644 --- a/Documentation/pbuilder-doc.xml +++ b/Documentation/pbuilder-doc.xml @@ -17,7 +17,7 @@ </bookinfo> <chapter> <title>Introducing pbuilder</title> - <sect1> + <sect1 id="aim"> <title>Aims of pbuilder</title> <para> <command>pbuilder</command> stands for @@ -63,9 +63,9 @@ </para> </sect1> </chapter> - <chapter> + <chapter id="usingpbuilder"> <title>Using pbuilder</title> - <sect1> + <sect1 id="creatingbase"> <title>Creating base chroot image</title> <para> <command>pbuilder create</command> @@ -121,7 +121,7 @@ pbuilder.8 manual page </para> </sect1> - <sect1> + <sect1 id="buildpackagechroot"> <title>Building a package using chroot image</title> <para> To build a package inside the chroot, invoke @@ -151,7 +151,7 @@ pbuilder.8 manual page </para> </sect1> - <sect1> + <sect1 id="pdebuild"> <title>Facilitating Debian Developers from typing, pdebuild</title> <para> <command>pdebuild</command> is a little wrapper @@ -174,7 +174,7 @@ See pdebuild.1 manual page for more details. </para> </sect1> - <sect1> + <sect1 id="configfile"> <title>Configuration Files</title> <para> It is possible to specify all settings by command-line @@ -189,7 +189,7 @@ pbuilderrc.5 documentation. </para> </sect1> - <sect1> + <sect1 id="nonrootchroot"> <title>Building packages as non-root inside the chroot</title> <para> <command>pbuilder</command> requires full root privilege @@ -219,7 +219,7 @@ in <xref linkend="pbuilder-uml"/>. </para> </sect1> - <sect1> + <sect1 id="backporting"> <title>Using pbuilder for back-porting</title> <para> pbuilder can be used for back-porting software from @@ -242,7 +242,7 @@ </listitem> </itemizedlist> </sect1> - <sect1> + <sect1 id="massbuild"> <title>Mass-building packages</title> <para> pbuilder can be automated, because its operations are @@ -325,7 +325,7 @@ how you are doing, or any examples. </para> </sect1> - <sect1> + <sect1 id="autotesting"> <title>Using pbuilder for automated testing of packages</title> <para> pbuilder can be used for automated testing of packages. @@ -346,7 +346,7 @@ </listitem> </itemizedlist> </sect1> - <sect1> + <sect1 id="altcompiler"> <title>Using pbuilder for testing build with alternate compilers</title> <para> Most packages are compiled with <command>gcc</command> diff --git a/debian/changelog b/debian/changelog index ffe8832..e6b7f3e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +pbuilder (0.72) unstable; urgency=low + + * UML: support new format for root hostfs for 2.4.20-3um-1 + - bump dependency for user-mode-linux version. + + -- Junichi Uekawa <dancer@debian.org> Wed, 9 Apr 2003 00:04:20 +0900 + pbuilder (0.71) unstable; urgency=low * UML: Do not try to umount, it's going to kernel-panic anyway. diff --git a/debian/control b/debian/control index 0e658c1..2156df3 100644 --- a/debian/control +++ b/debian/control @@ -31,7 +31,7 @@ Description: personal package builder for Debian packages Package: pbuilder-uml Architecture: i386 -Depends: rootstrap, user-mode-linux, pbuilder (= ${Source-Version}) +Depends: rootstrap, user-mode-linux (>= 2.4.20-3um-1), pbuilder (= ${Source-Version}) Description: user-mode-linux version of pbuilder pbuilder-uml uses a User-mode-linux system, and builds Debian packages inside the UML image. It is an ideal system to use to check diff --git a/pbuilder-user-mode-linux b/pbuilder-user-mode-linux index b474c4b..4ccc414 100755 --- a/pbuilder-user-mode-linux +++ b/pbuilder-user-mode-linux @@ -119,8 +119,8 @@ EOF chmod a+x ${INSIDE_PBUILDER} - echo Invoking: "linux mem=${UML_MEM} eth0=${MY_ETH0} con0=fd:0,fd:1 con=pty ubd0=/ ubd1=${PBUILDER_COW}${PBUILDER_UML_IMAGE} devfs=mount init=${INSIDE_PBUILDER}" - if linux mem=${UML_MEM} eth0=${MY_ETH0} con0=fd:0,fd:1 con=pty ubd0=/ ubd1="${PBUILDER_COW}${PBUILDER_UML_IMAGE}" devfs=mount init=${INSIDE_PBUILDER} ; then + echo Invoking: "linux mem=${UML_MEM} eth0=${MY_ETH0} con0=fd:0,fd:1 con=pty root=/dev/root rootflags=/ rootfstype=hostfs ubd1=${PBUILDER_COW}${PBUILDER_UML_IMAGE} devfs=mount init=${INSIDE_PBUILDER}" + if linux mem=${UML_MEM} eth0=${MY_ETH0} con0=fd:0,fd:1 con=pty root=/dev/root rootflags=/ rootfstype=hostfs ubd1="${PBUILDER_COW}${PBUILDER_UML_IMAGE}" devfs=mount init=${INSIDE_PBUILDER} ; then UML_EXITCODE=$? echo " -> Successful exit from user-mode linux" else |