From eae9b5b52f9fe8d819f28fc5c573bb095a6b30d9 Mon Sep 17 00:00:00 2001 From: Lennart Johansson Date: Mon, 5 Sep 2016 12:31:54 +0200 Subject: Change MANIFESTHASH to be dynamic by using ?= This modification in manifest_conf.mk will allow optionally setting the MANIFESTHASH dynamically, e.g. for a non-finished Release Candidate, without hacking in the files in git. A non-default value must be set when init in make fetches the source via repo using the manifest. The value is seen in the release info repo command line (-b) to download source via the manifest and is typically a tag, e.g. refs/tags/EL7_RC1 Signed-off-by: Lennart Johansson --- doc/Makefile | 9 +++++---- doc/manifest_conf.mk | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index 4c81dfc..ebb086c 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,7 +1,7 @@ #Path to this subsystem's root directory SUBSYSROOT := $(shell pwd) -# NOTE: MANIFESTHASH in manifest_conf.mk needs to be updated with final release tag before a release +# 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 include manifest_conf.mk @@ -76,8 +76,8 @@ export docusage: @echo 'make docusage #Shows this help text' @echo ' DOCBOOK_TOOLS_VERSIONS=yes #Displays DocBook tools versions in this machine' - @echo 'make doc #Builds the userdoc, does autoinit if needed' - @echo 'make dist BOOK_DIST_DIR=xx/doc #Builds all and copies results to BOOK_DIST_DIR' + @echo 'make doc #Builds the userdoc, does automatically also init if needed' + @echo 'make dist BOOK_DIST_DIR=xx/doc #Builds doc and copies results to BOOK_DIST_DIR' @echo ' #Does not work with DOCBOOK_TO_BOOKDIR or BOOK_BUILD_DIR' @echo ' #Currently EclipseHelp formated doc will not be in BOOK_DIST_DIR' @echo ' # unless BOOK_DIST_ECLIPSE is set to yes' @@ -88,7 +88,8 @@ docusage: @echo 'make initbuildboot #Init build_boot chapter from READMEs and template in release info' @echo ' DOCBOOK_CLEANTMP=no #Option to keep temp files in doc/ and tmp/' @echo ' BOOK_GLOBALCLONEROOT=yes #Option for all init above to clone all outside the doc directory' - @echo ' BOOK_GLOBALCLONEROOT=otherpath #Option for all init above to clone all' + @echo ' BOOK_GLOBALCLONEROOT=otherpath #Option for all init above to clone all to given path' + @echo ' MANIFESTHASH=xxxxx #Option for all init above to use nondefault MANIFEST in repo cmd' @echo 'make pullbuild #git pull in s_docbuild' @echo 'make pulltargets #git pull in s_targets. You need also initpardoc initbuildboot' @echo 'make clean #Clean. Also clean s_* but not any external clones' diff --git a/doc/manifest_conf.mk b/doc/manifest_conf.mk index 991d81f..4738ad4 100644 --- a/doc/manifest_conf.mk +++ b/doc/manifest_conf.mk @@ -2,6 +2,6 @@ # 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/EL6 +MANIFESTHASH ?= refs/tags/EL6 MANIFESTURL := git://git.enea.se/linux/manifests/el_manifests-networking.git PROFILE_NAME := Networking -- cgit v1.2.3-54-g00ecf