[FE training-materials-updates] yocto: slides: add some slides on applying patches

[Antoine Ténart]

Repository : git://git.free-electrons.com/training-materials.git

On branch  : master
Link       : http://git.free-electrons.com/training-materials/commit/?id=55f76f9e1ecce5c28b35c828cf589f14694c8bf2

>---------------------------------------------------------------

commit 55f76f9e1ecce5c28b35c828cf589f14694c8bf2
Author: Antoine Tenart <antoine.tenart at free-electrons.com>
Date:   Mon Nov 24 16:39:27 2014 +0100

    yocto: slides: add some slides on applying patches
    
    Signed-off-by: Antoine Tenart <antoine.tenart at free-electrons.com>


>---------------------------------------------------------------

55f76f9e1ecce5c28b35c828cf589f14694c8bf2
 slides/yocto-recipe-extra/yocto-recipe-extra.tex | 34 ++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/slides/yocto-recipe-extra/yocto-recipe-extra.tex b/slides/yocto-recipe-extra/yocto-recipe-extra.tex
index ae52fc9..6c01e99 100644
--- a/slides/yocto-recipe-extra/yocto-recipe-extra.tex
+++ b/slides/yocto-recipe-extra/yocto-recipe-extra.tex
@@ -111,3 +111,37 @@ PACKAGECONFIG ??= "                                                       \
       \end{block}
   \end{itemize}
 \end{frame}
+
+\subsection{Applying patches}
+
+\begin{frame}
+  \frametitle{Applying patches}
+  \begin{itemize}
+    \item Files ending in \code{.patch}, \code{.diff} or with the
+      \code{apply=yes} parameter will be applied during the
+      \code{do_patch} task.
+    \item It is possible to select which tool will be used to apply
+      the patches listed in \code{SRC_URI} variable with
+      \code{PATCHTOOL}.
+    \item By default, \code{PATCHTOOL = 'quilt'} in Poky.
+    \item Possible values: \code{git}, \code{patch} and \code{quilt}.
+    \item See \code{meta/classes/patch.bbclass}
+  \end{itemize}
+\end{frame}
+
+\begin{frame}
+  \frametitle{Resolving conflicts}
+  \begin{itemize}
+    \item The \code{PATCHRESOLVE} variable defines how to handle
+    conflicts when applying patches.
+    \item It has two valid values:
+      \begin{itemize}
+        \item \code{noop}: the build fails if a patch cannot be
+          successfully applied.
+        \item \code{user}: a shell is launched to resolve manually the
+          conflicts.
+      \end{itemize}
+    \item By default, \code{PATCHRESOLVE = "noop"} in
+      \code{meta-yocto}.
+  \end{itemize}
+\end{frame}