From 85d015213b015ec82d102ccfcbae0c6c4669978e Mon Sep 17 00:00:00 2001 From: Stéphane Desneux Date: Thu, 6 Dec 2018 19:51:01 +0100 Subject: tocs: forward port from master branch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit ports the adjustments recently made on master branch to the master-next branch, while keeping changes related to doc reorganization. Change-Id: I3d222bba1151bf0dd9136bed95a88bb2de9bdc24 Signed-off-by: Stéphane Desneux --- content/tocs/architecture/fetched_files.yml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'content/tocs/architecture') diff --git a/content/tocs/architecture/fetched_files.yml b/content/tocs/architecture/fetched_files.yml index 5903a18..b57d5d2 100644 --- a/content/tocs/architecture/fetched_files.yml +++ b/content/tocs/architecture/fetched_files.yml @@ -5,8 +5,8 @@ # # REPOSITORY ENTRY: # - -# url_fetch : gitweb fetch URL (format string with token %repo% %commit% %source%, defined in configuration) -# url_edit : gitweb edut URL (format string with token %repo% %commit% %source%, defined in configuration) +# url_fetch: gitweb fetch URL (format string with token %repo% %commit% %source%, defined in configuration) +# url_edit: gitweb edut URL (format string with token %repo% %commit% %source%, defined in configuration) # git_name: repository name (%repo%) # git_commit: git reference: revision, SHA1, branch... (%commit%) # src_prefix: prefix prepended to %source% @@ -37,11 +37,11 @@ # ------------------------------------ ############################################################################################################## -url_fetch : "AGL_GITHUB_FETCH" -url_edit : "AGL_GITHUB_EDIT" -git_commit : "AGL_GITHUB_BRANCH" -#git_commit : # default defined in _tocs/xxxx/latest.yml -#dst_prefix : # destination_path = destination_prefix + (document.destination || document.source) +#git_commit: # default defined in _tocs/xxxx/latest.yml +#dst_prefix: # destination_path = destination_prefix + (document.destination || document.source) + +url_fetch: GERRIT_FETCH +git_commit: AGL_GERRIT_BRANCH repositories: - @@ -51,9 +51,11 @@ repositories: - source: agl_spec_v1.0_final.pdf - - git_name : "automotive-grade-linux/docs-sources" - git_commit: master-next - src_prefix : docs/security-blueprint + url_fetch: AGL_GITHUB_FETCH + url_edit: AGL_GITHUB_EDIT + git_name: automotive-grade-linux/docs-sources + git_commit: AGL_GITHUB_BRANCH + src_prefix: docs/security-blueprint dst_prefix: security documents: - source: README.md -- cgit 1.2.3-korg