diff options
Diffstat (limited to 'util')
| -rw-r--r-- | util/kconfig/README.md | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/util/kconfig/README.md b/util/kconfig/README.md index 4d508a5e19..a02d903aeb 100644 --- a/util/kconfig/README.md +++ b/util/kconfig/README.md @@ -13,7 +13,9 @@ The first step is to unapply the patches. This can either be done with quilt in an already-configured tree (`quilt pop -a` should cleanly unapply them all) or manually if quilt doesn't have its tracking metadata around yet: - $ for i in `ls patches/*.patch | tac`; do patch -p1 -R -i "$i"; done +```sh +for i in $( ls patches/*.patch | tac ); do patch -p1 -R -i "$i"; done +``` The result should be a subtree that, apart from a few coreboot specific files on our side (e.g. documentation, integration in our build system) @@ -23,9 +25,11 @@ uprev we did. Check the uprev version by looking through `git log util/kconfig` output in our tree. Assuming that you want to uprev from Linux 5.13 to 5.14, with a Linux git tree -available in ~/linux, +available in `~/linux` - $ cd util/kconfig && (cd ~/linux/ && git diff v5.13..v5.14 scripts/kconfig) | patch -p2` +```sh +cd util/kconfig && (cd ~/linux/ && git diff v5.13..v5.14 scripts/kconfig) | patch -p2` +``` applies the changes to your local tree. @@ -39,6 +43,7 @@ write a meaningful commit message that documents what Linux kconfig version the tree has been upreved to. ## Adding a new patch + The format of the patches to kconfig is a mix of the headers produced by `git format-patch` and the patch format of quilt. However neither git nor quilt seems to have any functionality to directly produce a file in such a format |