summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiruna Paun <Miruna.Paun@enea.com>2016-10-25 16:30:13 +0200
committerMiruna Paun <Miruna.Paun@enea.com>2016-10-25 16:30:13 +0200
commitd4c585068c0dcfc9f13e5dc4f66f6c51ae92ad35 (patch)
tree1e6fc54267f9dbf7e8ec76bdca7c852bbd70132a
parentb828d67c8c429c2b1bf87d2f890607c378d55200 (diff)
downloadel_releases-networking-d4c585068c0dcfc9f13e5dc4f66f6c51ae92ad35.tar.gz
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>
-rw-r--r--doc/Makefile18
-rw-r--r--doc/book-enea-linux-release-info/doc/getting_enea_linux.xml51
-rw-r--r--doc/book-enea-linux-release-info/doc/prerequisites.xml2
3 files changed, 35 insertions, 36 deletions
diff --git a/doc/Makefile b/doc/Makefile
index c7569e9..7982e0c 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -32,6 +32,8 @@ BUILDBOOT_TEMPLATE := book-enea-linux-release-info/doc/build_boot_template.xml
32PKGDIFF_GEN_XML := book-enea-linux-release-info/doc/pkgdiff_generated.xml 32PKGDIFF_GEN_XML := book-enea-linux-release-info/doc/pkgdiff_generated.xml
33JIRA_ISSUES_GEN_XML := book-enea-linux-release-info/doc/jiraissues_generated.xml 33JIRA_ISSUES_GEN_XML := book-enea-linux-release-info/doc/jiraissues_generated.xml
34 34
35MANIFESTFILES_XML := book-enea-linux-release-info/doc/manifestfiles_generated.xml
36
35 37
36# ----------------------------------------------------- 38# -----------------------------------------------------
37#Path to DocBook make files and templates 39#Path to DocBook make files and templates
@@ -200,7 +202,7 @@ endif
200endif 202endif
201 203
202# cleaninit cleans ALL tmpcommon and all s_* 204# cleaninit cleans ALL tmpcommon and all s_*
203clean: cleaninit cleanbuildboot cleanpkgdiff cleanissues 205clean: cleaninit cleanbuildboot cleanpkgdiff cleanissues cleanmanifest
204 @echo "Cleaning build results and temporary files" 206 @echo "Cleaning build results and temporary files"
205 $(VERB)rm -rf doc tmp 2>/dev/null 207 $(VERB)rm -rf doc tmp 2>/dev/null
206ifneq ($(filter book-%, $(COMPONENTS)),) 208ifneq ($(filter book-%, $(COMPONENTS)),)
@@ -226,6 +228,11 @@ inittargets: s_targets
226s_manifest: $(TMPCLONEROOT_MANIFEST) 228s_manifest: $(TMPCLONEROOT_MANIFEST)
227 $(VERB)rm s_manifest 2>/dev/null; ln -s $(TMPCLONEROOT_MANIFEST) s_manifest 229 $(VERB)rm s_manifest 2>/dev/null; ln -s $(TMPCLONEROOT_MANIFEST) s_manifest
228 230
231cleanmanifest:
232 @echo "Cleaning generated manifestfilelist XML document file"
233 $(VERB)rm -f $(MANIFESTFILES_XML) 2>/dev/null
234 $(VERB)rm -rf "$(TMPCLONEROOT_MANIFEST)" s_manifest 2>/dev/null
235
229$(TMPCLONEROOT_MANIFEST): 236$(TMPCLONEROOT_MANIFEST):
230 $(VERB)if [ ! -d "$(TMPCLONEROOT)" ] ; then mkdir -p "$(TMPCLONEROOT)" ; fi 237 $(VERB)if [ ! -d "$(TMPCLONEROOT)" ] ; then mkdir -p "$(TMPCLONEROOT)" ; fi
231 $(VERB)if [ ! -d "$(TMPCLONEROOT_MANIFEST)" ]; then mkdir -p "$(TMPCLONEROOT_MANIFEST)" ; fi 238 $(VERB)if [ ! -d "$(TMPCLONEROOT_MANIFEST)" ]; then mkdir -p "$(TMPCLONEROOT_MANIFEST)" ; fi
@@ -235,7 +242,14 @@ $(TMPCLONEROOT_MANIFEST):
235 $(VERB)if [ ! -d "$(TMPCLONEROOT_MANIFEST)/$(MANIFESTDIR)" ]; then echo "ERROR: Missing $(TMPCLONEROOT_MANIFEST)/$(MANIFESTDIR)"; exit 10 ; fi ; \ 242 $(VERB)if [ ! -d "$(TMPCLONEROOT_MANIFEST)/$(MANIFESTDIR)" ]; then echo "ERROR: Missing $(TMPCLONEROOT_MANIFEST)/$(MANIFESTDIR)"; exit 10 ; fi ; \
236 TARGETDEFAULTXMLS=`cd $(TMPCLONEROOT_MANIFEST)/$(MANIFESTDIR); ls -1 */default.xml 2>/dev/null` ; \ 243 TARGETDEFAULTXMLS=`cd $(TMPCLONEROOT_MANIFEST)/$(MANIFESTDIR); ls -1 */default.xml 2>/dev/null` ; \
237 echo "$$TARGETDEFAULTXMLS" | tr '\n' ' ' >$(TMPCLONEROOT_MANIFEST)/targetdefaultxmls.txt ; \ 244 echo "$$TARGETDEFAULTXMLS" | tr '\n' ' ' >$(TMPCLONEROOT_MANIFEST)/targetdefaultxmls.txt ; \
238 echo "$$TARGETDEFAULTXMLS" | sed 's/\/.*//' | tr '\n' ' ' >$(TMPCLONEROOT_MANIFEST)/targetids.txt 245 echo "$$TARGETDEFAULTXMLS" | sed 's/\/.*//' | tr '\n' ' ' >$(TMPCLONEROOT_MANIFEST)/targetids.txt ; \
246 echo "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>" >$(MANIFESTFILES_XML) ; \
247 echo "<!DOCTYPE section PUBLIC \"-//OASIS//DTD DocBook XML V4.2//EN\"" >>$(MANIFESTFILES_XML) ; \
248 echo "\"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd\">" >>$(MANIFESTFILES_XML) ; \
249 echo "<section id=\"manifestfiles\">" >>$(MANIFESTFILES_XML) ; \
250 echo "<programlisting>$$TARGETDEFAULTXMLS</programlisting>" >>$(MANIFESTFILES_XML) ; \
251 echo "</section>" >>$(MANIFESTFILES_XML)
252
239 253
240# ----------------------------------------- 254# -----------------------------------------
241# Use repo to auto-clone each target separately - VERY LARGE if there are many targets (5 targets => about 1.3 Gbytes) 255# Use repo to auto-clone each target separately - VERY LARGE if there are many targets (5 targets => about 1.3 Gbytes)
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
41 </listitem> 41 </listitem>
42 42
43 <listitem> 43 <listitem>
44 <para>Use the repo tool to download the source:<remark>FIXME: Before 44 <para>Use the repo tool to download the source:<remark>FIXME: At final
45 final release the tag for the manifest must be set in Makefile as 45 release the tag for the manifest must be set in mainfest_conf.mk as
46 MANIFESTHASH, typically something like refs/tags/EL6. Before that, a 46 MANIFESTHASH, typically something like refs/tags/EL6. Before final
47 generic branch name is used instead, e.g. krogoth in 47 release, it is possible to set MANIFESTHASH on the make command line
48 Makefile</remark></para> 48 to override the value, e.g. with a commit hash string for a release
49 49 candidate to be tested</remark></para>
50 <para><programlisting>$ mkdir enea-linux 50
51 <programlisting>$ mkdir enea-linux
51$ cd enea-linux 52$ cd enea-linux
52$ repo init -u <xi:include href="../../s_docsrc_common/pardoc-distro.xml" 53$ repo init -u <xi:include href="../../s_docsrc_common/pardoc-distro.xml"
53 xmlns:xi="http://www.w3.org/2001/XInclude" 54 xmlns:xi="http://www.w3.org/2001/XInclude"
54 xpointer="element(EneaLinux_MANIFESTURL/1)" /> \ 55 xpointer="element(EneaLinux_MANIFESTURL/1)" /> \
55 -b <xi:include href="../../s_docsrc_common/pardoc-distro.xml" 56 -b <xi:include href="../../s_docsrc_common/pardoc-distro.xml"
56 xmlns:xi="http://www.w3.org/2001/XInclude" 57 xmlns:xi="http://www.w3.org/2001/XInclude"
57 xpointer="element(EneaLinux_MANIFESTHASH/1)" /> \ 58 xpointer="element(EneaLinux_MANIFESTHASH/1)" /> \
58 -m &lt;manifest file&gt; 59 -m &lt;manifest file&gt;
59$ repo sync</programlisting></para> 60$ repo sync</programlisting>
60
61 <para>The parameter &lt;manifest file&gt; depends on the target. See
62 the following table:</para>
63
64 <informaltable>
65 <tgroup cols="2">
66 <thead>
67 <row>
68 <entry align="center">Target</entry>
69
70 <entry align="center">Manifest file</entry>
71 </row>
72 </thead>
73 61
74 <tbody> 62 <para>The parameter &lt;manifest file&gt; depends on the target. Use
75 <row> 63 the following:</para>
76 <entry>P2041RDB</entry>
77 64
78 <entry><para>p2041rdb/default.xml</para></entry> 65 <xi:include element="manifestfiles/1"
79 </row> 66 href="manifestfiles_generated.xml"
80 </tbody> 67 xmlns:xi="http://www.w3.org/2001/XInclude" />
81 </tgroup>
82 </informaltable>
83 </listitem> 68 </listitem>
84 </orderedlist> 69 </orderedlist>
85 70
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 @@
18 <primary>Ubuntu</primary> 18 <primary>Ubuntu</primary>
19 </indexterm> distribution you need the following packages:</para> 19 </indexterm> distribution you need the following packages:</para>
20 20
21 <programlisting># sudo apt-get install sed wget subversion git-core 21 <programlisting>$ sudo apt-get install sed wget subversion git-core
22 coreutils unzip texi2html texinfo libsdl1.2-dev docbook-utils fop gawk 22 coreutils unzip texi2html texinfo libsdl1.2-dev docbook-utils fop gawk
23 python-pysqlite2 diffstat make gcc build-essential xsltproc g++ 23 python-pysqlite2 diffstat make gcc build-essential xsltproc g++
24 desktop-file-utils chrpath libgl1-mesa-dev libglu1-mesa-dev autoconf automake 24 desktop-file-utils chrpath libgl1-mesa-dev libglu1-mesa-dev autoconf automake