Minor all.sh improvements for 3.6 #195

Open
gilles-peskine-arm wants to merge 4 commits from gilles-peskine-arm/make_generated_files-improve-for-3.6 into main
gilles-peskine-arm commented 2025-07-31 10:03:21 -05:00 (Migrated from github.com)

A few improvements to all.sh and make_generated_files.py, mostly relevant for 3.6:

  • Have make_generated_files.py work in 3.6 as well. It's trivial and more convenient. Needs https://github.com/Mbed-TLS/mbedtls/pull/10339 for make_generated_files.py --list in 3.6.
  • Prepare for make list_generated_files to work even when called from all.sh with the make ”quiet wrapper“ active.
  • Fix make_generated_files.py --root DIR not working.
  • In all.sh cleanup, do remove $OUT_OF_SOURCE_DIR in mbedtls too (3.6 and development). We use it so we should clean it.

PR checklist

  • TF-PSA-Crypto PR not required because: just framework improvements
  • development PR not required because: just framework improvements
  • 3.6 PR not required because: just framework improvements
A few improvements to `all.sh` and `make_generated_files.py`, mostly relevant for 3.6: * Have `make_generated_files.py` work in 3.6 as well. It's trivial and more convenient. Needs https://github.com/Mbed-TLS/mbedtls/pull/10339 for `make_generated_files.py --list` in 3.6. * Prepare for `make list_generated_files` to work even when called from `all.sh` with the make ”quiet wrapper“ active. * Fix `make_generated_files.py --root DIR` not working. * In `all.sh` cleanup, do remove `$OUT_OF_SOURCE_DIR` in mbedtls too (3.6 and development). We use it so we should clean it. ## PR checklist - [x] **TF-PSA-Crypto PR** not required because: just framework improvements - [x] **development PR** not required because: just framework improvements - [x] **3.6 PR** not required because: just framework improvements
This pull request has changes conflicting with the target branch.
  • scripts/make_generated_files.py
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 'gilles-peskine-arm/make_generated_files-improve-for-3.6:gilles-peskine-arm/make_generated_files-improve-for-3.6'
git switch 'gilles-peskine-arm/make_generated_files-improve-for-3.6'

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch 'main'
git merge --no-ff 'gilles-peskine-arm/make_generated_files-improve-for-3.6'
git switch 'gilles-peskine-arm/make_generated_files-improve-for-3.6'
git rebase 'main'
git switch 'main'
git merge --ff-only 'gilles-peskine-arm/make_generated_files-improve-for-3.6'
git switch 'gilles-peskine-arm/make_generated_files-improve-for-3.6'
git rebase 'main'
git switch 'main'
git merge --no-ff 'gilles-peskine-arm/make_generated_files-improve-for-3.6'
git switch 'main'
git merge --squash 'gilles-peskine-arm/make_generated_files-improve-for-3.6'
git switch 'main'
git merge --ff-only 'gilles-peskine-arm/make_generated_files-improve-for-3.6'
git switch 'main'
git merge 'gilles-peskine-arm/make_generated_files-improve-for-3.6'
git push origin 'main'
Sign in to join this conversation.
No reviewers
No milestone
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
gh-Mbed-TLS/mbedtls-framework!195
No description provided.