Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

scripts: serie_update: integration of changes in Git submodules of HAL & CMSIS Device drivers #184

Merged
merged 1 commit into from
Dec 19, 2023
Merged

scripts: serie_update: integration of changes in Git submodules of HAL & CMSIS Device drivers #184

merged 1 commit into from
Dec 19, 2023

Conversation

ajarmouni-st
Copy link
Contributor

@ajarmouni-st ajarmouni-st commented Nov 24, 2023 •
edited
Loading

STM32Cube HAL & CMSIS Device drivers are now included as Git submodules in the upstream STM32Cube repos. So we need to use additional or different Git commands to fetch them & integrate the changes correctly:

  • To clone STM32Cube repos with the submodules, we add the "--recursive" option to "git clone".
  • Instead of using "git reset --hard" to clean the working tree and switch to a given tag, which misses with submodules in various ways, we use "git checkout -f --recurse-submodules". "Using --recurse-submodules will update the content of all active submodules according to the commit recorded in the superproject. If local modifications in a submodule would be overwritten the checkout will fail unless -f is used." https://git-scm.com/docs/git-checkout

@ajarmouni-st ajarmouni-st marked this pull request as draft November 24, 2023 17:30
@ajarmouni-st ajarmouni-st marked this pull request as ready for review November 27, 2023 10:03
erwango pushed a commit that referenced this pull request Dec 1, 2023
@ajarmouni-st @erwango
Revert "scripts: serie_update: fetch submodules"
f217494 
This reverts commit 818cef7.
Changes introduced in 818cef7 (PR #182) are not enough to update
Cube packages correctly following the introduction of submodules in
the upstream STM32Cube GitHub repos. PR #184 gives a more effective
solution.

Signed-off-by: Abderrahmane Jarmouni <[email protected]>
@erwango erwango requested a review from ABOSTM December 4, 2023 14:10
@ajarmouni-st ajarmouni-st marked this pull request as draft December 7, 2023 16:42
@ajarmouni-st ajarmouni-st marked this pull request as ready for review December 7, 2023 18:23
@ajarmouni-st
scripts: serie_update: fetch submodules
3f59aa1 
STM32Cube HAL & CMSIS Device drivers are now included as git
submodules in the upstream STM32Cube repos. So we need
a new logic to fetch them & integrate the changes.

Signed-off-by: Abderrahmane Jarmouni <[email protected]>
erwango
erwango requested changes Dec 8, 2023
View reviewed changes
Copy link
Member

@erwango erwango left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LTGM, but please provide a bit more detailed summary of the changes in the commit message.

@Desvauxm-st Desvauxm-st merged commit 3fe2e32 into zephyrproject-rtos:main Dec 19, 2023
4 checks passed
@ajarmouni-st ajarmouni-st deleted the dev_cube_update_c3.6.0 branch January 16, 2024 10:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@erwango erwango erwango approved these changes

@gautierg-st gautierg-st gautierg-st approved these changes

@ABOSTM ABOSTM Awaiting requested review from ABOSTM

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ajarmouni-st @erwango @gautierg-st @Desvauxm-st