[website] 01/01: Improve upon Ross' changes.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Fri Feb 5 22:26:25 UTC 2016


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository website.

commit 008ddb3b168bf8cdc30052013859a75b0060f6fe
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Feb 5 23:26:20 2016 +0100

    Improve upon Ross' changes.
---
 policy.xml | 95 ++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 58 insertions(+), 37 deletions(-)

diff --git a/policy.xml b/policy.xml
index 2d6dc0e..b8beed7 100644
--- a/policy.xml
+++ b/policy.xml
@@ -897,13 +897,11 @@ pkg-grass/
           </para>
           <literallayout><command>cowbuilder</command> is preferred over <command>pbuilder</command> by <command>git-buildpackage</command> for its increased performance using Copy-On-Write techniques.
 <command>pbuilder</command> can be selected instead by setting the environment variable <literal>BUILDER</literal> to "<literal>pbuilder</literal>", and
-<command>qemubuilder</command> can be selected by setting <literal>BUILDER</literal> to "<literal>qemubuilder</literal>".
-          </literallayout>
+<command>qemubuilder</command> can be selected by setting <literal>BUILDER</literal> to "<literal>qemubuilder</literal>".</literallayout>
           <sect5 id="git-pbuilder-create">
             <title>Creating the cowbuilder chroot</title>
             <literallayout>Root privileges are required to run <command>cowbuilder</command> and <command>pbuilder</command>.
-            Configure <command>sudo</command> with <command>visudo</command> to allow <replaceable><username></replaceable> passwordless execution of <command>cowbuilder</command> and <command>pbuilder</command> using the following settings:
-            </literallayout>
+Configure <command>sudo</command> with <command>visudo</command> to allow <replaceable><username></replaceable> passwordless execution of <command>cowbuilder</command> and <command>pbuilder</command> using the following settings:</literallayout>
 <programlisting>
 Defaults! PBUILDERS setenv
 
@@ -913,34 +911,6 @@ Cmnd_Alias PBUILDERS=/usr/sbin/pbuilder, /usr/sbin/cowbuilder
 # User privilege specification
 <replaceable><username></replaceable>     ALL=(root)     NOPASSWD:PBUILDERS
 </programlisting>
-          </sect5>
-          <sect5 id="git-pbuilder-hooks">
-            <title>Configure lintian pbuilder hook</title>
-            <para>
-              It's highly recommended to run <command>lintian</command>
-              after every build.
-              <command>pbuilder</command> provides an example
-              <literal>lintian</literal> hook in
-              <filename>/usr/share/doc/pbuilder/examples/B90lintian</filename>
-              for this.
-            </para>
-            <para>
-              Copy this file to your <command>pbuilder</command> hooks
-              directory, and modify it to report all <command>lintian</command>
-              tags and not fail the build if lintian reports issues.
-<programlisting>
-<command>mkdir</command> <filename class="directory">/var/cache/pbuilder/hook.d/</filename>
-<command>cp</command> <filename>/usr/share/doc/pbuilder/examples/B90lintian</filename> <filename class="directory">/var/cache/pbuilder/hook.d/</filename>
-<command>sed</command> <option>-i</option> <literal>'s/lintian -I --show-overrides/& --pedantic -E/; s/^su /##&/; s/^#su /su /'</literal> <filename>/var/cache/pbuilder/hook.d/B90lintian</filename>
-</programlisting>
-            </para>
-            <para>
-              Specify the <command>pbuilder</command> hook directory when
-              creating the chroot to run the hook scripts contained therein.
-<programlisting>
-<command>sudo cowbuilder</command> <option>--create</option> <option>--distribution=<replaceable>sid</replaceable></option> <option>--basepath=/var/cache/pbuilder/base-<replaceable>sid</replaceable>.cow</option> <option>--hookdir=~/pbuilder-hooks/</option>
-</programlisting>
-            </para>
             <para id="git-cowbuilder-dist">
               To create <emphasis>distribution</emphasis> specific
               <command>cowbuilder</command> chroots, use:
@@ -967,16 +937,67 @@ Cmnd_Alias PBUILDERS=/usr/sbin/pbuilder, /usr/sbin/cowbuilder
 </programlisting>
             </para>
             <para>
-              Remember to update the chroot for <command>git-buildpackage</command> regularly:
+              You can also use the
+              <ulink url="http://manpages.debian.org/cgi-bin/man.cgi?query=git-pbuilder">git-pbuilder</ulink>
+              wrapper to create (and
+              <link linkend="git-pbuilder-update">update</link>)
+              <command>cowbuilder</command> chroots for
+              <command>git-buildpackage</command>:
+<programlisting>
+<command>git-pbuilder</command> <option>create</option>
+</programlisting>
+              This will also create the default chroot for
+              <command>git-buildpackage</command>
+              (<filename>/var/cache/pbuilder/base-sid.cow</filename>).
+            </para>
+            <para>
+              Other distributions and architectures can be specified with
+              environment variables:
 <programlisting>
-<command>git-pbuilder update</command>
+DIST=<replaceable><distribution></replaceable> ARCH=<replaceable><architecture></replaceable> <command>git-pbuilder</command> <option>create</option>
 </programlisting>
-              This will update the default chroot (e.g. base-sid.cow).
+            </para>
+          </sect5>
+          <sect5 id="git-pbuilder-hooks">
+            <title>Configure lintian pbuilder hook</title>
+            <para>
+              It's highly recommended to run <command>lintian</command>
+              after every build.
+              <command>pbuilder</command> provides an example
+              <literal>lintian</literal> hook in
+              <filename>/usr/share/doc/pbuilder/examples/B90lintian</filename>
+              for this.
             </para>
             <para>
-              For other architectures and distributions:
+              Copy this file to your <command>pbuilder</command> hooks
+              directory, and modify it to report all <command>lintian</command>
+              tags and not fail the build if lintian reports issues.
+<programlisting>
+<command>mkdir</command> <filename class="directory">/var/cache/pbuilder/hook.d/</filename>
+<command>cp</command> <filename>/usr/share/doc/pbuilder/examples/B90lintian</filename> <filename class="directory">/var/cache/pbuilder/hook.d/</filename>
+<command>sed</command> <option>-i</option> <literal>'s/lintian -I --show-overrides/& --pedantic -E/; s/^su /##&/; s/^#su /su /'</literal> <filename>/var/cache/pbuilder/hook.d/B90lintian</filename>
+</programlisting>
+            </para>
+            <para>
+              Specify the <command>pbuilder</command> hook directory when
+              creating the chroot to run the hook scripts contained therein.
+<programlisting>
+<command>sudo cowbuilder</command> <option>--create</option> <option>--distribution=<replaceable>sid</replaceable></option> <option>--basepath=/var/cache/pbuilder/base-<replaceable>sid</replaceable>.cow</option> <option>--hookdir=/var/cache/pbuilder/hook.d/</option>
+</programlisting>
+            </para>
+          </sect5>
+          <sect5 id="git-pbuilder-update">
+            <title>Updating cowbuilder chroots</title>
+            <para>
+              Remember to update the chroots for
+              <command>git-buildpackage</command> regularly to build with
+              the latest packages from the repositories:
+<programlisting>
+<command>sudo cowbuilder</command> <option>--update</option> <option>--basepath=/var/cache/pbuilder/base-<replaceable><distribution></replaceable>-<replaceable><architecture></replaceable>.cow</option>
+</programlisting>
+              Or using <command>git-pbuilder</command>:
 <programlisting>
-<command>DIST=distribution ARCH=architecture git-pbuilder update</command>
+DIST=<replaceable><distribution></replaceable> ARCH=<replaceable><architecture></replaceable> <command>git-pbuilder</command> <option>update</option>
 </programlisting>
             </para>
           </sect5>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/website.git



More information about the Pkg-grass-devel mailing list