diff options
author | Lennart Johansson <lennart.johansson@enea.com> | 2016-10-24 13:41:56 +0200 |
---|---|---|
committer | Lennart Johansson <lennart.johansson@enea.com> | 2016-10-24 13:41:56 +0200 |
commit | 73136d4e4fe3386cc0cc5ae3ad909604590acdd3 (patch) | |
tree | 62faf38b556ad11ab41bf62435d9196a29672c33 | |
parent | f03d7877b17c354e3b15d7c94a37d7c154737624 (diff) | |
download | el_releases-standard-73136d4e4fe3386cc0cc5ae3ad909604590acdd3.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.
Signed-off-by: Lennart Johansson <lennart.johansson@enea.com>
-rw-r--r-- | doc/Makefile | 18 | ||||
-rw-r--r-- | doc/book-enea-linux-release-info/doc/getting_enea_linux.xml | 76 |
2 files changed, 35 insertions, 59 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 | |||
32 | PKGDIFF_GEN_XML := book-enea-linux-release-info/doc/pkgdiff_generated.xml | 32 | PKGDIFF_GEN_XML := book-enea-linux-release-info/doc/pkgdiff_generated.xml |
33 | JIRA_ISSUES_GEN_XML := book-enea-linux-release-info/doc/jiraissues_generated.xml | 33 | JIRA_ISSUES_GEN_XML := book-enea-linux-release-info/doc/jiraissues_generated.xml |
34 | 34 | ||
35 | MANIFESTFILES_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 | |||
200 | endif | 202 | endif |
201 | 203 | ||
202 | # cleaninit cleans ALL tmpcommon and all s_* | 204 | # cleaninit cleans ALL tmpcommon and all s_* |
203 | clean: cleaninit cleanbuildboot cleanpkgdiff cleanissues | 205 | clean: 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 |
206 | ifneq ($(filter book-%, $(COMPONENTS)),) | 208 | ifneq ($(filter book-%, $(COMPONENTS)),) |
@@ -226,6 +228,11 @@ inittargets: s_targets | |||
226 | s_manifest: $(TMPCLONEROOT_MANIFEST) | 228 | s_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 | ||
231 | cleanmanifest: | ||
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 dada8bd..0f03b7d 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,69 +41,31 @@ $ 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 <manifest file> | 59 | -m <manifest file> |
59 | $ repo sync</programlisting></para> | 60 | $ repo sync</programlisting> |
60 | |||
61 | <para>The parameter <manifest file> 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 | |||
74 | <tbody> | ||
75 | <row> | ||
76 | <entry>P2041RDB</entry> | ||
77 | |||
78 | <entry><para>p2041rdb/default.xml</para></entry> | ||
79 | </row> | ||
80 | |||
81 | <row> | ||
82 | <entry>LS1021a-IoT</entry> | ||
83 | |||
84 | <entry><para>ls1021aiot/default.xml</para></entry> | ||
85 | </row> | ||
86 | |||
87 | <row> | ||
88 | <entry>QEMUARM</entry> | ||
89 | |||
90 | <entry><para>qemuarm/default.xml</para></entry> | ||
91 | </row> | ||
92 | |||
93 | <row> | ||
94 | <entry>QEMUPCC</entry> | ||
95 | |||
96 | <entry><para>qemuppc/default.xml</para></entry> | ||
97 | </row> | ||
98 | 61 | ||
99 | <row> | 62 | <para>The parameter <manifest file> depends on the target. For a |
100 | <entry>QEMUX86</entry> | 63 | target in this distribution use <emphasis role="bold">one</emphasis> |
64 | of the following manifest files:</para> | ||
101 | 65 | ||
102 | <entry><para>qemux86/default.xml</para></entry> | 66 | <xi:include element="manifestfiles/1" |
103 | </row> | 67 | href="manifestfiles_generated.xml" |
104 | </tbody> | 68 | xmlns:xi="http://www.w3.org/2001/XInclude" /> |
105 | </tgroup> | ||
106 | </informaltable> | ||
107 | </listitem> | 69 | </listitem> |
108 | </orderedlist> | 70 | </orderedlist> |
109 | 71 | ||