coreboot-kgpe-d16/util/kconfig
Patrick Georgi a284a36535 util/kconfig: Add README.md documenting the uprev procedure
Change-Id: I2e74f1c5cb1657e11d4f7ea101549329274102db
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/57879
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Singer <felixsinger@posteo.net>
2022-07-22 19:27:32 +00:00
..
lxdialog util/kconfig: Uprev to Linux 5.13's kconfig 2021-07-13 20:28:14 +00:00
patches util/kconfig: Rewrite patch in quilt's normal form 2021-11-02 06:40:41 +00:00
.gitignore util/kconfig: Uprev to Linux 5.13's kconfig 2021-07-13 20:28:14 +00:00
Makefile util/kconfig: Uprev to Linux 5.13's kconfig 2021-07-13 20:28:14 +00:00
Makefile.inc util/kconfig: Add pre-built parser 2021-09-13 15:35:03 +00:00
README.md util/kconfig: Add README.md documenting the uprev procedure 2022-07-22 19:27:32 +00:00
conf.c util/kconfig: Uprev to Linux 5.14's kconfig 2021-11-02 08:10:41 +00:00
confdata.c util/kconfig: Uprev to Linux 5.13's kconfig 2021-07-13 20:28:14 +00:00
description.md
expr.c util/kconfig: Uprev to Linux 5.13's kconfig 2021-07-13 20:28:14 +00:00
expr.h util/kconfig: Uprev to Linux 5.13's kconfig 2021-07-13 20:28:14 +00:00
gconf-cfg.sh util/kconfig: Uprev to Linux 5.13's kconfig 2021-07-13 20:28:14 +00:00
gconf.c util/kconfig: Uprev to Linux 5.13's kconfig 2021-07-13 20:28:14 +00:00
gconf.glade
images.c util/kconfig: Uprev to Linux 5.13's kconfig 2021-07-13 20:28:14 +00:00
images.h util/kconfig: Uprev to Linux 5.13's kconfig 2021-07-13 20:28:14 +00:00
internal.h util/kconfig: Uprev to Linux 5.13's kconfig 2021-07-13 20:28:14 +00:00
lexer.l util/kconfig: Uprev to Linux 5.13's kconfig 2021-07-13 20:28:14 +00:00
lexer.lex.c_shipped util/kconfig: Add pre-built parser 2021-09-13 15:35:03 +00:00
list.h util/kconfig: Uprev to Linux 5.13's kconfig 2021-07-13 20:28:14 +00:00
lkc.h util/kconfig: Uprev to Linux 5.13's kconfig 2021-07-13 20:28:14 +00:00
lkc_proto.h util/kconfig: Uprev to Linux 5.13's kconfig 2021-07-13 20:28:14 +00:00
mconf-cfg.sh util/kconfig: detect ncurses on FreeBSD 2021-08-06 15:35:39 +00:00
mconf.c util/kconfig: Uprev to Linux 5.13's kconfig 2021-07-13 20:28:14 +00:00
menu.c util/kconfig: Uprev to Linux 5.13's kconfig 2021-07-13 20:28:14 +00:00
merge_config.sh util/kconfig: Uprev to Linux 5.15's kconfig 2021-11-02 08:10:47 +00:00
nconf-cfg.sh util/kconfig: Uprev to Linux 5.13's kconfig 2021-07-13 20:28:14 +00:00
nconf.c util/kconfig: Uprev to Linux 5.13's kconfig 2021-07-13 20:28:14 +00:00
nconf.gui.c util/kconfig: Uprev to Linux 5.13's kconfig 2021-07-13 20:28:14 +00:00
nconf.h util/kconfig: Uprev to Linux 5.13's kconfig 2021-07-13 20:28:14 +00:00
parser.tab.c_shipped util/kconfig: Add pre-built parser 2021-09-13 15:35:03 +00:00
parser.tab.h_shipped util/kconfig: Add pre-built parser 2021-09-13 15:35:03 +00:00
parser.y util/kconfig: Uprev to Linux 5.13's kconfig 2021-07-13 20:28:14 +00:00
preprocess.c util/kconfig: Uprev to Linux 5.13's kconfig 2021-07-13 20:28:14 +00:00
qconf-cfg.sh util/kconfig: Uprev to Linux 5.13's kconfig 2021-07-13 20:28:14 +00:00
qconf.cc util/kconfig: Uprev to Linux 5.13's kconfig 2021-07-13 20:28:14 +00:00
qconf.h util/kconfig: Uprev to Linux 5.13's kconfig 2021-07-13 20:28:14 +00:00
regex.c
regex.h
streamline_config.pl util/kconfig: Uprev to Linux 5.14's kconfig 2021-11-02 08:10:41 +00:00
symbol.c util/kconfig: Uprev to Linux 5.13's kconfig 2021-07-13 20:28:14 +00:00
toada.c
util.c util/kconfig: Uprev to Linux 5.13's kconfig 2021-07-13 20:28:14 +00:00

README.md

coreboot kconfig

This is coreboot's copy of kconfig which tracks Linux as upstream but comes with a few patches for portability but also a few semantic changes.

The patches that lead to this tree can be found in the patches/ subdirectory in a quilt friendly format that is also simple enough to manage manually with Unix tooling.

Updating kconfig

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

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) and a few files on the upstream end that we don't carry (e.g. the tests), is identical to the scripts/kconfig/ directory of Linux as of the most recent 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,

$ cd util/kconfig && (cd ~/linux/ && git diff v5.13..v5.14 scripts/kconfig) | patch -p2`

applies the changes to your local tree.

Then reapply our patch train, which might be as simple as quilt push -a --refresh but might also require some meddling with the patches to make them apply again with the changes you just imported from Linux.

Check that kconfig still works, git add and git commit the changes and write a meaningful commit message that documents what Linux kconfig version the tree has been upreved to.