[eclipse-yocto] [neon][rocko][PATCH] generate-doc.sh: fix and simplify build of yocto-docs

Tim Orling timothy.t.orling at linux.intel.com
Tue Nov 6 09:06:50 PST 2018


The generate-doc.sh script had a check for krogoth and yocto-2.1
which do not apply in the rocko branch, the fall back was causing
an error in building the docs and thus a failure on autobuilder.

[YOCTO #12977]

Signed-off-by: Tim Orling <timothy.t.orling at linux.intel.com>
---
 scripts/generate-doc.sh | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/scripts/generate-doc.sh b/scripts/generate-doc.sh
index 45ae818..cdfa323 100755
--- a/scripts/generate-doc.sh
+++ b/scripts/generate-doc.sh
@@ -62,21 +62,10 @@ cd ${DOC_DIR}
 git checkout $1 || fail $? "git checkout $1"
 COMMIT_ID=`git rev-parse HEAD`
 
-# check yocto-docs branch/tag and build sdk-manual or adt-manual accordingly
-# [YOCTO #9622]
-if [ "$1" = "master" ] || [ "$1" = "krogoth" ] || [ "$1" = "yocto-2.1" ]; then
-  DOCS="yocto-project-qs sdk-manual kernel-dev \
-        bsp-guide ref-manual dev-manual profile-manual"
-else
-  DOCS="yocto-project-qs adt-manual kernel-dev \
-        bsp-guide ref-manual dev-manual profile-manual"
-  safe_sed "s/sdk-manual/adt-manual/" ${DOC_PLUGIN_DIR}/plugin.xml
-  safe_sed "s/sdk-manual/adt-manual/" ${DOC_PLUGIN_DIR}/about.html.in
-  safe_sed "s/Software Development Kit (SDK)/Application/" ${DOC_PLUGIN_DIR}/about.html.in
-  safe_sed "s/(SDK)/(ADT)/" ${DOC_PLUGIN_DIR}/about.html.in
-  safe_sed "s/sdk-manual/adt-manual/" ${DOC_PLUGIN_DIR}/toc.xml
-  safe_sed "s/Software Development Kit (SDK)/Application/" ${DOC_PLUGIN_DIR}/toc.xml
-fi
+# keep this in sync with yocto-docs, i.e. in yocto-docs/documentation 
+# run 'make eclipse' to see what targets are valid
+DOCS="yocto-project-qs sdk-manual kernel-dev \
+      bsp-guide ref-manual dev-manual profile-manual"
 
 # build and copy
 cd documentation
-- 
2.14.4



More information about the eclipse-yocto mailing list