Move `mbedtls_dev` to framework submodule #9094

davidhorstmann-arm · 2024-05-03T14:03:55Z

Move the mbedtls_dev python module into the mbedtls-framework repository. This PR pairs with Mbed-TLS/mbedtls-framework#15.

PR checklist

Please tick as appropriate and edit the reasons (e.g.: "backport: not needed because this is a new feature")

changelog not required - non-user-facing change
3.6 backport [Backport 3.6] Move mbedtls_dev to framework submodule #9131
2.28 backport not required - no framework submodule for 2.28
tests not required - internal script motion only - current tests should suffice

ronald-cron-arm

This looks quite good to me. I can see that the "Move some files to framework repository" commits in mbedtls and mbedtls-framework are both based on the same commit: 61734ec. The one in mbedtls removes the mbedtls_dev files while the one in mbedtls-framework removes all files but the mbedtls_dev ones that are renamed (path change only) (checked with git show 7554102 --name-status in the framework submodule).

Otherwise, have you checked that you can play the same move game subsequently on another set of mbedtls files, tests/data_files/* for example without merge trouble in framework?

tests/scripts/scripts_path.py

scripts/framework_path.py

davidhorstmann-arm · 2024-05-09T14:44:27Z

Otherwise, have you checked that you can play the same move game subsequently on another set of mbedtls files, tests/data_files/* for example without merge trouble in framework?

I have now added to the script so that it can do this. The result is in Mbed-TLS/mbedtls-framework#18, which is based on the corresponding PR in the framework submodule.

ronald-cron-arm

This looks good to me, thanks. There is a conflict with development now thus you will need to rebase though.

Signed-off-by: David Horstmann <[email protected]>

This allows test scripts to find the new mbedtls_framework module. Signed-off-by: David Horstmann <[email protected]>

Change these to point to the new mbedtls_framework module in the framework submodule. Signed-off-by: David Horstmann <[email protected]>

This allows scripts in the scripts/ directory to get the path to the mbedtls_framework module in framework/scripts/ Signed-off-by: David Horstmann <[email protected]>

Since this python module resides in the framework submodule we must add an extra explicit path to it for mypy. Signed-off-by: David Horstmann <[email protected]>

This allows us to use the mbedtls_framework python files moved there. Signed-off-by: David Horstmann <[email protected]>

This name is more descriptive of its purpose, since it actually adds framework/scripts to the path rather than just framework/ Signed-off-by: David Horstmann <[email protected]>

ronald-cron-arm

I've checked the rebase. LGTM, thanks.

bensze01

LGTM. I've also checked the moved scripts, and they are up to date with the tip of development.

Signed-off-by: Ronald Cron <[email protected]>

ronald-cron-arm · 2024-05-27T15:53:36Z

@davidhorstmann-arm @bensze01 I've just updated the framework to the merge of mbedtls-framework:#15.

davidhorstmann-arm

Framework update LGTM, thanks!

ronald-cron-arm

LGTM up to the last commit and @davidhorstmann-arm checked the last commit.

bensze01

LGTM.

davidhorstmann-arm force-pushed the move-mbedtls-dev-to-framework branch from 1e91186 to eb11292 Compare May 3, 2024 15:02

davidhorstmann-arm requested a review from ronald-cron-arm May 3, 2024 15:28

ronald-cron-arm requested changes May 6, 2024

View reviewed changes

tests/scripts/scripts_path.py Show resolved Hide resolved

scripts/framework_path.py Outdated Show resolved Hide resolved

davidhorstmann-arm mentioned this pull request May 7, 2024

Move mbedtls_dev to mbedtls_framework in the framework repo Mbed-TLS/mbedtls-framework#15

Merged

ronald-cron-arm requested a review from bensze01 May 13, 2024 12:20

ronald-cron-arm removed the needs-review Every commit must be reviewed by at least two team members, label May 13, 2024

ronald-cron-arm previously approved these changes May 13, 2024

View reviewed changes

davidhorstmann-arm added 2 commits May 13, 2024 13:48

Move some files to framework repository

6343a83

Signed-off-by: David Horstmann <[email protected]>

Add framework/scripts to scripts_path.py

1131318

This allows test scripts to find the new mbedtls_framework module. Signed-off-by: David Horstmann <[email protected]>

davidhorstmann-arm dismissed ronald-cron-arm’s stale review via 47fff1e May 13, 2024 12:49

davidhorstmann-arm force-pushed the move-mbedtls-dev-to-framework branch from 2df41f2 to 47fff1e Compare May 13, 2024 12:49

davidhorstmann-arm requested a review from ronald-cron-arm May 13, 2024 12:49

davidhorstmann-arm mentioned this pull request May 13, 2024

[Backport 3.6] Move mbedtls_dev to framework submodule #9131

Merged

4 tasks

davidhorstmann-arm added 5 commits May 13, 2024 14:43

Update references to mbedtls_dev

cd84bb2

Change these to point to the new mbedtls_framework module in the framework submodule. Signed-off-by: David Horstmann <[email protected]>

Add framework_path module

875c32f

This allows scripts in the scripts/ directory to get the path to the mbedtls_framework module in framework/scripts/ Signed-off-by: David Horstmann <[email protected]>

Add mbedtls_framework to mypy checks

299e741

Since this python module resides in the framework submodule we must add an extra explicit path to it for mypy. Signed-off-by: David Horstmann <[email protected]>

Update framework submodule to tip of branch

6c0e362

This allows us to use the mbedtls_framework python files moved there. Signed-off-by: David Horstmann <[email protected]>

Rename framework_path to framework_scripts_path

ecd6d01

This name is more descriptive of its purpose, since it actually adds framework/scripts to the path rather than just framework/ Signed-off-by: David Horstmann <[email protected]>

davidhorstmann-arm force-pushed the move-mbedtls-dev-to-framework branch from 47fff1e to ecd6d01 Compare May 13, 2024 13:43

davidhorstmann-arm added needs-ci Needs to pass CI tests and removed needs-ci Needs to pass CI tests needs-backports Backports are missing or are pending review and approval. labels May 13, 2024

davidhorstmann-arm added needs-review Every commit must be reviewed by at least two team members, and removed needs-ci Needs to pass CI tests needs-reviewer This PR needs someone to pick it up for review labels May 13, 2024

ronald-cron-arm previously approved these changes May 21, 2024

View reviewed changes

bensze01 previously approved these changes May 27, 2024

View reviewed changes

bensze01 added approved Design and code approved - may be waiting for CI or backports and removed needs-review Every commit must be reviewed by at least two team members, labels May 27, 2024

Update framework submodule to the merge of Mbed-TLS#15

a7ec5c8

Signed-off-by: Ronald Cron <[email protected]>

ronald-cron-arm dismissed stale reviews from bensze01 and themself via a7ec5c8 May 27, 2024 15:52

davidhorstmann-arm commented May 28, 2024

View reviewed changes

ronald-cron-arm approved these changes May 28, 2024

View reviewed changes

ronald-cron-arm requested a review from bensze01 May 28, 2024 15:02

bensze01 approved these changes May 28, 2024

View reviewed changes

bensze01 added this pull request to the merge queue May 28, 2024

Merged via the queue into Mbed-TLS:development with commit e3abb6a May 28, 2024
6 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Move `mbedtls_dev` to framework submodule #9094

Move `mbedtls_dev` to framework submodule #9094

davidhorstmann-arm commented May 3, 2024 •

edited

Loading

ronald-cron-arm left a comment

davidhorstmann-arm commented May 9, 2024

ronald-cron-arm left a comment

ronald-cron-arm left a comment

bensze01 left a comment

ronald-cron-arm commented May 27, 2024 •

edited

Loading

davidhorstmann-arm left a comment

ronald-cron-arm left a comment

bensze01 left a comment

Move mbedtls_dev to framework submodule #9094

Move mbedtls_dev to framework submodule #9094

Conversation

davidhorstmann-arm commented May 3, 2024 • edited Loading

PR checklist

ronald-cron-arm left a comment

Choose a reason for hiding this comment

davidhorstmann-arm commented May 9, 2024

ronald-cron-arm left a comment

Choose a reason for hiding this comment

ronald-cron-arm left a comment

Choose a reason for hiding this comment

bensze01 left a comment

Choose a reason for hiding this comment

ronald-cron-arm commented May 27, 2024 • edited Loading

davidhorstmann-arm left a comment

Choose a reason for hiding this comment

ronald-cron-arm left a comment

Choose a reason for hiding this comment

bensze01 left a comment

Choose a reason for hiding this comment

Move `mbedtls_dev` to framework submodule #9094

Move `mbedtls_dev` to framework submodule #9094

davidhorstmann-arm commented May 3, 2024 •

edited

Loading

ronald-cron-arm commented May 27, 2024 •

edited

Loading