Differences

This shows you the differences between two versions of the page.

--- docs:guide-developer:toolchain:use-patches-with-buildsystem [2021/10/15 13:03] – formatting vgaetera
+++ docs:guide-developer:toolchain:use-patches-with-buildsystem [2022/07/24 19:31] (current) – [Adding a new patch] mention importing an upstream patch darksky2
@@ Line 54: / Line 54: @@
 </code>
-Create a new, empty patch file with the //quilt new// command:
+At this point, we can either import an upstream patch or we can create a new patch by hand.  The advantage of importing an upstream patch is that the data associated with it is maintained in the project (upstream's git header, author of the patch, why it is necessary, and if it was upstreamed etc).
+As an aside, both github and gitlab offer the ability to easily create a patch from a given commit in their respective web interfaces.  To do so simply browse to a commit and edit the URL appending a literal ".patch" to it.
-<code bash>
+To import a patch, download it to a temp directory, and give it a name according to these guidelines:
-quilt new 010-main_code_fix.patch
-</code>
   * The name should start with a number, followed by a hyphen and a very short description of what is changed
   * The chosen number should be higher than any existing patch - use //quilt series// to see the list of patches
   * The patch file name should be short but descriptive
+<code bash>
+quilt import /path/to/010-main_code_fix.patch
+</code>
+To simply create a new, empty patch file without importing an existing one:
+<code bash>
+quilt new 010-main_code_fix.patch
+</code>
 After creating the empty patch, files to edit must be associated with it.