From 110ad415512f5efe4b85d3263150a9ca156e0284 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Tue, 10 Dec 2019 14:56:30 +0000 Subject: [PATCH] Add documentation for the current fedora-patches situation --- home.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/home.md b/home.md index 63549cd..dc1d392 100644 --- a/home.md +++ b/home.md @@ -26,6 +26,7 @@ Rebasing the kernel involves the following steps: 1. Rebase the kernel patches: ``git rebase 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/`` +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.