From: Samuel Martin <s.martin49@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 18/23] manual: add patch-policy.txt
Date: Sun, 11 Nov 2012 14:14:56 +0100 [thread overview]
Message-ID: <1352639701-27829-19-git-send-email-s.martin49@gmail.com> (raw)
In-Reply-To: <1352639701-27829-1-git-send-email-s.martin49@gmail.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
create mode 100644 docs/manual/patch-policy.txt
diff --git a/docs/manual/developer-guide.txt b/docs/manual/developer-guide.txt
index f3fc1dd..5002897 100644
--- a/docs/manual/developer-guide.txt
+++ b/docs/manual/developer-guide.txt
@@ -7,6 +7,8 @@ include::writing-rules.txt[]
include::adding-packages.txt[]
+include::patch-policy.txt[]
+
include::download-infra.txt[]
include::board-support.txt[]
diff --git a/docs/manual/patch-policy.txt b/docs/manual/patch-policy.txt
new file mode 100644
index 0000000..551ea12
--- /dev/null
+++ b/docs/manual/patch-policy.txt
@@ -0,0 +1,128 @@
+// -*- mode:doc; -*-
+
+[[patch-policy]]
+
+Patch Policy
+------------
+
+While integrating a new package or updating an existing one, it may be
+necessary to patch the source of the software to get it built within
+Buildroot.
+
+Buildroot offers an infrastructure to automatically handle this during
+the builds. It support several ways of applying patch sets:
+
+Provinding patches
+~~~~~~~~~~~~~~~~~~
+
+Additionnal tarball
+^^^^^^^^^^^^^^^^^^^
+
+If there needs to apply a patch set available as a tarball and
+downloadable, then add the patch tarball to the +<packagename>_PATCH+
+variable.
+
+Note that the patch tarballs are downloaded from the same site as the
+sources.
+
+Within Buildroot
+^^^^^^^^^^^^^^^^
+
+Most of the patches are provided within Buildroot, in the package
+directory, because they aim to fix cross-compilation, +libc+ support,
+or whatever the reason is.
+
+These patch files should have the extension +*.patch+.
+
+A +series+ file, like +quilt+ uses it, may also be added in the
+package directory. In that case, the +series+ file defines the patch
+application order.
+
+How patches are applied
+~~~~~~~~~~~~~~~~~~~~~~~
+
+. Run the +<packagename>_PRE_PATCH_HOOKS+ commands if defined;
+
+. Cleanup the build directory from any existing +*.rej+ files;
+
+. If +<packagename>_PATCH+ is defined, then patches from these
+ tarballs are applied;
+
+. If there are some +*.patch+ files in the package directory or in the
+ a package subdirectory named +<packagename>-<packageversion>+, then:
++
+* If a +series+ file exists in the package directory, then patches are
+ applied according to the +series+ file;
++
+* Otherwise, patch files matching `<packagename>-*.patch` or
+ `<packagename>-*.patch.<arch>` (where +<arch>+ is the architecture
+ name) are applied following the +ls+ command order.
+
+. Run the +<packagename>_POST_PATCH_HOOKS+ commands if defined.
+
+If something goes wrong in the steps _3_ or _4_, then the build fails.
+
+Format and licensing of the package patches
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Patches are released under the same license the software that is
+modified.
+
+A message explaining what does the patch and why should be add in the
+patch's header.
+
+You should add a +signed-off-by+ statement in the header of the each
+patch to help keeping track of the changes.
+
+If the software is under versionning, it is recommended to use the SCM
+software to generate the patch set.
+
+Otherwise, concatenate the header with the output of the
++diff -purN source.c.orig source.c+ command.
+
+At the end, the patch should look like:
+
+---------------
+configure.ac: add C++ support test
+
+signed-off-by John Doe <john.doe@noname.org>
+
+--- configure.ac.orig
++++ configure.ac
+@@ -40,2 +40,12 @@
+
+AC_PROG_MAKE_SET
++
++AC_CACHE_CHECK([whether the C++ compiler works],
++ [rw_cv_prog_cxx_works],
++ [AC_LANG_PUSH([C++])
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
++ [rw_cv_prog_cxx_works=yes],
++ [rw_cv_prog_cxx_works=no])
++ AC_LANG_POP([C++])])
++
++AM_CONDITIONAL([CXX_WORKS], [test "x$rw_cv_prog_cxx_works" = "xyes"])
+---------------
+
+Integrating patches found on the Web
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When integrating a patch whom you are not the author, you have to add
+few things in the header of the patch itself.
+
+Depending on whether the patch has been pick-up from the project
+repository itself, or from somewhere on the web, add one of the
+following tags:
+
+---------------
+Backported from: <some commit id>
+---------------
+
+or
+
+---------------
+Fetch from: <some url>
+---------------
+
+It is also possible to add few words about the changes that may have
+been necessary if any.
--
1.8.0
next prev parent reply other threads:[~2012-11-11 13:14 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-11 13:14 [Buildroot] [PATCH 00/23] Pull request for branch for-2012/doc Samuel Martin
2012-11-11 13:14 ` [Buildroot] [PATCH 01/23] dependencies.sh: remove makeinfo (texinfo) from the requirement list Samuel Martin
2012-11-11 17:10 ` Thomas Petazzoni
2012-11-15 23:00 ` Peter Korsgaard
2012-11-11 13:14 ` [Buildroot] [PATCH 02/23] manual: make clean target consistent with others in buildroot Samuel Martin
2012-11-11 22:57 ` Arnout Vandecappelle
2012-11-11 23:34 ` Samuel Martin
2012-11-15 21:56 ` Peter Korsgaard
2012-11-15 22:07 ` Samuel Martin
2012-11-11 13:14 ` [Buildroot] [PATCH 03/23] manual: set toc depth to 4 for html outputs Samuel Martin
2012-11-11 13:14 ` [Buildroot] [PATCH 04/23] manual: rework the whole documentation stub Samuel Martin
2012-11-11 13:14 ` [Buildroot] [PATCH 05/23] manual: rework introduction.txt and add embedded-basics.txt Samuel Martin
2012-11-11 13:14 ` [Buildroot] [PATCH 06/23] manual: rework using.txt and update common-usage.txt Samuel Martin
2012-11-11 13:14 ` [Buildroot] [PATCH 07/23] manual: customize-rootfs.txt: refactoring, misc. fixes and update Samuel Martin
2012-11-11 13:14 ` [Buildroot] [PATCH 08/23] manual: update rebuilding-packages.txt Samuel Martin
2012-11-11 13:14 ` [Buildroot] [PATCH 09/23] manual: adding-package-directory.txt: update, cleanup and typo fixes Samuel Martin
2012-11-11 13:14 ` [Buildroot] [PATCH 10/23] manual: add prerequisite.txt Samuel Martin
2012-11-11 13:14 ` [Buildroot] [PATCH 11/23] manual: add make-tips.txt Samuel Martin
2012-11-11 13:14 ` [Buildroot] [PATCH 12/23] manual: faq.txt: rework and update Samuel Martin
2012-11-11 13:14 ` [Buildroot] [PATCH 13/23] manual: add writing-rules.txt Samuel Martin
2012-11-11 13:14 ` [Buildroot] [PATCH 14/23] manual: add get-involved.txt Samuel Martin
2012-11-11 13:14 ` [Buildroot] [PATCH 15/23] manual: add contribute.txt Samuel Martin
2012-11-11 13:14 ` [Buildroot] [PATCH 16/23] manual: add package-make-target.txt Samuel Martin
2012-11-11 13:14 ` [Buildroot] [PATCH 17/23] manual: add download-infra.txt Samuel Martin
2012-11-11 13:14 ` Samuel Martin [this message]
2012-11-11 13:14 ` [Buildroot] [PATCH 19/23] manual: add adding-package-tips.txt Samuel Martin
2012-11-11 13:14 ` [Buildroot] [PATCH 20/23] manual: add legal-info.txt Samuel Martin
2012-11-11 13:14 ` [Buildroot] [PATCH 21/23] manual: add pkg-list.txt (generated list of available packages) Samuel Martin
2012-11-11 23:11 ` Arnout Vandecappelle
2012-11-11 13:15 ` [Buildroot] [PATCH 22/23] manual: add deprecated-list.txt Samuel Martin
2012-11-11 13:15 ` [Buildroot] [PATCH 23/23] manual: add beyond-buildroot.txt Samuel Martin
2012-11-11 13:23 ` [Buildroot] [PATCH 00/23] Pull request for branch for-2012/doc Samuel Martin
2012-11-11 23:13 ` Arnout Vandecappelle
2012-11-15 23:01 ` Peter Korsgaard
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=1352639701-27829-19-git-send-email-s.martin49@gmail.com \
--to=s.martin49@gmail.com \
--cc=buildroot@busybox.net \
/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