mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Roland Hieber <rhi@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Roland Hieber <rhi@pengutronix.de>
Subject: [ptxdist] [PATCH 2/2] doc: dev/ref manual: describe the <PKG>_PATCHES variable
Date: Tue,  8 Oct 2019 12:07:56 +0200	[thread overview]
Message-ID: <20191008100756.27371-2-rhi@pengutronix.de> (raw)
In-Reply-To: <20191008100756.27371-1-rhi@pengutronix.de>

Fixes: 2e2242356f0bc72a56bc ("ptxd_make_world_patchin: allow specifying a custom patch directory")
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 doc/dev_manual.rst         |  5 ++++-
 doc/ref_make_variables.inc | 10 ++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/doc/dev_manual.rst b/doc/dev_manual.rst
index c370940906ea..29d1cbf1d2df 100644
--- a/doc/dev_manual.rst
+++ b/doc/dev_manual.rst
@@ -1265,7 +1265,10 @@ integrated into your BSP or into PTXdist.
 
 PTXdist handles patching automatically.
 After extracting the archive of a package, PTXdist checks for the existence of
-a patch directory named like its ``<PKG>`` variable.
+a patch directory named like its ``<PKG>_PATCHES`` variable, or, if this variable
+is not set, like its ``<PKG>`` variable.
+The patch directory is then searched in all locations listed by the
+``PTXDIST_PATH_PATCHES`` variable, and the first one found is used.
 Take an exemplary package ``foo`` with version ``1.1.0``:
 The variable ``FOO`` will have the value ``foo-1.1.0``, so PTXdist will look for
 a patch directory named ``foo-1.1.0`` in the following locations:
diff --git a/doc/ref_make_variables.inc b/doc/ref_make_variables.inc
index 08854c7db636..fcfac83d385c 100644
--- a/doc/ref_make_variables.inc
+++ b/doc/ref_make_variables.inc
@@ -205,6 +205,16 @@ Package Definition
   For local URLs (``file://`` or ``lndir://``) ``<PKG>_SOURCE`` must not be
   set.
 
+``<PKG>_PATCHES``
+  The name of the patch directory, relative to any of the paths listed in
+  ``PTXDIST_PATH_PATCHES`` (i.e., according to the search order described in
+  :ref:`patching_packages`).
+  If not specified, the default patch directory name is set to the value of the
+  ``<PKG>`` variable.
+
+  This variable can be set for multiple packages that should share the same
+  patch stack (e.g. kernel packages).
+
 ``<PKG>_DIR``
   This is the directory where the source archive is extracted. In most
   cases this is set to ``$(BUILDDIR)/$(<PKG>)``. However, if two packages
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

      reply	other threads:[~2019-10-08 10:07 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-08 10:07 [ptxdist] [PATCH 1/2] doc: dev manual: patches: clean up literal formatting Roland Hieber
2019-10-08 10:07 ` Roland Hieber [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191008100756.27371-2-rhi@pengutronix.de \
    --to=rhi@pengutronix.de \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox