From 8decb3267be14596c377155d6bc84a0eb61f04e9 Mon Sep 17 00:00:00 2001
From: Lennart Johansson <lennart.johansson@enea.com>
Date: Thu, 2 Jun 2016 13:41:16 +0200
Subject: Doc Add autovariables from manifest, poky.ent, enea.conf

Add autovariable from manifest repository name,
    e.g. the profile name
Add autovariables from poky.ent, e.g. Yocto version etc..
    in pardoc-distro
Add autovariables from enea.conf e.g. release MAJOR MINOR
    via generated s_docsrc_common/pardoc-distro
    and also pick up MAJOR MINOR into the
    make system to create BOOK_VER => BL_LABEL on books
Add autocreate build_boot chapter in release info
    from the README files in all included targets
Adapt book XML files to the above
Currently this makes the Makefile and init scripts identical
in different el6-<profile>.git
All are now automatic: Just clone el6-xxxx.git and
   cd el6-xxx/doc ; make doc
and all are done until the books are built and ready.
It takes several minutes to autofetch all from git
using the repo command according to the target manifests
before the books start to build.
Rebuilding books are quick.

Signed-off-by: Lennart Johansson <lennart.johansson@enea.com>
---
 doc/docsrc_common/pardoc-distro.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'doc/docsrc_common')

diff --git a/doc/docsrc_common/pardoc-distro.xml b/doc/docsrc_common/pardoc-distro.xml
index 129d7a5..9c9edd6 100644
--- a/doc/docsrc_common/pardoc-distro.xml
+++ b/doc/docsrc_common/pardoc-distro.xml
@@ -5,7 +5,7 @@
 ==============================
 -->
 <!-- Distribution and release -->
-<!ENTITY ENEA_LINUX_REL_VER "6-Networking">  <!-- used also in Makefile -->
+<!ENTITY ENEA_LINUX_REL_VER "MAJOR.MINOR-Networking">  <!-- TEMPLATE LINE, IS PATCHED by Makefile with values from enea.conf in poky/ -->
 <!ENTITY % common_poky_entities SYSTEM "../s_targets/qemuarm/poky/documentation/poky.ent">
 %common_poky_entities;
 ]>
@@ -24,8 +24,6 @@
 
   <para>**** The phrase elements below can be used as variables in several
              places in XML files ****</para>
-  <para>**** In addition: Makefile parses variable REL_VER from entity ENEA_LINUX_REL_VER,
-             after which swcomp.mk extracts BOOK_VER from variable REL_VER ****</para>
 
   <para>You can add more elements using ENTITY lines in poky.ent, e.g. like Poky_VER below</para>
 
@@ -34,5 +32,6 @@
 <para id="ULINK_ENEA_LINUX_URL"><ulink url='https://linux.enea.com/&ENEA_LINUX_REL_VER;'>https://linux.enea.com/&ENEA_LINUX_REL_VER;</ulink></para>
 <para id="Poky_VER"><phrase>&POKYVERSION;</phrase></para>
 <para id="Yocto_VER"><phrase>&DISTRO;</phrase></para>
+<para id="Yocto_NAME"><phrase>&DISTRO_NAME_NO_CAP;</phrase></para>
 <para id="ULINK_YOCTO_RELEASE_NOTES"><ulink url='&YOCTO_RELEASE_NOTES;'>&YOCTO_RELEASE_NOTES;</ulink></para>
 </section>
-- 
cgit v1.2.3-54-g00ecf