Skip to content

Commit

Permalink
Revert "scripts: serie_update: fetch submodules"
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
ajarmouni-st authored and erwango committed Dec 1, 2023
1 parent 818cef7 commit f217494
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions scripts/serie_update.py
Original file line number Diff line number Diff line change
Expand Up @@ -192,22 +192,14 @@ def clone_cube_repo(self):
# if already exists, then just clean and fetch
self.os_cmd(("git", "clean", "-fdx"), cwd=self.stm32cube_serie_path)
self.os_cmd(("git", "fetch"), cwd=self.stm32cube_serie_path)
# this is useful when HAL drivers submodules are not aleardy
# present locally, otherwise "git fetch" is sufficient
self.os_cmd(("git", "submodule", "update", "--init"),
cwd=self.stm32cube_serie_path)
branch = self.major_branch()
self.os_cmd(
("git", "reset", "--hard", branch),
cwd=self.stm32cube_serie_path,
)
else:
# HAL drivers are now included as git submodules in upstream
# STM32Cube repositories
# So, we need to add --recursive or --recurse-submodules to
# "git clone" to fetch them
self.os_cmd(
("git", "clone", "--recursive", repo_name),
("git", "clone", repo_name),
cwd=self.stm32cube_repo_path,
)
branch = self.major_branch()
Expand Down

0 comments on commit f217494

Please sign in to comment.