The repository is based on the upstream Linux kernel tree. However, we only push upstream tags to the repository. The branches are all downstreamonly.
The repository is based on the upstream Linux kernel tree. All branches except master, though, are downstream-only.
## Branches
### master
The master branch points to the latest ARK release branch (e.g. `ark/v5.6-rc1`).
The master branch tracks [Linus's master branch](git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git)(i.e."mainline").
### internal
...
...
@@ -12,19 +12,15 @@ The internal branch is used for the kernel configuration and build scripts. When
### ark-patches
***This branch is regularly rebased; do not rely on commit hashes in this branch!***
***This branch is regularly rebased; do not rely on commit hashes in this branch unless they are contained by a tag or release branch!***
This branch tracks the latest version of the kernel patches for ARK. Patches for a particular release are available via the ``ark/patches/vX.Y[-rcN]`` branches.
### fedora-patches
***This branch is regularly rebased; do not rely on commit hashes in this branch!***
***This branch is regularly rebased; do not rely on commit hashes in this branch unless they are contained by a tag or release branch!***
This branch tracks the latest version of the kernel patches for Fedora Rawhide. Patches for a particular release are available via the ``fedora/patches/vX.Y[-rcN]`` branches. In the future the hope is to merge ark-patches and fedora-patches.
### rhpatches
This branch is no longer used. Previously, it held the Red Hat patches for the kernel as a quilt series and remains for historical reasons. Patch history up to v5.4 is available in this branch.
This branch tracks the latest version of the kernel patches for Fedora Rawhide. Patches for a particular release are available via the ``fedora/patches/vX.Y[-rcN]`` branches. This branch is based on top of the `ark-patches` branch.
### Release branches
...
...
@@ -38,6 +34,9 @@ Branches in this format (e.g. ``ark/patches/v5.4-rc1`` or ``ark/patches/v5.3``)
Branches in this format (e.g. ``ark/v5.4-rc1`` or ``ark/v5.3``) contain the set of patches that were added on top of the upstream kernel release along with the configuration and build scripts. They can be checked out and built into RPMs. The ``master`` branch points to the latest version of these branches.
### rhpatches
This branch is no longer used. Previously, it held the Red Hat patches for the kernel as a quilt series and remains for historical reasons. Patch history up to v5.4 is available in this branch.
## Tags
...
...
@@ -45,9 +44,11 @@ Branches in this format (e.g. ``ark/v5.4-rc1`` or ``ark/v5.3``) contain the set
Tags in this format (e.g. ``v5.4-rc1`` or ``v5.3``) are the upstream Linux kernel tags from Linus's tree.
### kernel-X.Y.Z-N.elrdy
### kernel-X.Y.Z-N.\<dist\> and kernel-X.Y.Z-0.rcN.YYYYMMDDgit\<short-hash\>.\<dist\>
Tags in this format (e.g. `kernel-5.4.0-1.elrdy`, `kernel-5.6.0-1.fc33`, or `kernel-5.6.0-0.rc5.20200314gitabcd1234.fc33`) map to the RPM name-version-release tuple in the build system. These can be used to check out the source tree used to build that RPM. Tags with the `elrdy` dist are Always Ready kernel releases and tags with the `fcNN` dist are Fedora kernels.
Tags in this format (e.g. ``kernel-5.4.0-1.elrdy``) map to the RPM name-version-release tuple in the build system. These can be used to check out the source tree used to build that RPM.
The tags come in two varieties. The first is kernel builds based off an upstream tag. `kernel-5.4.0-1.elrdy` and `kernel-5.6.0-0.rc6.fc33` fall into this category. The second variety, which includes a date and commit hash, is based off a snapshot of Linus's master branch for that particular day. The git commit hash included in the release is the commit in Linus's tree the build is based on, *not* the commit in the Fedora source tree.
