Updated the makefile and init.mk to point to gitlab2

Updated the makefile to reflect olinkdb changes
Updated the makefule to reflect removal of manifest_conf.mk
Updated rel notes with olinks and removing zip files no longer
included in releases.
Updated the ATFH OSR swcomp to include version variable.

Change-Id: I7b4decb707370acff90348361525f30bd8c20707
Signed-off-by: mrpa <miruna.paun@enea.com>

5 files changed, 26 insertions, 111 deletions

diff --git a/doc/Makefile b/doc/Makefile
index 80a93c7..404ad05 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -8,8 +8,8 @@ SUBSYSROOT := $(shell pwd)
 
 # NOTE: MANIFESTHASH in manifest_conf.mk needs to be the final release tag before a release
 #       The manifest_conf.mk defines MANIFESTHASH and MANIFESTURL and PROFILE_NAME(on front+footers)
-include manifest_conf.mk
-MANIFESTDIR := $(shell echo "$(MANIFESTURL)" | sed 's/.*\///;s/\.git//')
+#include manifest_conf.mk
+#MANIFESTDIR := $(shell echo "$(MANIFESTURL)" | sed 's/.*\///;s/\.git//')
 
 # Further down we extract the list of target manifest file names from the manifest itself
 
@@ -19,7 +19,7 @@ MANIFESTDIR := $(shell echo "$(MANIFESTURL)" | sed 's/.*\///;s/\.git//')
 # This also defines TMPCLONEROOT which optionally can be nondefault using BOOK_GLOBALCLONEROOT=yes or a path
 include init.mk
 
-TMPCLONEROOT_MANIFEST := $(TMPCLONEROOT)/manifest
+#TMPCLONEROOT_MANIFEST := $(TMPCLONEROOT)/manifest
 
 
 # ******************* AutoGenerated chapters from template and target READMEs *******
@@ -42,7 +42,7 @@ DOCBOOKMAKE         = $(SUBSYSROOT)/s_docbuild/docmake
 DOCBOOKTEMPLATE     = $(SUBSYSROOT)/s_docbuild/template
 
 #Path to the OLINK database including leading part of file name (will add -$(FORMAT).db)
-DOCBOOKOLINKDB_BASE = $(SUBSYSROOT)/s_docbuild/olinkdb/olink-targetdb-ose5-master
+DOCBOOKOLINKDB_BASE = $(SUBSYSROOT)/s_docbuild/olinkdb/olink-targetdb-master
 
 DOCBOOK_OLINKS ?= yes
 DOCBOOK_FO_USEFOP ?= yes
@@ -51,16 +51,7 @@ DOCBOOK_CLEANTMP ?= yes
 
 #Components (books) in this subsystem. Now use all books found here
 COMPONENTS := book-enea-nfv-access-auto-fw-th-open-source book-enea-nfv-access-auto-fw-th-user-guide book-enea-nfv-access-cmc-example-usecases book-enea-nfv-access-example-usecases book-enea-nfv-access-getting-started book-enea-nfv-access-open-source book-enea-nfv-access-release-info book-enea-nfv-access-system-test-specification book-enea-nfv-access-evalkit
-#  COMPONENTS +=
-#book-enea-nfv-access-dev-hardening-guide
-#book-enea-nfv-access-esdk-open-source
-#book-enea-nfv-access-guide
-#book-enea-nfv-access-reference-guide-intel
-#book-enea-nfv-access-sdk-open-source
-#book-enea-nfv-access-user-hardening-guide
-#book-enea-nfv-access-vnf-onboarding-guide
 
-#COMPONENTS := $(shell ls -d book-enea* )
 
 # --------------------------------------------------------------
 ifeq ($(VERBOSE),yes)
@@ -82,7 +73,7 @@ VALIDATE = no
 # Export all parameters including those on the command line
 export
 
-.PHONY: doc books docusage init initbuild initmanifest initpardoc initbuildboot dist
+.PHONY: doc books docusage init initbuild initpardoc dist
 
 
 docusage:
@@ -151,7 +142,7 @@ ifeq ($(DOCBOOK_TOOLS_VERSIONS),yes)
 endif
 
 # We rely on make doing these in order left to right
-init: initbuild initcommon initmanifest initpardoc initbuildboot initpkgdiff initissues
+init: initbuild initcommon initpardoc initpkgdiff initissues
 pullall: pullbuild
 
 # If no COMP, iterate over books-* in COMPONENTS with make doc
@@ -193,7 +184,7 @@ endif
 books: init
 # BOOKPACKAGES is defined in all book-*/swcomp.mk
         $(VERB)DISTRO_VERSION=`egrep '"EneaLinux_REL_VER"><phrase>' $(ELTF_PARAMS_UPDATED) | sed 's/.*<phrase>//;s/<\/phrase>.*//'` ; \
-               BOOKVER="$(PROFILE_NAME)-$$DISTRO_VERSION"-$(shell date +"%Y.%m.%d"); \
+               BOOKVER="Enea NFV Access-$$DISTRO_VERSION"-$(shell date +"%Y.%m.%d"); \
          for book in $(BOOKPACKAGES); do \
           for format in $(FORMAT); do \
             $(MAKE) -f $(DOCBOOKMAKE)/make_docbook_standalone.mk BOOK=$$book FORMAT=$$format BOOK_VER="$$BOOKVER" books || exit 10; \
@@ -215,7 +206,7 @@ endif
 endif
 
 # cleaninit cleans ALL tmpcommon and all s_*
-clean:  cleaninit cleanbuildboot cleanpkgdiff cleanissues cleanmanifest
+clean:  cleaninit cleanpkgdiff cleanissues
         @echo "Cleaning build results and temporary files"
         $(VERB)rm -rf doc tmp 2>/dev/null
 ifneq ($(filter book-%, $(COMPONENTS)),)
@@ -226,42 +217,6 @@ ifneq ($(filter book-%, $(COMPONENTS)),)
 endif
 
 
-# ******************************************************************
-# ****************** SUPPORT FOR TARGETS ***************************
-initmanifest: s_manifest
-
-
-# -----------------------------------------
-# We only clone the manifest to be able to autodetect which targets are in it
-# git clone requires only the tag string e.g. EL6, not the entire ref/tags/EL6 that repo requires
-# git clone -b hashvalue is not supported. We must first clone, then git checkout hashvalue
-#     These steps work also for a tag so we could use the same stepwise code
-
-s_manifest: $(TMPCLONEROOT_MANIFEST)
-        $(VERB)rm s_manifest 2>/dev/null; ln -s $(TMPCLONEROOT_MANIFEST) s_manifest
-
-cleanmanifest:
-        @echo "Cleaning generated manifest files"
-        $(VERB)rm -f $(MACHINE_LIST_XML) 2>/dev/null
-        $(VERB)rm -rf "$(TMPCLONEROOT_MANIFEST)" s_manifest 2>/dev/null
-
-$(TMPCLONEROOT_MANIFEST):
-        $(VERB)if [ ! -d "$(TMPCLONEROOT)" ] ; then mkdir -p "$(TMPCLONEROOT)" ; fi
-        $(VERB)if [ ! -d "$(TMPCLONEROOT_MANIFEST)" ]; then mkdir -p "$(TMPCLONEROOT_MANIFEST)" ; fi
-        $(VERB) MBRANCH=`echo "$(MANIFESTHASH)" | sed 's/.*\///'`; \
-           echo "**** Cloning manifest version $$MBRANCH of $(MANIFESTURL) in $(TMPCLONEROOT_MANIFEST)" ; \
-           cd "$(TMPCLONEROOT_MANIFEST)"; git clone $(MANIFESTURL) ; cd $(MANIFESTDIR) ; git checkout $(MANIFESTHASH)
-        $(VERB)if [ ! -d "$(TMPCLONEROOT_MANIFEST)/$(MANIFESTDIR)" ]; then echo "ERROR: Missing $(TMPCLONEROOT_MANIFEST)/$(MANIFESTDIR)"; exit 10 ; fi ; \
-           TARGETDEFAULTXMLS=`cd $(TMPCLONEROOT_MANIFEST)/$(MANIFESTDIR); ls -1 */default.xml 2>/dev/null` ; \
-           TARGET_LIST=`echo "$$TARGETDEFAULTXMLS" | sed 's/\/default.xml//;s/^/# export MACHINE=/'` ; \
-           echo "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>" >$(MACHINE_LIST_XML) ; \
-           echo "<!DOCTYPE para PUBLIC \"-//OASIS//DTD DocBook XML V4.2//EN\"" >>$(MACHINE_LIST_XML) ; \
-           echo "\"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd\">" >>$(MACHINE_LIST_XML) ; \
-           echo "<para id=\"machine-list\">" >>$(MACHINE_LIST_XML) ; \
-           echo "<programlisting># Set MACHINE to ONE of the targets in this release!" >>$(MACHINE_LIST_XML) ; \
-           echo "$$TARGET_LIST</programlisting>" >>$(MACHINE_LIST_XML) ; \
-           echo "</para>" >>$(MACHINE_LIST_XML)
-
 
 # ****************************************************************************
 # ******************** SUPPORT FOR dynamic pardoc with added parameters ******
@@ -288,24 +243,6 @@ $(TMPCLONEROOT_DOCSRC_COMMON):
         @echo "**** Copy docsrc_common/ files to $(TMPCLONEROOT_DOCSRC_COMMON)"
         $(VERB)cat docsrc_common/pardoc-distro.xml >$(TMPPARDOC)
 
-# ****************************************************************************
-# ***** Create XML chapter with build/boot commands from all README files in manifest
-
-initbuildboot: $(BUILDBOOT_XML)
-
-cleanbuildboot:
-        @echo "Cleaning generated build-boot command document file"
-        $(VERB)rm -f $(BUILDBOOT_XML) 2>/dev/null
-
-
-$(BUILDBOOT_XML): $(BUILDBOOT_TEMPLATE)
-        @echo "**** Creating $(BUILDBOOT_XML) from READMEs"
-        $(VERB)INITBB_CMD=initbuildboot.sh ; \
-          if [ -f "$$INITBB_CMD" ]; then \
-             sh "$$INITBB_CMD" -xml $(BUILDBOOT_XML) -template $(BUILDBOOT_TEMPLATE) -readmebasedir s_manifest/$(MANIFESTDIR); \
-          else \
-             echo "ERROR: Missing $$INITBB_CMD, can not create $(BUILDBOOT_XML)"; exit 10; \
-          fi
 
 # ****************************************************************************
 # ***** Create Package DIFF XML section
diff --git a/doc/book-enea-nfv-access-auto-fw-th-open-source/swcomp.mk b/doc/book-enea-nfv-access-auto-fw-th-open-source/swcomp.mk
index 1eba8f1..2f2e677 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-open-source/swcomp.mk
+++ b/doc/book-enea-nfv-access-auto-fw-th-open-source/swcomp.mk
@@ -6,5 +6,5 @@ BOOK_VER ?= $(REL_VER)-dev
 DOCBOOK_SRC := $(COMP)/swcomp.mk $(COMP)/doc/book.xml $(shell find $(COMP)/doc -type f \( -name "*.xml" -o -name "*.svg" -o -name "*.png" \) ! -name "book.xml" -print)
 
 BOOKPACKAGES := book-enea-nfv-access-auto-fw-th-open-source
-BOOKDESC_$(BOOKPACKAGES) := "Enea NFV Access AF&TH Open Source Report"
+BOOKDESC_$(BOOKPACKAGES) := "Enea NFV Access $(PROD_VER) AF&TH Open Source Report"
 BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS)
diff --git a/doc/book-enea-nfv-access-release-info/doc/about_release.xml b/doc/book-enea-nfv-access-release-info/doc/about_release.xml
index f9ebf71..9610aa7 100644
--- a/doc/book-enea-nfv-access-release-info/doc/about_release.xml
+++ b/doc/book-enea-nfv-access-release-info/doc/about_release.xml
@@ -13,19 +13,6 @@
   <xref linkend="relinfo-changes-other">Section 2.1 New
   Features</xref>.</para>
 
-  <para>
-    <remark>INFO <emphasis role="bold">eltf_params_updated.xml</emphasis>
-    contains many parameters in the book, also in the open source books, and
-    MUST be created FROM <emphasis
-    role="bold">eltf_params_template.xml</emphasis>. The parameters are
-    automatically used in the books, via xi:include statements, similar to how
-    parameters from pardoc-distro.xml are included in the book. Read the file
-    <emphasis
-    role="bold">eltf_params_updated_template_how_to_use.txt</emphasis> for
-    important details about formats and how to do! The idea is that ELTF will
-    auto-create/update it.</remark>
-  </para>
-
   <section id="release-content">
     <title>Enea NFV Access Release Content</title>
 
@@ -41,14 +28,6 @@
       </listitem>
 
       <listitem>
-        <para>Enea_NFV_Access_2.2.2_UpgradeKit_XeonD.zip</para>
-      </listitem>
-
-      <listitem>
-        <para>Enea_NFV_Access_2.2.2_UpgradeKit_C3000.zip</para>
-      </listitem>
-
-      <listitem>
         <para>ucpeManager_1.1.1_b37-CentOS.tar.gz</para>
       </listitem>
 
@@ -149,21 +128,28 @@
       </listitem>
 
       <listitem>
-        <para>Enea NFV Access Automation Framework and Test Harness
-        Open-Source Report. Provides license information pertaining to
-        packages available with the AFTH.</para>
+        <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        xpointer="element(book_enea_nfv_access_auto_fw_th_open_source/1)" />.
+        Provides license information pertaining to packages available with the
+        AFTH.</para>
       </listitem>
 
       <listitem>
-        <para>Enea NFV Access Automation Framework and Test Harness User
-        Guide. Describes the Automation Framework and Test Harness for Enea
-        NFV Access and provides instructions regarding the necessary steps to
-        run these software tools.</para>
+        <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        xpointer="element(book_enea_nfv_access_auto_fw_th_user_guide/1)" />.
+        Describes the Automation Framework and Test Harness for Enea NFV
+        Access and provides instructions regarding the necessary steps to run
+        these software tools.</para>
       </listitem>
 
       <listitem>
-        <para>Enea NFV Access System Test Specification. Describes a sample
-        Test Suite for System Testing of Enea NFV Access.</para>
+        <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        xpointer="element(book_enea_nfv_access_system_test_specification/1)" />.
+        Describes a sample Test Suite for System Testing of Enea NFV
+        Access.</para>
       </listitem>
     </itemizedlist>
   </section>
diff --git a/doc/init.mk b/doc/init.mk
index c1457fd..f2c3fb5 100644
--- a/doc/init.mk
+++ b/doc/init.mk
@@ -80,7 +80,7 @@ $(TMPCLONEROOT)/$(NAME_DOCBUILD):
            else \
              echo "Cloning $(REPO_DOCBUILD) in $(TMPCLONEROOT)" ; \
              cd "$(TMPCLONEROOT)" ; \
-             git clone -b master git@git.enea.se:$(REPO_DOCBUILD) $(NAME_DOCBUILD) ; \
+             git clone -b master git@gitlab2.enea.se:$(REPO_DOCBUILD) $(NAME_DOCBUILD) ; \
            fi
 
 $(TMPCLONEROOT)/$(NAME_DOCENEACOMMON):
diff --git a/doc/manifest_conf.mk b/doc/manifest_conf.mk
deleted file mode 100644
index b3144b9..0000000
--- a/doc/manifest_conf.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# To be included in Makefile
-# NOTE: MANIFESTHASH needs to be changed to final release tag in format refs/tags/ELnnn before a release
-#       The values are shown in the release info
-#       The manifest is used to fetch information into the release info from the distro files
-MANIFESTHASH      ?= refs/tags/Enea_NFV_Access_2.2.2
-        #change the above value later to refs/tags/ELnnn (?)
-MANIFESTURL       := ssh://gerrit.enea.se:29418/linux/manifests/el_manifests-nfv-access
-PROFILE_NAME      := Enea NFV Access