summaryrefslogtreecommitdiffstats
path: root/doc/dev_manual.rst
diff options
context:
space:
mode:
authorJuergen Borleis <jbe@pengutronix.de>2015-06-04 15:40:14 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2015-12-03 22:37:00 +0100
commit584ce0973254050ca0945c261d8dcd064c69c0b7 (patch)
treeb87eae26c93f7a0a001c130a2524c0401d6f31e6 /doc/dev_manual.rst
parentf689cdcf7a1543782a04f27bea427262405159fc (diff)
downloadptxdist-584ce0973254050ca0945c261d8dcd064c69c0b7.tar.gz
ptxdist-584ce0973254050ca0945c261d8dcd064c69c0b7.tar.xz
Developer's manual: patch and quilt are outdated.
This section must be still changed to a git workflow. Just adapt it slightly to recomment git, but still document the usage of quilt. Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
Diffstat (limited to 'doc/dev_manual.rst')
-rw-r--r--doc/dev_manual.rst12
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/dev_manual.rst b/doc/dev_manual.rst
index 178a8a0c3..dd00a7ca9 100644
--- a/doc/dev_manual.rst
+++ b/doc/dev_manual.rst
@@ -54,8 +54,8 @@ fixes per package. They are organized in *patch series* and can be found
in the ``patches/`` directory within a subdirectory using the same name
as the package itself.
-PTXdist uses the utility ``patch`` or ``quilt`` to apply an existing
-patch series after extracting the archive. So, every patch series
+PTXdist uses the utility ``patch`` or ``quilt`` (or ``git`` on demand) to apply
+an existing patch series after extracting the archive. So, every patch series
contains a set of patches and one ``series`` file to define the order in
which the patches must be applied.
@@ -1095,10 +1095,10 @@ PTXdist should be used.
Creating Patches for a Package
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-PTXdist uses the utilities ``git``, *patch* or *quilt* to work with
-patches or patch series. We recommend *quilt*, as it can manage patch
-series in a very easy way. For this manual we assume *quilt* is
-installed on the build host.
+PTXdist uses the utilities *git*, *patch* or *quilt* to work with
+patches or patch series. We recommend *git*, as it can manage patch
+series in a very easy way.
+For this manual and the example we use *quilt* instead.
Creating a Patch Series for a Package
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^