From 6c61000c3a8ef46a0ded12476b005ae220b90371 Mon Sep 17 00:00:00 2001 From: Samuel Martin Date: Sun, 11 Nov 2012 03:14:56 +0000 Subject: [PATCH] manual: add patch-policy.txt Signed-off-by: Samuel Martin Signed-off-by: Peter Korsgaard --- docs/manual/developer-guide.txt | 2 + docs/manual/patch-policy.txt | 128 ++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+) create mode 100644 docs/manual/patch-policy.txt diff --git a/docs/manual/developer-guide.txt b/docs/manual/developer-guide.txt index f3fc1dd6af..5002897077 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 0000000000..551ea1288f --- /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 +_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 +_PRE_PATCH_HOOKS+ commands if defined; + +. Cleanup the build directory from any existing +*.rej+ files; + +. If +_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 +-+, then: ++ +* If a +series+ file exists in the package directory, then patches are + applied according to the +series+ file; ++ +* Otherwise, patch files matching `-*.patch` or + `-*.patch.` (where ++ is the architecture + name) are applied following the +ls+ command order. + +. Run the +_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 + +--- 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: +--------------- + +or + +--------------- +Fetch from: +--------------- + +It is also possible to add few words about the changes that may have +been necessary if any. -- 2.30.2