nRF Connect SDK code base
The source code, libraries, and tools that compose the nRF Connect SDK are entirely hosted in a set of Git repositories. Basic familiarity with Git is required to understand the architecture of the repository set and to work with the nRF Connect SDK.
All nRF Connect SDK repositories are publicly hosted on the nrfconnect GitHub organization, and accessible to both individual users and companies.
Repository types
There are two main types of Git repositories in the nRF Connect SDK repository set:
nRF repositories
Created, developed, and maintained by Nordic.
Usually licensed for use on Nordic products only.
OSS repositories
Created and maintained by Nordic.
Soft forks of open-source projects.
Typically contain a small set of changes that are specific to nRF Connect SDK.
Updated (“upmerged”) regularly with the latest changes from the open source project.
nRF repositories are stand-alone and have no upstreams, since they are unique to the nRF Connect SDK. Some examples of repositories of this type are:
sdk-nrf: The main repository for Nordic-developed software.
sdk-nrfxlib: A repository containing linkable libraries developed by Nordic.
OSS repositories, on the other hand, are typically soft forks of an upstream open source project, which Nordic maintains in order to keep a small set of changes that do not belong, or have not been merged, to the upstream official open-source repository. For example:
sdk-zephyr is a soft fork (and therefore a downstream) of the upstream official Zephyr repository.
sdk-mcuboot is a soft fork (and therefore a downstream) of the upstream official MCUboot repository.
Repository structure
The nRF Connect SDK uses west to manage the combination of repositories and versions.
A manifest repository, sdk-nrf, contains a file in its root folder, west.yml
, which lists all other repositories (west projects) included in the nRF Connect SDK.
The nRF Connect SDK repository structure has a star topology, with the sdk-nrf repository being the center of the star and all other repositories being west projects that are managed by west.yml
.
This is equivalent to topology T2 in the west documentation.
The figure above depicts the nRF Connect SDK repository structure.
A central concept with this repository structure is that each revision (in Git terms) of the sdk-nrf repository completely determines the revisions of all other
repositories (that is, the west projects).
This means that the linear Git history of this manifest repository also determines the history of the repository set in its entirety, thanks to the west.yml
west manifest file being part of the manifest repository.
West reads the contents of the manifest file to find out which revisions of the project repositories are to be checked out every time west update
is run.
In this way, you can decide to work with a specific nRF Connect SDK release either by initializing a new west installation at a particular tag or by checking out the corresponding tag for a release in an existing installation and then updating your project repositories to the corresponding state with west update
.
Alternatively, you can work with the latest state of development by using the main branch of the sdk-nrf repository, updating it with Git regularly and using west update
to update the project repositories every time the manifest repository changes.
More information about manifests can be found in the west manifest section of the Zephyr documentation.
Revisions
There are two fundamental revisions that are relevant to most nRF Connect SDK users:
The
main
branch of the sdk-nrf repositoryAny Git tag (that is, release, release candidate or development tag) of the sdk-nrf repository
As discussed above, the revision of the manifest repository, sdk-nrf, uniquely determines the revisions of all other repositories, so a discussion about nRF Connect SDK revisions can be essentially limited to the manifest repository revision.
The main
branch of the sdk-nrf repository always contains the latest development state of the nRF Connect SDK.
Since all development is done openly, you can use it if you are not particularly concerned about stability and want to track the latest changes that are being merged continuously into the different repositories.
The Git tags correspond to official releases tested and signed by the Nordic engineers. The format for nRF repositories is as follows:
vX.Y.Z(-rcN)
Where X, Y, and Z are the major, minor, and patch version respectively and, optionally, a release candidate postfix -rcN
is attached if the tag identifies a candidate instead of the actual release.
The Git tags are composed as follows:
vX.Y.Z(-rcN|-devN)
X, Y, and Z are the major, minor, and patch version, respectively.
A special value of 99
for the patch version number is reserved for any revision in between releases.
Tags without a suffix correspond to official releases tested and signed by Nordic Semiconductor engineers.
A release candidate suffix -rcN
is attached if the tag identifies a candidate instead of the actual release.
In between releases, there might be development tags.
These are identified by a -devN
suffix.
In the case of OSS repositories, the git tag format reuses the upstream project’s version along with some nRF Connect SDK specific postfixes:
vX.Y.Z-ncsN(-rcM)
In this format, X, Y and Z are the major, minor and patch versions of the upstream project, and -ncsN
is used to identify the number of nRF Connect SDK releases based on that particular version.
OSS repositories downstream project history
As described in Repository types, the nRF Connect SDK contains OSS repositories, which are based on third-party, open-source Git repositories and may contain additional patches not present upstream. Examples include sdk-zephyr and sdk-mcuboot, which have upstream open-source projects used as a basis for downstream repositories distributed with the nRF Connect SDK. This section describes how the history of these OSS repositories is maintained, and how they are synchronized with their upstreams.
The short logs for these downstream patches contain [nrf xyz]
at the beginning, for different xyz
strings.
This makes their different purposes downstream clearer, and makes them easier to search for and see in git log
.
The current values of [nrf xyz]
are:
[nrf mergeup]
: periodic merges of the upstream tree[nrf fromlist]
: patches which have upstream pull requests, including any later revisions[nrf noup]
: patches which are specific to the nRF Connect SDK[nrf fromtree]
: patches which have been cherry-picked from an upstream tree
Note
The downstream project history is periodically rewritten. This is important to prevent the number of downstream patches included in a specific nRF Connect SDK release from increasing forever. A repository’s history is typically only rewritten once for every nRF Connect SDK release.
To make incorporating new history into your own forks easier, a new point in the downstream nRF Connect SDK history is always created which has an empty git diff
with the previous version.
The empty diff means you can always use:
git merge
to get the rewritten history merged into your own fork without errorsgit rebase --onto
orgit cherry-pick
to reapply any of your own patches cleanly before and after the history rewritegit cherry
to list any additional patches you may have applied to these projects to rewrite history as needed
Additionally, both the old and new histories are committed sequentially into the revision
fields for these projects in the nrf/west.yml
west
manifest file.
This means you can always combine git bisect
in the nrf
repository with west update
at each bisection point to diagnose regressions and the rest.