mad-jsanjuan
commented
1 year ago On a first investigation it looks the submodules intended to be updated for next release would be:
[submodule "DRIVERS/BBIS/CHAMELEON"]
branch = mad-dev
[submodule "13Z015-06"]
branch = mad-dev_issue228
[submodule "13M072-06"]
branch = mad-dev
[submodule "13Z055-90"]
branch = mad_devThese branches are also inconsistent in the naming (maddev, mad-dev. mad-dev*). An overview is described below:
CHAMELEON
This repo contains one branch with changes that may be needed for next release:
13Z015-06
In this repo there are two mad* branches:
- mad-dev_issue228 : This one contains one commit that does not seem to be useful. It seems to add debugging traces.
- mad-dev-10_14: This one contains some commits that may affect the drivers for this components.
13M072-06
This repo contains one branch with changes that may be needed for next release:
13Z055-90
This repo contains one branch with changes that may be needed for next release. However, there seems to be some development based on master instead of this mad_devbranch. We should probably rename this branch to mad-dev for consistency and make sure expected developments for next releases are based on this branch instead of master.
- mad_dev : This one shall be named
mad-devinstead. - TC2219001 : This development may be needed for next release. If so it would need to be merged to
mad-dev.
F27P CPU Support
The other set of changes on this mad-dev_02_05 branch is the support for the F27P CPU board and release bump from version 2.4 to 2.5 on the INSTALL.sh script.
dpfeuffer
According the Configuration management plan 13MD05-90_SwConfMgmtPlan.md, the development branch of the SCM project repos shall be named mad-dev. There is a mad-dev_02_05 branch with commits from the retired Spanish colleagues. Please evaluate the commits and merge it into mad-dev. The development branch shall be used later on for the release testing. All pull requests shall be merged into mad-dev, but not into master directly. For further information, see chapter "Workflow C - Outsourced projects" in "Guideline for SW Configuration Management (SW-CM)".