davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add documentation for the current fedora-patches situation

Jeremy Cline 2019-12-10 14:56:30 +00:00
parent 2a95732828
commit 110ad41551
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
home.md

@ -26,6 +26,7 @@ Rebasing the kernel involves the following steps:
1. Rebase the kernel patches: ``git rebase <upstream-tag> ark-patches``.
2. If a patch fails to apply and the fix is clear, go ahead and fix it. Otherwise, file an [issue](https://gitlab.com/cki-project/kernel-ark/issues) for each patch that does not apply with the commit hash and conflict details so it can be resolved later.
3. Create a branch for this revision of the kernel patches. This is useful when comparing the state of the patches between versions: ``git branch ark/patches/<upstream-tag>``
4. Import the latest Fedora Rawhide patches from the Fedora [dist-git](https://src.fedoraproject.org/rpms/kernel): ``grep ^Patch $FEDORA_DISTGIT/kernel.spec | awk -vdistgit="$FEDORA_DISTGIT" '{print distgit $2}' | xargs git am``
### Configuration
@ -68,6 +69,10 @@ The internal branch is used for the kernel configuration and build scripts. When
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 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.