Skip to content

Conversation

@erwango
Copy link
Member

@erwango erwango commented Apr 29, 2019

License link provided in stm32cube abstract packages was not
reflecting the actual license in use for these packages.
Update the link to BSD 3-Clause official.

Signed-off-by: Erwan Gouriou erwan.gouriou@linaro.org

@nashif
Copy link
Member

nashif commented May 3, 2019

@erwango please rebase

License link provided in stm32cube abstract packages was not
reflecting the actual license in use for these packages.
Update the link to BSD 3-Clause official.

Signed-off-by: Erwan Gouriou <erwan.gouriou@linaro.org>
@erwango erwango force-pushed the fix_cube_licence_link branch from 78e25b1 to 0473628 Compare May 6, 2019 07:29
@galak galak merged commit 15c2296 into zephyrproject-rtos:master May 6, 2019
@backporting
Copy link

backporting bot commented May 6, 2019

The backport to v1.14-branch failed:

Commits ["04736283e828edf64e83bee43d184a49350bdbdf"] could not be cherry-picked on top of v1.14-branch

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport v1.14-branch
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick 04736283e828edf64e83bee43d184a49350bdbdf
# Create a new branch with these backported commits.
git checkout -b backport-15731-to-v1.14-branch
# Push it to GitHub.
git push --set-upstream origin backport-15731-to-v1.14-branch
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

Then, create a pull request where the base branch is v1.14-branch and the compare/head branch is backport-15731-to-v1.14-branch.

@erwango erwango deleted the fix_cube_licence_link branch September 3, 2019 12:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

platform: STM32 ST Micro STM32

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants