From d4c585068c0dcfc9f13e5dc4f66f6c51ae92ad35 Mon Sep 17 00:00:00 2001
From: Miruna Paun <Miruna.Paun@enea.com>
Date: Tue, 25 Oct 2016 16:30:13 +0200
Subject: Autogenerate list of manifest files for repo cmd

From the manifest, autocreate an XML file with a
list of the manifest files which can be used
in the repo command, and including this XML file
in the release info.
Also changed the prompt in prerequisites.xml from
# to $

Signed-off-by: Miruna Paun <Miruna.Paun@enea.com>
---
 .../doc/getting_enea_linux.xml                     | 51 ++++++++--------------
 .../doc/prerequisites.xml                          |  2 +-
 2 files changed, 19 insertions(+), 34 deletions(-)

(limited to 'doc/book-enea-linux-release-info')

diff --git a/doc/book-enea-linux-release-info/doc/getting_enea_linux.xml b/doc/book-enea-linux-release-info/doc/getting_enea_linux.xml
index f25c1a5..93a5c59 100644
--- a/doc/book-enea-linux-release-info/doc/getting_enea_linux.xml
+++ b/doc/book-enea-linux-release-info/doc/getting_enea_linux.xml
@@ -41,45 +41,30 @@ $ chmod a+x ~/bin/repo</programlisting>The instruction assumes that ~/bin
       </listitem>
 
       <listitem>
-        <para>Use the repo tool to download the source:<remark>FIXME: Before
-        final release the tag for the manifest must be set in Makefile as
-        MANIFESTHASH, typically something like refs/tags/EL6. Before that, a
-        generic branch name is used instead, e.g. krogoth in
-        Makefile</remark></para>
-
-        <para><programlisting>$ mkdir enea-linux
+        <para>Use the repo tool to download the source:<remark>FIXME: At final
+        release the tag for the manifest must be set in mainfest_conf.mk as
+        MANIFESTHASH, typically something like refs/tags/EL6. Before final
+        release, it is possible to set MANIFESTHASH on the make command line
+        to override the value, e.g. with a commit hash string for a release
+        candidate to be tested</remark></para>
+
+        <programlisting>$ mkdir enea-linux
 $ cd enea-linux
 $ repo init -u	<xi:include href="../../s_docsrc_common/pardoc-distro.xml"
-              xmlns:xi="http://www.w3.org/2001/XInclude"
-              xpointer="element(EneaLinux_MANIFESTURL/1)" /> \
+            xmlns:xi="http://www.w3.org/2001/XInclude"
+            xpointer="element(EneaLinux_MANIFESTURL/1)" /> \
             -b <xi:include href="../../s_docsrc_common/pardoc-distro.xml"
-              xmlns:xi="http://www.w3.org/2001/XInclude"
-              xpointer="element(EneaLinux_MANIFESTHASH/1)" /> \
+            xmlns:xi="http://www.w3.org/2001/XInclude"
+            xpointer="element(EneaLinux_MANIFESTHASH/1)" /> \
             -m &lt;manifest file&gt;
-$ repo sync</programlisting></para>
-
-        <para>The parameter &lt;manifest file&gt; depends on the target. See
-        the following table:</para>
-
-        <informaltable>
-          <tgroup cols="2">
-            <thead>
-              <row>
-                <entry align="center">Target</entry>
-
-                <entry align="center">Manifest file</entry>
-              </row>
-            </thead>
+$ repo sync</programlisting>
 
-            <tbody>
-              <row>
-                <entry>P2041RDB</entry>
+        <para>The parameter &lt;manifest file&gt; depends on the target. Use
+        the following:</para>
 
-                <entry><para>p2041rdb/default.xml</para></entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </informaltable>
+        <xi:include element="manifestfiles/1"
+                    href="manifestfiles_generated.xml"
+                    xmlns:xi="http://www.w3.org/2001/XInclude" />
       </listitem>
     </orderedlist>
 
diff --git a/doc/book-enea-linux-release-info/doc/prerequisites.xml b/doc/book-enea-linux-release-info/doc/prerequisites.xml
index 3b55b26..71f7d7e 100644
--- a/doc/book-enea-linux-release-info/doc/prerequisites.xml
+++ b/doc/book-enea-linux-release-info/doc/prerequisites.xml
@@ -18,7 +18,7 @@
         <primary>Ubuntu</primary>
       </indexterm> distribution you need the following packages:</para>
 
-    <programlisting># sudo apt-get install sed wget subversion git-core
+    <programlisting>$ sudo apt-get install sed wget subversion git-core
     coreutils unzip texi2html texinfo libsdl1.2-dev docbook-utils fop gawk
     python-pysqlite2 diffstat make gcc build-essential xsltproc g++
     desktop-file-utils chrpath libgl1-mesa-dev libglu1-mesa-dev autoconf automake
-- 
cgit v1.2.3-54-g00ecf