From c8203d92c3dec1fc8e4f972d2d74c36f1554cc9e Mon Sep 17 00:00:00 2001 From: Lennart Johansson Date: Mon, 20 Jun 2016 11:10:45 +0200 Subject: Move distro parameters out to manifest_conf.mk --- doc/Makefile | 12 ++++-------- doc/manifest_conf.mk | 7 +++++++ 2 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 doc/manifest_conf.mk diff --git a/doc/Makefile b/doc/Makefile index ca334b1..1248749 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,18 +1,14 @@ #Path to this subsystem's root directory SUBSYSROOT := $(shell pwd) -# NOTE: MANIFESTHASH needs to be changed to final hash value or tag before a release -MANIFESTHASH := krogoth -MANIFEST := el_manifests-standard +# NOTE: MANIFESTHASH in manifest_conf.mk needs to be updated with final release tag before a release +# The manifest_conf.mk defines MANIFESTHASH and MANIFESTURL and PROFILE_NAME +include manifest_conf.mk + # An alternative is to clone the manifest repository and extract the list of target manifest files from that # We need all to get all README, but only first in alphabetic list is used to extract info from poky/ TARGETDEFAULTXMLS := ls1021aiot/default.xml p2041rdb/default.xml qemuarm/default.xml qemuppc/default.xml qemux86/default.xml -# Extract URL for repo command to use. It also uses MANIFESTHASH -MANIFESTURL := git@git.enea.com:linux/$(MANIFEST).git -# Extract profile name as word-after-hyphen in MANIFEST -PROFILE_NAME := $(word 2,$(subst -, ,$(MANIFEST))) - # ***************** Generic docbuild.git auto-clone + s_docbuild symlink *** # This also defines TMPCLONEROOT which optionally can be nondefault using BOOK_GLOBALCLONEROOT=yes or a path diff --git a/doc/manifest_conf.mk b/doc/manifest_conf.mk new file mode 100644 index 0000000..21e1699 --- /dev/null +++ b/doc/manifest_conf.mk @@ -0,0 +1,7 @@ +# 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 := krogoth +MANIFESTURL := git@git.enea.com:linux/el_manifests-standard.git +PROFILE_NAME := Standard -- cgit v1.2.3-54-g00ecf