From 5a049353e8294b8c7c181430c8ef2744cecdb605 Mon Sep 17 00:00:00 2001 From: Miruna Paun Date: Fri, 31 Mar 2017 14:25:17 +0200 Subject: Updating init and makefile with el_releases-common LXCR-7634 final updates to el_rel net Signed-off-by: Miruna Paun --- doc/Makefile | 2 +- doc/book-enea-linux-release-info/doc/prerequisites.xml | 2 +- doc/init.mk | 16 +++++++++------- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index 7982e0c..0b23b4f 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -143,7 +143,7 @@ ifeq ($(DOCBOOK_TOOLS_VERSIONS),yes) endif # We rely on make doing these in order left to right -init: initbuild initmanifest inittargets initpardoc initbuildboot initpkgdiff initissues +init: initbuild initcommon initmanifest initpardoc initbuildboot initpkgdiff initissues pullall: pullbuild # If no COMP, iterate over books-* in COMPONENTS with make doc diff --git a/doc/book-enea-linux-release-info/doc/prerequisites.xml b/doc/book-enea-linux-release-info/doc/prerequisites.xml index 197a48a..fb2d208 100644 --- a/doc/book-enea-linux-release-info/doc/prerequisites.xml +++ b/doc/book-enea-linux-release-info/doc/prerequisites.xml @@ -4,7 +4,7 @@ Prerequisites - Building Enea Linux or compiling applications requires that your git diff --git a/doc/init.mk b/doc/init.mk index 587542f..7dc5efd 100644 --- a/doc/init.mk +++ b/doc/init.mk @@ -2,7 +2,9 @@ # and should have targets init: s_docbuild and optional initcommon: s_doceneacommon # Typically let doc: depend on init and initcommon inside Makefile # Manually optionally set GLOBALTMPCLONEROOT to yes or to a parent dir for tmpcommon -# This init.mk file ver R1.00/2016-04-29 +# This init.mk file ver +# R1.00/2016-04-29 +# R2.00/2017-03-30 changed linux/documentation.git and it's old branch to linux/el_releases-common.git and it's new branch ifeq ($(VERBOSE),yes) VERB := @@ -13,13 +15,13 @@ endif #Git repositories to be cloned REPO_DOCBUILD := build/docbuild.git NAME_DOCBUILD := docbuild -REPO_DOCENEACOMMON := linux/documentation.git +REPO_DOCENEACOMMON := linux/el_releases-common.git NAME_DOCENEACOMMON := doceneacommon # Set nondefault BRANCH_DOCENEACOMMON in Makefile -BRANCH_DOCENEACOMMON ?= master-enea -# Separate clones of documentation.git with different branches, needed if cloned globally with risk that different distros can be at same place -ifneq ($(BRANCH_DOCENEACOMMON),master-enea) +BRANCH_DOCENEACOMMON ?= master +# Separate clones of el_releases-common.git with different branches, needed if cloned globally with risk that different distros can be at same place +ifneq ($(BRANCH_DOCENEACOMMON),master) NAME_DOCENEACOMMON := doceneacommon_$(BRANCH_DOCENEACOMMON) endif @@ -43,11 +45,11 @@ endif usageinit: docusage @echo 'make initbuild Create s_docbuild and if not exists, clone docbuild.git' - @echo 'make initcommon Create s_doceneacommon and if not exists, clone documentation.git' + @echo 'make initcommon Create s_doceneacommon and if not exists, clone el_releases-common.git' @echo ' Default clone in tmpcommon' @echo ' BOOK_GLOBALCLONEROOT=yes Clone in $(GLOBALTMPCLONEROOT)' @echo ' BOOK_GLOBALCLONEROOT=parentdir Clone in parentdir/tmpcommon' - @echo ' Default branch for documentation.git is master-enea' + @echo ' Default branch for el_releases-common.git is master' @echo ' BRANCH_DOCENEACOMMON=... If another branch, Makefile should set this' @echo 'make pullbuild git pull in s_docbuild' @echo 'make pullcommon git pull in s_doceneacommon' -- cgit v1.2.3-54-g00ecf