Skip to content

Commit 293364f

Browse files
govindraj-armTrustedFirmware Code Review
authored andcommitted
Merge "docs: updates for playbook" into integration
2 parents a6e0107 + 8b1d4a2 commit 293364f

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

docs/about/lts.rst

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,8 +283,9 @@ To make a new minor release (e.g. 2.x.y → 2.x.y+1), follow these steps.
283283
cherry-pick -x sha1-hash``.
284284
#. Some of the patches of this list may not be taken, mainly due to false
285285
positive. If in doubt, that can be discussed either in the “tf-a-lts” channel
286-
on Discord or during the LTS weekly meeting. There could also be patches to
287-
be taken in tf-a-ci-scripts or tf-a-tests.
286+
on Discord or during the LTS weekly meeting.
287+
#. Some dependency patches, not listed in the CSV file, may have to be taken, to ease the
288+
application of the LTS patches. This can also be discussed with the other LTS maintainers.
288289
#. Push the stack of changes: ``git push origin
289290
HEAD:refs/for/lts-v2.x%topic=for-lts-v2.x.y+1``. You might need the
290291
``--no-verify`` option: ``git push origin --no-verify
@@ -298,6 +299,13 @@ To make a new minor release (e.g. 2.x.y → 2.x.y+1), follow these steps.
298299
present, Gerrit will automatically merge the patch. LTS maintainers will then
299300
trigger a Jenkins job that will take care of the release (tag, mail, and
300301
readthedocs update).
302+
#. Some features may also require updates in other repositories (tf-a-ci-scripts,
303+
tf-a-job-configs or tf-a-tests...). For tf-a-job-configs, there are no LTS branches, but
304+
dedicated scripts for each LTS version which have to be updated manually. This is the case
305+
for e.g. MbedTLS updates. For tf-a-ci-scripts and tf-a-tests, there are LTS branches and patches
306+
will be cherry-picked from master branch to the LTS branch the same way it is done for TF-A.
307+
There is no automation for those repositories. So the patches will have to be merged manually,
308+
and for tf-a-ci-scripts and tf-a-tests, tags will also have to be set manually.
301309

302310
Execution Plan
303311
**************

0 commit comments

Comments
 (0)