summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Johansson <lennart.johansson@enea.com>2016-06-20 11:10:45 +0200
committerLennart Johansson <lennart.johansson@enea.com>2016-06-20 11:10:45 +0200
commitc8203d92c3dec1fc8e4f972d2d74c36f1554cc9e (patch)
treee49fa5a6f4f18565254e17080c8ef109d06da1e5
parentd32acca7ab520ccbbb4b70304291a6db92f2e084 (diff)
downloadel_releases-standard-c8203d92c3dec1fc8e4f972d2d74c36f1554cc9e.tar.gz
Move distro parameters out to manifest_conf.mk
-rw-r--r--doc/Makefile12
-rw-r--r--doc/manifest_conf.mk7
2 files changed, 11 insertions, 8 deletions
diff --git a/doc/Makefile b/doc/Makefile
index ca334b1..1248749 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,18 +1,14 @@
1#Path to this subsystem's root directory 1#Path to this subsystem's root directory
2SUBSYSROOT := $(shell pwd) 2SUBSYSROOT := $(shell pwd)
3 3
4# NOTE: MANIFESTHASH needs to be changed to final hash value or tag before a release 4# NOTE: MANIFESTHASH in manifest_conf.mk needs to be updated with final release tag before a release
5MANIFESTHASH := krogoth 5# The manifest_conf.mk defines MANIFESTHASH and MANIFESTURL and PROFILE_NAME
6MANIFEST := el_manifests-standard 6include manifest_conf.mk
7
7# An alternative is to clone the manifest repository and extract the list of target manifest files from that 8# An alternative is to clone the manifest repository and extract the list of target manifest files from that
8# We need all to get all README, but only first in alphabetic list is used to extract info from poky/ 9# We need all to get all README, but only first in alphabetic list is used to extract info from poky/
9TARGETDEFAULTXMLS := ls1021aiot/default.xml p2041rdb/default.xml qemuarm/default.xml qemuppc/default.xml qemux86/default.xml 10TARGETDEFAULTXMLS := ls1021aiot/default.xml p2041rdb/default.xml qemuarm/default.xml qemuppc/default.xml qemux86/default.xml
10 11
11# Extract URL for repo command to use. It also uses MANIFESTHASH
12MANIFESTURL := git@git.enea.com:linux/$(MANIFEST).git
13# Extract profile name as word-after-hyphen in MANIFEST
14PROFILE_NAME := $(word 2,$(subst -, ,$(MANIFEST)))
15
16 12
17# ***************** Generic docbuild.git auto-clone + s_docbuild symlink *** 13# ***************** Generic docbuild.git auto-clone + s_docbuild symlink ***
18# This also defines TMPCLONEROOT which optionally can be nondefault using BOOK_GLOBALCLONEROOT=yes or a path 14# 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 @@
1# To be included in Makefile
2# NOTE: MANIFESTHASH needs to be changed to final release tag in format refs/tags/ELnnn before a release
3# The values are shown in the release info
4# The manifest is used to fetch information into the release info from the distro files
5MANIFESTHASH := krogoth
6MANIFESTURL := git@git.enea.com:linux/el_manifests-standard.git
7PROFILE_NAME := Standard