Attention is currently required from: Felix Singer, Martin L Roth.
Nicholas Chin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/69863 )
Change subject: util/kconfig: Fix patch to be compatible with quilt ......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
Sounds good. Thanks for doing the research. Please edit this patch. […]
I checked if the main quilt functionality still worked after adding -p3 to the series file, and it seems like that breaks `quilt refresh` functionality, as quilt returns this: ``` Cannot refresh patches with -p3, please specify -p0, -p1, or -pab instead ``` Using `quilt refresh -p1` reformats the patch to be identical to the original fix I pushed here, so I think overall it would be better if I just left this patch as is. Alternatively I could manually edit the file paths of the original git formatted paths to remove the "util/kconfig" parts of the file paths, resulting in a patch that is the same as what would be output using the command described below. However, since over the course of refreshing patches using quilt the format is the same as my original fix, I may as well leave it.
The method that seems to result in the least amount of manual interventions overall is using `git format-patch --relative=util/kconfig HEAD~` when producing the patch file, resulting in file paths formatted as `{a,b}/<file changed>` (same as the default behavior, but without the util/kconfig part). The main quilt functions (pop, push, and refresh) do seem to work properly with that format without requiring any additional options/interventions, so I think the best solution moving forward is just to document this for adding new patches.
-
Nicholas Chin (Code Review)