github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 17:49:10 +00:00
Code Issues Projects Releases Wiki Activity

docs: fix a few snags in the kernel patch documentation

Browse Source 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer 2017-03-15 10:46:22 +00:00
parent a1a45db3d5
commit 13d3a93a08
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/kernel-patches.md
View File

@ -46,15 +46,15 @@ to refer to the location of the Moby and Linux kernel trees.
There are different ways to do this, but we recommend applying the patches to the current version and then rebase to the new version. We define the following variables to refer to the current base tag and the new tag you want to rebase the patches to: There are different ways to do this, but we recommend applying the patches to the current version and then rebase to the new version. We define the following variables to refer to the current base tag and the new tag you want to rebase the patches to:
```sh ```sh
CURTAG=v4.9.13 CURTAG=v4.9.14
NEWTAG=v4.9.13 NEWTAG=v4.9.15
``` ```
If you don't already have a branch, it's best to import the current patch set and then rebase: If you don't already have a branch, it's best to import the current patch set and then rebase:
```sh ```sh
cd $LINUXSRC cd $LINUXSRC
git checkout -b ${NEWTAG}-moby ${CURTAG} git checkout -b ${NEWTAG}-moby ${CURTAG}
git am ${MOBYSRC}/alpine/kernel/patches/*.patch git am ${MOBYSRC}/kernel/patches/*.patch
git rebase ${NEWTAG}-moby ${NEWTAG} git rebase ${NEWTAG}-moby ${NEWTAG}
``` ```
@ -88,7 +88,7 @@ To export patches to Moby, you should use `git format-patch` from the Linux tree
```sh ```sh
cd $LINUXSRC cd $LINUXSRC
rm $MOBYSRC/alpine/kernel/patches-4.9/* rm $MOBYSRC/alpine/kernel/patches-4.9/*
git format-patch -o $MOBYSRC/alpine/kernel/patches-4.9 v4.9.13..HEAD git format-patch -o $MOBYSRC/kernel/patches-4.9 v4.9.15..HEAD
``` ```
The, create a PR for Moby. The, create a PR for Moby.